From ffcff4aea15466d6adacd99844d58de5186c883a Mon Sep 17 00:00:00 2001 From: j883376 Date: Mon, 6 May 2013 13:07:41 -0400 Subject: [PATCH 1/4] Remove trailing whitespace --- CMakeLists.txt | 10 +- cmake/FindMySQL.cmake | 5 +- common/BasePacket.cpp | 6 +- common/BasePacket.h | 6 +- common/CRC16.cpp | 2 +- common/Condition.cpp | 20 +- common/Condition.h | 4 +- common/EQDB.cpp | 8 +- common/EQDB.h | 8 +- common/EQDBRes.cpp | 8 +- common/EQDBRes.h | 6 +- common/EQEMuError.cpp | 6 +- common/EQEMuError.h | 6 +- common/EQEmuConfig.cpp | 16 +- common/EQEmuConfig.h | 28 +- common/EQNetwork.cpp | 30 +- common/EQPacket.cpp | 22 +- common/EQPacket.h | 44 +- common/EQStream.cpp | 110 +- common/EQStream.h | 42 +- common/EQStreamFactory.cpp | 44 +- common/EQStreamFactory.h | 2 +- common/EQStreamIdent.cpp | 26 +- common/EQStreamIdent.h | 10 +- common/EQStreamIntf.h | 2 +- common/EQStreamLocator.h | 26 +- common/EQStreamProxy.cpp | 4 +- common/EQStreamProxy.h | 6 +- common/EmuTCPConnection.cpp | 68 +- common/EmuTCPConnection.h | 34 +- common/Item.cpp | 292 +- common/Item.h | 84 +- common/MaxSkill.cpp | 3110 ++++++++--------- common/MiscFunctions.cpp | 10 +- common/MiscFunctions.h | 4 +- common/Mutex.cpp | 2 +- common/ProcLauncher.cpp | 100 +- common/ProcLauncher.h | 18 +- common/StructStrategy.cpp | 14 +- common/StructStrategy.h | 12 +- common/TCPConnection.cpp | 38 +- common/TCPConnection.h | 26 +- common/TCPServer.cpp | 16 +- common/TCPServer.h | 26 +- common/XMLParser.cpp | 22 +- common/XMLParser.h | 12 +- common/bodytypes.h | 2 +- common/breakdowns.h | 4 +- common/classes.cpp | 424 +-- common/classes.h | 30 +- common/common_profile.h | 24 +- common/crash.cpp | 12 +- common/crc32.cpp | 6 +- common/crc32.h | 4 +- common/database.cpp | 128 +- common/database.h | 24 +- common/dbasync.cpp | 20 +- common/dbasync.h | 8 +- common/dbcore.cpp | 2 +- common/dbcore.h | 2 +- common/dbmemshare.cpp | 2 +- common/debug.cpp | 10 +- common/debug.h | 8 +- common/deity.h | 4 +- common/emu_opcodes.cpp | 4 +- common/emu_oplist.h | 2 +- common/eq_constants.h | 80 +- common/eq_packet_structs.h | 56 +- common/eqemu_exception.cpp | 18 +- common/eqemu_exception.h | 30 +- common/eqtime.cpp | 8 +- common/eqtime.h | 6 +- common/errmsg.h | 6 +- common/extprofile.cpp | 6 +- common/extprofile.h | 8 +- common/faction.h | 12 +- common/features.h | 8 +- common/fixed_memory_hash_set.h | 16 +- common/fixed_memory_variable_hash_set.h | 22 +- common/guild_base.cpp | 424 +-- common/guild_base.h | 30 +- common/guilds.cpp | 46 +- common/ipc_mutex.h | 16 +- common/languages.h | 28 +- common/linked_list.h | 22 +- common/logsys.cpp | 18 +- common/logsys.h | 24 +- common/logsys_eqemu.cpp | 6 +- common/logtypes.h | 4 +- common/md5.cpp | 4 +- common/md5.h | 4 +- common/memory_mapped_file.cpp | 60 +- common/memory_mapped_file.h | 20 +- common/opcode_dispatch.h | 50 +- common/opcodemgr.cpp | 52 +- common/opcodemgr.h | 42 +- common/packet_dump.cpp | 4 +- common/packet_dump_file.cpp | 2 +- common/packet_functions.cpp | 76 +- common/packetfile.cpp | 124 +- common/packetfile.h | 46 +- common/patches/Client62.cpp | 102 +- common/patches/Client62.h | 20 +- common/patches/Client62_structs.h | 112 +- common/patches/RoF.cpp | 230 +- common/patches/RoF.h | 20 +- common/patches/RoF_structs.h | 136 +- common/patches/SSDefine.h | 16 +- common/patches/SoD.cpp | 200 +- common/patches/SoD.h | 20 +- common/patches/SoD_structs.h | 50 +- common/patches/SoF.cpp | 186 +- common/patches/SoF.h | 20 +- common/patches/SoF_opcode_list.h | 2 +- common/patches/SoF_structs.h | 38 +- common/patches/Titanium.cpp | 126 +- common/patches/Titanium.h | 20 +- common/patches/Titanium_structs.h | 166 +- common/patches/Underfoot.cpp | 198 +- common/patches/Underfoot.h | 20 +- common/patches/Underfoot_structs.h | 58 +- common/patches/template.cpp | 26 +- common/patches/template.h | 20 +- common/perl_EQDB.cpp | 4 +- common/perl_EQDBRes.cpp | 6 +- common/profiler.h | 10 +- common/ptimer.h | 34 +- common/queues.h | 6 +- common/rdtsc.cpp | 24 +- common/rdtsc.h | 26 +- common/rulesys.h | 20 +- common/ruletypes.h | 8 +- common/seperator.h | 4 +- common/serverinfo.cpp | 16 +- common/servertalk.h | 14 +- common/shareddb.cpp | 246 +- common/shareddb.h | 12 +- common/spdat.cpp | 50 +- common/spdat.h | 60 +- common/timeoutmgr.cpp | 2 +- common/timeoutmgr.h | 10 +- common/timer.cpp | 18 +- common/types.h | 2 +- common/useperl.h | 4 +- common/worldconn.cpp | 12 +- common/worldconn.h | 12 +- eqlaunch/CMakeLists.txt | 2 +- eqlaunch/ZoneLaunch.cpp | 26 +- eqlaunch/ZoneLaunch.h | 30 +- eqlaunch/eqlaunch.cpp | 40 +- eqlaunch/worldserver.cpp | 22 +- eqlaunch/worldserver.h | 6 +- loginserver/CMakeLists.txt | 2 +- loginserver/Client.cpp | 14 +- loginserver/Client.h | 2 +- loginserver/ClientManager.cpp | 4 +- loginserver/Config.cpp | 2 +- loginserver/Config.h | 4 +- loginserver/Database.h | 2 +- loginserver/DatabaseMySQL.cpp | 10 +- loginserver/DatabaseMySQL.h | 2 +- loginserver/DatabasePostgreSQL.cpp | 12 +- loginserver/DatabasePostgreSQL.h | 2 +- loginserver/Encryption.cpp | 10 +- loginserver/ErrorLog.cpp | 68 +- loginserver/LoginServer.h | 2 +- loginserver/LoginStructures.h | 2 +- loginserver/Main.cpp | 18 +- loginserver/Options.h | 16 +- loginserver/ServerManager.cpp | 8 +- loginserver/WorldServer.cpp | 24 +- loginserver/WorldServer.h | 4 +- queryserv/CMakeLists.txt | 2 +- queryserv/database.h | 4 +- queryserv/lfguild.cpp | 14 +- queryserv/queryservconfig.h | 2 +- queryserv/worldserver.cpp | 12 +- queryserv/worldserver.h | 2 +- shared_memory/items.cpp | 12 +- shared_memory/items.h | 4 +- shared_memory/loot.cpp | 10 +- shared_memory/loot.h | 4 +- shared_memory/main.cpp | 12 +- shared_memory/npc_faction.cpp | 12 +- shared_memory/npc_faction.h | 4 +- shared_memory/skill_caps.cpp | 10 +- shared_memory/skill_caps.h | 4 +- shared_memory/spells.cpp | 4 +- shared_memory/spells.h | 4 +- tests/cppunit/collectoroutput.cpp | 18 +- tests/cppunit/compileroutput.cpp | 28 +- tests/cppunit/cpptest-assert.h | 6 +- tests/cppunit/cpptest-collectoroutput.h | 28 +- tests/cppunit/cpptest-compileroutput.h | 20 +- tests/cppunit/cpptest-htmloutput.h | 12 +- tests/cppunit/cpptest-output.h | 20 +- tests/cppunit/cpptest-source.h | 10 +- tests/cppunit/cpptest-suite.h | 34 +- tests/cppunit/cpptest-textoutput.h | 14 +- tests/cppunit/cpptest-time.h | 12 +- tests/cppunit/htmloutput.cpp | 80 +- tests/cppunit/missing.cpp | 12 +- tests/cppunit/missing.h | 12 +- tests/cppunit/source.cpp | 12 +- tests/cppunit/suite.cpp | 48 +- tests/cppunit/textoutput.cpp | 26 +- tests/cppunit/time.cpp | 30 +- tests/cppunit/utils.cpp | 4 +- tests/cppunit/utils.h | 2 +- tests/cppunit/winconfig.h | 2 +- tests/fixed_memory_test.h | 24 +- tests/fixed_memory_variable_test.h | 22 +- tests/ipc_mutex_test.h | 10 +- tests/main.cpp | 4 +- tests/memory_mapped_file_test.h | 20 +- ucs/CMakeLists.txt | 2 +- ucs/chatchannel.cpp | 10 +- ucs/clientlist.cpp | 72 +- ucs/clientlist.h | 4 +- ucs/database.cpp | 28 +- ucs/database.h | 4 +- ucs/ucs.cpp | 2 +- ucs/ucsconfig.h | 2 +- ucs/worldserver.cpp | 14 +- ucs/worldserver.h | 2 +- utils/EQExtractor2/EQExtractor2/ChangeLog.txt | 4 +- .../EQExtractor2/EQApplicationLayer.cs | 94 +- .../EQExtractor2/EQExtractor2.csproj | 2 +- .../EQExtractor2Form1.Designer.cs | 92 +- .../EQExtractor2/EQExtractor2Form1.cs | 58 +- .../EQExtractor2/EQExtractor2Form1.resx | 54 +- utils/EQExtractor2/EQExtractor2/EQPacket.cs | 70 +- .../EQExtractor2/GenerateSQLForm.Designer.cs | 172 +- .../EQExtractor2/GenerateSQLForm.cs | 4 +- .../EQExtractor2/GenerateSQLForm.resx | 54 +- .../EQExtractor2/InternalTypes.cs | 34 +- .../EQExtractor2/LogForm.Designer.cs | 8 +- utils/EQExtractor2/EQExtractor2/LogForm.cs | 2 +- utils/EQExtractor2/EQExtractor2/LogForm.resx | 54 +- .../EQExtractor2/OpcodeManager.cs | 8 +- .../EQExtractor2/PacketDotNet.dll | Bin 90624 -> 90623 bytes .../EQExtractor2/PatchApril15-2013.cs | 6 +- .../EQExtractor2/PatchAug04-2011.cs | 2 +- .../EQExtractor2/PatchAugust15-2012.cs | 8 +- .../EQExtractor2/PatchDec7-2010.cs | 6 +- .../EQExtractor2/PatchDecember10-2012.cs | 138 +- .../EQExtractor2/PatchFeb8-2011.cs | 2 +- .../EQExtractor2/PatchFebruary11-2013.cs | 6 +- .../EQExtractor2/EQExtractor2/PatchGeneric.cs | 12 +- .../EQExtractor2/PatchJanuary16-2013.cs | 6 +- .../EQExtractor2/PatchJuly13-2010.cs | 6 +- .../EQExtractor2/PatchJuly13-2012.cs | 4 +- .../EQExtractor2/PatchJune25-2012.cs | 4 +- .../EQExtractor2/PatchMar15-2012.cs | 8 +- .../EQExtractor2/PatchMarch13-2013.cs | 6 +- .../EQExtractor2/PatchMarch15-2011.cs | 4 +- .../EQExtractor2/PatchMay12-2010.cs | 78 +- .../EQExtractor2/PatchMay12-2011.cs | 16 +- .../EQExtractor2/PatchMay24-2011.cs | 6 +- .../EQExtractor2/PatchNov17-2011.cs | 6 +- utils/EQExtractor2/EQExtractor2/PatchSoD.cs | 8 +- .../EQExtractor2/PatchTestSep1-2010.cs | 38 +- .../EQExtractor2/PatchTestSep22-2010.cs | 8 +- .../PatchTestServerFebruary5-2013.cs | 4 +- .../PatchTestServerJanuary16-2013.cs | 4 +- .../EQExtractor2/Properties/AssemblyInfo.cs | 10 +- .../Properties/Resources.Designer.cs | 14 +- .../EQExtractor2/Properties/Resources.resx | 54 +- .../Properties/Settings.Designer.cs | 14 +- utils/EQExtractor2/EQExtractor2/SharpPcap.dll | Bin 38400 -> 38399 bytes .../EQExtractor2/UserOptions.Designer.cs | 36 +- .../EQExtractor2/UserOptions.resx | 54 +- utils/EQExtractor2/EQExtractor2/Utils.cs | 22 +- utils/EQExtractor2/EQExtractor2/log4net.dll | Bin 243712 -> 243704 bytes .../EQExtractor2/patch_April15-2013.conf | 2 +- .../EQExtractor2/patch_Aug04-2011.conf | 232 +- .../EQExtractor2/patch_August15-2012.conf | 1072 +++--- .../EQExtractor2/patch_Dec10-2012.conf | 2 +- .../EQExtractor2/patch_Dec7-2010.conf | 232 +- .../EQExtractor2/patch_Feb11-2013.conf | 2 +- .../EQExtractor2/patch_Feb8-2011.conf | 232 +- .../EQExtractor2/patch_July13-2012.conf | 1072 +++--- .../EQExtractor2/patch_June25-2012.conf | 1072 +++--- .../EQExtractor2/patch_Mar13-2013.conf | 2 +- .../EQExtractor2/patch_Mar15-2012.conf | 1072 +++--- .../EQExtractor2/patch_March15-2011.conf | 232 +- .../EQExtractor2/patch_May12-2010.conf | 234 +- .../EQExtractor2/patch_May12-2011.conf | 232 +- .../EQExtractor2/patch_Nov17-2011.conf | 232 +- .../EQExtractor2/patch_Sep01-2010.conf | 234 +- .../EQExtractor2/patch_Sep22-2010.conf | 232 +- .../EQExtractor2/EQExtractor2/patch_SoD.conf | 236 +- utils/EQExtractor2/EQExtractor2/zlib.net.dll | Bin 69632 -> 69605 bytes utils/TaskMaster/ErrorLog.cpp | 14 +- utils/TaskMaster/ErrorLog.h | 4 +- utils/TaskMaster/activities.cpp | 6 +- utils/TaskMaster/base.cpp | 16 +- utils/TaskMaster/base.h | 4 +- utils/TaskMaster/base_utility.cpp | 16 +- utils/TaskMaster/goals.cpp | 4 +- utils/TaskMaster/proximity.cpp | 12 +- utils/TaskMaster/tasks.cpp | 6 +- utils/azone2/CMakeLists.txt | 6 +- utils/azone2/GLModelViewer.cpp | 224 +- utils/azone2/awater.cpp | 48 +- utils/azone2/azone.h | 48 +- utils/azone2/dat.cpp | 78 +- utils/azone2/listobj.cpp | 26 +- utils/azone2/pfs.cpp | 10 +- utils/azone2/ter.cpp | 20 +- utils/azone2/wld.cpp | 32 +- utils/azone2/wld.hpp | 2 +- utils/azone2/zon.cpp | 18 +- utils/azone2/zon.hpp | 2 +- utils/azone2/zonv4.cpp | 2 +- utils/azone2/zonv4.hpp | 2 +- utils/defaults/eqemu_config.xml.full | 2 +- utils/defaults/mime.types | 30 +- utils/defaults/plugins/check_handin.pl | 4 +- utils/defaults/templates/TreeMenu.css | 14 +- utils/defaults/templates/TreeMenu.js | 104 +- utils/defaults/templates/account.html | 18 +- utils/defaults/templates/accounts.html | 6 +- utils/defaults/templates/bugs.html | 2 +- utils/defaults/templates/commands.html | 2 +- utils/defaults/templates/guild.html | 12 +- utils/defaults/templates/guilds.html | 2 +- utils/defaults/templates/launcher.html | 10 +- utils/defaults/templates/launchers.html | 4 +- utils/defaults/templates/main.css | 18 +- utils/defaults/templates/rule.html | 4 +- utils/defaults/templates/rules.html | 8 +- utils/defaults/templates/top.html | 2 +- utils/defaults/templates/variables.html | 2 +- .../updated_templates/actions/bug_action.html | 2 +- .../actions/console_action.html | 2 +- .../actions/launcher_action.html | 16 +- .../actions/world_action.html | 2 +- .../actions/zone_action.html | 2 +- utils/defaults/updated_templates/bugs.html | 26 +- utils/defaults/updated_templates/bugview.html | 22 +- utils/defaults/updated_templates/console.html | 42 +- .../updated_templates/data/bug_data.html | 6 +- .../updated_templates/data/console_data.html | 4 +- .../updated_templates/data/launcher_data.html | 10 +- .../updated_templates/data/player_data.html | 8 +- .../updated_templates/data/world_status.html | 2 +- .../updated_templates/data/zone_data.html | 4 +- .../updated_templates/images/loading.gif | Bin 673 -> 665 bytes utils/defaults/updated_templates/index.html | 50 +- .../defaults/updated_templates/launcher.html | 82 +- .../defaults/updated_templates/launchers.html | 46 +- .../defaults/updated_templates/petitions.html | 2 +- utils/defaults/updated_templates/players.html | 26 +- .../updated_templates/playerview.html | 22 +- .../updated_templates/style/style.css | 22 +- utils/defaults/updated_templates/zones.html | 18 +- .../defaults/updated_templates/zoneview.html | 14 +- utils/patches/opcodes.conf | 34 +- utils/patches/patch_6.2.conf | 20 +- utils/patches/patch_RoF.conf | 2 +- utils/patches/patch_SoD.conf | 236 +- utils/patches/patch_SoF.conf | 40 +- utils/patches/patch_Titanium.conf | 30 +- utils/patches/patch_Underfoot.conf | 234 +- .../player_profile_set/MiscFunctions.cpp | 6 +- .../player_profile_set/database.cpp | 8 +- .../player_profile_set/eq_player_structs.h | 10 +- .../player_profile_set/ini.cpp | 8 +- .../player_profile_set/ini.h | 2 +- .../player_profile_set/main.cpp | 4 +- .../player_profile_set/types.h | 2 +- utils/scripts/Examples/ListIteration.pl | 18 +- utils/scripts/Examples/SpawnManipulation.pl | 2 +- utils/scripts/factionmod.pl | 26 +- utils/scripts/import_showeq | 2 +- utils/scripts/import_spells.pl | 4 +- utils/scripts/ppreader.pl | 34 +- world/Adventure.cpp | 10 +- world/AdventureManager.cpp | 60 +- world/CMakeLists.txt | 2 +- world/EQLConfig.h | 26 +- world/EQW.cpp | 48 +- world/EQW.h | 24 +- world/EQWHTTPHandler.cpp | 58 +- world/EQWHTTPHandler.h | 42 +- world/EQWParser.cpp | 48 +- world/EQWParser.h | 10 +- world/HTTPRequest.cpp | 4 +- world/HTTPRequest.h | 14 +- world/LauncherLink.cpp | 52 +- world/LauncherLink.h | 22 +- world/LauncherList.cpp | 20 +- world/LauncherList.h | 14 +- world/LoginServer.cpp | 8 +- world/LoginServerList.h | 8 +- world/SoFCharCreateData.h | 2 +- world/WorldConfig.cpp | 4 +- world/WorldConfig.h | 8 +- world/client.cpp | 52 +- world/client.h | 6 +- world/cliententry.cpp | 6 +- world/clientlist.cpp | 92 +- world/clientlist.h | 18 +- world/console.cpp | 8 +- world/console.h | 2 +- world/lfplist.cpp | 14 +- world/lfplist.h | 6 +- world/net.cpp | 46 +- world/perl_EQLConfig.cpp | 8 +- world/perl_EQW.cpp | 4 +- world/perl_HTTPRequest.cpp | 8 +- world/queryserv.cpp | 6 +- world/ucs.cpp | 6 +- world/wguild_mgr.cpp | 30 +- world/wguild_mgr.h | 8 +- world/world_logsys.cpp | 4 +- world/worlddb.cpp | 100 +- world/worlddb.h | 12 +- world/zonelist.cpp | 18 +- world/zonelist.h | 10 +- world/zoneserver.cpp | 44 +- world/zoneserver.h | 2 +- zone/AA.cpp | 26 +- zone/AA.h | 110 +- zone/Map.cpp | 156 +- zone/MobAI.cpp | 360 +- zone/Object.cpp | 126 +- zone/PlayerCorpse.cpp | 204 +- zone/QGlobals.h | 4 +- zone/Quest.cpp | 2 +- zone/Quest.h | 2 +- zone/QuestParserCollection.cpp | 12 +- zone/StringIDs.h | 6 +- zone/ZoneConfig.cpp | 4 +- zone/ZoneConfig.h | 6 +- zone/aggro.cpp | 154 +- zone/attack.cpp | 536 +-- zone/basic_functions.h | 2 +- zone/beacon.cpp | 6 +- zone/beacon.h | 2 +- zone/bonuses.cpp | 388 +- zone/bot.cpp | 6 +- zone/botspellsai.cpp | 242 +- zone/client.cpp | 368 +- zone/client.h | 26 +- zone/client_logs.cpp | 12 +- zone/client_logs.h | 14 +- zone/client_mods.cpp | 238 +- zone/client_packet.cpp | 6 +- zone/client_packet.h | 4 +- zone/client_process.cpp | 208 +- zone/command.cpp | 644 ++-- zone/command.h | 6 +- zone/common.h | 14 +- zone/doors.cpp | 54 +- zone/doors.h | 12 +- zone/effects.cpp | 184 +- zone/embparser.cpp | 48 +- zone/embparser.h | 14 +- zone/embperl.h | 30 +- zone/embxs.cpp | 106 +- zone/embxs.h | 12 +- zone/entity.cpp | 692 ++-- zone/entity.h | 24 +- zone/errmsg.h | 6 +- zone/exp.cpp | 136 +- zone/fearpath.cpp | 164 +- zone/forage.cpp | 108 +- zone/groups.cpp | 160 +- zone/groups.h | 6 +- zone/guild.cpp | 58 +- zone/guild_mgr.cpp | 136 +- zone/guild_mgr.h | 10 +- zone/hate_list.cpp | 46 +- zone/horse.cpp | 46 +- zone/horse.h | 6 +- zone/inventory.cpp | 262 +- zone/loottables.cpp | 54 +- zone/map.h | 30 +- zone/masterentity.h | 2 +- zone/maxskill.h | 70 +- zone/merc.cpp | 20 +- zone/mob.cpp | 494 +-- zone/mob.h | 102 +- zone/net.cpp | 64 +- zone/net.h | 2 +- zone/npc.cpp | 230 +- zone/npc.h | 62 +- zone/object.h | 22 +- zone/oldcode.cpp | 172 +- zone/parser.cpp | 92 +- zone/parser.h | 8 +- zone/pathing.cpp | 130 +- zone/pathing.h | 2 +- zone/perl_PlayerCorpse.cpp | 4 +- zone/perl_client.cpp | 28 +- zone/perl_doors.cpp | 6 +- zone/perl_entity.cpp | 4 +- zone/perl_groups.cpp | 8 +- zone/perl_hateentry.cpp | 2 +- zone/perl_mob.cpp | 14 +- zone/perl_npc.cpp | 4 +- zone/perl_object.cpp | 4 +- zone/perl_perlpacket.cpp | 4 +- zone/perl_questitem.cpp | 8 +- zone/perl_raids.cpp | 10 +- zone/perlpacket.cpp | 10 +- zone/perlpacket.h | 12 +- zone/perlparser.cpp | 22 +- zone/petitions.cpp | 72 +- zone/petitions.h | 2 +- zone/pets.cpp | 84 +- zone/pets.h | 20 +- zone/questmgr.cpp | 26 +- zone/queues.h | 6 +- zone/raids.cpp | 56 +- zone/raids.h | 4 +- zone/spawn2.cpp | 272 +- zone/spawn2.h | 28 +- zone/spawngroup.cpp | 30 +- zone/special_attacks.cpp | 330 +- zone/spell_effects.cpp | 536 +-- zone/spells.cpp | 426 +-- zone/tasks.cpp | 296 +- zone/tasks.h | 12 +- zone/tradeskills.cpp | 250 +- zone/trading.cpp | 138 +- zone/trap.cpp | 20 +- zone/trap.h | 8 +- zone/tribute.cpp | 182 +- zone/updatemgr.cpp | 12 +- zone/updatemgr.h | 14 +- zone/watermap.cpp | 26 +- zone/watermap.h | 2 +- zone/waypoints.cpp | 150 +- zone/worldserver.cpp | 162 +- zone/worldserver.h | 14 +- zone/zone.cpp | 190 +- zone/zone.h | 30 +- zone/zone_logsys.cpp | 14 +- zone/zone_profile.cpp | 64 +- zone/zone_profile.h | 32 +- zone/zonedb.cpp | 300 +- zone/zonedb.h | 62 +- zone/zonedbasync.cpp | 2 +- zone/zonedump.h | 12 +- zone/zoning.cpp | 108 +- 548 files changed, 16397 insertions(+), 16398 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 312095f08..9b2bfd03b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,25 +37,25 @@ IF(MSVC) SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x86") SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x86") ENDIF(CMAKE_CL_64) - + #disable CRT warnings on windows cause they're annoying as shit and we use C functions everywhere OPTION(EQEMU_DISABLE_CRT_SECURE_WARNINGS "Disable Secure CRT Warnings" ON) IF(EQEMU_DISABLE_CRT_SECURE_WARNINGS) ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF(EQEMU_DISABLE_CRT_SECURE_WARNINGS) - + #fast FP if you'd like it OPTION(EQEMU_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON) IF(EQEMU_FAST_FLOATINGPOINT) ADD_DEFINITIONS(/fp:fast) ENDIF(EQEMU_FAST_FLOATINGPOINT) - + #crash logging currently only works on windows x86/x64 OPTION(EQEMU_ENABLE_CRASH_LOGGING "Enable crash logging" ON) IF(EQEMU_ENABLE_CRASH_LOGGING) ADD_DEFINITIONS(-DCRASH_LOGGING) ENDIF(EQEMU_ENABLE_CRASH_LOGGING) - + #Disable safe SEH or not? OPTION(EQEMU_DISABLE_SAFESEH "Disable Safe SEH (Needed for Strawberry Perl)" OFF) IF(EQEMU_DISABLE_SAFESEH) @@ -72,7 +72,7 @@ IF(MSVC) SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /SAFESEH:NO") SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") ENDIF(EQEMU_DISABLE_SAFESEH) - + #We want to compile /MT not /MD so we change that FOREACH(flag_var CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO) IF(${flag_var} MATCHES "/MD") diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index b4b65900c..8027ef9a0 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -37,7 +37,7 @@ IF(MYSQL_ROOT) PATHS ${MYSQL_ROOT}/lib/debug /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 PATH_SUFFIXES mysql ) - + FIND_LIBRARY(MySQL_LIBRARY_RELEASE NAMES ${MySQL_NAMES} PATHS ${MYSQL_ROOT}/lib /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 @@ -49,7 +49,7 @@ ELSE(MYSQL_ROOT) PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 PATH_SUFFIXES mysql ) - + FIND_LIBRARY(MySQL_LIBRARY_RELEASE NAMES ${MySQL_NAMES} PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 @@ -82,4 +82,3 @@ MARK_AS_ADVANCED( MySQL_LIBRARY_RELEASE MySQL_INCLUDE_DIR ) - \ No newline at end of file diff --git a/common/BasePacket.cpp b/common/BasePacket.cpp index 28d88659a..838e6454b 100644 --- a/common/BasePacket.cpp +++ b/common/BasePacket.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -108,7 +108,7 @@ void BasePacket::ReadString(char *str, uint32 Offset, uint32 MaxLength) const while((j < size) && (i < MaxLength) && (str[i - 1] != 0)); str[i - 1] = '\0'; -} +} void DumpPacketHex(const BasePacket* app) { diff --git a/common/BasePacket.h b/common/BasePacket.h index 56a36c2ef..2d4e88ec6 100644 --- a/common/BasePacket.h +++ b/common/BasePacket.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -71,7 +71,7 @@ public: uint32 ReadUInt32(uint32 Offset) const { uint32 value = *(uint32 *)(pBuffer + Offset); return value; } void ReadString(char *str) { uint32 len = static_cast(strlen((char *)(pBuffer + _rpos))) + 1; memcpy(str, pBuffer + _rpos, len); _rpos += len; } void ReadString(char *str, uint32 Offset, uint32 MaxLength) const; - + uint32 GetWritePosition() { return _wpos; } uint32 GetReadPosition() { return _rpos; } void SetWritePosition(uint32 Newwpos) { _wpos = Newwpos; } diff --git a/common/CRC16.cpp b/common/CRC16.cpp index d5a8942d5..401ff4ad1 100644 --- a/common/CRC16.cpp +++ b/common/CRC16.cpp @@ -1,6 +1,6 @@ #include "crc32.h" -uint16 CRC16(const unsigned char *buf, int size, int key) +uint16 CRC16(const unsigned char *buf, int size, int key) { // This is computed as the lowest 16 bits of an Ethernet CRC32 checksum // where the key is prepended to the data in little endian order. diff --git a/common/Condition.cpp b/common/Condition.cpp index 27a2015fa..29a3425e0 100644 --- a/common/Condition.cpp +++ b/common/Condition.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -29,7 +29,7 @@ #ifdef _WINDOWS -Condition::Condition() +Condition::Condition() { m_events[SignalEvent] = CreateEvent (nullptr, // security FALSE, // is auto-reset event? @@ -69,28 +69,28 @@ void Condition::SignalAll() void Condition::Wait() { EnterCriticalSection(&CSMutex); - + m_waiters++; - - + + LeaveCriticalSection(&CSMutex); int result = WaitForMultipleObjects (_eventCount, m_events, FALSE, INFINITE); EnterCriticalSection(&CSMutex); - + m_waiters--; - + //see if we are the last person waiting on the condition, and there was a broadcast //if so, we need to reset the broadcast event. if(m_waiters == 0 && result == (WAIT_OBJECT_0+BroadcastEvent)) ResetEvent(m_events[BroadcastEvent]); - + LeaveCriticalSection(&CSMutex); } #else //!WIN32 -Condition::Condition() +Condition::Condition() { pthread_cond_init(&cond,nullptr); pthread_mutex_init(&mutex,nullptr); diff --git a/common/Condition.h b/common/Condition.h index 139f41530..e66b28551 100644 --- a/common/Condition.h +++ b/common/Condition.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/common/EQDB.cpp b/common/EQDB.cpp index b1f0166cd..d729eaee7 100644 --- a/common/EQDB.cpp +++ b/common/EQDB.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -64,9 +64,9 @@ EQDBRes * EQDB::query(Const_char *q) { Const_char *EQDB::escape_string(Const_char *from) { int len = strlen(from); char *res = new char[len*2+1]; - + mysql_real_escape_string(mysql_ref,res,from,len); - + res[len*2] = '\0'; m_escapeBuffer = res; delete[] res; diff --git a/common/EQDB.h b/common/EQDB.h index 5bac35073..700ca5584 100644 --- a/common/EQDB.h +++ b/common/EQDB.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -32,10 +32,10 @@ public: static EQDB *Singleton() { return(&s_EQDB); } static void SetMySQL(MYSQL *m) { s_EQDB.mysql_ref=m; } - + //BEGIN PERL EXPORT //NOTE: you must have a space after the * of a return value - + unsigned int field_count(); unsigned long affected_rows(); unsigned long insert_id(); diff --git a/common/EQDBRes.cpp b/common/EQDBRes.cpp index d33b46bf2..ed6bb6ba2 100644 --- a/common/EQDBRes.cpp +++ b/common/EQDBRes.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -23,7 +23,7 @@ vector EQDBRes::fetch_row_array() { vector array; if(res == nullptr) return(array); - + int count=mysql_num_fields(res); MYSQL_ROW row=mysql_fetch_row(res); for (int i=0;i EQDBRes::fetch_row_hash() { map rowhash; if(res == nullptr) return(rowhash); - + MYSQL_FIELD *fields; MYSQL_ROW row; unsigned long num_fields,i; diff --git a/common/EQDBRes.h b/common/EQDBRes.h index dd1a3a1ca..19f9ee685 100644 --- a/common/EQDBRes.h +++ b/common/EQDBRes.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -30,7 +30,7 @@ class EQDBRes { public: EQDBRes(MYSQL_RES *r) { res=r; } ~EQDBRes() { finish(); } - + //BEGIN PERL EXPORT unsigned long num_rows() { return (res) ? mysql_num_rows(res) : 0; } unsigned long num_fields() { return (res) ? mysql_num_fields(res) : 0; } diff --git a/common/EQEMuError.cpp b/common/EQEMuError.cpp index 353c5a342..04836c4dc 100644 --- a/common/EQEMuError.cpp +++ b/common/EQEMuError.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -71,7 +71,7 @@ void AddEQEMuError(eEQEMuError iError, bool iExitNow) { } iterator.Advance(); } - + char* tmp = new char[6]; tmp[0] = 1; tmp[5] = 0; diff --git a/common/EQEMuError.h b/common/EQEMuError.h index 8ecb53aa6..edd0fdaf5 100644 --- a/common/EQEMuError.h +++ b/common/EQEMuError.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -20,7 +20,7 @@ #include "../common/types.h" -enum eEQEMuError { EQEMuError_NoError, +enum eEQEMuError { EQEMuError_NoError, EQEMuError_Mysql_1405, EQEMuError_Mysql_2003, EQEMuError_Mysql_2005, diff --git a/common/EQEmuConfig.cpp b/common/EQEmuConfig.cpp index 30d31606c..dded129cc 100644 --- a/common/EQEmuConfig.cpp +++ b/common/EQEmuConfig.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -63,7 +63,7 @@ void EQEmuConfig::do_world(TiXmlElement *ele) { text=ParseTextBlock(sub_ele,"port",true); if (text) LoginPort=atoi(text); - + text=ParseTextBlock(sub_ele,"account",true); if (text) LoginAccount=text; @@ -97,7 +97,7 @@ void EQEmuConfig::do_world(TiXmlElement *ele) { } } while(sub_ele); } - + // Check for locked sub_ele = ele->FirstChildElement("locked"); if (sub_ele != nullptr) @@ -140,7 +140,7 @@ void EQEmuConfig::do_world(TiXmlElement *ele) { text = sub_ele->Attribute("enabled"); if (text && !strcasecmp(text,"true")) WorldHTTPEnabled=true; - + } } @@ -155,7 +155,7 @@ void EQEmuConfig::do_chatserver(TiXmlElement *ele) { if (text) ChatPort=atoi(text); } - + void EQEmuConfig::do_mailserver(TiXmlElement *ele) { const char *text; @@ -167,7 +167,7 @@ void EQEmuConfig::do_mailserver(TiXmlElement *ele) { if (text) MailPort=atoi(text); } - + void EQEmuConfig::do_database(TiXmlElement *ele) { const char *text; @@ -192,7 +192,7 @@ void EQEmuConfig::do_database(TiXmlElement *ele) { DatabaseDB=text; } - + void EQEmuConfig::do_qsdatabase(TiXmlElement *ele) { const char *text; diff --git a/common/EQEmuConfig.h b/common/EQEmuConfig.h index 36b0056df..08ea3bfec 100644 --- a/common/EQEmuConfig.h +++ b/common/EQEmuConfig.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -52,11 +52,11 @@ public: uint16 WorldHTTPPort; string WorldHTTPMimeFile; string SharedKey; - + // From string ChatHost; uint16 ChatPort; - + // From string MailHost; uint16 MailPort; @@ -85,7 +85,7 @@ public: string MapDir; string QuestDir; string PluginDir; - + // From string LogPrefix; string LogSuffix; @@ -103,7 +103,7 @@ public: // uint16 DynamicCount; // map StaticZones; - + protected: static EQEmuConfig *_config; @@ -168,7 +168,7 @@ protected: MapDir="Maps"; QuestDir="quests"; PluginDir="plugins"; - + // Launcher LogPrefix = "logs/zone-"; LogSuffix = ".log"; @@ -181,22 +181,22 @@ protected: #else ZoneExe = "./zone"; #endif - + // Zones ZonePortLow=7000; ZonePortHigh=7999; DefaultStatus=0; - + // For where zones need to connect to. WorldIP="127.0.0.1"; - + // Dynamics to start //DynamicCount=5; - + MaxClients=-1; - + LoginCount=0; - + } virtual ~EQEmuConfig() {} @@ -204,7 +204,7 @@ public: // Produce a const singleton static const EQEmuConfig *get() { - if (_config == nullptr) + if (_config == nullptr) LoadConfig(); return(_config); } diff --git a/common/EQNetwork.cpp b/common/EQNetwork.cpp index 1dfa9ddb2..0aa3db4c2 100644 --- a/common/EQNetwork.cpp +++ b/common/EQNetwork.cpp @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* +/* * EQStream classes, by Quagmire */ @@ -61,17 +61,17 @@ using namespace std; //#define PRIORITYTEST template // LO_BYTE -type LO_BYTE (type a) {return (a&=0xff);} -template // HI_BYTE -type HI_BYTE (type a) {return (a&=0xff00);} +type LO_BYTE (type a) {return (a&=0xff);} +template // HI_BYTE +type HI_BYTE (type a) {return (a&=0xff00);} template // LO_WORD -type LO_WORD (type a) {return (a&=0xffff);} -template // HI_WORD -type HI_WORD (type a) {return (a&=0xffff0000);} +type LO_WORD (type a) {return (a&=0xffff);} +template // HI_WORD +type HI_WORD (type a) {return (a&=0xffff0000);} template // HI_LOSWAPshort -type HI_LOSWAPshort (type a) {return (LO_BYTE(a)<<8) | (HI_BYTE(a)>>8);} +type HI_LOSWAPshort (type a) {return (LO_BYTE(a)<<8) | (HI_BYTE(a)>>8);} template // HI_LOSWAPlong -type HI_LOSWAPlong (type x) {return (LO_WORD(a)<<16) | (HIWORD(a)>>16);} +type HI_LOSWAPlong (type x) {return (LO_WORD(a)<<16) | (HIWORD(a)>>16);} EQStreamServer::EQStreamServer(uint16 iPort) { RunLoop = false; @@ -125,7 +125,7 @@ bool EQStreamServer::Open(uint16 iPort) { unsigned long nonblocking = 1; #endif - /* Setup internet address information. + /* Setup internet address information. This is used with the bind() call */ memset((char *) &address, 0, sizeof(address)); address.sin_family = AF_INET; @@ -207,7 +207,7 @@ void EQStreamServer::Process() { } uchar buffer[1518]; - + int status; struct sockaddr_in from; unsigned int fromlen; @@ -240,13 +240,13 @@ void EQStreamServer::Process() { connection_list.erase(tmp); continue; } - EQStream* eqs_data = connection->second; - if (eqs_data->IsFree() && (!eqs_data->CheckNetActive())) { + EQStream* eqs_data = connection->second; + if (eqs_data->IsFree() && (!eqs_data->CheckNetActive())) { map ::iterator tmp=connection; connection++; safe_delete(eqs_data); connection_list.erase(tmp); - } + } else if(!eqs_data->RunLoop) { eqs_data->Process(sock); connection++; @@ -291,7 +291,7 @@ void EQStreamServer::RecvData(uchar* data, uint32 size, uint32 irIP, uint16 irPo return; } - if (data[1]==0x01) { + if (data[1]==0x01) { cout << "New EQStream Connection." << endl; EQStream* tmp = new EQStream(irIP, irPort); tmp->RecvData(data, size); diff --git a/common/EQPacket.cpp b/common/EQPacket.cpp index 9df2912fd..452aefe94 100644 --- a/common/EQPacket.cpp +++ b/common/EQPacket.cpp @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Michael S. Finger This program is free software; you can redistribute it and/or modify @@ -43,7 +43,7 @@ EQPacket::EQPacket(EmuOpcode op, const unsigned char *buf, uint32 len) void EQPacket::build_raw_header_dump(char *buffer, uint16 seq) const { BasePacket::build_raw_header_dump(buffer, seq); buffer += strlen(buffer); - + buffer += sprintf(buffer, "[EmuOpCode 0x%04x Size=%u]\n", emu_opcode, size); } @@ -68,7 +68,7 @@ void EQPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const } if (seq != 0xffff) fprintf(to, "[Seq=%u] ",seq); - + fprintf(to, "[EmuOpCode 0x%04x Size=%lu]\n",emu_opcode,(unsigned long)size); } @@ -76,7 +76,7 @@ void EQProtocolPacket::build_raw_header_dump(char *buffer, uint16 seq) const { BasePacket::build_raw_header_dump(buffer, seq); buffer += strlen(buffer); - + buffer += sprintf(buffer, "[ProtoOpCode 0x%04x Size=%u]\n",opcode,size); } @@ -102,7 +102,7 @@ void EQProtocolPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const } if (seq != 0xffff) fprintf(to, "[Seq=%u] ",seq); - + fprintf(to, "[ProtoOpCode 0x%04x Size=%lu]\n",opcode,(unsigned long)size); } @@ -110,7 +110,7 @@ void EQApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) const { BasePacket::build_raw_header_dump(buffer, seq); buffer += strlen(buffer); - + #ifdef STATIC_OPCODE buffer += sprintf(buffer, "[OpCode 0x%04x Size=%u]\n", emu_opcode,size); #else @@ -144,7 +144,7 @@ void EQApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const } if (seq != 0xffff) fprintf(to, "[Seq=%u] ",seq); - + #ifdef STATIC_OPCODE fprintf(to, "[OpCode 0x%04x Size=%u]\n", emu_opcode,size); #else @@ -156,7 +156,7 @@ void EQRawApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) con { BasePacket::build_raw_header_dump(buffer, seq); buffer += strlen(buffer); - + #ifdef STATIC_OPCODE buffer += sprintf(buffer, "[OpCode 0x%04x (0x%04x) Size=%u]\n", emu_opcode, opcode,size); #else @@ -190,7 +190,7 @@ void EQRawApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const } if (seq != 0xffff) fprintf(to, "[Seq=%u] ",seq); - + #ifdef STATIC_OPCODE fprintf(to, "[OpCode 0x%04x (0x%04x) Size=%u]\n", emu_opcode, opcode,size); #else @@ -421,7 +421,7 @@ void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey { test[i]=buffer[i]^KC; } - memcpy(buffer,test,size); + memcpy(buffer,test,size); free(test); } } @@ -445,7 +445,7 @@ void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey { test[i]=buffer[i]^KC; } - memcpy(buffer,test,size); + memcpy(buffer,test,size); free(test); } } diff --git a/common/EQPacket.h b/common/EQPacket.h index f8d4f11fb..74fe871af 100644 --- a/common/EQPacket.h +++ b/common/EQPacket.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Michael S. Finger This program is free software; you can redistribute it and/or modify @@ -39,9 +39,9 @@ class EQPacket : public BasePacket { friend class EQStream; public: virtual ~EQPacket() {} - + uint32 Size() const { return size+2; } - + virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const; virtual void build_header_dump(char *buffer) const; virtual void DumpRawHeader(uint16 seq=0xffff, FILE *to = stdout) const; @@ -50,7 +50,7 @@ public: void SetOpcode(EmuOpcode op) { emu_opcode = op; } const EmuOpcode GetOpcode() const { return(emu_opcode); } // const char *GetOpcodeName() const; - + protected: //this is just a cache so we dont look it up several times on Get() //and it is mutable so we can store the cached copy even on a const object @@ -68,32 +68,32 @@ class EQProtocolPacket : public BasePacket { friend class EQStream; friend class EQStreamPair; public: - EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len) : BasePacket(buf,len), opcode(op) { acked = false; } + EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len) : BasePacket(buf,len), opcode(op) { acked = false; } // EQProtocolPacket(const unsigned char *buf, uint32 len); bool combine(const EQProtocolPacket *rhs); uint32 serialize (unsigned char *dest) const; EQProtocolPacket *Copy() { return new EQProtocolPacket(opcode,pBuffer,size); } EQRawApplicationPacket *MakeAppPacket() const; - + bool acked; - + virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const; virtual void build_header_dump(char *buffer) const; virtual void DumpRawHeader(uint16 seq=0xffff, FILE *to = stdout) const; virtual void DumpRawHeaderNoTime(uint16 seq=0xffff, FILE *to = stdout) const; - + protected: - + static bool ValidateCRC(const unsigned char *buffer, int length, uint32 Key); static uint32 Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize); static uint32 Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize); static void ChatDecode(unsigned char *buffer, int size, int DecodeKey); static void ChatEncode(unsigned char *buffer, int size, int EncodeKey); - + uint16 GetRawOpcode() const { return(opcode); } - + uint32 Size() const { return size+2; } - + //the actual raw EQ opcode uint16 opcode; }; @@ -102,25 +102,25 @@ class EQApplicationPacket : public EQPacket { // friend class EQProtocolPacket; friend class EQStream; public: - EQApplicationPacket() : EQPacket(OP_Unknown,nullptr,0) + EQApplicationPacket() : EQPacket(OP_Unknown,nullptr,0) { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } - EQApplicationPacket(const EmuOpcode op) : EQPacket(op,nullptr,0) + EQApplicationPacket(const EmuOpcode op) : EQPacket(op,nullptr,0) { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } - EQApplicationPacket(const EmuOpcode op, const uint32 len) : EQPacket(op,nullptr,len) + EQApplicationPacket(const EmuOpcode op, const uint32 len) : EQPacket(op,nullptr,len) { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } - EQApplicationPacket(const EmuOpcode op, const unsigned char *buf, const uint32 len) : EQPacket(op,buf,len) + EQApplicationPacket(const EmuOpcode op, const unsigned char *buf, const uint32 len) : EQPacket(op,buf,len) { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } bool combine(const EQApplicationPacket *rhs); uint32 serialize (uint16 opcode, unsigned char *dest) const; uint32 Size() const { return size+app_opcode_size; } - + virtual EQApplicationPacket *Copy() const; - + virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const; virtual void build_header_dump(char *buffer) const; virtual void DumpRawHeader(uint16 seq=0xffff, FILE *to = stdout) const; virtual void DumpRawHeaderNoTime(uint16 seq=0xffff, FILE *to = stdout) const; - + protected: uint8 app_opcode_size; @@ -135,17 +135,17 @@ class EQRawApplicationPacket : public EQApplicationPacket { public: EQRawApplicationPacket(uint16 opcode, const unsigned char *buf, const uint32 len); uint16 GetRawOpcode() const { return(opcode); } - + virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const; virtual void build_header_dump(char *buffer) const; virtual void DumpRawHeader(uint16 seq=0xffff, FILE *to = stdout) const; virtual void DumpRawHeaderNoTime(uint16 seq=0xffff, FILE *to = stdout) const; protected: - + //the actual raw EQ opcode uint16 opcode; - + EQRawApplicationPacket(const unsigned char *buf, const uint32 len); }; diff --git a/common/EQStream.cpp b/common/EQStream.cpp index c9397f43e..1593d3ec5 100644 --- a/common/EQStream.cpp +++ b/common/EQStream.cpp @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Michael S. Finger This program is free software; you can redistribute it and/or modify @@ -106,11 +106,11 @@ EQRawApplicationPacket *EQStream::MakeApplicationPacket(const unsigned char *buf EQProtocolPacket *EQStream::MakeProtocolPacket(const unsigned char *buf, uint32 len) { uint16 proto_opcode = ntohs(*(const uint16 *)buf); - + //advance over opcode. buf += 2; len -= 2; - + return(new EQProtocolPacket(proto_opcode, buf, len)); } @@ -149,7 +149,7 @@ uint32 processed=0,subpacket_length=0; } } break; - + case OP_AppCombined: { processed=0; while(processedsize) { @@ -171,7 +171,7 @@ uint32 processed=0,subpacket_length=0; } } break; - + case OP_Packet: { if(!p->pBuffer || (p->Size() < 4)) { @@ -221,7 +221,7 @@ uint32 processed=0,subpacket_length=0; } } break; - + case OP_Fragment: { if(!p->pBuffer || (p->Size() < 4)) { @@ -317,10 +317,10 @@ uint32 processed=0,subpacket_length=0; #ifndef COLLECTOR if (GetState()==ESTABLISHED) { _log(NET__ERROR, _L "Received OP_SessionRequest in ESTABLISHED state (%d)" __L, GetState()); - + /*RemoveData(); - init(); - State=UNESTABLISHED;*/ + init(); + State=UNESTABLISHED;*/ _SendDisconnect(); SetState(CLOSED); break; @@ -360,7 +360,7 @@ uint32 processed=0,subpacket_length=0; encoded=(Response->Format&FLAG_ENCODED); _log(NET__NET_TRACE, _L "Received OP_SessionResponse: session %lu, maxlen %d, key %lu, compressed? %s, encoded? %s" __L, (unsigned long)Session, MaxLen, (unsigned long)Key, compressed?"yes":"no", encoded?"yes":"no"); - + // Kinda kludgy, but trie for now if (StreamType==UnknownStream) { if (compressed) { @@ -406,7 +406,7 @@ uint32 processed=0,subpacket_length=0; #ifndef COLLECTOR uint16 seq=ntohs(*(uint16 *)(p->pBuffer)); MOutboundQueue.lock(); - + if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) { _log(NET__ERROR, _L "Pre-OOA Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq); } @@ -457,9 +457,9 @@ if(NextSequencedSend > SequencedQueue.size()) { } #ifndef COLLECTOR SessionStats *Stats=(SessionStats *)p->pBuffer; - _log(NET__NET_TRACE, _L "Received Stats: %lu packets received, %lu packets sent, Deltas: local %lu, (%lu <- %lu -> %lu) remote %lu" __L, - (unsigned long)ntohl(Stats->packets_received), (unsigned long)ntohl(Stats->packets_sent), (unsigned long)ntohl(Stats->last_local_delta), - (unsigned long)ntohl(Stats->low_delta), (unsigned long)ntohl(Stats->average_delta), + _log(NET__NET_TRACE, _L "Received Stats: %lu packets received, %lu packets sent, Deltas: local %lu, (%lu <- %lu -> %lu) remote %lu" __L, + (unsigned long)ntohl(Stats->packets_received), (unsigned long)ntohl(Stats->packets_sent), (unsigned long)ntohl(Stats->last_local_delta), + (unsigned long)ntohl(Stats->low_delta), (unsigned long)ntohl(Stats->average_delta), (unsigned long)ntohl(Stats->high_delta), (unsigned long)ntohl(Stats->last_remote_delta)); uint64 x=Stats->packets_received; Stats->packets_received=Stats->packets_sent; @@ -502,7 +502,7 @@ void EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req) { if(p == nullptr) return; - + EQApplicationPacket *newp = p->Copy(); if (newp != nullptr) @@ -513,18 +513,18 @@ void EQStream::FastQueuePacket(EQApplicationPacket **p, bool ack_req) { EQApplicationPacket *pack=*p; *p = nullptr; //clear caller's pointer.. effectively takes ownership - + if(pack == nullptr) return; - + if(OpMgr == nullptr || *OpMgr == nullptr) { _log(NET__DEBUG, _L "Packet enqueued into a stream with no opcode manager, dropping." __L); delete pack; return; } - + uint16 opcode = (*OpMgr)->EmuToEQ(pack->emu_opcode); - + //make sure this packet is compatible with this stream /* if(StreamType == UnknownStream || StreamType == ChatOrMailStream) { _log(NET__DEBUG, _L "Stream type undetermined (%s), packet ignored" __L, StreamTypeString(StreamType)); @@ -534,9 +534,9 @@ void EQStream::FastQueuePacket(EQApplicationPacket **p, bool ack_req) _log(NET__ERROR, _L "Trying to queue a packet of type %s into a stream of type %s, dropping it." __L, StreamTypeString(pack->GetPacketType()), StreamTypeString(StreamType)); return; }*/ - + _log(NET__APP_TRACE, "Queueing %sacked packet with opcode 0x%x (%s) and length %d", ack_req?"":"non-", opcode, OpcodeManager::EmuToName(pack->emu_opcode), pack->size); - + if (!ack_req) { NonSequencedPush(new EQProtocolPacket(opcode, pack->pBuffer, pack->size)); delete pack; @@ -556,15 +556,15 @@ uint32 length; unsigned char *tmpbuff=new unsigned char[p->size+3]; length=p->serialize(opcode, tmpbuff); - + EQProtocolPacket *out=new EQProtocolPacket(OP_Fragment,nullptr,MaxLen-4); *(uint32 *)(out->pBuffer+2)=htonl(p->Size()); used=MaxLen-10; memcpy(out->pBuffer+6,tmpbuff,used); _log(NET__FRAGMENT, _L "First fragment: used %d/%d. Put size %d in the packet" __L, used, p->size, p->Size()); SequencedPush(out); - - + + while (used::iterator sitr; sitr = SequencedQueue.begin(); if (sitr!=SequencedQueue.end()) sitr += NextSequencedSend; - + // Loop until both are empty or MaxSends is reached while(!SeqEmpty || !NonSeqEmpty) { @@ -703,7 +703,7 @@ deque::iterator sitr; ReadyToSend.push(p); BytesWritten+=p->size; p=nullptr; - + if (BytesWritten > threshold) { // Sent enough this round, lets stop to be fair _log(NET__RATES, _L "Exceeded write threshold in nonseq (%d > %d)" __L, BytesWritten, threshold); @@ -721,7 +721,7 @@ deque::iterator sitr; } if (sitr!=SequencedQueue.end()) { -//_log(NET__NET_COMBINE, _L "Send Seq with %d seq packets starting at seq %d, next send %d, and %d non-seq packets." __L, +//_log(NET__NET_COMBINE, _L "Send Seq with %d seq packets starting at seq %d, next send %d, and %d non-seq packets." __L, // SequencedQueue.size(), SequencedBase, NextSequencedSend, NonSequencedQueue.size()); if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) { _log(NET__ERROR, _L "Pre-Send Seq NSS=%d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, NextSequencedSend, SequencedBase, SequencedQueue.size(), NextOutSeq); @@ -802,7 +802,7 @@ if(NextSequencedSend > SequencedQueue.size()) { delete p; ReadyToSend.pop(); } - + //see if we need to send our disconnect and finish our close if(SeqEmpty && NonSeqEmpty) { //no more data to send @@ -825,7 +825,7 @@ sockaddr_in address; address.sin_port=remote_port; #ifdef NOWAY uint32 ip=address.sin_addr.s_addr; - cout << "Sending to: " + cout << "Sending to: " << (int)*(unsigned char *)&ip << "." << (int)*((unsigned char *)&ip+1) << "." << (int)*((unsigned char *)&ip+2) @@ -886,7 +886,7 @@ char temp[15]; ntohs(from->sin_port)); //cout << timestamp() << "Data from: " << temp << " OpCode 0x" << hex << setw(2) << setfill('0') << (int)p->opcode << dec << endl; //dump_message(p->pBuffer,p->size,timestamp()); - + } return p; }*/ @@ -904,12 +904,12 @@ EQProtocolPacket *out=new EQProtocolPacket(OP_SessionResponse,nullptr,sizeof(Ses if (encoded) Response->Format|=FLAG_ENCODED; Response->Key=htonl(Key); - + out->size=sizeof(SessionResponse); - + _log(NET__NET_TRACE, _L "Sending OP_SessionResponse: session %lu, maxlen=%d, key=0x%x, compressed? %s, encoded? %s" __L, (unsigned long)Session, MaxLen, Key, compressed?"yes":"no", encoded?"yes":"no"); - + NonSequencedPush(out); } @@ -920,9 +920,9 @@ EQProtocolPacket *out=new EQProtocolPacket(OP_SessionRequest,nullptr,sizeof(Sess memset(Request,0,sizeof(SessionRequest)); Request->Session=htonl(time(nullptr)); Request->MaxLength=htonl(512); - + _log(NET__NET_TRACE, _L "Sending OP_SessionRequest: session %lu, maxlen=%d" __L, (unsigned long)ntohl(Request->Session), ntohl(Request->MaxLength)); - + NonSequencedPush(out); } @@ -930,11 +930,11 @@ void EQStream::_SendDisconnect() { if(GetState() == CLOSED) return; - + EQProtocolPacket *out=new EQProtocolPacket(OP_SessionDisconnect,nullptr,sizeof(uint32)); *(uint32 *)out->pBuffer=htonl(Session); NonSequencedPush(out); - + _log(NET__NET_TRACE, _L "Sending OP_SessionDisconnect: session %lu" __L, (unsigned long)Session); } @@ -956,7 +956,7 @@ EQRawApplicationPacket *p=nullptr; InboundQueue.erase(itr); } MInboundQueue.unlock(); - + //resolve the opcode if we can. if(p) { if(OpMgr != nullptr && *OpMgr != nullptr) { @@ -969,7 +969,7 @@ EQRawApplicationPacket *p=nullptr; p->SetOpcode(emu_op); } } - + return p; } @@ -984,7 +984,7 @@ EQRawApplicationPacket *p=nullptr; InboundQueue.erase(itr); } MInboundQueue.unlock(); - + //resolve the opcode if we can. if(p) { if(OpMgr != nullptr && *OpMgr != nullptr) { @@ -1018,9 +1018,9 @@ EQRawApplicationPacket *p=nullptr; void EQStream::InboundQueueClear() { EQApplicationPacket *p=nullptr; - + _log(NET__APP_TRACE, _L "Clearing inbound queue" __L); - + MInboundQueue.lock(); if (!InboundQueue.empty()) { vector::iterator itr; @@ -1036,11 +1036,11 @@ EQApplicationPacket *p=nullptr; bool EQStream::HasOutgoingData() { bool flag; - + //once closed, we have nothing more to say if(CheckClosed()) return(false); - + MOutboundQueue.lock(); flag=(!NonSequencedQueue.empty()); if (!flag) { @@ -1063,7 +1063,7 @@ void EQStream::OutboundQueueClear() EQProtocolPacket *p=nullptr; _log(NET__APP_TRACE, _L "Clearing outbound queue" __L); - + MOutboundQueue.lock(); while(!NonSequencedQueue.empty()) { delete NonSequencedQueue.front(); @@ -1078,7 +1078,7 @@ EQProtocolPacket *p=nullptr; SequencedQueue.clear(); } MOutboundQueue.unlock(); - + /*if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) { _log(NET__ERROR, _L "Out-bound Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq); } @@ -1093,7 +1093,7 @@ void EQStream::PacketQueueClear() EQProtocolPacket *p=nullptr; _log(NET__APP_TRACE, _L "Clearing future packet queue" __L); - + if(!PacketQueue.empty()) { map::iterator itr; for(itr=PacketQueue.begin();itr!=PacketQueue.end();itr++) { @@ -1150,7 +1150,7 @@ long EQStream::GetLastAckSent() void EQStream::AckPackets(uint16 seq) { deque::iterator itr, tmp; - + MOutboundQueue.lock(); //do a bit of sanity checking. if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) { @@ -1159,7 +1159,7 @@ if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) { if(NextSequencedSend > SequencedQueue.size()) { _log(NET__ERROR, _L "Pre-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size()); } - + SeqOrder ord = CompareSequence(SequencedBase, seq); if(ord == SeqInOrder) { //they are not acking anything new... @@ -1197,7 +1197,7 @@ if(NextSequencedSend > SequencedQueue.size()) { _log(NET__ERROR, _L "Post-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size()); } } - + MOutboundQueue.unlock(); } @@ -1222,7 +1222,7 @@ void EQStream::ProcessQueue() if(PacketQueue.empty()) { return; } - + EQProtocolPacket *qp=nullptr; while((qp=RemoveQueue(NextInSeq))!=nullptr) { _log(NET__DEBUG, _L "Processing Queued Packet: Seq=%d" __L, NextInSeq); @@ -1326,9 +1326,9 @@ void EQStream::SetState(EQStreamState state) { void EQStream::CheckTimeout(uint32 now, uint32 timeout) { - + bool outgoing_data = HasOutgoingData(); //up here to avoid recursive locking - + EQStreamState orig_state = GetState(); if (orig_state == CLOSING && !outgoing_data) { _log(NET__NET_TRACE, _L "Out of data in closing state, disconnecting." __L); @@ -1410,7 +1410,7 @@ void EQStream::Close() { EQStream::MatchState EQStream::CheckSignature(const Signature *sig) { EQRawApplicationPacket *p = nullptr; MatchState res = MatchNotReady; - + MInboundQueue.lock(); if (!InboundQueue.empty()) { //this is already getting hackish... @@ -1444,7 +1444,7 @@ EQStream::MatchState EQStream::CheckSignature(const Signature *sig) { } } MInboundQueue.unlock(); - + return(res); } diff --git a/common/EQStream.h b/common/EQStream.h index 2c6bf6c7b..73d0c4265 100644 --- a/common/EQStream.h +++ b/common/EQStream.h @@ -55,10 +55,10 @@ struct SessionStats { /*030*/ uint64 packets_received; /*038*/ }; - + #pragma pack() -class OpcodeManager; +class OpcodeManager; //extern OpcodeManager *EQNetworkOpcodeManager; //class EQStreamFactory; @@ -73,7 +73,7 @@ class EQStream : public EQStreamInterface { SeqInOrder, SeqFuture } SeqOrder; - + uint32 remote_ip; uint16 remote_port; uint8 buffer[8192]; @@ -119,10 +119,10 @@ class EQStream : public EQStreamInterface { uint16 SequencedBase; //the sequence number of SequencedQueue[0] long NextSequencedSend; //index into SequencedQueue Mutex MOutboundQueue; - + //a buffer we use for compression/decompression unsigned char _tempBuffer[2048]; - + // Packets waiting to be processed vector InboundQueue; map PacketQueue; //not mutex protected, only accessed by caller of Process() @@ -136,18 +136,18 @@ class EQStream : public EQStreamInterface { int32 RateThreshold; int32 DecayRate; - + OpcodeManager **OpMgr; - + // EQStreamFactory *const Factory; EQRawApplicationPacket *MakeApplicationPacket(EQProtocolPacket *p); EQRawApplicationPacket *MakeApplicationPacket(const unsigned char *buf, uint32 len); EQProtocolPacket *MakeProtocolPacket(const unsigned char *buf, uint32 len); void SendPacket(uint16 opcode, EQApplicationPacket *p); - + void SetState(EQStreamState state); - + void SendSessionResponse(); void SendSessionRequest(); void SendAck(uint16 seq); @@ -157,7 +157,7 @@ class EQStream : public EQStreamInterface { void NonSequencedPush(EQProtocolPacket *p); void SequencedPush(EQProtocolPacket *p); void WritePacket(int fd,EQProtocolPacket *p); - + uint32 GetKey() { return Key; } void SetKey(uint32 k) { Key=k; } @@ -172,16 +172,16 @@ class EQStream : public EQStreamInterface { void InboundQueuePush(EQRawApplicationPacket *p); EQRawApplicationPacket *PeekPacket(); //for collector. EQRawApplicationPacket *PopRawPacket(); //for collector. - + void InboundQueueClear(); void OutboundQueueClear(); void PacketQueueClear(); - + void ProcessQueue(); EQProtocolPacket *RemoveQueue(uint16 seq); - + void _SendDisconnect(); - + void init(); public: EQStream() { init(); remote_ip = 0; remote_port = 0; State=UNESTABLISHED; StreamType=UnknownStream; compressed=true; encoded=false; app_opcode_size=2; bytes_sent=0; bytes_recv=0; create_time=Timer::GetTimeSeconds(); } @@ -201,21 +201,21 @@ class EQStream : public EQStreamInterface { virtual void RemoveData() { InboundQueueClear(); OutboundQueueClear(); PacketQueueClear(); /*if (CombinedAppPacket) delete CombinedAppPacket;*/ } virtual bool CheckState(EQStreamState state) { return GetState() == state; } virtual std::string Describe() const { return("Direct EQStream"); } - + void SetOpcodeManager(OpcodeManager **opm) { OpMgr = opm; } - + void CheckTimeout(uint32 now, uint32 timeout=30); bool HasOutgoingData(); void Process(const unsigned char *data, const uint32 length); void SetLastPacketTime(uint32 t) {LastPacket=t;} void Write(int eq_fd); - + // inline bool IsInUse() { bool flag; MInUse.lock(); flag=(active_users>0); MInUse.unlock(); return flag; } inline void PutInUse() { MInUse.lock(); active_users++; MInUse.unlock(); } - + inline EQStreamState GetState() { EQStreamState s; MState.lock(); s=State; MState.unlock(); return s; } - + // static EQProtocolPacket *Read(int eq_fd, sockaddr_in *from); static SeqOrder CompareSequence(uint16 expected_seq , uint16 seq); @@ -259,7 +259,7 @@ class EQStream : public EQStreamInterface { return 0; return bytes_recv / (Timer::GetTimeSeconds() - create_time); } - + //used for dynamic stream identification class Signature { public: @@ -274,7 +274,7 @@ class EQStream : public EQStreamInterface { MatchFailed } MatchState; MatchState CheckSignature(const Signature *sig); - + }; diff --git a/common/EQStreamFactory.cpp b/common/EQStreamFactory.cpp index 56b1f9da7..c91d5da77 100644 --- a/common/EQStreamFactory.cpp +++ b/common/EQStreamFactory.cpp @@ -24,28 +24,28 @@ using namespace std; ThreadReturnType EQStreamFactoryReaderLoop(void *eqfs) { EQStreamFactory *fs=(EQStreamFactory *)eqfs; - + #ifndef WIN32 _log(COMMON__THREADS, "Starting EQStreamFactoryReaderLoop with thread ID %d", pthread_self()); #endif - + fs->ReaderLoop(); #ifndef WIN32 _log(COMMON__THREADS, "Ending EQStreamFactoryReaderLoop with thread ID %d", pthread_self()); #endif - + THREAD_RETURN(nullptr); } ThreadReturnType EQStreamFactoryWriterLoop(void *eqfs) { EQStreamFactory *fs=(EQStreamFactory *)eqfs; - + #ifndef WIN32 _log(COMMON__THREADS, "Starting EQStreamFactoryWriterLoop with thread ID %d", pthread_self()); #endif - + fs->WriterLoop(); #ifndef WIN32 @@ -55,7 +55,7 @@ ThreadReturnType EQStreamFactoryWriterLoop(void *eqfs) THREAD_RETURN(nullptr); } -EQStreamFactory::EQStreamFactory(EQStreamType type, int port, uint32 timeout) +EQStreamFactory::EQStreamFactory(EQStreamType type, int port, uint32 timeout) : Timeoutable(5000), stream_timeout(timeout) { StreamType=type; @@ -81,7 +81,7 @@ struct sockaddr_in address; #ifndef WIN32 pthread_t t1,t2; #endif - /* Setup internet address information. + /* Setup internet address information. This is used with the bind() call */ memset((char *) &address, 0, sizeof(address)); address.sin_family = AF_INET; @@ -172,10 +172,10 @@ timeval sleep_time; continue; } else if (num==0) continue; - + if(sock == -1) break; //somebody closed us while we were sleeping. - + if (FD_ISSET(sock,&readset)) { #ifdef _WINDOWS if ((length=recvfrom(sock,(char*)buffer,sizeof(buffer),0,(struct sockaddr*)&from,(int *)&socklen)) < 2) @@ -208,7 +208,7 @@ timeval sleep_time; else curstream->PutInUse(); MStreams.unlock(); //the in use flag prevents the stream from being deleted while we are using it. - + if(curstream) { curstream->AddBytesRecv(length); curstream->Process(buffer,length); @@ -225,17 +225,17 @@ void EQStreamFactory::CheckTimeout() { //lock streams the entire time were checking timeouts, it should be fast. MStreams.lock(); - + unsigned long now=Timer::GetCurrentTime(); map::iterator stream_itr; - + for(stream_itr=Streams.begin();stream_itr!=Streams.end();) { EQStream *s = stream_itr->second; - + s->CheckTimeout(now, stream_timeout); - + EQStreamState state = s->GetState(); - + //not part of the else so we check it right away on state change if (state==CLOSED) { if (s->IsInUse()) { @@ -267,7 +267,7 @@ bool decay=false; uint32 stream_count; Timer DecayTimer(20); - + WriterRunning=true; DecayTimer.Enable(); while(sock!=-1) { @@ -278,12 +278,12 @@ Timer DecayTimer(20); if (!WriterRunning) break; MWriterRunning.unlock(); - + havework = false; wants_write.clear(); decay=DecayTimer.Check(); - + //copy streams into a seperate list so we dont have to keep //MStreams locked while we are writting MStreams.lock(); @@ -291,13 +291,13 @@ Timer DecayTimer(20); // If it's time to decay the bytes sent, then let's do it before we try to write if (decay) stream_itr->second->Decay(); - + //bullshit checking, to see if this is really happening, GDB seems to think so... if(stream_itr->second == nullptr) { fprintf(stderr, "ERROR: nullptr Stream encountered in EQStreamFactory::WriterLoop for: %s", stream_itr->first.c_str()); continue; } - + if (stream_itr->second->HasOutgoingData()) { havework=true; stream_itr->second->PutInUse(); @@ -305,7 +305,7 @@ Timer DecayTimer(20); } } MStreams.unlock(); - + //do the actual writes cur = wants_write.begin(); end = wants_write.end(); @@ -313,7 +313,7 @@ Timer DecayTimer(20); (*cur)->Write(sock); (*cur)->ReleaseFromUse(); } - + Sleep(10); diff --git a/common/EQStreamFactory.h b/common/EQStreamFactory.h index 316a175b0..82cdaa7b9 100644 --- a/common/EQStreamFactory.h +++ b/common/EQStreamFactory.h @@ -23,7 +23,7 @@ class EQStreamFactory : private Timeoutable { Condition WriterWork; EQStreamType StreamType; - + queue NewStreams; Mutex MNewStreams; diff --git a/common/EQStreamIdent.cpp b/common/EQStreamIdent.cpp index 2cc5385e9..a04a0bfb9 100644 --- a/common/EQStreamIdent.cpp +++ b/common/EQStreamIdent.cpp @@ -39,12 +39,12 @@ void EQStreamIdentifier::RegisterPatch(const EQStream::Signature &sig, const cha void EQStreamIdentifier::Process() { vector::iterator cur; vector::iterator curp, endp; - + //foreach pending stream. cur = m_streams.begin(); while(cur != m_streams.end()) { Record *r = *cur; - + //first see if this stream has expired if(r->expire.Check(false)) { //this stream has failed to match any pattern in our timeframe. @@ -54,7 +54,7 @@ void EQStreamIdentifier::Process() { cur = m_streams.erase(cur); continue; } - + //then make sure the stream is still active //if stream hasn't finished initializing then continue; if(r->stream->GetState() == UNESTABLISHED) @@ -87,18 +87,18 @@ void EQStreamIdentifier::Process() { cur = m_streams.erase(cur); continue; } - + //not expired, check against all patch signatures - + bool found_one = false; //"we found a matching patch for this stream" bool all_ready = true; //"all signatures were ready to check the stream" - + //foreach possbile patch... curp = m_patches.begin(); endp = m_patches.end(); for(; !found_one && curp != endp; curp++) { Patch *p = *curp; - + //ask the stream to see if it matches the supplied signature EQStream::MatchState res = r->stream->CheckSignature(&p->signature); switch(res) { @@ -109,13 +109,13 @@ void EQStreamIdentifier::Process() { break; case EQStream::MatchSuccessful: { //yay, a match. - + _log(NET__IDENTIFY, "Identified stream %s:%d with signature %s", long2ip(r->stream->GetRemoteIP()).c_str(), ntohs(r->stream->GetRemotePort()), p->name.c_str()); - + //might want to do something less-specific here... some day.. EQStreamInterface *s = new EQStreamProxy(r->stream, p->structs, p->opcodes); m_identified.push(s); - + found_one = true; break; } @@ -125,14 +125,14 @@ void EQStreamIdentifier::Process() { break; } } - + //if we checked all patches and did not find a match. if(all_ready && !found_one) { //the stream cannot be identified. _log(NET__IDENTIFY, "Unable to identify stream from %s:%d, no match found.", long2ip(r->stream->GetRemoteIP()).c_str(), ntohs(r->stream->GetRemotePort())); r->stream->ReleaseFromUse(); } - + //if we found a match, or were not able to identify it if(found_one || all_ready) { //cannot print ip/port here. r->stream is invalid. @@ -156,7 +156,7 @@ EQStreamInterface *EQStreamIdentifier::PopIdentified() { m_identified.pop(); return(res); } - + EQStreamIdentifier::Record::Record(EQStream *s) : stream(s), expire(STREAM_IDENT_WAIT_MS) diff --git a/common/EQStreamIdent.h b/common/EQStreamIdent.h index 361c6237f..6ab734fb5 100644 --- a/common/EQStreamIdent.h +++ b/common/EQStreamIdent.h @@ -15,17 +15,17 @@ class StructStrategy; class EQStreamIdentifier { public: ~EQStreamIdentifier(); - + //registration interface. void RegisterPatch(const EQStream::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs); - + //main processing interface void Process(); void AddStream(EQStream *& eqs); EQStreamInterface *PopIdentified(); - + protected: - + //registered patches.. class Patch { public: @@ -35,7 +35,7 @@ protected: const StructStrategy *structs; }; std::vector m_patches; //we own these objects. - + //pending streams.. class Record { public: diff --git a/common/EQStreamIntf.h b/common/EQStreamIntf.h index e3e3ac092..9373f2262 100644 --- a/common/EQStreamIntf.h +++ b/common/EQStreamIntf.h @@ -19,7 +19,7 @@ class EQApplicationPacket; class EQStreamInterface { public: virtual ~EQStreamInterface() {} - + virtual void QueuePacket(const EQApplicationPacket *p, bool ack_req=true) = 0; virtual void FastQueuePacket(EQApplicationPacket **p, bool ack_req=true) = 0; virtual EQApplicationPacket *PopPacket() = 0; diff --git a/common/EQStreamLocator.h b/common/EQStreamLocator.h index 27d17aeb3..1724e77c6 100644 --- a/common/EQStreamLocator.h +++ b/common/EQStreamLocator.h @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 EQEmulator Team This program is free software; you can redistribute it and/or modify @@ -66,7 +66,7 @@ if(res) else printf(": False\n");*/ - + if(l.src_ip != r.src_ip) return(l.src_ip < r.src_ip); if(l.dst_ip != r.dst_ip) @@ -74,7 +74,7 @@ else if(l.src_port != r.src_port) return(l.src_port < r.src_port); return(l.dst_port < r.dst_port); - + /* //so, this turned out uglier than I had hoped if(l.src_ip < r.src_ip) return(true); @@ -105,35 +105,35 @@ class EQStreamLocator { protected: typedef typename map::iterator iterator; public: - + void Clear() { streams.clear(); } - + void AddStream(const EQStreamInfo &i, T *o) { //do we care to check if it exists? - + //add this stream, and its inverse streams[i] = o; EQStreamInfo inv; i.invert(inv); streams[inv] = o; } - + //deletes this stream, and its inverse void RemoveStream(const EQStreamInfo &i) { iterator res; res = streams.find(i); if(res != streams.end()) streams.erase(res); - + EQStreamInfo inv; i.invert(inv); res = streams.find(inv); if(res != streams.end()) streams.erase(res); } - + //removes every occurance of this stream from the list void RemoveStream(T *it) { iterator cur, end; @@ -142,14 +142,14 @@ public: for(; cur != end; cur++) { if(cur->second == it) { streams.erase(cur); - //lazy recursive delete for now, since we have to redo + //lazy recursive delete for now, since we have to redo //our iterators anyways RemoveStream(it); return; } } } - + T *GetStream(const EQStreamInfo &i) { iterator res; res = streams.find(i); @@ -160,12 +160,12 @@ public: return(nullptr); return(res->second); } - + //allow people to iterate over the const struct // typedef map::const_iterator iterator; // inline iterator begin() const { return(streams.begin()); } // inline iterator end() const { return(streams.end()); } - + protected: map streams; }; diff --git a/common/EQStreamProxy.cpp b/common/EQStreamProxy.cpp index 1268b378d..2791ad4e3 100644 --- a/common/EQStreamProxy.cpp +++ b/common/EQStreamProxy.cpp @@ -30,7 +30,7 @@ const EQClientVersion EQStreamProxy::ClientVersion() const void EQStreamProxy::QueuePacket(const EQApplicationPacket *p, bool ack_req) { if(p == nullptr) return; - + EQApplicationPacket *newp = p->Copy(); FastQueuePacket(&newp, ack_req); } @@ -45,7 +45,7 @@ EQApplicationPacket *EQStreamProxy::PopPacket() { EQApplicationPacket *pack = m_stream->PopPacket(); if(pack == nullptr) return(nullptr); - + //pass this packet through the struct strategy. m_structs->Decode(pack); return(pack); diff --git a/common/EQStreamProxy.h b/common/EQStreamProxy.h index d2266ab9c..68681899d 100644 --- a/common/EQStreamProxy.h +++ b/common/EQStreamProxy.h @@ -15,7 +15,7 @@ public: //takes ownership of the stream. EQStreamProxy(EQStream *&stream, const StructStrategy *structs, OpcodeManager **opcodes); virtual ~EQStreamProxy(); - + //EQStreamInterface: virtual void QueuePacket(const EQApplicationPacket *p, bool ack_req=true); virtual void FastQueuePacket(EQApplicationPacket **p, bool ack_req=true); @@ -28,7 +28,7 @@ public: virtual bool CheckState(EQStreamState state); virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + virtual const uint32 GetBytesSent() const; virtual const uint32 GetBytesRecieved() const; virtual const uint32 GetBytesSentPerSecond() const; @@ -39,7 +39,7 @@ protected: const StructStrategy *const m_structs; //we do not own this object. //this is a pointer to a pointer to make it less likely that a packet will //reference an invalid opcode manager when they are being reloaded. - OpcodeManager **const m_opcodes; //we do not own this object. + OpcodeManager **const m_opcodes; //we do not own this object. }; diff --git a/common/EmuTCPConnection.cpp b/common/EmuTCPConnection.cpp index a4108b0bb..e696efee2 100644 --- a/common/EmuTCPConnection.cpp +++ b/common/EmuTCPConnection.cpp @@ -17,30 +17,30 @@ */ /* - * - * - * - * + * + * + * + * * There are really two or three different objects shoe-hored into this * connection object. Sombody really needs to factor out the relay link - * crap into its own subclass of this object, it will clean things up + * crap into its own subclass of this object, it will clean things up * tremendously. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * */ #include "../common/debug.h" @@ -92,7 +92,7 @@ EmuTCPConnection::EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, SOCKET in_s RelayServer = false; RelayCount = 0; RemoteID = 0; - + } //client outgoing connection case (and client side relay) @@ -246,7 +246,7 @@ bool EmuTCPConnection::SendPacket(EmuTCPNetPacket_Struct* tnps) { return false; if (GetMode() != modePacket) return false; - + LockMutex lock(&MState); eTCPMode tmp = GetMode(); if (tmp == modeTransition) { @@ -391,13 +391,13 @@ bool EmuTCPConnection::LineOutQueuePush(char* line) { } } - + return(TCPConnection::LineOutQueuePush(line)); } void EmuTCPConnection::Disconnect(bool iSendRelayDisconnect) { TCPConnection::Disconnect(); - + if (RelayLink) { RelayLink->RemoveRelay(this, iSendRelayDisconnect); RelayLink = 0; @@ -407,7 +407,7 @@ void EmuTCPConnection::Disconnect(bool iSendRelayDisconnect) { bool EmuTCPConnection::ConnectIP(uint32 irIP, uint16 irPort, char* errbuf) { if(!TCPConnection::ConnectIP(irIP, irPort, errbuf)) return(false); - + MSendQueue.lock(); #ifdef MINILOGIN TCPMode = modePacket; @@ -453,22 +453,22 @@ bool EmuTCPConnection::ConnectIP(uint32 irIP, uint16 irPort, char* errbuf) { } #endif MSendQueue.unlock(); - + return(true); } void EmuTCPConnection::ClearBuffers() { TCPConnection::ClearBuffers(); - + LockMutex lock2(&MOutQueueLock); ServerPacket* pack = 0; while ((pack = OutQueue.pop())) safe_delete(pack); - + EmuTCPNetPacket_Struct* tnps = 0; while ((tnps = InModeQueue.pop())) safe_delete(tnps); - + keepalive_timer.Start(); timeout_timer.Start(); } @@ -810,7 +810,7 @@ bool EmuTCPConnection::SendData(bool &sent_something, char* errbuf) { sent_something = false; if(!TCPConnection::SendData(sent_something, errbuf)) return(false); - + if(sent_something) keepalive_timer.Start(); else if (TCPMode == modePacket && keepalive_timer.Check()) { @@ -821,7 +821,7 @@ bool EmuTCPConnection::SendData(bool &sent_something, char* errbuf) { cout << "Sending TCP keepalive packet. (timeout=" << timeout_timer.GetRemainingTime() << " remaining)" << endl; #endif } - + return(true); } @@ -832,13 +832,13 @@ bool EmuTCPConnection::RecvData(char* errbuf) { else return(false); } - + if ((TCPMode == modePacket || TCPMode == modeTransition) && timeout_timer.Check()) { if (errbuf) snprintf(errbuf, TCPConnection_ErrorBufferSize, "TCPConnection::RecvData(): Connection timeout"); return false; } - + return(true); } diff --git a/common/EmuTCPConnection.h b/common/EmuTCPConnection.h index 8d567154d..1c64c2196 100644 --- a/common/EmuTCPConnection.h +++ b/common/EmuTCPConnection.h @@ -31,67 +31,67 @@ class EmuTCPConnection : public TCPConnection { public: enum eTCPMode { modeConsole, modeTransition, modePacket }; enum ePacketMode { packetModeZone, packetModeLauncher, packetModeLogin, packetModeUCS, packetModeQueryServ }; - + EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, SOCKET iSock, uint32 irIP, uint16 irPort, bool iOldFormat = false); EmuTCPConnection(bool iOldFormat = false, EmuTCPServer* iRelayServer = 0, eTCPMode iMode = modePacket); // for outgoing connections EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, EmuTCPConnection* iRelayLink, uint32 iRemoteID, uint32 irIP, uint16 irPort); // for relay connections virtual ~EmuTCPConnection(); - + virtual bool ConnectIP(uint32 irIP, uint16 irPort, char* errbuf = 0); virtual void Disconnect(bool iSendRelayDisconnect = true); - + static EmuTCPNetPacket_Struct* MakePacket(ServerPacket* pack, uint32 iDestination = 0); static SPackSendQueue* MakeOldPacket(ServerPacket* pack); - + virtual bool SendPacket(ServerPacket* pack, uint32 iDestination = 0); virtual bool SendPacket(EmuTCPNetPacket_Struct* tnps); ServerPacket* PopPacket(); // OutQueuePop() void SetPacketMode(ePacketMode mode) { PacketMode = mode; } - + eTCPMode GetMode() const { return TCPMode; } ePacketMode GetPacketMode() const { return(PacketMode); } - + //relay crap: inline bool IsRelayServer() const { return RelayServer; } inline TCPConnection* GetRelayLink() const { return RelayLink; } inline uint32 GetRemoteID() const { return RemoteID; } - + protected: void OutQueuePush(ServerPacket* pack); void RemoveRelay(EmuTCPConnection* relay, bool iSendRelayDisconnect); - + void SendNetErrorPacket(const char* reason = 0); - + virtual bool SendData(bool &sent_something, char* errbuf = 0); virtual bool RecvData(char* errbuf = 0); - + virtual bool ProcessReceivedData(char* errbuf = 0); bool ProcessReceivedDataAsPackets(char* errbuf = 0); bool ProcessReceivedDataAsOldPackets(char* errbuf = 0); void ProcessNetworkLayerPacket(ServerPacket* pack); - + virtual bool LineOutQueuePush(char* line); virtual void ClearBuffers(); - + EmuTCPServer* Server; - + eTCPMode TCPMode; ePacketMode PacketMode; bool pOldFormat; - + Timer keepalive_timer; Timer timeout_timer; - + //relay crap: EmuTCPConnection* RelayLink; int32 RelayCount; bool RelayServer; uint32 RemoteID; - + //input queue... void InModeQueuePush(EmuTCPNetPacket_Struct* tnps); MyQueue InModeQueue; - + //output queue... MyQueue OutQueue; Mutex MOutQueueLock; diff --git a/common/Item.cpp b/common/Item.cpp index 023f341e9..74fa9579a 100644 --- a/common/Item.cpp +++ b/common/Item.cpp @@ -42,7 +42,7 @@ int32 NextItemInstSerialNumber = 1; static inline int32 GetNextItemInstSerialNumber() { - // The Bazaar relies on each item a client has up for Trade having a unique + // The Bazaar relies on each item a client has up for Trade having a unique // identifier. This 'SerialNumber' is sent in Serialized item packets and // is used in Bazaar packets to identify the item a player is buying or inspecting. // @@ -103,8 +103,8 @@ ItemInstQueue::~ItemInstQueue() { Inventory::~Inventory() { map::iterator cur,end; - - + + cur = m_worn.begin(); end = m_worn.end(); for(; cur != end; cur++) { @@ -112,7 +112,7 @@ Inventory::~Inventory() { safe_delete(tmp); } m_worn.clear(); - + cur = m_inv.begin(); end = m_inv.end(); for(; cur != end; cur++) { @@ -120,7 +120,7 @@ Inventory::~Inventory() { safe_delete(tmp); } m_inv.clear(); - + cur = m_bank.begin(); end = m_bank.end(); for(; cur != end; cur++) { @@ -128,7 +128,7 @@ Inventory::~Inventory() { safe_delete(tmp); } m_bank.clear(); - + cur = m_shbank.begin(); end = m_shbank.end(); for(; cur != end; cur++) { @@ -136,7 +136,7 @@ Inventory::~Inventory() { safe_delete(tmp); } m_shbank.clear(); - + cur = m_trade.begin(); end = m_trade.end(); for(; cur != end; cur++) { @@ -163,11 +163,11 @@ ItemInst::ItemInst(const ItemInst& copy) for (it=copy.m_contents.begin(); it!=copy.m_contents.end(); it++) { ItemInst* inst_old = it->second; ItemInst* inst_new = nullptr; - + if (inst_old) { inst_new = inst_old->Clone(); } - + if (inst_new != nullptr) { m_contents[it->first] = inst_new; } @@ -200,11 +200,11 @@ bool ItemInst::IsType(ItemClass item_class) const { // Check usage type if ((m_use_type == ItemUseWorldContainer) && (item_class == ItemClassContainer)) - + return true; if (!m_item) return false; - + return (m_item->ItemClass == item_class); } @@ -229,14 +229,14 @@ bool ItemInst::IsEquipable(int16 slot_id) const { if (!m_item) return false; - + if(slot_id == 9999) { slot_id = 22; uint32 slot_mask = (1 << slot_id); if (slot_mask & m_item->Slots) return true; } - + if (slot_id < 22) { uint32 slot_mask = (1 << slot_id); if (slot_mask & m_item->Slots) @@ -321,7 +321,7 @@ bool ItemInst::IsAmmo() const { return true; return false; - + } // Retrieve augment inside item @@ -329,7 +329,7 @@ ItemInst* ItemInst::GetAugment(uint8 slot) const { if (m_item->ItemClass == ItemClassCommon) return GetItem(slot); - + return nullptr; } @@ -376,7 +376,7 @@ ItemInst* ItemInst::GetItem(uint8 index) const ItemInst* inst = it->second; return inst; } - + return nullptr; } @@ -384,8 +384,8 @@ void ItemInst::PutItem(uint8 index, const ItemInst& inst) { // Clean up item already in slot (if exists) DeleteItem(index); - - + + // Delegate to internal method _PutItem(index, inst.Clone()); } @@ -423,7 +423,7 @@ void ItemInst::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent) const Item_Struct* item = inst->GetItem(); del = cur; cur++; - + switch(is_nodrop) { case byFlagSet: if (item->NoDrop == 0) { @@ -440,7 +440,7 @@ void ItemInst::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent) default: break; } - + switch(is_norent) { case byFlagSet: if (item->NoRent == 0) { @@ -470,7 +470,7 @@ ItemInst* ItemInst::PopItem(uint8 index) m_contents.erase(index); return inst; } - + // Return pointer that needs to be deleted (or otherwise managed) return nullptr; } @@ -492,7 +492,7 @@ ItemInst* ItemInstQueue::pop() { if (m_list.size() == 0) return nullptr; - + ItemInst* inst = m_list.front(); m_list.pop_front(); return inst; @@ -509,13 +509,13 @@ ItemInst* Inventory::GetItem(int16 slot_id) const { _CP(Inventory_GetItem); ItemInst* result = nullptr; - + // Cursor if (slot_id == SLOT_CURSOR) { // Cursor slot result = m_cursor.peek_front(); } - + // Non bag slots else if (slot_id>=3000 && slot_id<=3007) { // Trade slots @@ -537,7 +537,7 @@ ItemInst* Inventory::GetItem(int16 slot_id) const // Equippable slots (on body) result = _GetItem(m_worn, slot_id); } - + // Inner bag slots else if (slot_id>=3031 && slot_id<=3110) { // Trade bag slots @@ -574,7 +574,7 @@ ItemInst* Inventory::GetItem(int16 slot_id) const result = inst->GetItem(Inventory::CalcBagIdx(slot_id)); } } - + return result; } @@ -656,13 +656,13 @@ int16 Inventory::PutItem(int16 slot_id, const ItemInst& inst) { // Clean up item already in slot (if exists) DeleteItem(slot_id); - + if (!inst) { // User is effectively deleting the item // in the slot, why hold a null ptr in map<>? return slot_id; } - + // Delegate to internal method return _PutItem(slot_id, inst.Clone()); } @@ -693,48 +693,48 @@ int16 Inventory::HasItem(uint32 item_id, uint8 quantity, uint8 where) { _CP(Inventory_HasItem); int16 slot_id = SLOT_INVALID; - + //Altered by Father Nitwit to support a specification of //where to search, with a default value to maintain compatibility - + // Check each inventory bucket if(where & invWhereWorn) { slot_id = _HasItem(m_worn, item_id, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWherePersonal) { slot_id = _HasItem(m_inv, item_id, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereBank) { slot_id = _HasItem(m_bank, item_id, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereSharedBank) { slot_id = _HasItem(m_shbank, item_id, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereTrading) { slot_id = _HasItem(m_trade, item_id, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereCursor) { // Check cursor queue slot_id = _HasItem(m_cursor, item_id, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + return slot_id; } @@ -743,90 +743,90 @@ int16 Inventory::HasItem(uint32 item_id, uint8 quantity, uint8 where) int16 Inventory::HasItemByUse(uint8 use, uint8 quantity, uint8 where) { int16 slot_id = SLOT_INVALID; - + // Check each inventory bucket if(where & invWhereWorn) { slot_id = _HasItemByUse(m_worn, use, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWherePersonal) { slot_id = _HasItemByUse(m_inv, use, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereBank) { slot_id = _HasItemByUse(m_bank, use, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereSharedBank) { slot_id = _HasItemByUse(m_shbank, use, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereTrading) { slot_id = _HasItemByUse(m_trade, use, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereCursor) { // Check cursor queue slot_id = _HasItemByUse(m_cursor, use, quantity); if (slot_id != SLOT_INVALID) return slot_id; } - + return slot_id; } -int16 Inventory::HasItemByLoreGroup(uint32 loregroup, uint8 where) +int16 Inventory::HasItemByLoreGroup(uint32 loregroup, uint8 where) { int16 slot_id = SLOT_INVALID; - + // Check each inventory bucket if(where & invWhereWorn) { slot_id = _HasItemByLoreGroup(m_worn, loregroup); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWherePersonal) { slot_id = _HasItemByLoreGroup(m_inv, loregroup); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereBank) { slot_id = _HasItemByLoreGroup(m_bank, loregroup); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereSharedBank) { slot_id = _HasItemByLoreGroup(m_shbank, loregroup); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereTrading) { slot_id = _HasItemByLoreGroup(m_trade, loregroup); if (slot_id != SLOT_INVALID) return slot_id; } - + if(where & invWhereCursor) { // Check cursor queue slot_id = _HasItemByLoreGroup(m_cursor, loregroup); if (slot_id != SLOT_INVALID) return slot_id; } - + return slot_id; } @@ -835,13 +835,13 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { if(ItemToTry->Stackable) { for(int16 i = 22; i <= 29; i++) { - + ItemInst* InvItem = GetItem(i); if(InvItem && (InvItem->GetItem()->ID == ItemToTry->ID) && (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); - + if(Quantity <= ChargeSlotsLeft) return true; @@ -860,7 +860,7 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); - + if(Quantity <= ChargeSlotsLeft) return true; @@ -930,7 +930,7 @@ bool Inventory::DeleteItem(int16 slot_id, uint8 quantity) { // Pop item out of inventory map (or queue) ItemInst* item_to_delete = PopItem(slot_id); - + // Determine if object should be fully deleted, or // just a quantity of charges of the item can be deleted if (item_to_delete && (quantity > 0)) { @@ -942,7 +942,7 @@ bool Inventory::DeleteItem(int16 slot_id, uint8 quantity) // If the item is stackable (e.g arrows), or // the item is not stackable, and is not a charged item, or is expendable, delete it if(item_to_delete->IsStackable() || - (!item_to_delete->IsStackable() && + (!item_to_delete->IsStackable() && ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))) { // Item can now be destroyed safe_delete(item_to_delete); @@ -954,11 +954,11 @@ bool Inventory::DeleteItem(int16 slot_id, uint8 quantity) _PutItem(slot_id, item_to_delete); return false; } - + safe_delete(item_to_delete); return true; - + } // Checks All items in a bag for No Drop @@ -980,7 +980,7 @@ bool Inventory::CheckNoDrop(int16 slot_id) { ItemInst* Inventory::PopItem(int16 slot_id) { ItemInst* p = nullptr; - + if (slot_id==SLOT_CURSOR) { // Cursor p = m_cursor.pop(); } @@ -1011,7 +1011,7 @@ ItemInst* Inventory::PopItem(int16 slot_id) p = baginst->PopItem(Inventory::CalcBagIdx(slot_id)); } } - + // Return pointer that needs to be deleted (or otherwise managed) return p; } @@ -1026,12 +1026,12 @@ int16 Inventory::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, boo // Found available slot in personal inventory return i; } - + if (!for_bag) { for (int16 i=22; i<=29; i++) { const ItemInst* inst = GetItem(i); - if (inst && inst->IsType(ItemClassContainer) - && inst->GetItem()->BagSize >= min_size) + if (inst && inst->IsType(ItemClassContainer) + && inst->GetItem()->BagSize >= min_size) { if(inst->GetItem()->BagType == bagTypeQuiver && inst->GetItem()->ItemType != ItemTypeArrow) { @@ -1050,12 +1050,12 @@ int16 Inventory::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, boo } } } - + if (try_cursor) // Always room on cursor (it's a queue) // (we may wish to cap this in the future) return SLOT_CURSOR; - + // No available slots return SLOT_INVALID; } @@ -1064,7 +1064,7 @@ void Inventory::dumpInventory() { iter_inst it; iter_contents itb; ItemInst* inst = nullptr; - + // Check item: After failed checks, check bag contents (if bag) printf("Worn items:\n"); for (it=m_worn.begin(); it!=m_worn.end(); it++) { @@ -1072,9 +1072,9 @@ void Inventory::dumpInventory() { it->first; if(!inst || !inst->GetItem()) continue; - + printf("Slot %d: %s (%d)\n", it->first, it->second->GetItem()->Name, (inst->GetCharges()<=0) ? 1 : inst->GetCharges()); - + // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { for (itb=inst->_begin(); itb!=inst->_end(); itb++) { @@ -1086,16 +1086,16 @@ void Inventory::dumpInventory() { } } } - + printf("Inventory items:\n"); for (it=m_inv.begin(); it!=m_inv.end(); it++) { inst = it->second; it->first; if(!inst || !inst->GetItem()) continue; - + printf("Slot %d: %s (%d)\n", it->first, it->second->GetItem()->Name, (inst->GetCharges()<=0) ? 1 : inst->GetCharges()); - + // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { for (itb=inst->_begin(); itb!=inst->_end(); itb++) { @@ -1104,57 +1104,57 @@ void Inventory::dumpInventory() { continue; printf(" Slot %d: %s (%d)\n", Inventory::CalcSlotId(it->first, itb->first), baginst->GetItem()->Name, (baginst->GetCharges()<=0) ? 1 : baginst->GetCharges()); - + } } } - + printf("Bank items:\n"); for (it=m_bank.begin(); it!=m_bank.end(); it++) { inst = it->second; it->first; if(!inst || !inst->GetItem()) continue; - + printf("Slot %d: %s (%d)\n", it->first, it->second->GetItem()->Name, (inst->GetCharges()<=0) ? 1 : inst->GetCharges()); - + // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; if(!baginst || !baginst->GetItem()) continue; printf(" Slot %d: %s (%d)\n", Inventory::CalcSlotId(it->first, itb->first), baginst->GetItem()->Name, (baginst->GetCharges()<=0) ? 1 : baginst->GetCharges()); - + } } } - + printf("Shared Bank items:\n"); for (it=m_shbank.begin(); it!=m_shbank.end(); it++) { inst = it->second; it->first; if(!inst || !inst->GetItem()) continue; - + printf("Slot %d: %s (%d)\n", it->first, it->second->GetItem()->Name, (inst->GetCharges()<=0) ? 1 : inst->GetCharges()); - + // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; if(!baginst || !baginst->GetItem()) continue; printf(" Slot %d: %s (%d)\n", Inventory::CalcSlotId(it->first, itb->first), baginst->GetItem()->Name, (baginst->GetCharges()<=0) ? 1 : baginst->GetCharges()); - + } } } - + printf("\n"); fflush(stdout); } @@ -1166,7 +1166,7 @@ ItemInst* Inventory::_GetItem(const map& bucket, int16 slot_id if (it != bucket.end()) { return it->second; } - + // Not found! return nullptr; } @@ -1181,9 +1181,9 @@ int16 Inventory::_PutItem(int16 slot_id, ItemInst* inst) PopItem(slot_id); return slot_id; } - + int16 result = SLOT_INVALID; - + if (slot_id==SLOT_CURSOR) { // Cursor // Replace current item on cursor, if exists m_cursor.pop(); // no memory delete, clients of this function know what they are doing @@ -1218,12 +1218,12 @@ int16 Inventory::_PutItem(int16 slot_id, ItemInst* inst) result = slot_id; } } - + if (result == SLOT_INVALID) { LogFile->write(EQEMuLog::Error, "Inventory::_PutItem: Invalid slot_id specified (%i)", slot_id); safe_delete(inst); // Slot not found, clean up } - + return result; } @@ -1234,7 +1234,7 @@ int16 Inventory::_HasItem(map& bucket, uint32 item_id, uint8 q iter_contents itb; ItemInst* inst = nullptr; uint8 quantity_found = 0; - + // Check item: After failed checks, check bag contents (if bag) for (it=bucket.begin(); it!=bucket.end(); it++) { inst = it->second; @@ -1244,15 +1244,15 @@ int16 Inventory::_HasItem(map& bucket, uint32 item_id, uint8 q if (quantity_found >= quantity) return it->first; } - + for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { - if (inst->GetAugmentItemID(i) == item_id && quantity <= 1) + if (inst->GetAugmentItemID(i) == item_id && quantity <= 1) return SLOT_AUGMENT; // Only one augment per slot. } } // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; if (baginst->GetID() == item_id) { @@ -1261,13 +1261,13 @@ int16 Inventory::_HasItem(map& bucket, uint32 item_id, uint8 q return Inventory::CalcSlotId(it->first, itb->first); } for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { - if (baginst->GetAugmentItemID(i) == item_id && quantity <= 1) + if (baginst->GetAugmentItemID(i) == item_id && quantity <= 1) return SLOT_AUGMENT; // Only one augment per slot. } } } } - + // Not found return SLOT_INVALID; } @@ -1278,7 +1278,7 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) iter_queue it; iter_contents itb; uint8 quantity_found = 0; - + // Read-only iteration of queue for (it=iqueue.begin(); it!=iqueue.end(); it++) { ItemInst* inst = *it; @@ -1290,13 +1290,13 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) return SLOT_CURSOR; } for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { - if (inst->GetAugmentItemID(i) == item_id && quantity <= 1) + if (inst->GetAugmentItemID(i) == item_id && quantity <= 1) return SLOT_AUGMENT; // Only one augment per slot. } } // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; if (baginst->GetID() == item_id) { @@ -1305,14 +1305,14 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) return Inventory::CalcSlotId(SLOT_CURSOR, itb->first); } for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { - if (baginst->GetAugmentItemID(i) == item_id && quantity <= 1) + if (baginst->GetAugmentItemID(i) == item_id && quantity <= 1) return SLOT_AUGMENT; // Only one augment per slot. } } } } - + // Not found return SLOT_INVALID; } @@ -1324,7 +1324,7 @@ int16 Inventory::_HasItemByUse(map& bucket, uint8 use, uint8 q iter_contents itb; ItemInst* inst = nullptr; uint8 quantity_found = 0; - + // Check item: After failed checks, check bag contents (if bag) for (it=bucket.begin(); it!=bucket.end(); it++) { inst = it->second; @@ -1333,10 +1333,10 @@ int16 Inventory::_HasItemByUse(map& bucket, uint8 use, uint8 q if (quantity_found >= quantity) return it->first; } - + // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; if (baginst && baginst->IsType(ItemClassCommon) && baginst->GetItem()->ItemType == use) { @@ -1347,7 +1347,7 @@ int16 Inventory::_HasItemByUse(map& bucket, uint8 use, uint8 q } } } - + // Not found return SLOT_INVALID; } @@ -1358,7 +1358,7 @@ int16 Inventory::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity) iter_queue it; iter_contents itb; uint8 quantity_found = 0; - + // Read-only iteration of queue for (it=iqueue.begin(); it!=iqueue.end(); it++) { ItemInst* inst = *it; @@ -1367,10 +1367,10 @@ int16 Inventory::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity) if (quantity_found >= quantity) return SLOT_CURSOR; } - + // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; if (baginst && baginst->IsType(ItemClassCommon) && baginst->GetItem()->ItemType == use) { @@ -1381,24 +1381,24 @@ int16 Inventory::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity) } } } - + // Not found return SLOT_INVALID; } -int16 Inventory::_HasItemByLoreGroup(map& bucket, uint32 loregroup) +int16 Inventory::_HasItemByLoreGroup(map& bucket, uint32 loregroup) { iter_inst it; iter_contents itb; ItemInst* inst = nullptr; - + // Check item: After failed checks, check bag contents (if bag) for (it=bucket.begin(); it!=bucket.end(); it++) { inst = it->second; if (inst) { - if (inst->GetItem()->LoreGroup == loregroup) + if (inst->GetItem()->LoreGroup == loregroup) return it->first; - + ItemInst* Aug; for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { Aug = inst->GetAugment(i); @@ -1408,12 +1408,12 @@ int16 Inventory::_HasItemByLoreGroup(map& bucket, uint32 loreg } // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; - if (baginst && baginst->IsType(ItemClassCommon)&& baginst->GetItem()->LoreGroup == loregroup) + if (baginst && baginst->IsType(ItemClassCommon)&& baginst->GetItem()->LoreGroup == loregroup) return Inventory::CalcSlotId(it->first, itb->first); - + ItemInst* Aug2; for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { Aug2 = baginst->GetAugment(i); @@ -1423,7 +1423,7 @@ int16 Inventory::_HasItemByLoreGroup(map& bucket, uint32 loreg } } } - + // Not found return SLOT_INVALID; } @@ -1433,15 +1433,15 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup) { iter_queue it; iter_contents itb; - + // Read-only iteration of queue for (it=iqueue.begin(); it!=iqueue.end(); it++) { ItemInst* inst = *it; if (inst) { - if (inst->GetItem()->LoreGroup == loregroup) + if (inst->GetItem()->LoreGroup == loregroup) return SLOT_CURSOR; - + ItemInst* Aug; for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { Aug = inst->GetAugment(i); @@ -1451,13 +1451,13 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup) } // Go through bag, if bag if (inst && inst->IsType(ItemClassContainer)) { - + for (itb=inst->_begin(); itb!=inst->_end(); itb++) { ItemInst* baginst = itb->second; - if (baginst && baginst->IsType(ItemClassCommon)&& baginst->GetItem()->LoreGroup == loregroup) + if (baginst && baginst->IsType(ItemClassCommon)&& baginst->GetItem()->LoreGroup == loregroup) return Inventory::CalcSlotId(SLOT_CURSOR, itb->first); - - + + ItemInst* Aug2; for(int i = 0; i < MAX_AUGMENT_SLOTS; i++) { Aug2 = baginst->GetAugment(i); @@ -1468,7 +1468,7 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup) } } } - + // Not found return SLOT_INVALID; } @@ -1513,7 +1513,7 @@ bool ItemInst::IsNoneEmptyContainer() for(int i = 0; i < m_item->BagSlots; ++i) if(GetItem(i)) return true; - + return false; } @@ -1522,7 +1522,7 @@ bool ItemInst::IsAugmented() for(int i = 0; i < MAX_AUGMENT_SLOTS; ++i) if (GetAugmentItemID(i)) return true; - + return false; } @@ -1532,9 +1532,9 @@ int16 Inventory::CalcSlotId(int16 bagslot_id, uint8 bagidx) if (!Inventory::SupportsContainers(bagslot_id)) { return SLOT_INVALID; } - + int16 slot_id = SLOT_INVALID; - + if (bagslot_id==SLOT_CURSOR || bagslot_id==8000) // Cursor slot_id = IDX_CURSOR_BAG + bagidx; else if (bagslot_id>=22 && bagslot_id<=29) // Inventory slots @@ -1545,7 +1545,7 @@ int16 Inventory::CalcSlotId(int16 bagslot_id, uint8 bagidx) slot_id = IDX_SHBANK_BAG + (bagslot_id-2500)*MAX_ITEMS_PER_BAG + bagidx; else if (bagslot_id>=3000 && bagslot_id<=3007) // Trade window slots slot_id = IDX_TRADE_BAG + (bagslot_id-3000)*MAX_ITEMS_PER_BAG + bagidx; - + return slot_id; } @@ -1553,7 +1553,7 @@ int16 Inventory::CalcSlotId(int16 bagslot_id, uint8 bagidx) int16 Inventory::CalcSlotId(int16 slot_id) { int16 parent_slot_id = SLOT_INVALID; - + if (slot_id>=251 && slot_id<=330) parent_slot_id = IDX_INV + (slot_id-251) / MAX_ITEMS_PER_BAG; else if (slot_id>=331 && slot_id<=340) @@ -1566,14 +1566,14 @@ int16 Inventory::CalcSlotId(int16 slot_id) parent_slot_id = IDX_SHBANK + (slot_id-2531) / MAX_ITEMS_PER_BAG; else if (slot_id>=3100 && slot_id<=3179) parent_slot_id = IDX_TRADE + (slot_id-3100) / MAX_ITEMS_PER_BAG; - + return parent_slot_id; } uint8 Inventory::CalcBagIdx(int16 slot_id) { uint8 index = 0; - + if (slot_id>=251 && slot_id<=330) index = (slot_id-251) % MAX_ITEMS_PER_BAG; else if (slot_id>=331 && slot_id<=340) @@ -1588,7 +1588,7 @@ uint8 Inventory::CalcBagIdx(int16 slot_id) index = (slot_id-3100) % MAX_ITEMS_PER_BAG; else if (slot_id>=4000 && slot_id<=4009) index = (slot_id-4000) % MAX_ITEMS_PER_BAG; - + return index; } @@ -1691,11 +1691,11 @@ EvoItemInst::EvoItemInst(const EvoItemInst ©) { for (it=copy.m_contents.begin(); it!=copy.m_contents.end(); it++) { ItemInst* inst_old = it->second; ItemInst* inst_new = nullptr; - + if (inst_old) { inst_new = inst_old->Clone(); } - + if (inst_new != nullptr) { m_contents[it->first] = inst_new; } @@ -1717,7 +1717,7 @@ EvoItemInst::EvoItemInst(const EvoItemInst ©) { EvoItemInst::EvoItemInst(const ItemInst &basecopy) { EvoItemInst* copy = (EvoItemInst*)&basecopy; - + m_use_type=copy->m_use_type; m_item=copy->m_item; m_charges=copy->m_charges; @@ -1732,11 +1732,11 @@ EvoItemInst::EvoItemInst(const ItemInst &basecopy) { for (it=copy->m_contents.begin(); it!=copy->m_contents.end(); it++) { ItemInst* inst_old = it->second; ItemInst* inst_new = nullptr; - + if (inst_old) { inst_new = inst_old->Clone(); } - + if (inst_new != nullptr) { m_contents[it->first] = inst_new; } @@ -1775,7 +1775,7 @@ EvoItemInst::EvoItemInst(const Item_Struct* item, int16 charges) { } EvoItemInst::~EvoItemInst() { - safe_delete(m_scaledItem); + safe_delete(m_scaledItem); } EvoItemInst* EvoItemInst::Clone() const { @@ -1812,7 +1812,7 @@ void EvoItemInst::Initialize(SharedDatabase *db) { void EvoItemInst::ScaleItem() { // free memory from any previously scaled item data safe_delete(m_scaledItem); - + m_scaledItem = new Item_Struct(*m_item); float Mult = (float)(GetExp())/10000; // scaling is determined by exp, with 10,000 being full stats @@ -1829,7 +1829,7 @@ void EvoItemInst::ScaleItem() { m_scaledItem->DR = (int8)((float)m_item->DR*Mult); m_scaledItem->CR = (int8)((float)m_item->CR*Mult); m_scaledItem->FR = (int8)((float)m_item->FR*Mult); - + m_scaledItem->HP = (int32)((float)m_item->HP*Mult); m_scaledItem->Mana = (int32)((float)m_item->Mana*Mult); m_scaledItem->AC = (int32)((float)m_item->AC*Mult); @@ -1862,8 +1862,8 @@ void EvoItemInst::ScaleItem() { m_scaledItem->EnduranceRegen = (uint32)((float)m_item->EnduranceRegen*Mult); m_scaledItem->Haste = (uint32)((float)m_item->Haste*Mult); m_scaledItem->DamageShield = (uint32)((float)m_item->DamageShield*Mult); - - + + m_scaledItem->CharmFileID = 0; // this stops the client from trying to scale the item itself. } @@ -1874,14 +1874,14 @@ bool EvoItemInst::EvolveOnAllKills() const { int8 EvoItemInst::GetMaxEvolveLvl() const { if(m_evolveInfo) return m_evolveInfo->MaxLvl; - else + else return 0; } uint32 EvoItemInst::GetKillsNeeded(uint8 currentlevel) { uint32 kills = -1; // default to -1 (max uint32 value) because this value is usually divided by, so we don't want to ever return zero. - if (m_evolveInfo) - if (currentlevel != m_evolveInfo->MaxLvl) + if (m_evolveInfo) + if (currentlevel != m_evolveInfo->MaxLvl) kills = m_evolveInfo->LvlKills[currentlevel-1]; if (kills == 0) @@ -1913,7 +1913,7 @@ bool Item_Struct::IsEquipable(uint16 Race, uint16 Class_) const { bool IsRace = false; bool IsClass = false; - + uint32 Classes_ = Classes; uint32 Races_ = Races; diff --git a/common/Item.h b/common/Item.h index 4b765221d..7a677edf6 100644 --- a/common/Item.h +++ b/common/Item.h @@ -105,23 +105,23 @@ public: ///////////////////////// // Public Methods ///////////////////////// - + inline iter_queue begin() { return m_list.begin(); } inline iter_queue end() { return m_list.end(); } - + void push(ItemInst* inst); void push_front(ItemInst* inst); ItemInst* pop(); ItemInst* peek_front() const; inline int size() { return static_cast(m_list.size()); } - + protected: ///////////////////////// // Protected Members ///////////////////////// - + list m_list; - + }; // ######################################## @@ -134,9 +134,9 @@ public: /////////////////////////////// // Public Methods /////////////////////////////// - + virtual ~Inventory(); - + // Retrieve a writeable item at specified slot ItemInst* GetItem(int16 slot_id) const; ItemInst* GetItem(int16 slot_id, uint8 bagidx) const; @@ -144,16 +144,16 @@ public: inline iter_queue cursor_begin() { return m_cursor.begin(); } inline iter_queue cursor_end() { return m_cursor.end(); } inline bool CursorEmpty() { return (m_cursor.size() == 0); } - + // Retrieve a read-only item from inventory inline const ItemInst* operator[](int16 slot_id) const { return GetItem(slot_id); } - + // Add item to inventory int16 PutItem(int16 slot_id, const ItemInst& inst); // Add item to cursor queue int16 PushCursor(const ItemInst& inst); - + // Swap items in inventory bool SwapItem(int16 slot_a, int16 slot_b); @@ -162,17 +162,17 @@ public: // Checks All items in a bag for No Drop bool CheckNoDrop(int16 slot_id); - + // Remove item from inventory (and take control of memory) ItemInst* PopItem(int16 slot_id); - + // Check whether item exists in inventory // where argument specifies OR'd list of invWhere constants to look int16 HasItem(uint32 item_id, uint8 quantity=0, uint8 where=0xFF); // Check whether there is space for the specified number of the specified item. bool HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity); - + // Check whether item exists in inventory // where argument specifies OR'd list of invWhere constants to look int16 HasItemByUse(uint8 use, uint8 quantity=0, uint8 where=0xFF); @@ -180,10 +180,10 @@ public: // Check whether item exists in inventory // where argument specifies OR'd list of invWhere constants to look int16 HasItemByLoreGroup(uint32 loregroup, uint8 where=0xFF); - + // Locate an available inventory slot int16 FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size = 0, bool is_arrow = false); - + // Calculate slot_id for an item within a bag static int16 CalcSlotId(int16 slot_id); // Calc parent bag's slot_id static int16 CalcSlotId(int16 bagslot_id, uint8 bagidx); // Calc slot_id for item inside bag @@ -195,7 +195,7 @@ public: // Test whether a given slot can support a container item static bool SupportsContainers(int16 slot_id); - + void dumpInventory(); void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value); @@ -207,13 +207,13 @@ protected: /////////////////////////////// // Protected Methods /////////////////////////////// - + // Retrieves item within an inventory bucket ItemInst* _GetItem(const map& bucket, int16 slot_id) const; - + // Private "put" item into bucket, without regard for what is currently in bucket int16 _PutItem(int16 slot_id, ItemInst* inst); - + // Checks an inventory bucket for a particular item int16 _HasItem(map& bucket, uint32 item_id, uint8 quantity); int16 _HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity); @@ -221,8 +221,8 @@ protected: int16 _HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity); int16 _HasItemByLoreGroup(map& bucket, uint32 loregroup); int16 _HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup); - - + + // Player inventory map m_worn; // Items worn by character map m_inv; // Items in character personal inventory @@ -245,12 +245,12 @@ public: ///////////////////////// // Methods ///////////////////////// - + // Constructors/Destructor ItemInst(const Item_Struct* item = nullptr, int16 charges = 0); - + ItemInst(SharedDatabase *db, uint32 item_id, int16 charges = 0); - + ItemInst(ItemUseType use_type) { m_use_type = use_type; m_item = nullptr; @@ -262,19 +262,19 @@ public: } ItemInst(const ItemInst& copy); - + virtual ~ItemInst(); - + // Query item type virtual bool IsType(ItemClass item_class) const; - + // Can item be stacked? virtual bool IsStackable() const; // Can item be equipped by/at? virtual bool IsEquipable(uint16 race, uint16 class_) const; virtual bool IsEquipable(int16 slot_id) const; - + // // Augements // @@ -322,13 +322,13 @@ public: const uint32 GetItemScriptID() const { return m_item->ScriptFileID; } virtual const Item_Struct* GetItem() const { return m_item; } void SetItem(const Item_Struct* item) { m_item = item; } - + int16 GetCharges() const { return m_charges; } void SetCharges(int16 charges) { m_charges = charges; } - + uint32 GetPrice() const { return m_price; } void SetPrice(uint32 price) { m_price = price; } - + void SetColor(uint32 color) { m_color = color; } uint32 GetColor() const { return m_color; } @@ -358,14 +358,14 @@ public: // Allows treatment of this object as though it were a pointer to m_item operator bool() const { return (m_item != nullptr); } - + // Compare inner Item_Struct of two ItemInst objects bool operator==(const ItemInst& right) const { return (this->m_item == right.m_item); } bool operator!=(const ItemInst& right) const { return (this->m_item != right.m_item); } - + // Clone current item virtual ItemInst* Clone() const; - + bool IsSlotAllowed(int16 slot_id) const; virtual bool IsScaling() const { return false; } @@ -383,10 +383,10 @@ protected: iter_contents _end() { return m_contents.end(); } friend class Inventory; - - + + void _PutItem(uint8 index, ItemInst* inst) { m_contents[index] = inst; } - + ItemUseType m_use_type; // Usage type for item const Item_Struct* m_item; // Ptr to item data int16 m_charges; // # of charges for chargeable items @@ -410,7 +410,7 @@ public: EvoItemInst(const ItemInst& copy); EvoItemInst(const Item_Struct* item = nullptr, int16 charges = 0); ~EvoItemInst(); - + // accessors... a lot of these are for evolving items (not complete yet) bool IsScaling() const { return (m_evolveLvl == -1); } bool IsEvolving() const { return (m_evolveLvl >= 1); } @@ -420,16 +420,16 @@ public: bool IsActivated() { return m_activated; } void SetActivated(bool activated) { m_activated = activated; } int8 GetEvolveLvl() const { return m_evolveLvl; } - + EvoItemInst* Clone() const; const Item_Struct* GetItem() const; const Item_Struct* GetUnscaledItem() const; void Initialize(SharedDatabase *db = nullptr); void ScaleItem(); - bool EvolveOnAllKills() const; + bool EvolveOnAllKills() const; int8 GetMaxEvolveLvl() const; uint32 GetKillsNeeded(uint8 currentlevel); - + private: uint32 m_exp; @@ -447,7 +447,7 @@ public: uint32 FirstItem; uint8 MaxLvl; bool AllKills; - + EvolveInfo(); EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10); ~EvolveInfo(); diff --git a/common/MaxSkill.cpp b/common/MaxSkill.cpp index 5558827c2..3b914b611 100644 --- a/common/MaxSkill.cpp +++ b/common/MaxSkill.cpp @@ -3,7 +3,7 @@ #include "../zone/skills.h" uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level); -/* TODO: +/* TODO: Load MaxSkillTable function into ram as a really big matrix: MaxSkillTable[skillid][race][eqclass][level] @@ -31,43 +31,43 @@ uint8 MaxSkill(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { "must put one point in at GM", etc */ -uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { - uint16 r_value = 0; - - switch (skillid) { - /////////////// - // Melee Weapon/ Hand to Hand - /////////////// - case _1H_BLUNT: - case _2H_BLUNT: - case PIERCING: - case HAND_TO_HAND: - case _1H_SLASHING: - case _2H_SLASHING:{ - switch (eqclass) { - // Pure melee classes - case WARRIOR: case WARRIORGM: { - r_value = 5 + (level*5); - if ( level < 51 && r_value > 200) - r_value = 200; - if ( level > 51 && r_value > 250 ) - r_value = 250; +uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { + uint16 r_value = 0; + + switch (skillid) { + /////////////// + // Melee Weapon/ Hand to Hand + /////////////// + case _1H_BLUNT: + case _2H_BLUNT: + case PIERCING: + case HAND_TO_HAND: + case _1H_SLASHING: + case _2H_SLASHING:{ + switch (eqclass) { + // Pure melee classes + case WARRIOR: case WARRIORGM: { + r_value = 5 + (level*5); + if ( level < 51 && r_value > 200) + r_value = 200; + if ( level > 51 && r_value > 250 ) + r_value = 250; switch (skillid) { case PIERCING: { - if ( r_value > 240 ) - r_value = 240; - break; - } + if ( r_value > 240 ) + r_value = 240; + break; + } case HAND_TO_HAND: { - if ( r_value > 100 ) - r_value = 100; - break; - } + if ( r_value > 100 ) + r_value = 100; + break; + } default: - break; + break; } - break; - } + break; + } case MONK: case MONKGM: { r_value = 5 + (level*5); if ( level < 51 && r_value > 240) @@ -80,24 +80,24 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { if ( r_value > 225 && level < 51 ) r_value = 225; break; - } - case PIERCING: - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } + } + case PIERCING: + case _1H_SLASHING: + case _2H_SLASHING:{ + r_value = 0; + break; + } default: break; } - break; - } + break; + } case ROGUE: case ROGUEGM: { r_value = 5 + (level*5); if ( level > 50 ) { - if ( r_value > 250 ) - r_value = 250; - } + if ( r_value > 250 ) + r_value = 250; + } else if ( level < 51 ) { if ( r_value > 200 && skillid != PIERCING ) r_value = 200; @@ -108,226 +108,226 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { break; } default: - break; - } - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } + break; + } + } + switch (skillid) { + case HAND_TO_HAND:{ + if ( r_value > 100 ) + r_value = 100; + break; + } default: break; - } - break; - } + } + break; + } ////////////////////////////////////////////////////////////// - // Melee Weapon/ Hand to Hand - // Priest classes + // Melee Weapon/ Hand to Hand + // Priest classes ////////////////////////////////////////////////////////////// - case CLERIC: case CLERICGM:{ - r_value = 4 + (level*4); - if ( r_value > 175 ){ - r_value = 175; - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 75 ) - r_value = 75; - break; - } + case CLERIC: case CLERICGM:{ + r_value = 4 + (level*4); + if ( r_value > 175 ){ + r_value = 175; + } + switch (skillid) { + case HAND_TO_HAND:{ + if ( r_value > 75 ) + r_value = 75; + break; + } case PIERCING: case _1H_SLASHING: case _2H_SLASHING: { - r_value = 0; - break; - } + r_value = 0; + break; + } default: break; - } - break; - } - case DRUID: case DRUIDGM:{ - r_value = 4 + (level*4); - if ( r_value > 175 ){ - r_value = 175; - } - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 75 ) - r_value = 75; - } - case PIERCING: - case _2H_SLASHING:{ - r_value = 0; - break; - } + } + break; + } + case DRUID: case DRUIDGM:{ + r_value = 4 + (level*4); + if ( r_value > 175 ){ + r_value = 175; + } + switch (skillid) { + case HAND_TO_HAND:{ + if ( r_value > 75 ) + r_value = 75; + } + case PIERCING: + case _2H_SLASHING:{ + r_value = 0; + break; + } default: break; - } - break; - } - case SHAMAN: case SHAMANGM:{ - r_value = 4 + (level*4); - if ( r_value > 200 ){ - r_value = 200; - } + } + break; + } + case SHAMAN: case SHAMANGM:{ + r_value = 4 + (level*4); + if ( r_value > 200 ){ + r_value = 200; + } switch (skillid) { case HAND_TO_HAND: { - if ( r_value > 75 ) - r_value = 75; - } - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } + if ( r_value > 75 ) + r_value = 75; + } + case _1H_SLASHING: + case _2H_SLASHING:{ + r_value = 0; + break; + } default: break; - } - break; + } + break; } - /////////////////////////////////////////////////////////// - // Melee Weapon/ Hand to Hand - // Hybrids + /////////////////////////////////////////////////////////// + // Melee Weapon/ Hand to Hand + // Hybrids ////////////////////////////////////////////////////////// - case RANGER: case RANGERGM:{ - r_value = 5 + (level*5); + case RANGER: case RANGERGM:{ + r_value = 5 + (level*5); if ( level > 50 ) { - if ( r_value > 250 ) - r_value = 250; - - switch (skillid) { + if ( r_value > 250 ) + r_value = 250; + + switch (skillid) { case PIERCING: { - if ( r_value > 240 ) - r_value = 240; - break; + if ( r_value > 240 ) + r_value = 240; + break; } default: break; - } - } + } + } else if ( level < 51 ) { - if ( r_value > 200 ) - r_value = 200; - } + if ( r_value > 200 ) + r_value = 200; + } switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } - default: + case HAND_TO_HAND:{ + if ( r_value > 100 ) + r_value = 100; break; - } - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - r_value = 5 + (level*5); - if ( level > 50 ){ - if ( r_value > 225 ) - r_value = 225; - } - if ( level < 51 ){ - if ( r_value > 200 ) - r_value = 200; - } - - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; } default: - break; + break; } - break; - } + break; + } + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + r_value = 5 + (level*5); + if ( level > 50 ){ + if ( r_value > 225 ) + r_value = 225; + } + if ( level < 51 ){ + if ( r_value > 200 ) + r_value = 200; + } + + switch (skillid) { + case HAND_TO_HAND:{ + if ( r_value > 100 ) + r_value = 100; + break; + } + default: + break; + } + break; + } case BARD: case BARDGM: { r_value = 5 + (level*5); if ( level > 51 && r_value > 225 ) r_value = 225; if ( level < 51 && r_value > 200 ) - r_value = 200; - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 100 ) - r_value = 100; - break; - } - case _2H_BLUNT: - case _2H_SLASHING:{ - r_value = 0; + r_value = 200; + switch (skillid) { + case HAND_TO_HAND:{ + if ( r_value > 100 ) + r_value = 100; + break; + } + case _2H_BLUNT: + case _2H_SLASHING:{ + r_value = 0; - } + } default: break; } - break; + break; } - - case BEASTLORD: case BEASTLORDGM:{ - r_value = 4 + (level*4); - if ( level > 51 ){ - if ( r_value > 225 && skillid != HAND_TO_HAND ) - r_value = 225; - } - if ( r_value > 250 ) - r_value = 250; - if ( level < 51 && r_value > 200 ) - r_value = 200; - - switch (skillid) { - case HAND_TO_HAND:{ - r_value = 5 + (level*5); - if ( level < 51 ) - r_value = 200; - if ( r_value > 250 ) - r_value = 250; - break; - } - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } - default: - break; - } - break; - } + case BEASTLORD: case BEASTLORDGM:{ + r_value = 4 + (level*4); + if ( level > 51 ){ + if ( r_value > 225 && skillid != HAND_TO_HAND ) + r_value = 225; + } + if ( r_value > 250 ) + r_value = 250; + if ( level < 51 && r_value > 200 ) + r_value = 200; - // Melee Weapon/ Hand to Hand - // Pure casters - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - r_value = 3 + (level*3); - if ( r_value > 110 ) - r_value = 110; - switch (skillid) { - case HAND_TO_HAND:{ - if ( r_value > 75 ) - r_value = 75; + switch (skillid) { + case HAND_TO_HAND:{ + r_value = 5 + (level*5); + if ( level < 51 ) + r_value = 200; + + if ( r_value > 250 ) + r_value = 250; break; - } - case _1H_SLASHING: - case _2H_SLASHING:{ - r_value = 0; - break; - } + } + case _1H_SLASHING: + case _2H_SLASHING:{ + r_value = 0; + break; + } default: break; } - } + break; + } + + // Melee Weapon/ Hand to Hand + // Pure casters + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM:{ + r_value = 3 + (level*3); + if ( r_value > 110 ) + r_value = 110; + switch (skillid) { + case HAND_TO_HAND:{ + if ( r_value > 75 ) + r_value = 75; + break; + } + case _1H_SLASHING: + case _2H_SLASHING:{ + r_value = 0; + break; + } + default: + break; + } + } default: { r_value = 0; break; @@ -337,95 +337,95 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { } // end case weapon skills -///////////////////////////////////////////////////////////// -// Combat non weapon -///////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////// +// Combat non weapon +///////////////////////////////////////////////////////////// -// Attack +// Attack case OFFENSE: { switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM: - case ROGUE: case ROGUEGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case MONK: case MONKGM:{ - // 230 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 230) - r_value = 230; - } - if (r_value > 252) - r_value = 252; - break; - } - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM:{ - // 200 200 4*level+4 - r_value = ((level*4) + 4); - if (r_value > 200) - r_value = 200; - break; + // Melee + case WARRIOR: case WARRIORGM: + case ROGUE: case ROGUEGM:{ + // 210 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 210) + r_value = 210; + } + if (r_value > 252) + r_value = 252; + break; } - // Hybrid - case BEASTLORD: case BEASTLORDGM:{ - // 200 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 252) - r_value = 252; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM:{ - // 200 225 5*level+5 + case MONK: case MONKGM:{ + // 230 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 230) + r_value = 230; + } + if (r_value > 252) + r_value = 252; + break; + } + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM:{ + // 200 200 4*level+4 + r_value = ((level*4) + 4); + if (r_value > 200) + r_value = 200; + break; + } + // Hybrid + case BEASTLORD: case BEASTLORDGM:{ + // 200 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 252) + r_value = 252; + break; + } + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM: + case BARD: case BARDGM:{ + // 200 225 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 225) - r_value = 225; - break; - } - case RANGER: case RANGERGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 140 140 level*4 - r_value = (level*4); - if (r_value > 140) - r_value = 140; - break; - } + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 225) + r_value = 225; + break; + } + case RANGER: case RANGERGM:{ + // 210 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 210) + r_value = 210; + } + if (r_value > 252) + r_value = 252; + break; + } + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM:{ + // 140 140 level*4 + r_value = (level*4); + if (r_value > 140) + r_value = 140; + break; + } default: { r_value = 0; break; @@ -433,221 +433,221 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { } // end switch (eqclass) break; } // end case OFFENSE - case THROWING: { - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM:{ - // 220 250 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 220) - r_value = 220; - } - if (r_value > 250) - r_value = 250; - break; - } - case WARRIOR: case WARRIORGM: - case MONK: case MONKGM:{ - // 113 200 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 113) - r_value = 113; - } - if (r_value > 200) - r_value = 200; - break; + case THROWING: { + switch (eqclass) { + // Melee + case ROGUE: case ROGUEGM:{ + // 220 250 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 220) + r_value = 220; + } + if (r_value > 250) + r_value = 250; + break; } - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: - case RANGER: case RANGERGM:{ - // 113 - r_value = ((level*5) + 5); - if ( r_value > 113 ) - r_value = 113; - break; - } - // Pure + case WARRIOR: case WARRIORGM: + case MONK: case MONKGM:{ + // 113 200 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 113) + r_value = 113; + } + if (r_value > 200) + r_value = 200; + break; + } + // Hybrid + case BEASTLORD: case BEASTLORDGM: + case BARD: case BARDGM: + case RANGER: case RANGERGM:{ + // 113 + r_value = ((level*5) + 5); + if ( r_value > 113 ) + r_value = 113; + break; + } + // Pure case NECROMANCER: case NECROMANCERGM: case WIZARD: case WIZARDGM: case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 75 - r_value = ((level*3) + 3); - if ( r_value > 75 ) - r_value = 75; - break; + case ENCHANTER: case ENCHANTERGM:{ + // 75 + r_value = ((level*3) + 3); + if ( r_value > 75 ) + r_value = 75; + break; } - // No skill classes - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: + // No skill classes + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM: default: { - r_value = 0; + r_value = 0; break; } } // end switch (eqclass) - break; + break; } // end case THROWING: case ARCHERY: { - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM: - case WARRIOR: case WARRIORGM:{ - // 200 240 - r_value = ((level*5) + 5); - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 240) - r_value = 240; - break; - } - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 75 75 - r_value = ((level*5) + 5); - if ( r_value > 75 ) - r_value = 75; - break; - } - case RANGER: case RANGERGM:{ - // 240 240 - r_value = ((level*5) + 5); - if ( r_value > 240 ) - r_value = 240; - break; - } - // Pure - // No skill classes - // Melee - case MONK: case MONKGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: + switch (eqclass) { + // Melee + case ROGUE: case ROGUEGM: + case WARRIOR: case WARRIORGM:{ + // 200 240 + r_value = ((level*5) + 5); + if ( level < 51 && r_value > 200) + r_value = 200; + if (r_value > 240) + r_value = 240; + break; + } + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 75 75 + r_value = ((level*5) + 5); + if ( r_value > 75 ) + r_value = 75; + break; + } + case RANGER: case RANGERGM:{ + // 240 240 + r_value = ((level*5) + 5); + if ( r_value > 240 ) + r_value = 240; + break; + } + // Pure + // No skill classes + // Melee + case MONK: case MONKGM: + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case BEASTLORD: case BEASTLORDGM: + case BARD: case BARDGM: default: { - r_value = 0; + r_value = 0; break; } } // end switch (eqclass) break; } // end case ARCHERY: - case DOUBLE_ATTACK: { - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM:{ - // 16 200 240 - r_value = ((level*5) + 5); - if ( level < 16 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 240) - r_value = 240; - break; - } - case WARRIOR: case WARRIORGM:{ - // 15 205 245 - r_value = ((level*5) + 5); - if ( level < 15 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 245) - r_value = 245; - break; - } - case MONK: case MONKGM:{ - // 15 210 250 - r_value = ((level*5) + 5); - if ( level < 15 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 250) - r_value = 250; - break; - } - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 20 200 235 - r_value = ((level*5) + 5); - if ( level < 20 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 235) - r_value = 235; - break; - } - case RANGER: case RANGERGM:{ - // 20 200 245 - r_value = ((level*5) + 5); - if ( level < 20 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 245) - r_value = 245; - break; - } - // Pure - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: + case DOUBLE_ATTACK: { + switch (eqclass) { + // Melee + case ROGUE: case ROGUEGM:{ + // 16 200 240 + r_value = ((level*5) + 5); + if ( level < 16 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 240) + r_value = 240; + break; + } + case WARRIOR: case WARRIORGM:{ + // 15 205 245 + r_value = ((level*5) + 5); + if ( level < 15 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 245) + r_value = 245; + break; + } + case MONK: case MONKGM:{ + // 15 210 250 + r_value = ((level*5) + 5); + if ( level < 15 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 210) + r_value = 210; + } + if (r_value > 250) + r_value = 250; + break; + } + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 20 200 235 + r_value = ((level*5) + 5); + if ( level < 20 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 235) + r_value = 235; + break; + } + case RANGER: case RANGERGM:{ + // 20 200 245 + r_value = ((level*5) + 5); + if ( level < 20 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 245) + r_value = 245; + break; + } + // Pure + // No skill classes + // Melee + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case BEASTLORD: case BEASTLORDGM: + case BARD: case BARDGM: default: { r_value = 0; break; } } // end switch (eqclass) - break; + break; } // end case DOUBLE_ATTACK: case DUEL_WIELD: { - switch (eqclass) { - // Melee + switch (eqclass) { + // Melee case MONK: case MONKGM:{ // 1 252 252 r_value = level*7; // This can't be right can it? break ; } - case WARRIOR: case WARRIORGM: + case WARRIOR: case WARRIORGM: case ROGUE: case ROGUEGM: { // 15 210 245 r_value = ((level*5) + 5); @@ -661,7 +661,7 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { r_value = 245; break; } - // Hybrid + // Hybrid case BEASTLORD: case BEASTLORDGM: // 17 210 245 case RANGER: case RANGERGM:{ @@ -686,25 +686,25 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { r_value = 210; break; } - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: + // No skill classes + // Melee + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM: default: { - r_value = 0; - break; + r_value = 0; + break; } - }// end Class switch + }// end Class switch break; } // end case DUEL_WIELD: case KICK: { @@ -721,519 +721,519 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { r_value = 210; break; } - case MONK: case MONKGM:{ - // 1 200 250 + case MONK: case MONKGM:{ + // 1 200 250 r_value = ((level*5) + 5); if ( level < 51 ) { if (r_value > 200) r_value = 200; } - if (r_value > 250) + if (r_value > 250) r_value = 250; break; - } - // Hybrid - case RANGER: case RANGERGM:{ - // 5 149 205 - r_value = ((level*5) + 5); - if ( level < 5 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 149) - r_value = 149; - } - if (r_value > 205) - r_value = 205; - break; - } - case BEASTLORD: case BEASTLORDGM:{ - // 5 180 230 - r_value = ((level*5) + 5); - if ( level < 5 ) - r_value = 0; - if ( level < 51 ) { - if (r_value > 180) - r_value = 180; - } - if (r_value > 230) - r_value = 230; - break; - } - // Pure - // No skill classes - case ROGUE: case ROGUEGM: - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM: + } + // Hybrid + case RANGER: case RANGERGM:{ + // 5 149 205 + r_value = ((level*5) + 5); + if ( level < 5 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 149) + r_value = 149; + } + if (r_value > 205) + r_value = 205; + break; + } + case BEASTLORD: case BEASTLORDGM:{ + // 5 180 230 + r_value = ((level*5) + 5); + if ( level < 5 ) + r_value = 0; + if ( level < 51 ) { + if (r_value > 180) + r_value = 180; + } + if (r_value > 230) + r_value = 230; + break; + } + // Pure + // No skill classes + case ROGUE: case ROGUEGM: + // Melee + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM: + case BARD: case BARDGM: default: { - r_value = 0; - break; + r_value = 0; + break; } } // end switch(eqclass) break; } // end case KICK: - /////////// - // FIXME Where is slam? + /////////// + // FIXME Where is slam? // Quagmire: Slam = bash w/ race check - case BASH:{ - r_value = ((level*5)+5); - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 6 220 240 - if (level < 6) - r_value = 0; - if (level < 51 && r_value > 220) - r_value = 220; - if (r_value > 240) - r_value = 240; - break; - } - // Priest - case CLERIC: case CLERICGM:{ - // 25 180 200 - if (level < 25) - r_value = 0; - if (level < 51 && r_value > 180) - r_value = 180; - if (r_value > 200) - r_value = 200; - break; - } - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 6 175 200 - if (level < 6) - r_value = 0; - if (level < 51 && r_value > 175) - r_value = 175; - if (r_value > 200) - r_value = 200; - break; - } - // Pure - // No skill classes - // Melee - case MONK: case MONKGM: - case ROGUE: case ROGUEGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case RANGER: case RANGERGM: - case BARD: case BARDGM:{ - switch (race) { - case BARBARIAN: - case TROLL: - case OGRE:{ - r_value = 50; - break; - } + case BASH:{ + r_value = ((level*5)+5); + switch (eqclass) { + // Melee + case WARRIOR: case WARRIORGM:{ + // 6 220 240 + if (level < 6) + r_value = 0; + if (level < 51 && r_value > 220) + r_value = 220; + if (r_value > 240) + r_value = 240; + break; + } + // Priest + case CLERIC: case CLERICGM:{ + // 25 180 200 + if (level < 25) + r_value = 0; + if (level < 51 && r_value > 180) + r_value = 180; + if (r_value > 200) + r_value = 200; + break; + } + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 6 175 200 + if (level < 6) + r_value = 0; + if (level < 51 && r_value > 175) + r_value = 175; + if (r_value > 200) + r_value = 200; + break; + } + // Pure + // No skill classes + // Melee + case MONK: case MONKGM: + case ROGUE: case ROGUEGM: + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case BEASTLORD: case BEASTLORDGM: + case RANGER: case RANGERGM: + case BARD: case BARDGM:{ + switch (race) { + case BARBARIAN: + case TROLL: + case OGRE:{ + r_value = 50; + break; + } default: { break; } } // end switch (race) r_value = 0; - break; + break; } - } + } break; } // end case BASH: - ///////////////////////////////////// - ///////////////////////////////////// - // Defensive skills - case DEFENSE:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case ROGUE: case ROGUEGM:{ - // 200 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 252) - r_value = 252; - break; - } - case MONK: case MONKGM:{ - // 230 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 230) - r_value = 230; - } - if (r_value > 252) - r_value = 252; - break; - } - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM:{ - // 200 200 4*level+4 - r_value = ((level*4) + 4); - if (r_value > 200) - r_value = 200; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 210 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 210) - r_value = 210; - } - if (r_value > 252) - r_value = 252; - break; - } - case BARD: case BARDGM:{ - // 200 252 5*level+5 - r_value = ((level*5) + 5); - if ( level < 51 ) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 252) - r_value = 252; - break; - } - case RANGER: case RANGERGM:{ - // 200 200 5*level+5 - r_value = ((level*5) + 5); - if (r_value > 200) - r_value = 200; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 145 145 level*4 - r_value = (level*4); - if (r_value > 140) - r_value = 140; + ///////////////////////////////////// + ///////////////////////////////////// + // Defensive skills + case DEFENSE:{ + switch (eqclass) { + // Melee + case WARRIOR: case WARRIORGM:{ + // 210 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 210) + r_value = 210; + } + if (r_value > 252) + r_value = 252; break; - } + } + case ROGUE: case ROGUEGM:{ + // 200 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 252) + r_value = 252; + break; + } + case MONK: case MONKGM:{ + // 230 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 230) + r_value = 230; + } + if (r_value > 252) + r_value = 252; + break; + } + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM:{ + // 200 200 4*level+4 + r_value = ((level*4) + 4); + if (r_value > 200) + r_value = 200; + break; + } + // Hybrid + case BEASTLORD: case BEASTLORDGM:{ + // 210 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 210) + r_value = 210; + } + if (r_value > 252) + r_value = 252; + break; + } + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 210 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 210) + r_value = 210; + } + if (r_value > 252) + r_value = 252; + break; + } + case BARD: case BARDGM:{ + // 200 252 5*level+5 + r_value = ((level*5) + 5); + if ( level < 51 ) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 252) + r_value = 252; + break; + } + case RANGER: case RANGERGM:{ + // 200 200 5*level+5 + r_value = ((level*5) + 5); + if (r_value > 200) + r_value = 200; + break; + } + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM:{ + // 145 145 level*4 + r_value = (level*4); + if (r_value > 140) + r_value = 140; + break; + } default: { break; } } // end switch(eqclass) - break; + break; } // end case DEFENSE: - case PARRY:{ - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM:{ - // 12 200 230 - r_value = ((level*5) + 5); - if ( level < 12 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - case WARRIOR: case WARRIORGM:{ - // 10 200 230 - r_value = ((level*5) + 5); - if ( level < 10 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - // Hybrid - case BARD: case BARDGM:{ - // 53 0 75 - r_value = ((level*5) + 5); - if ( level < 53 ) - r_value = 0; - if (r_value > 75) - r_value = 75; + case PARRY:{ + switch (eqclass) { + // Melee + case ROGUE: case ROGUEGM:{ + // 12 200 230 + r_value = ((level*5) + 5); + if ( level < 12 ) + r_value = 0; + if (r_value > 200 && level < 51 ) + r_value = 200; + if (r_value > 230) + r_value = 230; break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 17 175 205 - r_value = ((level*5) + 5); - if ( level < 17 ) - r_value = 0; - if (r_value > 175 && level < 51 ) - r_value = 175; - if (r_value > 205) - r_value = 205; - break; - } - case RANGER: case RANGERGM:{ - // 18 185 220 - r_value = ((level*5) + 5); - if ( level < 18 ) - r_value = 0; - if (r_value > 185 && level < 51 ) - r_value = 185; - if (r_value > 220) - r_value = 220; - break; - } - // Pure - // No skill classes - // Melee - case MONK: case MONKGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: + } + case WARRIOR: case WARRIORGM:{ + // 10 200 230 + r_value = ((level*5) + 5); + if ( level < 10 ) + r_value = 0; + if (r_value > 200 && level < 51 ) + r_value = 200; + if (r_value > 230) + r_value = 230; + break; + } + // Hybrid + case BARD: case BARDGM:{ + // 53 0 75 + r_value = ((level*5) + 5); + if ( level < 53 ) + r_value = 0; + if (r_value > 75) + r_value = 75; + break; + } + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 17 175 205 + r_value = ((level*5) + 5); + if ( level < 17 ) + r_value = 0; + if (r_value > 175 && level < 51 ) + r_value = 175; + if (r_value > 205) + r_value = 205; + break; + } + case RANGER: case RANGERGM:{ + // 18 185 220 + r_value = ((level*5) + 5); + if ( level < 18 ) + r_value = 0; + if (r_value > 185 && level < 51 ) + r_value = 185; + if (r_value > 220) + r_value = 220; + break; + } + // Pure + // No skill classes + // Melee + case MONK: case MONKGM: + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case BEASTLORD: case BEASTLORDGM: default: { - r_value = 0; - break; + r_value = 0; + break; } } // end switch (eqclass) - break; + break; } // end case PARRY: - case RIPOSTE:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 25 200 225 - r_value = ((level*5) + 5); - if ( level < 25 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case ROGUE: case ROGUEGM:{ - // 30 200 225 - r_value = ((level*5) + 5); - if ( level < 30 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case MONK: case MONKGM:{ - // 35 200 225 - r_value = ((level*5) + 5); - if ( level < 35 ) - r_value = 0; - if (r_value > 200 && level < 51 ) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM:{ - // 40 150 185 - r_value = ((level*5) + 5); - if ( level < 40 ) - r_value = 0; - if (r_value > 150 && level < 51 ) - r_value = 150; - if (r_value > 185) - r_value = 185; - break; - } - case BARD: case BARDGM:{ - // 58 75 75 - r_value = ((level*5) + 5); - if ( level < 58 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; - } - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 30 175 200 - r_value = ((level*5) + 5); - if ( level < 30 ) - r_value = 0; - if (r_value > 175 && level < 51 ) - r_value = 175; - if (r_value > 200) - r_value = 200; - break; - } - case RANGER: case RANGERGM:{ - // 35 150 150 - r_value = ((level*5) + 5); - if ( level < 35 ) - r_value = 0; - if (r_value > 150) - r_value = 150; - break; - } - // Pure - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid + case RIPOSTE:{ + switch (eqclass) { + // Melee + case WARRIOR: case WARRIORGM:{ + // 25 200 225 + r_value = ((level*5) + 5); + if ( level < 25 ) + r_value = 0; + if (r_value > 200 && level < 51 ) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + case ROGUE: case ROGUEGM:{ + // 30 200 225 + r_value = ((level*5) + 5); + if ( level < 30 ) + r_value = 0; + if (r_value > 200 && level < 51 ) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + case MONK: case MONKGM:{ + // 35 200 225 + r_value = ((level*5) + 5); + if ( level < 35 ) + r_value = 0; + if (r_value > 200 && level < 51 ) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + // Hybrid + case BEASTLORD: case BEASTLORDGM:{ + // 40 150 185 + r_value = ((level*5) + 5); + if ( level < 40 ) + r_value = 0; + if (r_value > 150 && level < 51 ) + r_value = 150; + if (r_value > 185) + r_value = 185; + break; + } + case BARD: case BARDGM:{ + // 58 75 75 + r_value = ((level*5) + 5); + if ( level < 58 ) + r_value = 0; + if (r_value > 75) + r_value = 75; + break; + } + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 30 175 200 + r_value = ((level*5) + 5); + if ( level < 30 ) + r_value = 0; + if (r_value > 175 && level < 51 ) + r_value = 175; + if (r_value > 200) + r_value = 200; + break; + } + case RANGER: case RANGERGM:{ + // 35 150 150 + r_value = ((level*5) + 5); + if ( level < 35 ) + r_value = 0; + if (r_value > 150) + r_value = 150; + break; + } + // Pure + // No skill classes + // Melee + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid default: { - r_value = 0; - break; + r_value = 0; + break; } } // end switch (eqclass) - break; + break; } // end case RIPOSTE: - case DODGE:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 6 140 175 - r_value = ((level*5) + 5); - if ( level < 6 ) - r_value = 0; - if (r_value > 140 && level < 51 ) - r_value = 140; - if (r_value > 175) - r_value = 175; - break; - } - case ROGUE: case ROGUEGM:{ - // 4 150 210 - r_value = ((level*5) + 5); - if ( level < 4 ) - r_value = 0; - if (r_value > 150 && level < 51 ) - r_value = 150; - if (r_value > 210) - r_value = 210; - break; - } - case MONK: case MONKGM:{ - // 1 200 230 - r_value = ((level*5) + 5); - if (r_value > 200) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM:{ - // 15 75 75 4*level+4 - r_value = ((level*4) + 4); - if ( level < 15 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; - } - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM:{ - // 10 125 155 5*level+5 - r_value = ((level*5) + 5); - if ( level < 10 ) - r_value = 0; - if (r_value > 125 && level < 51 ) - r_value = 125; - if (r_value > 155) - r_value = 155; - break; - } - - case RANGER: case RANGERGM:{ - // 8 137 170 5*level+5 - r_value = ((level*5) + 5); - if ( level < 8 ) - r_value = 0; - if (r_value > 137 && level < 51 ) - r_value = 137; - if (r_value > 170) - r_value = 170; - break; - } - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM:{ - // 22 75 75 3*level+3 - r_value = ((level*3) + 3); - if ( level < 22 ) - r_value = 0; - if (r_value > 75) - r_value = 75; - break; + case DODGE:{ + switch (eqclass) { + // Melee + case WARRIOR: case WARRIORGM:{ + // 6 140 175 + r_value = ((level*5) + 5); + if ( level < 6 ) + r_value = 0; + if (r_value > 140 && level < 51 ) + r_value = 140; + if (r_value > 175) + r_value = 175; + break; } - // No skill classes - // Melee - // Priest - // Pure - // Hybrid + case ROGUE: case ROGUEGM:{ + // 4 150 210 + r_value = ((level*5) + 5); + if ( level < 4 ) + r_value = 0; + if (r_value > 150 && level < 51 ) + r_value = 150; + if (r_value > 210) + r_value = 210; + break; + } + case MONK: case MONKGM:{ + // 1 200 230 + r_value = ((level*5) + 5); + if (r_value > 200) + r_value = 200; + if (r_value > 230) + r_value = 230; + break; + } + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM:{ + // 15 75 75 4*level+4 + r_value = ((level*4) + 4); + if ( level < 15 ) + r_value = 0; + if (r_value > 75) + r_value = 75; + break; + } + // Hybrid + case BEASTLORD: case BEASTLORDGM: + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM: + case BARD: case BARDGM:{ + // 10 125 155 5*level+5 + r_value = ((level*5) + 5); + if ( level < 10 ) + r_value = 0; + if (r_value > 125 && level < 51 ) + r_value = 125; + if (r_value > 155) + r_value = 155; + break; + } + + case RANGER: case RANGERGM:{ + // 8 137 170 5*level+5 + r_value = ((level*5) + 5); + if ( level < 8 ) + r_value = 0; + if (r_value > 137 && level < 51 ) + r_value = 137; + if (r_value > 170) + r_value = 170; + break; + } + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM:{ + // 22 75 75 3*level+3 + r_value = ((level*3) + 3); + if ( level < 22 ) + r_value = 0; + if (r_value > 75) + r_value = 75; + break; + } + // No skill classes + // Melee + // Priest + // Pure + // Hybrid default: { r_value = 0; break; @@ -1241,661 +1241,661 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { } // end switch (eqclass) break; } // end case DODGE: - // Other - case TAUNT:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 1 200 200 - r_value = ((level*5) + 5); - if (r_value > 200) - r_value = 200; - break; - } - // Priest - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 1 180 180 - r_value = ((level*5) + 5); - if (r_value > 180) - r_value = 180; - break; - } - case RANGER: case RANGERGM:{ - // 1 150 150 - r_value = ((level*5) + 5); - if (r_value > 150) - r_value = 150; - break; - } - // Pure - // No skill classes - // Melee - case ROGUE: case ROGUEGM: - case MONK: case MONKGM: - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BEASTLORD: case BEASTLORDGM: - case BARD: case BARDGM: + // Other + case TAUNT:{ + switch (eqclass) { + // Melee + case WARRIOR: case WARRIORGM:{ + // 1 200 200 + r_value = ((level*5) + 5); + if (r_value > 200) + r_value = 200; + break; + } + // Priest + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 1 180 180 + r_value = ((level*5) + 5); + if (r_value > 180) + r_value = 180; + break; + } + case RANGER: case RANGERGM:{ + // 1 150 150 + r_value = ((level*5) + 5); + if (r_value > 150) + r_value = 150; + break; + } + // Pure + // No skill classes + // Melee + case ROGUE: case ROGUEGM: + case MONK: case MONKGM: + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case BEASTLORD: case BEASTLORDGM: + case BARD: case BARDGM: default: { r_value = 0; - break; + break; } } // end swtich (eqclass) break; } // end case TAUNT: - case DISARM:{ - switch (eqclass) { - // Melee - case WARRIOR: case WARRIORGM:{ - // 35 200 200 - r_value = ((level*5) + 5); - if (level < 35) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - case ROGUE: case ROGUEGM: - case MONK: case MONKGM:{ - // 27 200 200 - r_value = ((level*5) + 5); - if (level < 27) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - // Priest - // Hybrid - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 40 70 70 - r_value = ((level*5) + 5); - if (level < 40) - r_value = 0; - if (r_value > 70) - r_value = 70; - break; - } - case RANGER: case RANGERGM:{ - // 35 55 55 - r_value = ((level*5) + 5); - if (level < 35) - r_value = 0; - if (r_value > 55) - r_value = 55; - break; - } + case DISARM:{ + switch (eqclass) { + // Melee + case WARRIOR: case WARRIORGM:{ + // 35 200 200 + r_value = ((level*5) + 5); + if (level < 35) + r_value = 0; + if (r_value > 200) + r_value = 200; + break; + } + case ROGUE: case ROGUEGM: + case MONK: case MONKGM:{ + // 27 200 200 + r_value = ((level*5) + 5); + if (level < 27) + r_value = 0; + if (r_value > 200) + r_value = 200; + break; + } + // Priest + // Hybrid + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 40 70 70 + r_value = ((level*5) + 5); + if (level < 40) + r_value = 0; + if (r_value > 70) + r_value = 70; + break; + } + case RANGER: case RANGERGM:{ + // 35 55 55 + r_value = ((level*5) + 5); + if (level < 35) + r_value = 0; + if (r_value > 55) + r_value = 55; + break; + } // Pure - // No skill classes - // Melee - // Priest - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM: - case CLERIC: case CLERICGM: - // Pure - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM: - case MAGICIAN: case MAGICIANGM: - case ENCHANTER: case ENCHANTERGM: - // Hybrid - case BARD: case BARDGM: - case BEASTLORD: case BEASTLORDGM: + // No skill classes + // Melee + // Priest + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM: + case CLERIC: case CLERICGM: + // Pure + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM: + case MAGICIAN: case MAGICIANGM: + case ENCHANTER: case ENCHANTERGM: + // Hybrid + case BARD: case BARDGM: + case BEASTLORD: case BEASTLORDGM: default: { r_value = 0; - break; - } + break; + } } // end switch (eqclass) break; } // end case DISARM: - /////////////////////////////////////////// - /////////////////////////////////////////// - // Spell Skills - case MEDITATE: - case ABJURE: + /////////////////////////////////////////// + /////////////////////////////////////////// + // Spell Skills + case MEDITATE: + case ABJURE: - case ALTERATION: - case CHANNELING: - case CONJURATION: - case DIVINATION: + case ALTERATION: + case CHANNELING: + case CONJURATION: + case DIVINATION: - case EVOCATION:{ - r_value = ((level*5) + 5); - switch(eqclass){ - // Hybrid - case RANGER: case RANGERGM:{ - // 9 235 235 - // Channel 9 200 215 - // Med 12 185 235 - if (level < 9) - r_value = 0; - if (level < 12 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 215) - r_value = 215; + case EVOCATION:{ + r_value = ((level*5) + 5); + switch(eqclass){ + // Hybrid + case RANGER: case RANGERGM:{ + // 9 235 235 + // Channel 9 200 215 + // Med 12 185 235 + if (level < 9) + r_value = 0; + if (level < 12 && skillid == MEDITATE) + r_value = 0; + if (r_value > 0 && skillid == CHANNELING) { + if ( level < 51 && r_value > 200) + r_value = 200; + if (r_value > 215) + r_value = 215; } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 185) - r_value = 185; - if (r_value > 235) - r_value = 235; - } - break; - } - case BEASTLORD: case BEASTLORDGM: - case PALADIN: case PALADINGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ - // 9 235 235 - // Channel 9 200 220 - // Med 12 185 235 - if (level < 9) - r_value = 0; - if (level < 12 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 185) - r_value = 185; - if (r_value > 220) - r_value = 220; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 185) - r_value = 185; - if (r_value > 235) - r_value = 235; - } - break; - } - // Priest - case CLERIC: case CLERICGM: - case DRUID: case DRUIDGM: - case SHAMAN: case SHAMANGM:{ - // 1 235 235 - // Channel 4 200 220 - // Med 8 235 252 - if (level < 4 && skillid == CHANNELING) - r_value = 0; - if (level < 8 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 220) - r_value = 220; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 235) - r_value = 235; - if (r_value > 252) - r_value = 252; - } - break; - } - // Int caster - case ENCHANTER: case ENCHANTERGM: - case MAGICIAN: case MAGICIANGM: - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM:{ - // 1 235 235 - // Channel 1 200 220 - // Med 4 235 252 - if (level < 4 && skillid == MEDITATE) - r_value = 0; - if (r_value > 0 && skillid == CHANNELING) { - if ( level < 51 && r_value > 200) - r_value = 200; - if (r_value > 220) - r_value = 220; - } - if (r_value > 0 && skillid == MEDITATE) { - if ( level < 51 && r_value > 235) - r_value = 235; - if (r_value > 252) - r_value = 252; - } - break; + if (r_value > 0 && skillid == MEDITATE) { + if ( level < 51 && r_value > 185) + r_value = 185; + if (r_value > 235) + r_value = 235; + } + break; + } + case BEASTLORD: case BEASTLORDGM: + case PALADIN: case PALADINGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM:{ + // 9 235 235 + // Channel 9 200 220 + // Med 12 185 235 + if (level < 9) + r_value = 0; + if (level < 12 && skillid == MEDITATE) + r_value = 0; + if (r_value > 0 && skillid == CHANNELING) { + if ( level < 51 && r_value > 185) + r_value = 185; + if (r_value > 220) + r_value = 220; + } + if (r_value > 0 && skillid == MEDITATE) { + if ( level < 51 && r_value > 185) + r_value = 185; + if (r_value > 235) + r_value = 235; + } + break; + } + // Priest + case CLERIC: case CLERICGM: + case DRUID: case DRUIDGM: + case SHAMAN: case SHAMANGM:{ + // 1 235 235 + // Channel 4 200 220 + // Med 8 235 252 + if (level < 4 && skillid == CHANNELING) + r_value = 0; + if (level < 8 && skillid == MEDITATE) + r_value = 0; + if (r_value > 0 && skillid == CHANNELING) { + if ( level < 51 && r_value > 200) + r_value = 200; + if (r_value > 220) + r_value = 220; + } + if (r_value > 0 && skillid == MEDITATE) { + if ( level < 51 && r_value > 235) + r_value = 235; + if (r_value > 252) + r_value = 252; + } + break; + } + // Int caster + case ENCHANTER: case ENCHANTERGM: + case MAGICIAN: case MAGICIANGM: + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM:{ + // 1 235 235 + // Channel 1 200 220 + // Med 4 235 252 + if (level < 4 && skillid == MEDITATE) + r_value = 0; + if (r_value > 0 && skillid == CHANNELING) { + if ( level < 51 && r_value > 200) + r_value = 200; + if (r_value > 220) + r_value = 220; + } + if (r_value > 0 && skillid == MEDITATE) { + if ( level < 51 && r_value > 235) + r_value = 235; + if (r_value > 252) + r_value = 252; + } + break; + } + case BARD: case BARDGM:{ + r_value = 0; + if (level > 9 && skillid == MEDITATE) + r_value = 1; + break; } - case BARD: case BARDGM:{ - r_value = 0; - if (level > 9 && skillid == MEDITATE) - r_value = 1; - break; - } default: { - // Unknown class - r_value = 0; - break; + // Unknown class + r_value = 0; + break; } - }// Class Switch + }// Class Switch break; } // end spell skills - case SPECIALIZE_ABJURE: - case SPECIALIZE_ALTERATION: - case SPECIALIZE_CONJURATION: - case SPECIALIZE_DIVINATION: - case SPECIALIZE_EVOCATION: - case RESEARCH:{ - r_value = ((level*5) + 5); - switch(eqclass){ - // Int caster - case ENCHANTER: case ENCHANTERGM: - case MAGICIAN: case MAGICIANGM: - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM:{ - // Res 16 200 200 - if (level < 16 && skillid == RESEARCH) - r_value = 0; - if (r_value > 0 && skillid == RESEARCH) { - if (r_value > 200) - r_value = 200; - } - if (r_value > 235) - r_value = 235; - // FIXME Only let one SPEC go above what ever limit theres supposed to be - break; - } - default:{ - r_value = 0; - break; - } - }// Class Switch + case SPECIALIZE_ABJURE: + case SPECIALIZE_ALTERATION: + case SPECIALIZE_CONJURATION: + case SPECIALIZE_DIVINATION: + case SPECIALIZE_EVOCATION: + case RESEARCH:{ + r_value = ((level*5) + 5); + switch(eqclass){ + // Int caster + case ENCHANTER: case ENCHANTERGM: + case MAGICIAN: case MAGICIANGM: + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM:{ + // Res 16 200 200 + if (level < 16 && skillid == RESEARCH) + r_value = 0; + if (r_value > 0 && skillid == RESEARCH) { + if (r_value > 200) + r_value = 200; + } + if (r_value > 235) + r_value = 235; + // FIXME Only let one SPEC go above what ever limit theres supposed to be + break; + } + default:{ + r_value = 0; + break; + } + }// Class Switch break; } // end specilize & research skills - case BRASS_INSTRUMENTS: - case SINGING: - case STRINGED_INSTRUMENTS: - case WIND_INSTRUMENTS: - case PERCUSSION_INSTRUMENTS:{ - switch(eqclass){ - case BARD: case BARDGM:{ - r_value = ((level*5) + 5); - if (level < 5 && skillid == PERCUSSION_INSTRUMENTS){ - r_value = 0; - } - if (level < 8 && skillid == STRINGED_INSTRUMENTS){ - r_value = 0; - } - if (level < 11 && skillid == BRASS_INSTRUMENTS){ - r_value = 0; - } - if (level < 14 && skillid == WIND_INSTRUMENTS){ - r_value = 0; - } - if (r_value > 235) - r_value = 235; - break; - } - default: { - r_value = 0; + case BRASS_INSTRUMENTS: + case SINGING: + case STRINGED_INSTRUMENTS: + case WIND_INSTRUMENTS: + case PERCUSSION_INSTRUMENTS:{ + switch(eqclass){ + case BARD: case BARDGM:{ + r_value = ((level*5) + 5); + if (level < 5 && skillid == PERCUSSION_INSTRUMENTS){ + r_value = 0; + } + if (level < 8 && skillid == STRINGED_INSTRUMENTS){ + r_value = 0; + } + if (level < 11 && skillid == BRASS_INSTRUMENTS){ + r_value = 0; + } + if (level < 14 && skillid == WIND_INSTRUMENTS){ + r_value = 0; + } + if (r_value > 235) + r_value = 235; + break; } - break; - }// Class Switch + default: { + r_value = 0; + } + break; + }// Class Switch break; } // bard song skills - /////////////////////////////////////////// - /////////////////////////////////////////// - // Class skills - // Rogue - case APPLY_POISON: - case MAKE_POISON: - case PICK_POCKETS: - case BACKSTAB:{ - switch (eqclass) { - // Melee - case ROGUE: case ROGUEGM: { - r_value = ((level*5) + 5); - switch (skillid){ - case APPLY_POISON:{ - // 18 200 200 - if (level < 18) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - case MAKE_POISON:{ - // 20 200 250 - if (level < 20) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 250) - r_value = 250; - break; - } - case PICK_POCKETS:{ - // 7 200 210 - if (level < 7) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 210) - r_value = 210; - break; - } - case BACKSTAB:{ - // 10 200 225 - if (level < 10) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } + /////////////////////////////////////////// + /////////////////////////////////////////// + // Class skills + // Rogue + case APPLY_POISON: + case MAKE_POISON: + case PICK_POCKETS: + case BACKSTAB:{ + switch (eqclass) { + // Melee + case ROGUE: case ROGUEGM: { + r_value = ((level*5) + 5); + switch (skillid){ + case APPLY_POISON:{ + // 18 200 200 + if (level < 18) + r_value = 0; + if (r_value > 200) + r_value = 200; + break; + } + case MAKE_POISON:{ + // 20 200 250 + if (level < 20) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 250) + r_value = 250; + break; + } + case PICK_POCKETS:{ + // 7 200 210 + if (level < 7) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 210) + r_value = 210; + break; + } + case BACKSTAB:{ + // 10 200 225 + if (level < 10) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } default: { - r_value = 0; - break; + r_value = 0; + break; } } // end switch (skillid) - break; + break; } // end case ROGUE: case ROGUEGM: default: { - r_value = 0; - break; + r_value = 0; + break; } - }// Class Switch + }// Class Switch break; } // end rogue skills - // Monk - case FEIGN_DEATH: - case MEND: - case DRAGON_PUNCH: - case EAGLE_STRIKE: - case FLYING_KICK: - case ROUND_KICK: - case TIGER_CLAW: - case BLOCKSKILL:{ - switch(eqclass){ - case MONK: case MONKGM:{ - r_value = ((level*5) + 5); - switch (skillid){ - case MEND:{ - // 1 200 200 - if (r_value > 200) - r_value = 200; - break; - } - case ROUND_KICK:{ - // 5 200 225 - if (level < 5) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case TIGER_CLAW:{ - // 10 200 225 - if (level < 10) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case BLOCKSKILL:{ - // 12 200 230 - if (level < 12) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 230) - r_value = 230; - break; - } - case FEIGN_DEATH:{ - // 17 200 200 - if (level < 17) - r_value = 0; - if (r_value > 200) - r_value = 200; - break; - } - case EAGLE_STRIKE:{ - // 20 200 225 - if (level < 20) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case DRAGON_PUNCH:{ - // 25 200 225 - if (level < 25) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } - case FLYING_KICK:{ - // 30 200 225 - if (level < 30) - r_value = 0; - if (level < 51 && r_value > 200) - r_value = 200; - if (r_value > 225) - r_value = 225; - break; - } + // Monk + case FEIGN_DEATH: + case MEND: + case DRAGON_PUNCH: + case EAGLE_STRIKE: + case FLYING_KICK: + case ROUND_KICK: + case TIGER_CLAW: + case BLOCKSKILL:{ + switch(eqclass){ + case MONK: case MONKGM:{ + r_value = ((level*5) + 5); + switch (skillid){ + case MEND:{ + // 1 200 200 + if (r_value > 200) + r_value = 200; + break; + } + case ROUND_KICK:{ + // 5 200 225 + if (level < 5) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + case TIGER_CLAW:{ + // 10 200 225 + if (level < 10) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + case BLOCKSKILL:{ + // 12 200 230 + if (level < 12) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 230) + r_value = 230; + break; + } + case FEIGN_DEATH:{ + // 17 200 200 + if (level < 17) + r_value = 0; + if (r_value > 200) + r_value = 200; + break; + } + case EAGLE_STRIKE:{ + // 20 200 225 + if (level < 20) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + case DRAGON_PUNCH:{ + // 25 200 225 + if (level < 25) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } + case FLYING_KICK:{ + // 30 200 225 + if (level < 30) + r_value = 0; + if (level < 51 && r_value > 200) + r_value = 200; + if (r_value > 225) + r_value = 225; + break; + } default: { - r_value = 0; - break; + r_value = 0; + break; } } // end switch (skillid) - break; + break; } // end case MONK: case MONKGM: default: { - r_value = 0; - break; + r_value = 0; + break; } }// Class Switch break; } // end monk skills - // Shaman - case ALCHEMY:{ - switch(eqclass){ - case SHAMAN: case SHAMANGM:{ - // 25 130 180 - r_value = ((level*5) + 5); - if (level < 25) - r_value = 0; - if (level < 51 && r_value > 130) - r_value = 130; - if (r_value > 180) - r_value = 180; - break; - } - default: { - r_value = 0; + // Shaman + case ALCHEMY:{ + switch(eqclass){ + case SHAMAN: case SHAMANGM:{ + // 25 130 180 + r_value = ((level*5) + 5); + if (level < 25) + r_value = 0; + if (level < 51 && r_value > 130) + r_value = 130; + if (r_value > 180) + r_value = 180; break; } - }// Class Switch + default: { + r_value = 0; + break; + } + }// Class Switch break; } // end case ALCHEMY: - /////////////////////////////////////////// - ////////////////////////////////////////// - // Shared skill - // Shared Rogue - case HIDE: - case SNEAK:{ - switch(eqclass){ - // True class - case ROGUE: case ROGUEGM:{ - break; - } - // Hybrids - case MONK: case MONKGM: - case RANGER: case RANGERGM: - case SHADOWKNIGHT: case SHADOWKNIGHTGM: - case BARD: case BARDGM:{ - break; - } - default: { - r_value = 0; - break; + /////////////////////////////////////////// + ////////////////////////////////////////// + // Shared skill + // Shared Rogue + case HIDE: + case SNEAK:{ + switch(eqclass){ + // True class + case ROGUE: case ROGUEGM:{ + break; } - }// Class Switch + // Hybrids + case MONK: case MONKGM: + case RANGER: case RANGERGM: + case SHADOWKNIGHT: case SHADOWKNIGHTGM: + case BARD: case BARDGM:{ + break; + } + default: { + r_value = 0; + break; + } + }// Class Switch } // end sneak/hide - case SENSE_TRAPS: - case PICK_LOCK: - case DISARM_TRAPS:{ - switch(eqclass){ - // True class - case ROGUE: case ROGUEGM:{ - break; - } - // Hybrids - case BARD: case BARDGM:{ - break; - } - default: { - r_value = 0; - break; + case SENSE_TRAPS: + case PICK_LOCK: + case DISARM_TRAPS:{ + switch(eqclass){ + // True class + case ROGUE: case ROGUEGM:{ + break; } - }// Class Switch + // Hybrids + case BARD: case BARDGM:{ + break; + } + default: { + r_value = 0; + break; + } + }// Class Switch break; } // end case SENSE_TRAPS/PICK_LOCK/DISARM_TRAPS - case SAFE_FALL: - case INTIMIDATION:{ - switch(eqclass){ - // Melee - case MONK: case MONKGM: - case ROGUE: case ROGUEGM:{ - break; - } - default: { - r_value = 0; - break; + case SAFE_FALL: + case INTIMIDATION:{ + switch(eqclass){ + // Melee + case MONK: case MONKGM: + case ROGUE: case ROGUEGM:{ + break; } - }// Class Switch + default: { + r_value = 0; + break; + } + }// Class Switch break; } // end SAFE_FALL/INTIMIDATION - // Druid/Ranger/Bard - case FORAGE:{ - switch(eqclass) { - case DRUID: case DRUIDGM: - case RANGER: case RANGERGM:{ - if (r_value > 200) - r_value = 200; - break; - } + // Druid/Ranger/Bard + case FORAGE:{ + switch(eqclass) { + case DRUID: case DRUIDGM: + case RANGER: case RANGERGM:{ + if (r_value > 200) + r_value = 200; + break; + } case BARD: case BARDGM: { - r_value = 55; - break; + r_value = 55; + break; } default: { - r_value = 00; - break; + r_value = 00; + break; } } // end switch (eqclass) - break; + break; } // end case FORAGE: - case TRACKING:{ - switch(eqclass){ - case RANGER: case RANGERGM: - case BARD: case BARDGM: + case TRACKING:{ + switch(eqclass){ + case RANGER: case RANGERGM: + case BARD: case BARDGM: case DRUID: case DRUIDGM: { } default: { - r_value = 0; + r_value = 0; break; } - }// Class Switch + }// Class Switch } // end case TRACKING - /////////////////////////////////////////// - /////////////////////////////////////////// - // Tradeskills - case BAKING: - case TAILORING: - case BLACKSMITHING: - case FLETCHING: - case BREWING: - case JEWELRY_MAKING: - case POTTERY: - case FISHING:{ - // Check for Any Trade above 200, check for X (aa skill) Trades above 200 - r_value = 200; - break; - } + /////////////////////////////////////////// + /////////////////////////////////////////// + // Tradeskills + case BAKING: + case TAILORING: + case BLACKSMITHING: + case FLETCHING: + case BREWING: + case JEWELRY_MAKING: + case POTTERY: + case FISHING:{ + // Check for Any Trade above 200, check for X (aa skill) Trades above 200 + r_value = 200; + break; + } /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - // Gnome + // Gnome /////////////////////////////////////////////////////////////////// - case TINKERING:{ - if ( race == GNOME && level > 24 ) { - r_value = ((level*5)+5); - break; - } - r_value = 0; - break; + case TINKERING:{ + if ( race == GNOME && level > 24 ) { + r_value = ((level*5)+5); + break; + } + r_value = 0; + break; } // end case TINKERING: - ///////////////////////////////////////// - // Common - ///////////////////////////////////////// - case BIND_WOUND:{ - r_value = 5 + (level*5); - if (level > 50){ - // Check for aa and class - } - if (r_value > 200) - r_value = 200; - switch (eqclass) { - case ENCHANTER: case ENCHANTERGM: - case MAGICIAN: case MAGICIANGM: - case NECROMANCER: case NECROMANCERGM: - case WIZARD: case WIZARDGM:{ - if ( r_value > 100 ) - r_value = 100; - } + ///////////////////////////////////////// + // Common + ///////////////////////////////////////// + case BIND_WOUND:{ + r_value = 5 + (level*5); + if (level > 50){ + // Check for aa and class + } + if (r_value > 200) + r_value = 200; + switch (eqclass) { + case ENCHANTER: case ENCHANTERGM: + case MAGICIAN: case MAGICIANGM: + case NECROMANCER: case NECROMANCERGM: + case WIZARD: case WIZARDGM:{ + if ( r_value > 100 ) + r_value = 100; + } default: { - break; + break; } } // end switch (eqclass) - break; + break; } // end case BIND_WOUND: - case SENSE_HEADING: - case SWIMMING: - case ALCOHOL_TOLERANCE: - case BEGGING:{ - r_value = 5 + (level*5); - if (r_value > 200) - r_value = 200; - break; - } - //case BERSERKING: - default: { - // Unknown skill we should like print something to a log/debug here - r_value = 0; - break; - } + case SENSE_HEADING: + case SWIMMING: + case ALCOHOL_TOLERANCE: + case BEGGING:{ + r_value = 5 + (level*5); + if (r_value > 200) + r_value = 200; + break; + } + //case BERSERKING: + default: { + // Unknown skill we should like print something to a log/debug here + r_value = 0; + break; + } } // end switch (skillid) // NO skill may go over 252 if (r_value > 252) r_value = 252; - return r_value; -} + return r_value; +} diff --git a/common/MiscFunctions.cpp b/common/MiscFunctions.cpp index f6cd00e63..a08fd1f3d 100644 --- a/common/MiscFunctions.cpp +++ b/common/MiscFunctions.cpp @@ -83,7 +83,7 @@ void CoutTimestamp(bool ms) { time(&rawtime); gmt_t = gmtime(&rawtime); - struct timeval read_time; + struct timeval read_time; gettimeofday(&read_time,0); cout << (gmt_t->tm_year + 1900) << "/" << setw(2) << setfill('0') << (gmt_t->tm_mon + 1) << "/" << setw(2) << setfill('0') << gmt_t->tm_mday << " " << setw(2) << setfill('0') << gmt_t->tm_hour << ":" << setw(2) << setfill('0') << gmt_t->tm_min << ":" << setw(2) << setfill('0') << gmt_t->tm_sec; @@ -383,7 +383,7 @@ const char * itoa(int num, char* a,int b) { } #endif -/* +/* * generate a random integer in the range low-high this * should be used instead of the rand()%limit method */ @@ -425,9 +425,9 @@ uint32 rnd_hash( time_t t, clock_t c ) // Get a uint32 from t and c // Better than uint32(x) in case x is floating point in [0,1] // Based on code by Lawrence Kirby (fred@genesis.demon.co.uk) - + static uint32 differ = 0; // guarantee time-based seeds will change - + uint32 h1 = 0; unsigned char *p = (unsigned char *) &t; for( size_t i = 0; i < sizeof(t); ++i ) @@ -553,7 +553,7 @@ static unsigned int case_6 (void){ char *CleanMobName(const char *in, char *out) { unsigned i, j; - + for(i = j = 0; i < strlen(in); i++) { // convert _ to space.. any other conversions like this? I *think* this diff --git a/common/MiscFunctions.h b/common/MiscFunctions.h index 2ed8a8954..037ffbefc 100644 --- a/common/MiscFunctions.h +++ b/common/MiscFunctions.h @@ -32,8 +32,8 @@ // These are helper macros for dealing with packets of variable length, typically those that contain // variable length strings where it is not convenient to use a fixed length struct. // -#define VARSTRUCT_DECODE_TYPE(Type, Buffer) *(Type *)Buffer; Buffer += sizeof(Type); -#define VARSTRUCT_DECODE_STRING(String, Buffer) strcpy(String, Buffer); Buffer += strlen(String)+1; +#define VARSTRUCT_DECODE_TYPE(Type, Buffer) *(Type *)Buffer; Buffer += sizeof(Type); +#define VARSTRUCT_DECODE_STRING(String, Buffer) strcpy(String, Buffer); Buffer += strlen(String)+1; #define VARSTRUCT_ENCODE_STRING(Buffer, String) { sprintf(Buffer, String); Buffer += strlen(String) + 1; } #define VARSTRUCT_ENCODE_INTSTRING(Buffer, Number) { sprintf(Buffer, "%i", Number); Buffer += strlen(Buffer) + 1; } #define VARSTRUCT_ENCODE_TYPE(Type, Buffer, Value) { *(Type *)Buffer = Value; Buffer += sizeof(Type); } diff --git a/common/Mutex.cpp b/common/Mutex.cpp index a866c5530..df481a68b 100644 --- a/common/Mutex.cpp +++ b/common/Mutex.cpp @@ -23,7 +23,7 @@ using namespace std; #define DEBUG_MUTEX_CLASS 0 #if DEBUG_MUTEX_CLASS >= 1 - + #endif #ifdef _WINDOWS diff --git a/common/ProcLauncher.cpp b/common/ProcLauncher.cpp index de317886f..584dece69 100644 --- a/common/ProcLauncher.cpp +++ b/common/ProcLauncher.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -71,7 +71,7 @@ void ProcLauncher::Process() { //GetLastError(); TerminateProcess(cur->second->proc_info.hProcess, 1); } - + //if we get here, the current process died. tmp = cur; tmp++; @@ -85,7 +85,7 @@ void ProcLauncher::Process() { ProcRef died = waitpid(-1, &status, WNOHANG); if(died == -1) { //error waiting... shouldent really happen... - + } else if(died == 0) { //nothing pending... break; @@ -102,14 +102,14 @@ void ProcLauncher::Process() { } } #endif //!WIN32 - + } void ProcLauncher::ProcessTerminated(std::map::iterator &it) { - + if(it->second->handler != nullptr) it->second->handler->OnTerminate(it->first, it->second); - + #ifdef _WINDOWS CloseHandle(it->second->proc_info.hProcess); #else //!WIN32 @@ -125,18 +125,18 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { #ifdef _WINDOWS STARTUPINFO siStartInfo; - BOOL bFuncRetn = FALSE; - - // Set up members of the PROCESS_INFORMATION structure. - + BOOL bFuncRetn = FALSE; + + // Set up members of the PROCESS_INFORMATION structure. + ZeroMemory( &it->proc_info, sizeof(PROCESS_INFORMATION) ); - - // Set up members of the STARTUPINFO structure. - + + // Set up members of the STARTUPINFO structure. + ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) ); - siStartInfo.cb = sizeof(STARTUPINFO); + siStartInfo.cb = sizeof(STARTUPINFO); siStartInfo.dwFlags = 0; - + //handle output redirection. HANDLE logOut = nullptr; BOOL inherit_handles = FALSE; @@ -144,9 +144,9 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { inherit_handles = TRUE; // Set up our log file to redirect output into. SECURITY_ATTRIBUTES saAttr; - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; //we want this handle to be inherited by the child. - saAttr.lpSecurityDescriptor = nullptr; + saAttr.lpSecurityDescriptor = nullptr; logOut = CreateFile( it->logFile.c_str(), //lpFileName FILE_WRITE_DATA, //dwDesiredAccess @@ -155,7 +155,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { CREATE_ALWAYS, //dwCreationDisposition FILE_FLAG_NO_BUFFERING, //dwFlagsAndAttributes nullptr ); //hTemplateFile - + //configure the startup info to redirect output appropriately. siStartInfo.hStdError = logOut; siStartInfo.hStdOutput = logOut; @@ -164,9 +164,9 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { } siStartInfo.dwFlags |= CREATE_NEW_CONSOLE; - - // Create the child process. - + + // Create the child process. + //glue together all the nice command line arguments string args(it->program); vector::iterator cur, end; @@ -176,39 +176,39 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { args += " "; args += *cur; } - - bFuncRetn = CreateProcess(it->program.c_str(), - const_cast(args.c_str()), // command line - nullptr, // process security attributes - nullptr, // primary thread security attributes - inherit_handles, // handles are not inherited + + bFuncRetn = CreateProcess(it->program.c_str(), + const_cast(args.c_str()), // command line + nullptr, // process security attributes + nullptr, // primary thread security attributes + inherit_handles, // handles are not inherited 0, // creation flags (CREATE_NEW_PROCESS_GROUP maybe) - nullptr, // use parent's environment - nullptr, // use parent's current directory - &siStartInfo, // STARTUPINFO pointer - &it->proc_info); // receives PROCESS_INFORMATION - + nullptr, // use parent's environment + nullptr, // use parent's current directory + &siStartInfo, // STARTUPINFO pointer + &it->proc_info); // receives PROCESS_INFORMATION + if (bFuncRetn == 0) { safe_delete(it); //GetLastError() return(ProcError); } - - + + //keep process handle open to get exit code CloseHandle(it->proc_info.hThread); //we dont need their thread handle if(logOut != nullptr) CloseHandle(logOut); //we dont want their output handle either. - + ProcRef res = it->proc_info.dwProcessId; - + //record this entry.. m_running[res] = it; - + return(res); - + #else //!WIN32 - + //build argv char **argv = new char *[it->args.size()+2]; unsigned int r; @@ -217,7 +217,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { argv[r] = const_cast(it->args[r-1].c_str()); } argv[r] = nullptr; - + ProcRef res = fork(); //cant use vfork since we are opening the log file. if(res == -1) { //error forking... errno @@ -225,10 +225,10 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { safe_delete_array(argv); return(ProcError); } - + if(res == 0) { //child... exec this bitch - + //handle output redirection if requested. if(it->logFile.length() > 0) { //we will put their output directly into a file. @@ -252,20 +252,20 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { write(outfd, err, strlen(err)); } close(STDIN_FILENO); - + close(outfd); //dont need this one, we have two more copies... } } - + //call it... execv(argv[0], argv); _exit(1); } safe_delete_array(argv); - + //record this entry.. m_running[res] = it; - + return(res); #endif //!WIN32 } @@ -277,10 +277,10 @@ bool ProcLauncher::Terminate(const ProcRef &proc, bool graceful) { std::map::iterator res = m_running.find(proc); if(res == m_running.end()) return(false); - + //we do not remove it from the list until we have been notified //that they have been terminated. - + #ifdef _WINDOWS if(!TerminateProcess(res->second->proc_info.hProcess, 0)) { return(false); @@ -311,7 +311,7 @@ void ProcLauncher::TerminateAll(bool final) { //kill each process and remove it from the list std::map running(m_running); m_running.clear(); - + std::map::iterator cur, end; cur = running.begin(); end = running.end(); diff --git a/common/ProcLauncher.h b/common/ProcLauncher.h index 1c851de4f..dcdc25191 100644 --- a/common/ProcLauncher.h +++ b/common/ProcLauncher.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -32,7 +32,7 @@ public: //Singleton method static ProcLauncher *get() { return(&s_launcher); } static void ProcessInThisThread(); - + #ifdef WIN32 typedef DWORD ProcRef; static const ProcRef ProcError; @@ -47,7 +47,7 @@ public: Spec(); Spec(const Spec &other); Spec &operator=(const Spec &other); - + std::string program; std::vector args; //std::map environment; @@ -64,18 +64,18 @@ public: virtual ~EventHandler() {} virtual void OnTerminate(const ProcRef &ref, const Spec *spec) = 0; }; - + /* * The main launch method, call to start a new background process. */ ProcRef Launch(Spec *&to_launch); //takes ownership of the pointer - + /* * The terminate method */ bool Terminate(const ProcRef &proc, bool graceful = true); void TerminateAll(bool final = true); - + /* * The main processing method. Call regularly to check for terminated * background processes. @@ -85,9 +85,9 @@ public: protected: // std::vector m_specs; std::map m_running; //we own the pointers in this map - + void ProcessTerminated(std::map::iterator &it); - + private: static ProcLauncher s_launcher; #ifndef WIN32 diff --git a/common/StructStrategy.cpp b/common/StructStrategy.cpp index 7b71180e3..61b060259 100644 --- a/common/StructStrategy.cpp +++ b/common/StructStrategy.cpp @@ -28,13 +28,13 @@ void StructStrategy::Decode(EQApplicationPacket *p) const { proc(p); } - + void StructStrategy::ErrorEncoder(EQApplicationPacket **in_p, EQStream *dest, bool ack_req) { EQApplicationPacket *p = *in_p; *in_p = nullptr; - + _log(NET__STRUCTS, "Error encoding opcode %s: no encoder provided. Dropping.", OpcodeManager::EmuToName(p->GetOpcode())); - + delete p; } @@ -56,13 +56,13 @@ void StructStrategy::PassDecoder(EQApplicationPacket *p) { //effectively a singleton, but I decided to do it this way for no apparent reason. namespace StructStrategyFactory { - + static map strategies; - + void RegisterPatch(EmuOpcode first_opcode, const StructStrategy *structs) { strategies[first_opcode] = structs; } - + const StructStrategy *FindPatch(EmuOpcode first_opcode) { map::const_iterator res; res = strategies.find(first_opcode); @@ -70,7 +70,7 @@ namespace StructStrategyFactory { return(nullptr); return(res->second); } - + }; diff --git a/common/StructStrategy.h b/common/StructStrategy.h index b504db6a5..224c1e31d 100644 --- a/common/StructStrategy.h +++ b/common/StructStrategy.h @@ -14,18 +14,18 @@ public: typedef void (*Encoder)(EQApplicationPacket **p, EQStream *dest, bool ack_req); //the decoder may only edit the supplied packet, producing a single packet for eqemu to consume. typedef void (*Decoder)(EQApplicationPacket *p); - + StructStrategy(); virtual ~StructStrategy() {} - + //this method takes an eqemu struct, and enqueues the produced structs into the stream. void Encode(EQApplicationPacket **p, EQStream *dest, bool ack_req) const; //this method takes an EQ wire struct, and converts it into an eqemu struct void Decode(EQApplicationPacket *p) const; - + virtual std::string Describe() const = 0; virtual const EQClientVersion ClientVersion() const = 0; - + protected: //some common coders: //Print an error saying unknown struct/opcode and drop it @@ -34,7 +34,7 @@ protected: //pass the packet through without modification (emu == EQ) (default) static void PassEncoder(EQApplicationPacket **p, EQStream *dest, bool ack_req); static void PassDecoder(EQApplicationPacket *p); - + Encoder encoders[_maxEmuOpcode]; Decoder decoders[_maxEmuOpcode]; }; @@ -42,7 +42,7 @@ protected: //effectively a singleton, but I decided to do it this way for no apparent reason. namespace StructStrategyFactory { void RegisterPatch(EmuOpcode first_opcode, const StructStrategy *structs); - + //does NOT return ownership of the strategy. const StructStrategy *FindPatch(EmuOpcode first_opcode); }; diff --git a/common/TCPConnection.cpp b/common/TCPConnection.cpp index c4a4f79b3..a1a96ac09 100644 --- a/common/TCPConnection.cpp +++ b/common/TCPConnection.cpp @@ -490,7 +490,7 @@ bool TCPConnection::ConnectIP(uint32 in_ip, uint16 in_port, char* errbuf) { SetEcho(false); ClearBuffers(); - + rIP = in_ip; rPort = in_port; SetState(TCPS_Connected); @@ -504,7 +504,7 @@ void TCPConnection::ClearBuffers() { LockMutex lock4(&MState); safe_delete_array(recvbuf); safe_delete_array(sendbuf); - + char* line = 0; while ((line = LineOutQueue.pop())) safe_delete_array(line); @@ -520,7 +520,7 @@ bool TCPConnection::CheckNetActive() { return false; } -/* This is always called from an IO thread. Either the server socket's thread, or a +/* This is always called from an IO thread. Either the server socket's thread, or a * special thread we create when we make an outbound connection. */ bool TCPConnection::Process() { char errbuf[TCPConnection_ErrorBufferSize]; @@ -535,7 +535,7 @@ bool TCPConnection::Process() { } } return(true); - + case TCPS_Connected: // only receive data in the connected state, no others... if (!RecvData(errbuf)) { @@ -546,7 +546,7 @@ bool TCPConnection::Process() { } /* we break to do the send */ break; - + case TCPS_Disconnecting: { //waiting for any sending data to go out... MSendQueue.lock(); @@ -562,7 +562,7 @@ bool TCPConnection::Process() { MSendQueue.unlock(); } /* Fallthrough */ - + case TCPS_Disconnected: FinishDisconnect(); MRunLoop.lock(); @@ -570,19 +570,19 @@ bool TCPConnection::Process() { MRunLoop.unlock(); // SetState(TCPS_Ready); //reset the state in case they want to use it again... return(false); - + case TCPS_Closing: //I dont understand this state... - + case TCPS_Error: MRunLoop.lock(); pRunLoop = false; MRunLoop.unlock(); return(false); } - + /* we get here in connected or disconnecting with more data to send */ - + bool sent_something = false; if (!SendData(sent_something, errbuf)) { struct in_addr in; @@ -590,7 +590,7 @@ bool TCPConnection::Process() { cout << inet_ntoa(in) << ":" << GetrPort() << ": " << errbuf << endl; return false; } - + return true; } @@ -770,15 +770,15 @@ bool TCPConnection::ProcessReceivedData(char* errbuf) { i = -1; m_previousLineEnd = true; } - - + + if(line != nullptr) { bool finish_proc = false; finish_proc = LineOutQueuePush(line); if(finish_proc) return(true); //break early as requested by LineOutQueuePush } - + break; } case 8: // backspace @@ -877,13 +877,13 @@ bool TCPConnection::SendData(bool &sent_something, char* errbuf) { snprintf(errbuf, TCPConnection_ErrorBufferSize, "TCPConnection::SendData(): send(): Errorcode: %s", strerror(errno)); #endif } - + //if we get an error while disconnecting, just jump to disconnected MState.lock(); if(pState == TCPS_Disconnecting) pState = TCPS_Disconnected; MState.unlock(); - + return false; } } @@ -908,7 +908,7 @@ ThreadReturnType TCPConnection::TCPConnectionLoop(void* tmp) { if (!tcpc->ConnectReady()) { _CP(TCPConnectionLoop); if (!tcpc->Process()) { - //the processing loop has detecting an error.. + //the processing loop has detecting an error.. //we want to drop the link immediately, so we clear buffers too. tcpc->ClearBuffers(); tcpc->Disconnect(); @@ -927,11 +927,11 @@ ThreadReturnType TCPConnection::TCPConnectionLoop(void* tmp) { Sleep(10); //nothing to do. } tcpc->MLoopRunning.unlock(); - + #ifndef WIN32 _log(COMMON__THREADS, "Ending TCPConnectionLoop with thread ID %d", pthread_self()); #endif - + THREAD_RETURN(nullptr); } diff --git a/common/TCPConnection.h b/common/TCPConnection.h index d2f942c5e..1078d58db 100644 --- a/common/TCPConnection.h +++ b/common/TCPConnection.h @@ -75,15 +75,15 @@ protected: TCPS_Closing = 250, TCPS_Error = 255 } State_t; - + public: //socket created by a server (incoming) TCPConnection(uint32 ID, SOCKET iSock, uint32 irIP, uint16 irPort); //socket created to connect to a server (outgoing) TCPConnection(); // for outgoing connections - + virtual ~TCPConnection(); - + // Functions for outgoing connections bool Connect(const char* irAddress, uint16 irPort, char* errbuf = 0); virtual bool ConnectIP(uint32 irIP, uint16 irPort, char* errbuf = 0); @@ -92,7 +92,7 @@ public: virtual void Disconnect(); bool Send(const uchar* data, int32 size); - + char* PopLine(); //returns ownership of allocated byte array inline uint32 GetrIP() const { return rIP; } inline uint16 GetrPort() const { return rPort; } @@ -106,7 +106,7 @@ public: bool GetEcho(); void SetEcho(bool iValue); bool GetSockName(char *host, uint16 *port); - + //should only be used by TCPServer: bool CheckNetActive(); inline bool IsFree() const { return pFree; } @@ -129,10 +129,10 @@ protected: virtual bool ProcessReceivedData(char* errbuf = 0); virtual bool SendData(bool &sent_something, char* errbuf = 0); virtual bool RecvData(char* errbuf = 0); - + virtual void ClearBuffers(); - + bool m_previousLineEnd; eConnectionType ConnectionType; @@ -144,22 +144,22 @@ protected: uint32 rIP; uint16 rPort; // host byte order bool pFree; - + mutable Mutex MState; State_t pState; - + //text based line out queue. Mutex MLineOutQueue; virtual bool LineOutQueuePush(char* line); //this is really kinda a hack for the transition to packet mode. Returns true to stop processing the output. MyQueue LineOutQueue; - + uchar* recvbuf; int32 recvbuf_size; int32 recvbuf_used; - + int32 recvbuf_echo; volatile bool pEcho; - + Mutex MSendQueue; uchar* sendbuf; int32 sendbuf_size; @@ -169,7 +169,7 @@ protected: void ServerSendQueuePushEnd(const uchar* data, int32 size); void ServerSendQueuePushEnd(uchar** data, int32 size); void ServerSendQueuePushFront(uchar* data, int32 size); - + private: void FinishDisconnect(); }; diff --git a/common/TCPServer.cpp b/common/TCPServer.cpp index 175dc0b3b..5abb591b7 100644 --- a/common/TCPServer.cpp +++ b/common/TCPServer.cpp @@ -70,11 +70,11 @@ ThreadReturnType BaseTCPServer::TCPServerLoop(void* tmp) { THREAD_RETURN(nullptr); } BaseTCPServer* tcps = (BaseTCPServer*) tmp; - + #ifndef WIN32 _log(COMMON__THREADS, "Starting TCPServerLoop with thread ID %d", pthread_self()); #endif - + tcps->MLoopRunning.lock(); while (tcps->RunLoop()) { _CP(BaseTCPServerLoop); @@ -82,11 +82,11 @@ ThreadReturnType BaseTCPServer::TCPServerLoop(void* tmp) { tcps->Process(); } tcps->MLoopRunning.unlock(); - + #ifndef WIN32 _log(COMMON__THREADS, "Ending TCPServerLoop with thread ID %d", pthread_self()); #endif - + THREAD_RETURN(nullptr); } @@ -100,7 +100,7 @@ void BaseTCPServer::ListenNewConnections() { struct in_addr in; unsigned int fromlen; unsigned short port; - + from.sin_family = AF_INET; fromlen = sizeof(from); LockMutex lock(&MSock); @@ -124,7 +124,7 @@ void BaseTCPServer::ListenNewConnections() { setsockopt(tmpsock, SOL_SOCKET, SO_RCVBUF, (char*) &bufsize, sizeof(bufsize)); port = from.sin_port; in.s_addr = from.sin_addr.s_addr; - + // New TCP connection, this must consume the socket. CreateNewConnection(GetNextID(), tmpsock, in.s_addr, ntohs(from.sin_port)); } @@ -151,7 +151,7 @@ bool BaseTCPServer::Open(uint16 in_port, char* errbuf) { #endif int reuse_addr = 1; -// Setup internet address information. +// Setup internet address information. // This is used with the bind() call memset((char *) &address, 0, sizeof(address)); address.sin_family = AF_INET; @@ -211,7 +211,7 @@ bool BaseTCPServer::Open(uint16 in_port, char* errbuf) { void BaseTCPServer::Close() { StopLoopAndWait(); - + LockMutex lock(&MSock); if (sock) { #ifdef _WINDOWS diff --git a/common/TCPServer.h b/common/TCPServer.h index 2a5b95ad3..2ed2e24de 100644 --- a/common/TCPServer.h +++ b/common/TCPServer.h @@ -22,17 +22,17 @@ public: protected: static ThreadReturnType TCPServerLoop(void* tmp); - + //factory method: virtual void CreateNewConnection(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort) = 0; - - + + virtual void Process(); bool RunLoop(); Mutex MLoopRunning; - + void StopLoopAndWait(); - + void ListenNewConnections(); uint32 NextID; @@ -55,10 +55,10 @@ public: TCPServer(uint16 iPort = 0) : BaseTCPServer(iPort) { } - + virtual ~TCPServer() { StopLoopAndWait(); - + //im not sure what the right thing to do here is... //we are freeing a connection which somebody likely has a pointer to.. //but, we really shouldent ever get called anyhow.. @@ -69,7 +69,7 @@ public: delete *cur; } } - + T * NewQueuePop() { T * ret = nullptr; MNewQueue.lock(); @@ -80,11 +80,11 @@ public: MNewQueue.unlock(); return ret; } - + protected: virtual void Process() { BaseTCPServer::Process(); - + vitr cur; cur = m_list.begin(); while(cur != m_list.end()) { @@ -102,18 +102,18 @@ protected: } } } - + void AddConnection(T *con) { m_list.push_back(con); MNewQueue.lock(); m_NewQueue.push(con); MNewQueue.unlock(); } - + //queue of new connections, for the app to pull from Mutex MNewQueue; std::queue m_NewQueue; - + vstore m_list; }; diff --git a/common/XMLParser.cpp b/common/XMLParser.cpp index 481dbf81f..0b56b6b47 100644 --- a/common/XMLParser.cpp +++ b/common/XMLParser.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -29,7 +29,7 @@ bool XMLParser::ParseFile(const char *file, const char *root_ele) { printf("Unable to load '%s': %s\n", file, doc.ErrorDesc()); return(false); } - + TiXmlElement *root = doc.FirstChildElement( root_ele ); if(root == nullptr) { printf("Unable to find root '%s' in %s\n",root_ele, file); @@ -37,7 +37,7 @@ bool XMLParser::ParseFile(const char *file, const char *root_ele) { } ParseOkay=true; - + TiXmlNode *main_element = nullptr; while( (main_element = root->IterateChildren( main_element )) ) { if(main_element->Type() != TiXmlNode::ELEMENT) @@ -47,25 +47,25 @@ bool XMLParser::ParseFile(const char *file, const char *root_ele) { handler=Handlers.find(ele->Value()); if (handler!=Handlers.end() && handler->second) { ElementHandler h=handler->second; - + /* - * + * * This is kinda a sketchy operation here, since all of these * element handler methods will be functions in child classes. * This essentially causes us to do an un-checkable (and hence * un-handle-properly-able) cast down to the child class. This * WILL BREAK if any children classes do multiple inheritance. - * - * + * + * */ - + (this->*h)(ele); } else { //unhandled element.... do nothing for now } - + } - + return(ParseOkay); } diff --git a/common/XMLParser.h b/common/XMLParser.h index 37e1bb915..54f7d09ee 100644 --- a/common/XMLParser.h +++ b/common/XMLParser.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -34,13 +34,13 @@ using namespace std; class XMLParser { public: typedef void (XMLParser::*ElementHandler)(TiXmlElement *ele); - + XMLParser(); virtual ~XMLParser() {} - + bool ParseFile(const char *file, const char *root_ele); bool ParseStatus() const { return ParseOkay; } - + protected: const char *ParseTextBlock(TiXmlNode *within, const char *name, bool optional = false); const char *GetText(TiXmlNode *within, bool optional = false); @@ -48,7 +48,7 @@ protected: map Handlers; bool ParseOkay; - + }; diff --git a/common/bodytypes.h b/common/bodytypes.h index f3e49a0b4..5975ed54d 100644 --- a/common/bodytypes.h +++ b/common/bodytypes.h @@ -25,7 +25,7 @@ typedef enum { BT_Giant = 4, BT_Construct = 5, BT_Extraplanar = 6, - BT_Magical = 7, //this name might be a bit off, + BT_Magical = 7, //this name might be a bit off, BT_SummonedUndead = 8, BT_RaidGiant = 9, // ... diff --git a/common/breakdowns.h b/common/breakdowns.h index dccf6e2f6..5e56b1e9b 100644 --- a/common/breakdowns.h +++ b/common/breakdowns.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/common/classes.cpp b/common/classes.cpp index a632c8889..98ad290c3 100644 --- a/common/classes.cpp +++ b/common/classes.cpp @@ -20,226 +20,226 @@ const char* GetEQClassName(uint8 class_, uint8 level) { switch(class_) { - case WARRIOR: - if (level >= 70) - return "Vanquisher"; - else if (level >= 65) + case WARRIOR: + if (level >= 70) + return "Vanquisher"; + else if (level >= 65) return "Overlord"; //Baron-Sprite: LEAVE MY CLASSES ALONE. - else if (level >= 60) - return "Warlord"; - else if (level >= 55) - return "Myrmidon"; - else if (level >= 51) - return "Champion"; - else - return "Warrior"; + else if (level >= 60) + return "Warlord"; + else if (level >= 55) + return "Myrmidon"; + else if (level >= 51) + return "Champion"; + else + return "Warrior"; case CLERIC: - if (level >= 70) - return "Prelate"; - else if (level >= 65) - return "Archon"; - else if (level >= 60) - return "High Priest"; - else if (level >= 55) - return "Templar"; - else if (level >= 51) - return "Vicar"; - else - return "Cleric"; - case PALADIN: - if (level >= 70) - return "Lord"; - else if (level >= 65) - return "Lord Protector"; - else if (level >= 60) - return "Crusader"; - else if (level >= 55) - return "Knight"; - else if (level >= 51) - return "Cavalier"; - else - return "Paladin"; + if (level >= 70) + return "Prelate"; + else if (level >= 65) + return "Archon"; + else if (level >= 60) + return "High Priest"; + else if (level >= 55) + return "Templar"; + else if (level >= 51) + return "Vicar"; + else + return "Cleric"; + case PALADIN: + if (level >= 70) + return "Lord"; + else if (level >= 65) + return "Lord Protector"; + else if (level >= 60) + return "Crusader"; + else if (level >= 55) + return "Knight"; + else if (level >= 51) + return "Cavalier"; + else + return "Paladin"; case RANGER: - if (level >= 70) - return "Plainswalker"; - else if (level >= 65) - return "Forest Stalker"; - else if (level >= 60) - return "Warder"; - else if (level >= 55) - return "Outrider"; - else if (level >= 51) - return "Pathfinder"; - else - return "Ranger"; + if (level >= 70) + return "Plainswalker"; + else if (level >= 65) + return "Forest Stalker"; + else if (level >= 60) + return "Warder"; + else if (level >= 55) + return "Outrider"; + else if (level >= 51) + return "Pathfinder"; + else + return "Ranger"; case SHADOWKNIGHT: - if (level >= 70) - return "Scourge Knight"; - else if (level >= 65) - return "Dread Lord"; - else if (level >= 60) - return "Grave Lord"; - else if (level >= 55) - return "Revenant"; - else if (level >= 51) - return "Reaver"; - else - return "Shadowknight"; + if (level >= 70) + return "Scourge Knight"; + else if (level >= 65) + return "Dread Lord"; + else if (level >= 60) + return "Grave Lord"; + else if (level >= 55) + return "Revenant"; + else if (level >= 51) + return "Reaver"; + else + return "Shadowknight"; case DRUID: - if (level >= 70) - return "Natureguard"; - else if (level >= 65) - return "Storm Warden"; - else if (level >= 60) - return "Hierophant"; - else if (level >= 55) - return "Preserver"; - else if (level >= 51) - return "Wanderer"; - else - return "Druid"; + if (level >= 70) + return "Natureguard"; + else if (level >= 65) + return "Storm Warden"; + else if (level >= 60) + return "Hierophant"; + else if (level >= 55) + return "Preserver"; + else if (level >= 51) + return "Wanderer"; + else + return "Druid"; case MONK: - if (level >= 70) - return "Stone Fist"; - else if (level >= 65) - return "Transcendent"; - else if (level >= 60) - return "Grandmaster"; - else if (level >= 55) - return "Master"; - else if (level >= 51) - return "Disciple"; - else - return "Monk"; - case BARD: - if (level >= 70) + if (level >= 70) + return "Stone Fist"; + else if (level >= 65) + return "Transcendent"; + else if (level >= 60) + return "Grandmaster"; + else if (level >= 55) + return "Master"; + else if (level >= 51) + return "Disciple"; + else + return "Monk"; + case BARD: + if (level >= 70) return "Performer"; - else if (level >= 65) - return "Maestro"; - else if (level >= 60) - return "Virtuoso"; - else if (level >= 55) - return "Troubadour"; - else if (level >= 51) - return "Minstrel"; - else - return "Bard"; - case ROGUE: - if (level >= 70) - return "Nemesis"; - else if (level >= 65) - return "Deceiver"; - else if (level >= 60) - return "Assassin"; - else if (level >= 55) - return "Blackguard"; - else if (level >= 51) - return "Rake"; - else - return "Rogue"; - case SHAMAN: - if (level >= 70) + else if (level >= 65) + return "Maestro"; + else if (level >= 60) + return "Virtuoso"; + else if (level >= 55) + return "Troubadour"; + else if (level >= 51) + return "Minstrel"; + else + return "Bard"; + case ROGUE: + if (level >= 70) + return "Nemesis"; + else if (level >= 65) + return "Deceiver"; + else if (level >= 60) + return "Assassin"; + else if (level >= 55) + return "Blackguard"; + else if (level >= 51) + return "Rake"; + else + return "Rogue"; + case SHAMAN: + if (level >= 70) return "Soothsayer"; - else if (level >= 65) - return "Prophet"; - else if (level >= 60) - return "Oracle"; - else if (level >= 55) - return "Luminary"; - else if (level >= 51) - return "Mystic"; - else - return "Shaman"; - case NECROMANCER: - if (level >= 70) - return "Wraith"; - else if (level >= 65) - return "Arch Lich"; - else if (level >= 60) - return "Warlock"; - else if (level >= 55) - return "Defiler"; - else if (level >= 51) - return "Heretic"; - else - return "Necromancer"; - case WIZARD: - if (level >= 70) - return "Grand Arcanist"; - else if (level >= 65) - return "Arcanist"; - else if (level >= 60) - return "Sorcerer"; - else if (level >= 55) - return "Evoker"; - else if (level >= 51) - return "Channeler"; - else - return "Wizard"; - case MAGICIAN: - if (level >= 70) - return "Arch Magus"; - else if (level >= 65) - return "Arch Convoker"; - else if (level >= 60) - return "Arch Mage"; - else if (level >= 55) - return "Conjurer"; - if (level >= 51) - return "Elementalist"; - else - return "Magician"; - case ENCHANTER: - if (level >= 70) - return "Bedazzler"; - else if (level >= 65) - return "Coercer"; - else if (level >= 60) - return "Phantasmist"; - else if (level >= 55) - return "Beguiler"; - else if (level >= 51) - return "Illusionist"; - else - return "Enchanter"; - case BEASTLORD: - if (level >= 70) - return "Wildblood"; - else if (level >= 65) - return "Feral Lord"; - else if (level >= 60) - return "Savage Lord"; - else if (level >= 55) - return "Animist"; - else if (level >= 51) - return "Primalist"; - else - return "Beastlord"; - case BERSERKER: - if (level >= 70) - return "Ravager"; - else if (level >= 65) - return "Fury"; - else if (level >= 60) - return "Rager"; - else if (level >= 55) - return "Vehement"; - else if (level >= 51) - return "Brawler"; - else - return "Berserker"; - case BANKER: - if (level >= 70) - return "Master Banker"; - else if (level >= 65) - return "Elder Banker"; - else if (level >= 60) - return "Oldest Banker"; - else if (level >= 55) - return "Older Banker"; - else if (level >= 51) - return "Old Banker"; - else + else if (level >= 65) + return "Prophet"; + else if (level >= 60) + return "Oracle"; + else if (level >= 55) + return "Luminary"; + else if (level >= 51) + return "Mystic"; + else + return "Shaman"; + case NECROMANCER: + if (level >= 70) + return "Wraith"; + else if (level >= 65) + return "Arch Lich"; + else if (level >= 60) + return "Warlock"; + else if (level >= 55) + return "Defiler"; + else if (level >= 51) + return "Heretic"; + else + return "Necromancer"; + case WIZARD: + if (level >= 70) + return "Grand Arcanist"; + else if (level >= 65) + return "Arcanist"; + else if (level >= 60) + return "Sorcerer"; + else if (level >= 55) + return "Evoker"; + else if (level >= 51) + return "Channeler"; + else + return "Wizard"; + case MAGICIAN: + if (level >= 70) + return "Arch Magus"; + else if (level >= 65) + return "Arch Convoker"; + else if (level >= 60) + return "Arch Mage"; + else if (level >= 55) + return "Conjurer"; + if (level >= 51) + return "Elementalist"; + else + return "Magician"; + case ENCHANTER: + if (level >= 70) + return "Bedazzler"; + else if (level >= 65) + return "Coercer"; + else if (level >= 60) + return "Phantasmist"; + else if (level >= 55) + return "Beguiler"; + else if (level >= 51) + return "Illusionist"; + else + return "Enchanter"; + case BEASTLORD: + if (level >= 70) + return "Wildblood"; + else if (level >= 65) + return "Feral Lord"; + else if (level >= 60) + return "Savage Lord"; + else if (level >= 55) + return "Animist"; + else if (level >= 51) + return "Primalist"; + else + return "Beastlord"; + case BERSERKER: + if (level >= 70) + return "Ravager"; + else if (level >= 65) + return "Fury"; + else if (level >= 60) + return "Rager"; + else if (level >= 55) + return "Vehement"; + else if (level >= 51) + return "Brawler"; + else + return "Berserker"; + case BANKER: + if (level >= 70) + return "Master Banker"; + else if (level >= 65) + return "Elder Banker"; + else if (level >= 60) + return "Oldest Banker"; + else if (level >= 55) + return "Older Banker"; + else if (level >= 51) + return "Old Banker"; + else return "Banker"; case WARRIORGM: return "Warrior Guildmaster"; diff --git a/common/classes.h b/common/classes.h index a6072e1ba..6b9803b6d 100644 --- a/common/classes.h +++ b/common/classes.h @@ -37,23 +37,23 @@ #define BEASTLORD 15 #define BERSERKER 16 #define PLAYER_CLASS_COUNT 16 // used for array defines, must be the count of playable classes -#define WARRIORGM 20 -#define CLERICGM 21 -#define PALADINGM 22 -#define RANGERGM 23 -#define SHADOWKNIGHTGM 24 -#define DRUIDGM 25 -#define MONKGM 26 -#define BARDGM 27 -#define ROGUEGM 28 -#define SHAMANGM 29 -#define NECROMANCERGM 30 -#define WIZARDGM 31 -#define MAGICIANGM 32 -#define ENCHANTERGM 33 +#define WARRIORGM 20 +#define CLERICGM 21 +#define PALADINGM 22 +#define RANGERGM 23 +#define SHADOWKNIGHTGM 24 +#define DRUIDGM 25 +#define MONKGM 26 +#define BARDGM 27 +#define ROGUEGM 28 +#define SHAMANGM 29 +#define NECROMANCERGM 30 +#define WIZARDGM 31 +#define MAGICIANGM 32 +#define ENCHANTERGM 33 #define BEASTLORDGM 34 #define BERSERKERGM 35 -#define BANKER 40 +#define BANKER 40 #define MERCHANT 41 #define DISCORD_MERCHANT 59 #define ADVENTURERECRUITER 60 diff --git a/common/common_profile.h b/common/common_profile.h index 034a59d63..2ecc37020 100644 --- a/common/common_profile.h +++ b/common/common_profile.h @@ -45,41 +45,41 @@ public: Database_DBLoadItems, Database_GetWaypoints, Database_DBLoadNPCFactionLists, - + DBcore_RunQuery, - + DBAsync_ProcessWork, DBAsync_DispatchWork, DBAsyncLoop_loop, - + EQStreamServer_Process, - + EQStream_Process, - + EQStreamServerLoop, EQStreamInLoop, EQStreamOutLoop, TCPServerLoop, TCPConnectionLoop, - + Inventory_GetItem, Inventory_HasItem, - + BaseTCPServerLoop, MakeRandomInt, MakeRandomFloat, - + Mutex_lock, Timer_Check, - + WorldConnection_Process, - + MaxCommonProfilerId }; - + inline CommonProfiler() : GeneralProfiler(MaxCommonProfilerId) { } - + }; extern CommonProfiler _cp; diff --git a/common/crash.cpp b/common/crash.cpp index 44c05f50f..6d8e92a8b 100644 --- a/common/crash.cpp +++ b/common/crash.cpp @@ -9,7 +9,7 @@ class EQEmuStackWalker : public StackWalker public: EQEmuStackWalker() : StackWalker() { } EQEmuStackWalker(DWORD dwProcessId, HANDLE hProcess) : StackWalker(dwProcessId, hProcess) { } - virtual void OnOutput(LPCSTR szText) { + virtual void OnOutput(LPCSTR szText) { char buffer[4096]; for(int i = 0; i < 4096; ++i) { if(szText[i] == 0) { @@ -24,8 +24,8 @@ public: } } - LogFile->write(EQEMuLog::Crash, buffer); - StackWalker::OnOutput(szText); + LogFile->write(EQEMuLog::Crash, buffer); + StackWalker::OnOutput(szText); } }; @@ -97,12 +97,12 @@ LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo) LogFile->write(EQEMuLog::Crash, "Unknown Exception"); break; } - + if(EXCEPTION_STACK_OVERFLOW != ExceptionInfo->ExceptionRecord->ExceptionCode) { EQEmuStackWalker sw; sw.ShowCallstack(GetCurrentThread(), ExceptionInfo->ContextRecord); - } - + } + return EXCEPTION_EXECUTE_HANDLER; } diff --git a/common/crc32.cpp b/common/crc32.cpp index d5dd48e78..b28d2cd83 100644 --- a/common/crc32.cpp +++ b/common/crc32.cpp @@ -85,9 +85,9 @@ void CRC32::SetEQChecksum(uchar* in_data, uint32 in_length, uint32 start_at) { unsigned long data; unsigned long check = 0xffffffff; - + assert(in_length >= start_at && in_data); - + for(uint32 i=start_at; i 0) + if (mysql_num_rows(result) > 0) { row = mysql_fetch_row(result); peqzone = atoi(row[0]); @@ -1425,7 +1425,7 @@ uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){ return peqzone; } -bool Database::CheckNameFilter(const char* name, bool surname) +bool Database::CheckNameFilter(const char* name, bool surname) { std::string str_name = name; char errbuf[MYSQL_ERRMSG_SIZE]; @@ -2257,7 +2257,7 @@ uint32 Database::GetRaidID(const char* name){ MYSQL_RES *result; MYSQL_ROW row; uint32 raidid=0; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT raidid from raid_members where name='%s'", name), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT raidid from raid_members where name='%s'", name), errbuf, &result)) { if((row = mysql_fetch_row(result))) { @@ -2282,8 +2282,8 @@ const char *Database::GetRaidLeaderName(uint32 rid) char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - - if (RunQuery(query, MakeAnyLenString(&query, "SELECT name FROM raid_members WHERE raidid=%u AND israidleader=1", + + if (RunQuery(query, MakeAnyLenString(&query, "SELECT name FROM raid_members WHERE raidid=%u AND israidleader=1", rid), errbuf, &result)) { if((row = mysql_fetch_row(result)) != nullptr) { @@ -2326,11 +2326,11 @@ bool Database::VerifyZoneInstance(uint32 zone_id, uint16 instance_id) char *query = 0; MYSQL_RES *result; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM instance_lockout where id=%u AND zone=%u", + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM instance_lockout where id=%u AND zone=%u", instance_id, zone_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { mysql_free_result(result); return true; @@ -2341,7 +2341,7 @@ bool Database::VerifyZoneInstance(uint32 zone_id, uint16 instance_id) return false; } } - else + else { safe_delete_array(query); return false; @@ -2356,17 +2356,17 @@ bool Database::CharacterInInstanceGroup(uint16 instance_id, uint32 char_id) MYSQL_RES *result; bool lockout_instance_player = false; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM instance_lockout_player where id=%u AND charid=%u", + if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM instance_lockout_player where id=%u AND charid=%u", instance_id, char_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) == 1) + if (mysql_num_rows(result) == 1) { lockout_instance_player = true; } mysql_free_result(result); } - else + else { safe_delete_array(query); } @@ -2402,11 +2402,11 @@ bool Database::CheckInstanceExpired(uint16 instance_id) int32 start_time = 0; int32 duration = 0; uint32 never_expires = 0; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT start_time, duration, never_expires FROM instance_lockout WHERE id=%u", + if (RunQuery(query, MakeAnyLenString(&query, "SELECT start_time, duration, never_expires FROM instance_lockout WHERE id=%u", instance_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); start_time = atoi(row[0]); @@ -2420,7 +2420,7 @@ bool Database::CheckInstanceExpired(uint16 instance_id) } mysql_free_result(result); } - else + else { safe_delete_array(query); return true; @@ -2448,16 +2448,16 @@ uint32 Database::ZoneIDFromInstanceID(uint16 instance_id) MYSQL_ROW row; uint32 ret; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT zone FROM instance_lockout where id=%u", instance_id), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT zone FROM instance_lockout where id=%u", instance_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); ret = atoi(row[0]); mysql_free_result(result); - return ret; + return ret; } else { @@ -2465,7 +2465,7 @@ uint32 Database::ZoneIDFromInstanceID(uint16 instance_id) return 0; } } - else + else { safe_delete_array(query); return 0; @@ -2481,16 +2481,16 @@ uint32 Database::VersionFromInstanceID(uint16 instance_id) MYSQL_ROW row; uint32 ret; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT version FROM instance_lockout where id=%u", instance_id), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT version FROM instance_lockout where id=%u", instance_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); ret = atoi(row[0]); mysql_free_result(result); - return ret; + return ret; } else { @@ -2498,7 +2498,7 @@ uint32 Database::VersionFromInstanceID(uint16 instance_id) return 0; } } - else + else { safe_delete_array(query); return 0; @@ -2516,11 +2516,11 @@ uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma) uint32 duration = 0; uint32 never_expires = 0; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT start_time, duration, never_expires FROM instance_lockout WHERE id=%u", + if (RunQuery(query, MakeAnyLenString(&query, "SELECT start_time, duration, never_expires FROM instance_lockout WHERE id=%u", instance_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); start_time = atoi(row[0]); @@ -2535,7 +2535,7 @@ uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma) } mysql_free_result(result); } - else + else { safe_delete_array(query); is_perma = false; @@ -2567,7 +2567,7 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id) if (RunQuery(query, MakeAnyLenString(&query, "SELECT COUNT(*) FROM instance_lockout"), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); int count = atoi(row[0]); @@ -2584,7 +2584,7 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id) } mysql_free_result(result); } - else + else { safe_delete_array(query); instance_id = 0; @@ -2597,7 +2597,7 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id) if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM instance_lockout where id >= %i ORDER BY id", count), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { while((row = mysql_fetch_row(result))) { @@ -2624,7 +2624,7 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id) mysql_free_result(result); } } - else + else { safe_delete_array(query); } @@ -2638,13 +2638,13 @@ bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - if(RunQuery(query, MakeAnyLenString(&query, "INSERT INTO instance_lockout (id, zone, version, start_time, duration)" + if(RunQuery(query, MakeAnyLenString(&query, "INSERT INTO instance_lockout (id, zone, version, start_time, duration)" " values(%lu, %lu, %lu, UNIX_TIMESTAMP(), %lu)", (unsigned long)instance_id, (unsigned long)zone_id, (unsigned long)version, (unsigned long)duration), errbuf)) { safe_delete_array(query); return true; } - else + else { safe_delete_array(query); return false; @@ -2663,7 +2663,7 @@ void Database::PurgeExpiredInstances() "(start_time+duration) <= UNIX_TIMESTAMP() and never_expires = 0"), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) > 0) + if (mysql_num_rows(result) > 0) { row = mysql_fetch_row(result); while(row != nullptr) @@ -2675,7 +2675,7 @@ void Database::PurgeExpiredInstances() } mysql_free_result(result); } - else + else { safe_delete_array(query); } @@ -2692,7 +2692,7 @@ bool Database::AddClientToInstance(uint16 instance_id, uint32 char_id) safe_delete_array(query); return true; } - else + else { safe_delete_array(query); return false; @@ -2704,13 +2704,13 @@ bool Database::RemoveClientFromInstance(uint16 instance_id, uint32 char_id) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - if(RunQuery(query, MakeAnyLenString(&query, "DELETE FROM instance_lockout_player WHERE id=%lu AND charid=%lu", + if(RunQuery(query, MakeAnyLenString(&query, "DELETE FROM instance_lockout_player WHERE id=%lu AND charid=%lu", (unsigned long)instance_id, (unsigned long)char_id), errbuf)) { safe_delete_array(query); return true; } - else + else { safe_delete_array(query); return false; @@ -2722,13 +2722,13 @@ bool Database::RemoveClientsFromInstance(uint16 instance_id) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - if(RunQuery(query, MakeAnyLenString(&query, "DELETE FROM instance_lockout_player WHERE id=%lu", + if(RunQuery(query, MakeAnyLenString(&query, "DELETE FROM instance_lockout_player WHERE id=%lu", (unsigned long)instance_id), errbuf)) { safe_delete_array(query); return true; } - else + else { safe_delete_array(query); return false; @@ -2741,11 +2741,11 @@ bool Database::CheckInstanceExists(uint16 instance_id) char *query = 0; MYSQL_RES *result; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT * FROM instance_lockout where id=%u", instance_id), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT * FROM instance_lockout where id=%u", instance_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { mysql_free_result(result); return true; @@ -2753,7 +2753,7 @@ bool Database::CheckInstanceExists(uint16 instance_id) mysql_free_result(result); return false; } - else + else { safe_delete_array(query); return false; @@ -2767,7 +2767,7 @@ void Database::BuryCorpsesInInstance(uint16 instance_id) char *query = 0; MYSQL_RES *result; - if(RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried=1, instanceid=0 WHERE instanceid=%u", + if(RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried=1, instanceid=0 WHERE instanceid=%u", instance_id), errbuf, &result)) { mysql_free_result(result); @@ -2786,16 +2786,16 @@ uint16 Database::GetInstanceVersion(uint16 instance_id) MYSQL_ROW row; uint32 ret; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT version FROM instance_lockout where id=%u", instance_id), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT version FROM instance_lockout where id=%u", instance_id), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); ret = atoi(row[0]); mysql_free_result(result); - return ret; + return ret; } else { @@ -2803,7 +2803,7 @@ uint16 Database::GetInstanceVersion(uint16 instance_id) return 0; } } - else + else { safe_delete_array(query); return 0; @@ -2824,12 +2824,12 @@ uint16 Database::GetInstanceID(const char* zone, uint32 charid, int16 version) "instance_lockout_player.charid=%u LIMIT 1;", GetZoneID(zone), version, charid, charid), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); ret = atoi(row[0]); mysql_free_result(result); - return ret; + return ret; } else { @@ -2837,7 +2837,7 @@ uint16 Database::GetInstanceID(const char* zone, uint32 charid, int16 version) return 0; } } - else + else { safe_delete_array(query); return 0; @@ -2861,12 +2861,12 @@ uint16 Database::GetInstanceID(uint32 zone, uint32 charid, int16 version) "instance_lockout_player.charid=%u LIMIT 1;", zone, version, charid), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) != 0) + if (mysql_num_rows(result) != 0) { row = mysql_fetch_row(result); ret = atoi(row[0]); mysql_free_result(result); - return ret; + return ret; } else { @@ -2874,7 +2874,7 @@ uint16 Database::GetInstanceID(uint32 zone, uint32 charid, int16 version) return 0; } } - else + else { safe_delete_array(query); return 0; @@ -2891,7 +2891,7 @@ void Database::AssignGroupToInstance(uint32 gid, uint32 instance_id) uint32 zone_id = ZoneIDFromInstanceID(instance_id); uint16 version = VersionFromInstanceID(instance_id); - if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM group_id WHERE groupid=%u", gid), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM group_id WHERE groupid=%u", gid), errbuf, &result)) { safe_delete_array(query); @@ -2905,7 +2905,7 @@ void Database::AssignGroupToInstance(uint32 gid, uint32 instance_id) } mysql_free_result(result); } - else + else { safe_delete_array(query); } @@ -2920,7 +2920,7 @@ void Database::AssignRaidToInstance(uint32 rid, uint32 instance_id) uint32 zone_id = ZoneIDFromInstanceID(instance_id); uint16 version = VersionFromInstanceID(instance_id); - if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM raid_members WHERE raidid=%u", rid), + if (RunQuery(query, MakeAnyLenString(&query, "SELECT charid FROM raid_members WHERE raidid=%u", rid), errbuf, &result)) { safe_delete_array(query); @@ -2934,7 +2934,7 @@ void Database::AssignRaidToInstance(uint32 rid, uint32 instance_id) } mysql_free_result(result); } - else + else { safe_delete_array(query); } @@ -3012,7 +3012,7 @@ bool Database::GlobalInstance(uint16 instance_id) return false; } } - else + else { safe_delete_array(query); return false; @@ -3125,7 +3125,7 @@ void Database::UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win) } } -bool Database::GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, uint32 &mmc_w, uint32 &ruj_w, +bool Database::GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, uint32 &mmc_w, uint32 &ruj_w, uint32 &tak_w, uint32 &guk_l, uint32 &mir_l, uint32 &mmc_l, uint32 &ruj_l, uint32 &tak_l) { char errbuf[MYSQL_ERRMSG_SIZE]; @@ -3134,7 +3134,7 @@ bool Database::GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, u MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT `guk_wins`, `mir_wins`, `mmc_wins`, `ruj_wins`, `tak_wins`, " - "`guk_losses`, `mir_losses`, `mmc_losses`, `ruj_losses`, `tak_losses` FROM `adventure_stats` WHERE player_id=%u", + "`guk_losses`, `mir_losses`, `mmc_losses`, `ruj_losses`, `tak_losses` FROM `adventure_stats` WHERE player_id=%u", char_id), errbuf, &result)) { safe_delete_array(query); @@ -3154,7 +3154,7 @@ bool Database::GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, u mysql_free_result(result); return true; } - else + else { safe_delete_array(query); return false; diff --git a/common/database.h b/common/database.h index f494484e0..fd05a7033 100644 --- a/common/database.h +++ b/common/database.h @@ -76,7 +76,7 @@ EventLogDetails_Struct eld[255]; }; -// Added By Hogie +// Added By Hogie // INSERT into variables (varname,value) values('decaytime [minlevel] [maxlevel]','[number of seconds]'); // IE: decaytime 1 54 = Levels 1 through 54 // decaytime 55 100 = Levels 55 through 100 @@ -106,7 +106,7 @@ public: Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port); bool Connect(const char* host, const char* user, const char* passwd, const char* database,uint32 port); ~Database(); - + /* * General Character Related Stuff */ @@ -175,7 +175,7 @@ public: * Adventure related. */ void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win); - bool GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, uint32 &mmc_w, uint32 &ruj_w, uint32 &tak_w, + bool GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, uint32 &mmc_w, uint32 &ruj_w, uint32 &tak_w, uint32 &guk_l, uint32 &mir_l, uint32 &mmc_l, uint32 &ruj_l, uint32 &tak_l); /* @@ -194,7 +194,7 @@ public: bool GetLiveChar(uint32 account_id, char* cname); uint8 GetAgreementFlag(uint32 acctid); void SetAgreementFlag(uint32 acctid); - + /* * Groups */ @@ -202,7 +202,7 @@ public: void SetGroupID(const char* name, uint32 id, uint32 charid, uint32 ismerc = false); void ClearGroup(uint32 gid = 0); char* GetGroupLeaderForLogin(const char* name,char* leaderbuf); - + void SetGroupLeaderName(uint32 gid, const char* name); char* GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, GroupLeadershipAA_Struct* GLAA = nullptr); @@ -224,7 +224,7 @@ public: bool LoadVariables(); uint32 LoadVariables_MQ(char** query); bool LoadVariables_result(MYSQL_RES* result); - + /* * General Queries */ @@ -243,22 +243,22 @@ public: bool LoadPTimers(uint32 charid, PTimerList &into); void ClearPTimers(uint32 charid); void ClearMerchantTemp(); - void SetLFP(uint32 CharID, bool LFP); + void SetLFP(uint32 CharID, bool LFP); void SetLFG(uint32 CharID, bool LFG); void SetFirstLogon(uint32 CharID, uint8 firstlogon); - void SetLoginFlags(uint32 CharID, bool LFP, bool LFG, uint8 firstlogon); + void SetLoginFlags(uint32 CharID, bool LFP, bool LFG, uint8 firstlogon); void AddReport(std::string who, std::string against, std::string lines); - + protected: void HandleMysqlError(uint32 errnum); - + private: void DBInitVars(); - + uint32 max_zonename; char** zonename_array; - + Mutex Mvarcache; uint32 varcache_max; VarCache_Struct** varcache_array; diff --git a/common/dbasync.cpp b/common/dbasync.cpp index 31e956180..ba13ab2f6 100644 --- a/common/dbasync.cpp +++ b/common/dbasync.cpp @@ -41,11 +41,11 @@ void AsyncLoadVariables(DBAsync *dba, Database *db) { //which will get signaled when somebody puts something on the queue ThreadReturnType DBAsyncLoop(void* tmp) { DBAsync* dba = (DBAsync*) tmp; - + #ifndef WIN32 _log(COMMON__THREADS, "Starting DBAsyncLoop with thread ID %d", pthread_self()); #endif - + dba->MLoopRunning.lock(); while (dba->RunLoop()) { //wait before working so we check the loop condition @@ -60,11 +60,11 @@ ThreadReturnType DBAsyncLoop(void* tmp) { // Sleep(ASYNC_LOOP_GRANULARITY); } dba->MLoopRunning.unlock(); - + #ifndef WIN32 _log(COMMON__THREADS, "Ending DBAsyncLoop with thread ID %d", pthread_self()); #endif - + THREAD_RETURN(nullptr); } @@ -92,14 +92,14 @@ bool DBAsync::StopThread() { ret = pRunLoop; pRunLoop = false; MRunLoop.unlock(); - + //signal the condition so we exit the loop if were waiting CInList.Signal(); - + //this effectively waits for the processing thread to finish MLoopRunning.lock(); MLoopRunning.unlock(); - + return ret; } @@ -120,10 +120,10 @@ uint32 DBAsync::AddWork(DBAsyncWork** iWork, uint32 iDelay) { #endif *iWork = 0; MInList.unlock(); - + //wake up the processing thread and tell it to get to work. CInList.Signal(); - + return ret; } @@ -268,7 +268,7 @@ void DBAsync::CheckTimeout() { MFQList.unlock(); } catch(...){ - + } } diff --git a/common/dbasync.h b/common/dbasync.h index d6db825df..f65f9cb58 100644 --- a/common/dbasync.h +++ b/common/dbasync.h @@ -31,10 +31,10 @@ protected: Condition CInList; bool RunLoop(); void Process(); - + private: virtual void CheckTimeout(); - + void ProcessWork(DBAsyncWork* iWork, bool iSleep = true); void DispatchWork(DBAsyncWork* iWork); inline uint32 GetNextID() { return pNextID++; } @@ -64,7 +64,7 @@ private: /* DB Work Complete Callback: - This will be called under the DBAsync thread! Never access any non-threadsafe + This will be called under the DBAsync thread! Never access any non-threadsafe data/functions/classes. (ie: zone, entitylist, client, etc are not threadsafe) Function prototype: return value: true if we should delete the data, false if we should keep it @@ -103,7 +103,7 @@ public: // Pops finished queries off the work DBAsyncQuery* PopAnswer(); uint32 QueryCount(); - + Database *GetDB() const { return(m_db); } bool CheckTimeout(uint32 iFQTimeout); diff --git a/common/dbcore.cpp b/common/dbcore.cpp index 504843db0..57e754b31 100644 --- a/common/dbcore.cpp +++ b/common/dbcore.cpp @@ -190,7 +190,7 @@ bool DBcore::Open(uint32* errnum, char* errbuf) { /* Added CLIENT_FOUND_ROWS flag to the connect otherwise DB update calls would say 0 rows affected when the value already equalled - what the function was tring to set it to, therefore the function would think it failed + what the function was tring to set it to, therefore the function would think it failed */ uint32 flags = CLIENT_FOUND_ROWS; if (pCompress) diff --git a/common/dbcore.h b/common/dbcore.h index 2e2290f95..b43752c1f 100644 --- a/common/dbcore.h +++ b/common/dbcore.h @@ -26,7 +26,7 @@ public: uint32 DoEscapeString(char* tobuf, const char* frombuf, uint32 fromlen); void ping(); MYSQL* getMySQL(){ return &mysql; } - + protected: bool Open(const char* iHost, const char* iUser, const char* iPassword, const char* iDatabase, uint32 iPort, uint32* errnum = 0, char* errbuf = 0, bool iCompress = false, bool iSSL = false); private: diff --git a/common/dbmemshare.cpp b/common/dbmemshare.cpp index c8e917791..4b7fc3cd4 100644 --- a/common/dbmemshare.cpp +++ b/common/dbmemshare.cpp @@ -29,7 +29,7 @@ int32 Database::GetDoorsCount(uint32* oMaxID) { delete[] query; return -1; } - + return -1; } diff --git a/common/debug.cpp b/common/debug.cpp index ebeed542f..d621d2854 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -140,7 +140,7 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) { time_t aclock; struct tm *newtime; - + time( &aclock ); /* Get time in seconds */ newtime = localtime( &aclock ); /* Convert time to struct */ @@ -210,7 +210,7 @@ bool EQEMuLog::writePVA(LogIDs id, const char *prefix, const char *fmt, va_list time_t aclock; struct tm *newtime; - + time( &aclock ); /* Get time in seconds */ newtime = localtime( &aclock ); /* Convert time to struct */ @@ -273,7 +273,7 @@ bool EQEMuLog::writebuf(LogIDs id, const char *buf, uint8 size, uint32 count) { time_t aclock; struct tm *newtime; - + time( &aclock ); /* Get time in seconds */ newtime = localtime( &aclock ); /* Convert time to struct */ @@ -347,7 +347,7 @@ bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 ski LockMutex lock(&MLog[id]); if (!logFileValid) return false; //check again for threading race reasons (to avoid two mutexes) - + write(id, "Dumping Packet: %i", size); // Output as HEX int j = 0; char* ascii = new char[cols+1]; memset(ascii, 0, cols+1); @@ -382,7 +382,7 @@ bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 ski safe_delete_array(ascii); return true; } - + void EQEMuLog::SetCallback(LogIDs id, msgCallbackFmt proc) { if (!logFileValid) return; diff --git a/common/debug.h b/common/debug.h index 62641f53a..43a4a9833 100644 --- a/common/debug.h +++ b/common/debug.h @@ -106,19 +106,19 @@ public: Crash, MaxLogID }; - + //these are callbacks called for each typedef void (* msgCallbackBuf)(LogIDs id, const char *buf, uint8 size, uint32 count); typedef void (* msgCallbackFmt)(LogIDs id, const char *fmt, va_list ap); typedef void (* msgCallbackPva)(LogIDs id, const char *prefix, const char *fmt, va_list ap); - + void SetAllCallbacks(msgCallbackFmt proc); void SetAllCallbacks(msgCallbackBuf proc); void SetAllCallbacks(msgCallbackPva proc); void SetCallback(LogIDs id, msgCallbackFmt proc); void SetCallback(LogIDs id, msgCallbackBuf proc); void SetCallback(LogIDs id, msgCallbackPva proc); - + bool writebuf(LogIDs id, const char *buf, uint8 size, uint32 count); bool write(LogIDs id, const char *fmt, ...); bool writePVA(LogIDs id, const char *prefix, const char *fmt, va_list args); @@ -137,7 +137,7 @@ private: 8 = use stderr instead (2 must be set) */ uint8 pLogStatus[MaxLogID]; - + msgCallbackFmt logCallbackFmt[MaxLogID]; msgCallbackBuf logCallbackBuf[MaxLogID]; msgCallbackPva logCallbackPva[MaxLogID]; diff --git a/common/deity.h b/common/deity.h index beff69134..bb9e1bf1d 100644 --- a/common/deity.h +++ b/common/deity.h @@ -18,7 +18,7 @@ #ifndef DEITY_H #define DEITY_H -/* +/* ** Diety List */ #define DEITY_AGNOSTIC 396 //drop the high bit for 140 @@ -37,7 +37,7 @@ #define DEITY_TUNARE 215 //Guessed: -#define DEITY_BERTOX 201 +#define DEITY_BERTOX 201 #define DEITY_RODCET 212 #define DEITY_VEESHAN 216 diff --git a/common/emu_opcodes.cpp b/common/emu_opcodes.cpp index 6075e7d86..90dea14f6 100644 --- a/common/emu_opcodes.cpp +++ b/common/emu_opcodes.cpp @@ -21,13 +21,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA const char *OpcodeNames[_maxEmuOpcode+1] = { "OP_Unknown", - + //a preprocessor hack so we dont have to maintain two lists #define N(x) #x #include "emu_oplist.h" #include "mail_oplist.h" #undef N - + "" }; diff --git a/common/emu_oplist.h b/common/emu_oplist.h index 4b7357efe..bd83a6f30 100644 --- a/common/emu_oplist.h +++ b/common/emu_oplist.h @@ -413,7 +413,7 @@ N(OP_PetBuffWindow), N(OP_RaidJoin), N(OP_Translocate), N(OP_Sacrifice), -N(OP_KeyRing), +N(OP_KeyRing), N(OP_PopupResponse), N(OP_DeleteCharge), N(OP_PotionBelt), diff --git a/common/eq_constants.h b/common/eq_constants.h index 039f80006..5faf66fdc 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQ_CONSTANTS_H -#define EQ_CONSTANTS_H +#define EQ_CONSTANTS_H #include "skills.h" @@ -170,7 +170,7 @@ typedef enum { _eaMaxAppearance } EmuAppearance; -/* +/* ** Diety List */ #define DEITY_UNKNOWN 0 @@ -190,11 +190,11 @@ typedef enum { #define DEITY_TUNARE 215 //Guessed: -#define DEITY_BERT 201 +#define DEITY_BERT 201 #define DEITY_RODCET 212 #define DEITY_VEESHAN 216 -// msg_type's for custom usercolors +// msg_type's for custom usercolors #define MT_Say 256 #define MT_Tell 257 #define MT_Group 258 @@ -435,33 +435,33 @@ typedef enum { #define STAT_HASTE 19 #define STAT_DAMAGE_SHIELD 20 - /** - * Recast timer types. Used as an off set to charProfileStruct timers. - */ - enum RecastTypes - { - RecastTimer0 = 0, - RecastTimer1, - WeaponHealClickTimer, // 2 - MuramiteBaneNukeClickTimer, // 3 - RecastTimer4, - DispellClickTimer, // 5 (also click heal orbs?) - EpicTimer, // 6 - OoWBPClickTimer, // 7 - VishQuestClassItemTimer, // 8 - HealPotionTimer, // 9 - RecastTimer10, - RecastTimer11, - RecastTimer12, - RecastTimer13, - RecastTimer14, - RecastTimer15, - RecastTimer16, - RecastTimer17, - RecastTimer18, - ModRodTimer // 19 + /** + * Recast timer types. Used as an off set to charProfileStruct timers. + */ + enum RecastTypes + { + RecastTimer0 = 0, + RecastTimer1, + WeaponHealClickTimer, // 2 + MuramiteBaneNukeClickTimer, // 3 + RecastTimer4, + DispellClickTimer, // 5 (also click heal orbs?) + EpicTimer, // 6 + OoWBPClickTimer, // 7 + VishQuestClassItemTimer, // 8 + HealPotionTimer, // 9 + RecastTimer10, + RecastTimer11, + RecastTimer12, + RecastTimer13, + RecastTimer14, + RecastTimer15, + RecastTimer16, + RecastTimer17, + RecastTimer18, + ModRodTimer // 19 }; - + enum GroupUpdateAction { GUA_Joined = 0, @@ -593,7 +593,7 @@ enum InventorySlot //////////////////////// // Equip slots //////////////////////// - + SLOT_CHARM = 0, SLOT_EAR01 = 1, SLOT_HEAD = 2, @@ -616,38 +616,38 @@ enum InventorySlot SLOT_FEET = 19, SLOT_WAIST = 20, SLOT_AMMO = 21, - + //////////////////////// // All other slots //////////////////////// SLOT_PERSONAL_BEGIN = 22, SLOT_PERSONAL_END = 29, - + SLOT_CURSOR = 30, - + SLOT_CURSOR_END = (int16)0xFFFE, // Last item on cursor queue // Cursor bag slots are 331->340 (10 slots) - + // Personal Inventory Slots // Slots 1 through 8 are slots 22->29 // Inventory bag slots are 251->330 (10 slots per bag) - + // Tribute slots are 400-404? (upper bound unknown) // storing these in worn item's map - + // Bank slots // Bank slots 1 through 16 are slots 2000->2015 // Bank bag slots are 2031->2190 - + // Shared bank slots // Shared bank slots 1 through 2 are slots 2500->2501 // Shared bank bag slots are 2531->2550 - + // Trade session slots // Trade slots 1 through 8 are slots 3000->3007 // Trade bag slots are technically 0->79 when passed to client, // but in our code, we treat them as slots 3100->3179 - + // Slot used in OP_TradeSkillCombine for world tradeskill containers SLOT_TRADESKILL = 1000, SLOT_AUGMENT = 1001, diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index 1be8eddc5..9b4a15f80 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -547,7 +547,7 @@ struct BuffRemoveRequest_Struct struct PetBuff_Struct { /*000*/ uint32 petid; /*004*/ uint32 spellid[BUFF_COUNT]; -/*104*/ uint32 unknown700; +/*104*/ uint32 unknown700; /*108*/ uint32 unknown701; /*112*/ uint32 unknown702; /*116*/ uint32 unknown703; @@ -867,7 +867,7 @@ struct PlayerProfile_Struct /*0116*/ uint32 level; // Level of player (might be one byte) /*0120*/ BindStruct binds[5]; // Bind points (primary is first, home city is fifth) /*0220*/ uint32 deity; // deity -/*0224*/ uint32 guild_id; +/*0224*/ uint32 guild_id; /*0228*/ uint32 birthday; // characters bday /*0232*/ uint32 lastlogin; // last login or zone time /*0236*/ uint32 timePlayedMin; // in minutes @@ -1906,7 +1906,7 @@ struct AdventureFinish_Struct{ }; struct Weblink_Struct{ -/*000*/ char weblink[1]; +/*000*/ char weblink[1]; /*004*/ }; @@ -2040,22 +2040,22 @@ struct Illusion_Struct_Old { struct QuestReward_Struct { /*000*/ uint32 from_mob; // ID of mob awarding the client -/*004*/ uint32 unknown004; -/*008*/ uint32 unknown008; -/*012*/ uint32 unknown012; -/*016*/ uint32 unknown016; -/*020*/ uint32 unknown020; +/*004*/ uint32 unknown004; +/*008*/ uint32 unknown008; +/*012*/ uint32 unknown012; +/*016*/ uint32 unknown016; +/*020*/ uint32 unknown020; /*024*/ uint32 silver; // Gives silver to the client /*028*/ uint32 gold; // Gives gold to the client /*032*/ uint32 platinum; // Gives platinum to the client -/*036*/ uint32 unknown036; -/*040*/ uint32 unknown040; -/*044*/ uint32 unknown044; -/*048*/ uint32 unknown048; -/*052*/ uint32 unknown052; -/*056*/ uint32 unknown056; -/*060*/ uint32 unknown060; -/*064*/ uint32 unknown064; +/*036*/ uint32 unknown036; +/*040*/ uint32 unknown040; +/*044*/ uint32 unknown044; +/*048*/ uint32 unknown048; +/*052*/ uint32 unknown052; +/*056*/ uint32 unknown056; +/*060*/ uint32 unknown060; +/*064*/ uint32 unknown064; /*068*/ }; @@ -2760,7 +2760,7 @@ struct BarterSearchRequest_Struct { struct BuyerItemSearchLinkRequest_Struct { /*000*/ uint32 Action; // 0x00000015 -/*004*/ uint32 ItemID; +/*004*/ uint32 ItemID; /*008*/ uint32 Unknown008; /*012*/ uint32 Unknown012; }; @@ -3435,7 +3435,7 @@ struct MerchantList{ uint32 item; int16 faction_required; int8 level_required; - uint16 alt_currency_cost; + uint16 alt_currency_cost; }; struct TempMerchantList{ uint32 npcid; @@ -4195,7 +4195,7 @@ struct RespawnWindow_Struct { /** * Shroud spawn. For others shrouding, this has their spawnId and * spawnStruct. - * + * * Length: 586 * OpCode: OP_Shroud */ @@ -4650,7 +4650,7 @@ struct GroupMakeLeader_Struct //any items come after in much the same way adventure merchant items do except there is no theme included #define ALT_CURRENCY_OP_POPULATE 8 #define ALT_CURRENCY_OP_UPDATE 7 - + //Server -> Client //Populates the initial Alternate Currency Window struct AltCurrencyPopulateEntry_Struct @@ -4681,7 +4681,7 @@ struct AltCurrencyUpdate_Struct { /*084*/ uint32 unknown084; //seen 0 }; -//Client -> Server +//Client -> Server //When an item is selected while the alt currency merchant window is open struct AltCurrencySelectItem_Struct { /*000*/ uint32 merchant_entity_id; @@ -4711,7 +4711,7 @@ struct AltCurrencySelectItem_Struct { //eg: "I will give you no doubloons for a cloth cap." //Probably also sends amounts somewhere struct AltCurrencySelectItemReply_Struct { -/*000*/ uint32 unknown000; +/*000*/ uint32 unknown000; /*004*/ uint8 unknown004; //0xff /*005*/ uint8 unknown005; //0xff /*006*/ uint8 unknown006; //0xff @@ -4839,7 +4839,7 @@ struct Membership_Entry_Struct { /*000*/ uint32 purchase_id; // Seen 1, then increments 90287 to 90300 /*004*/ uint32 bitwise_entry; // Seen 16 to 65536 - Skips 4096 -/*008*/ +/*008*/ }; struct Membership_Setting_Struct @@ -4847,7 +4847,7 @@ struct Membership_Setting_Struct /*000*/ uint32 setting_index; // 0, 1, or 2 /*004*/ uint32 setting_id; // 0 to 21 /*008*/ int32 setting_value; // All can be 0, 1, or -1 -/*012*/ +/*012*/ }; struct Membership_Details_Struct @@ -4891,7 +4891,7 @@ struct MercenaryList_Struct { /*0045*/ uint32 MercUnk02; // Unknown (normally see 1, but sometimes 2 or 0) /*0049*/ uint32 StanceCount; // Iterations of MercenaryStance_Struct - Normally 2 to 4 seen /*0053*/ int32 MercUnk03; // Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77 -/*0057*/ uint8 MercUnk04; // Seen 1 +/*0057*/ uint8 MercUnk04; // Seen 1 /*0058*/ char MercName[1]; // Null Terminated Mercenary Name (00 at merchants) }; @@ -4913,7 +4913,7 @@ struct MercenaryListEntry_Struct { /*0045*/ uint32 MercUnk02; // Unknown (normally see 1, but sometimes 2 or 0) /*0049*/ uint32 StanceCount; // Iterations of MercenaryStance_Struct - Normally 2 to 4 seen /*0053*/ int32 MercUnk03; // Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77 -/*0057*/ uint8 MercUnk04; // Seen 1 +/*0057*/ uint8 MercUnk04; // Seen 1 /*0058*/ char MercName[1]; // Null Terminated Mercenary Name (00 at merchants) /*0000*/ MercenaryStance_Struct Stances[MAX_MERC_STANCES]; // Count Varies, but hard set to 5 max for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012) }; @@ -4953,7 +4953,7 @@ struct MercenaryData_Struct { /*0045*/ uint32 MercUnk02; // Unknown (normally see 1, but sometimes 2 or 0) /*0049*/ uint32 StanceCount; // Iterations of MercenaryStance_Struct - Normally 2 to 4 seen /*0053*/ int32 MercUnk03; // Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77 -/*0057*/ uint8 MercUnk04; // Seen 1 +/*0057*/ uint8 MercUnk04; // Seen 1 /*0058*/ char MercName[64]; // Null Terminated Mercenary Name (00 at merchants) /*0000*/ MercenaryStance_Struct Stances[MAX_MERC_STANCES]; // Count Varies, but hard set to 2 for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012) /*0000*/ uint32 MercUnk05; // Seen 1 - Extra Merc Data field that differs from MercenaryListEntry_Struct @@ -4963,7 +4963,7 @@ struct MercenaryData_Struct { // [OPCode: 0x6537] On Live as of April 2 2012 [Server->Client] // Should be named OP_MercenaryDataResponse, but the current opcode using that name should be renamed first // Size varies if mercenary is hired or if browsing Mercenary Merchant -// This may also be the response for Client->Server 0x0327 (size 0) packet On Live as of April 2 2012 +// This may also be the response for Client->Server 0x0327 (size 0) packet On Live as of April 2 2012 struct MercenaryDataUpdate_Struct { /*0000*/ int32 MercStatus; // Seen 0 with merc and -1 with no merc hired /*0004*/ uint32 MercCount; // Seen 1 with 1 merc hired and 0 with no merc hired diff --git a/common/eqemu_exception.cpp b/common/eqemu_exception.cpp index 47f023e6f..c247e1a0a 100644 --- a/common/eqemu_exception.cpp +++ b/common/eqemu_exception.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -18,17 +18,17 @@ #include "eqemu_exception.h" -namespace EQEmu +namespace EQEmu { - Exception::Exception(const char* name, const std::string& description, const char* file, long line) - : line_(line), + Exception::Exception(const char* name, const std::string& description, const char* file, long line) + : line_(line), file_(file), desc_(description), name_(name) { } - - Exception::Exception(const Exception& e) + + Exception::Exception(const Exception& e) : line_(e.line_), file_(e.file_), desc_(e.desc_), @@ -37,7 +37,7 @@ namespace EQEmu } #ifdef EQEMU_RVALUE_MOVE - Exception::Exception(const Exception&& e) + Exception::Exception(const Exception&& e) : line_(e.line_), file_(e.file_), desc_(e.desc_), @@ -45,7 +45,7 @@ namespace EQEmu { } #endif - + void Exception::operator=(const Exception& e) { line_ = e.line_; file_ = e.file_; diff --git a/common/eqemu_exception.h b/common/eqemu_exception.h index cf6ede925..2ccd75be0 100644 --- a/common/eqemu_exception.h +++ b/common/eqemu_exception.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -30,7 +30,7 @@ namespace EQEmu */ class Exception : public std::exception { public: - + //! Detailed Constructor /*! \param name The name given for this exception. @@ -39,55 +39,55 @@ namespace EQEmu \param line The line number for this exception. */ Exception(const char* name, const std::string& description, const char* file, long line); - + //! Copy Constructor Exception(const Exception& e); - + //! Move Constructor #ifdef EQEMU_RVALUE_MOVE Exception(const Exception&& e); #endif - + //! Destructor ~Exception() throw() { } - + //! Assignment Operator void operator=(const Exception& e); //! Get Name /*! - Gets the name of the exception as it was when it was created. + Gets the name of the exception as it was when it was created. These are typically descriptive categories that the exception would fall under. */ virtual const std::string& name() const { return name_; } - + //! Get Basic Description /*! - Gets the description of the exception as it was when it was created. + Gets the description of the exception as it was when it was created. This tends to explain the circumstances of why the exception was thrown. */ virtual const std::string& description() const { return desc_; } - + //! Get Full Description /*! - Gets a full description for this exception. + Gets a full description for this exception. This is a string containing the name, description, file and line number in a custom format. This string is created the first time the full_description is accessed. */ virtual const std::string& full_description() const; - + //! Get File Name /*! Gets the name of the file this exception was thrown from. */ virtual const std::string& file() const { return file_; } - + //! Get File Line /*! Gets the file line this exception was thrown from. */ virtual const long& line() const { return line_; } - + //! std::exception overload /*! Overload from std::exception diff --git a/common/eqtime.cpp b/common/eqtime.cpp index 248948aa6..e168f238f 100644 --- a/common/eqtime.cpp +++ b/common/eqtime.cpp @@ -145,7 +145,7 @@ bool EQTime::saveFile(const char *filename) return false; } //Enable for debugging - //cout << "SAVE: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << endl; + //cout << "SAVE: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << endl; of << EQT_VERSION << endl; of << (long)eqTime.start_eqtime.day << endl; of << (long)eqTime.start_eqtime.hour << endl; @@ -182,7 +182,7 @@ bool EQTime::loadFile(const char *filename) //in >> eqTime.start_eqtime.hour; in >> in_data; eqTime.start_eqtime.hour = in_data; - in.ignore(80, '\n'); + in.ignore(80, '\n'); //in >> eqTime.start_eqtime.minute; in >> in_data; in.ignore(80, '\n'); @@ -195,7 +195,7 @@ bool EQTime::loadFile(const char *filename) in.ignore(80, '\n'); in >> eqTime.start_realtime; //Enable for debugging... - //cout << "LOAD: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << endl; + //cout << "LOAD: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << endl; in.close(); return true; } @@ -228,7 +228,7 @@ bool EQTime::IsTimeBefore(TimeOfDay_Struct *base, TimeOfDay_Struct *test) { void EQTime::AddMinutes(uint32 minutes, TimeOfDay_Struct *to) { uint32 cur; - + //minutes start at 0, everything else starts at 1 cur = to->minute; cur += minutes; diff --git a/common/eqtime.h b/common/eqtime.h index 5a60db27f..50bb4b562 100644 --- a/common/eqtime.h +++ b/common/eqtime.h @@ -34,13 +34,13 @@ public: //Set functions int setEQTimeOfDay(TimeOfDay_Struct start_eq, time_t start_real); void setEQTimeZone(int32 in_timezone) { timezone=in_timezone; } - + //Time math/logic functions static bool IsTimeBefore(TimeOfDay_Struct *base, TimeOfDay_Struct *test); //is test before base static void AddMinutes(uint32 minutes, TimeOfDay_Struct *to); - + static void ToString(TimeOfDay_Struct *t, string &str); - + //Database functions //bool loadDB(Database q); //bool setDB(Database q); diff --git a/common/errmsg.h b/common/errmsg.h index 8087c5269..03863ec61 100644 --- a/common/errmsg.h +++ b/common/errmsg.h @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, diff --git a/common/extprofile.cpp b/common/extprofile.cpp index d4793873c..b66ada553 100644 --- a/common/extprofile.cpp +++ b/common/extprofile.cpp @@ -35,10 +35,10 @@ bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len) memcpy(to, old, sizeof(ExtendedProfile_Struct)); return(true); } - + //convert an old block of memory of size old to the new struct //and store the new results in 'to' - + //generic converter that will work as long as the structre //only grows, and nothign gets re-arranged if(len < sizeof(ExtendedProfile_Struct)) { @@ -46,7 +46,7 @@ bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len) memcpy(to, old, len); return(true); } - + return(false); } diff --git a/common/extprofile.h b/common/extprofile.h index adbf74bc1..183f98206 100644 --- a/common/extprofile.h +++ b/common/extprofile.h @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EXTENDED_PROFILE_H -#define EXTENDED_PROFILE_H +#define EXTENDED_PROFILE_H #include "eq_packet_structs.h" #include "Item.h" @@ -27,11 +27,11 @@ /* This is a place to store data that dosent have a home in the official player profile. - + Try not to expand or re-arrange thing in this struct to make conversion between sizes easier. if something gets removed from here, just turn it into an unused - item, so conversion is not needed. Then reuse old unused values if + item, so conversion is not needed. Then reuse old unused values if possible later instead of adding more, so long as old values left over would not be extrememly unpleasent side effects. */ @@ -43,7 +43,7 @@ struct ExtendedProfile_Struct { SpellBuff_Struct pet_buffs[BUFF_COUNT]; uint32 pet_items[MAX_MATERIALS]; char merc_name[64]; - + uint32 aa_effects; uint32 perAA; //% of exp going to AAs uint32 expended_aa; // Total of expended AA diff --git a/common/faction.h b/common/faction.h index ca9f4107d..ae41a9286 100644 --- a/common/faction.h +++ b/common/faction.h @@ -28,9 +28,9 @@ enum FACTION_VALUE { FACTION_WARMLY = 2, FACTION_KINDLY = 3, FACTION_AMIABLE = 4, - + FACTION_INDIFFERENT = 5, - + FACTION_APPREHENSIVE = 6, FACTION_DUBIOUS = 7, FACTION_THREATENLY = 8, @@ -63,13 +63,13 @@ struct Faction { }; typedef std::map faction_map; -struct NPCFaction -{ +struct NPCFaction +{ uint32 factionID; int32 value_mod; int8 npc_value; - uint8 temp; -}; + uint8 temp; +}; const char *FactionValueToString(FACTION_VALUE fv); FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value); diff --git a/common/features.h b/common/features.h index f418f1bb5..938cb9cf7 100644 --- a/common/features.h +++ b/common/features.h @@ -22,7 +22,7 @@ This file defines many optional features for the emu as well as various parameters used by the emu. - + If ambitious, most of these could prolly be turned into database variables, but the really frequently run pieces of code, should not be done that way for speed reasons IMO @@ -185,7 +185,7 @@ enum { //timer settings, all in milliseconds }; enum { //some random constants - //each of these attack modifiers are added to the NPC's level to determine their + //each of these attack modifiers are added to the NPC's level to determine their //probability of executing such an attack (which may or may not hit) NPCDualAttackModifier = 20, NPCTripleAttackModifier = 0, @@ -200,7 +200,7 @@ enum { //some random constants //an npc can be and still let the theif PP them #define THIEF_PICKPOCKET_OVER 5 -//this is the % chance that an NPC will dual wield a 2nd weapon +//this is the % chance that an NPC will dual wield a 2nd weapon //in its loot table, if it is able to. //Aug 2007: was 5% chance.. changed to 100% by default since that seems more normal //Kept it intact codewise incase someone wants to or is already using it. @@ -221,7 +221,7 @@ enum { //some random constants //minimum level to do alchemy #define MIN_LEVEL_ALCHEMY 25 -//chance ratio that a +//chance ratio that a #define THREATENLY_ARRGO_CHANCE 32 // 32/128 (25%) chance that a mob will arrgo on con Threatenly // max factions per npc faction list diff --git a/common/fixed_memory_hash_set.h b/common/fixed_memory_hash_set.h index d020f1b80..f2235e953 100644 --- a/common/fixed_memory_hash_set.h +++ b/common/fixed_memory_hash_set.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -25,7 +25,7 @@ namespace EQEmu { - /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an + /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an allocator for (shared memory), we assume all keys are unsigned int */ template @@ -41,7 +41,7 @@ namespace EQEmu { Constructor which initializes the hash set \param data Raw data \param size Raw data size - \param element_count Max number of possible unique elements that can be inserted. + \param element_count Max number of possible unique elements that can be inserted. \param max_element_id Number of offsets to store: eg highest "key" that will be used. */ FixedMemoryHashSet(byte *data, size_type size, key_type element_count, key_type max_element_id) { @@ -69,7 +69,7 @@ namespace EQEmu { } /*! - Constructor which does not initialize the hash set. Builds the hash set from what data is + Constructor which does not initialize the hash set. Builds the hash set from what data is stored in the data pointer passed. \param data Raw data \param size Raw data size @@ -136,7 +136,7 @@ namespace EQEmu { elements_ = other.elements_; return *this; } - + //! Returns whether the set is empty (has 0 elements) or not bool empty() const { return current_elements_ == 0; @@ -156,7 +156,7 @@ namespace EQEmu { key_type max_key() const { return offset_count_ > 0 ? (offset_count_ - 1) : 0; } - + /*! Retrieve value operator \param i Index to retrieve the value from @@ -229,7 +229,7 @@ namespace EQEmu { } } - //! Calculates how much memory we should allocate based on element size and count + //! Calculates how much memory we should allocate based on element size and count static size_type estimated_size(key_type element_count, key_type max_elements) { size_type total_size = 3 * sizeof(key_type); total_size += sizeof(key_type) * (max_elements + 1); diff --git a/common/fixed_memory_variable_hash_set.h b/common/fixed_memory_variable_hash_set.h index 7c3b0b004..67cbb441e 100644 --- a/common/fixed_memory_variable_hash_set.h +++ b/common/fixed_memory_variable_hash_set.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -25,7 +25,7 @@ namespace EQEmu { - /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an + /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an allocator for (shared memory), we assume all keys are unsigned int, values are a pointer and size */ template @@ -49,17 +49,17 @@ namespace EQEmu { remaining_size_ = size_ - (sizeof(key_type) * 3) - (sizeof(key_type) * (max_element_id + 1)); byte *ptr = data; - *reinterpret_cast(ptr) = max_element_id + 1; + *reinterpret_cast(ptr) = max_element_id + 1; offset_count_ = max_element_id + 1; ptr += sizeof(key_type); *reinterpret_cast(ptr) = remaining_size_; ptr += sizeof(key_type); - + *reinterpret_cast(ptr) = 0; current_offset_ = 0; ptr += sizeof(key_type); - + offsets_ = reinterpret_cast(ptr); memset(ptr, 0xFFFFFFFFU, sizeof(key_type) * (max_element_id + 1)); @@ -69,7 +69,7 @@ namespace EQEmu { } /*! - Constructor which does not initialize the hash set. Builds the hash set from what data is + Constructor which does not initialize the hash set. Builds the hash set from what data is stored in the data pointer passed. \param data Raw data \param size Raw data size @@ -87,7 +87,7 @@ namespace EQEmu { current_offset_ = *reinterpret_cast(ptr); ptr += sizeof(key_type); - + offsets_ = reinterpret_cast(ptr); ptr += sizeof(key_type) * offset_count_; @@ -135,7 +135,7 @@ namespace EQEmu { elements_ = other.elements_; return *this; } - + //! Returns the number of bytes in the set currently size_type size() const { return size_ - remaining_size_; @@ -150,7 +150,7 @@ namespace EQEmu { key_type max_key() const { return offset_count_ > 0 ? (offset_count_ - 1) : 0; } - + /*! Retrieve value operator \param i Index to retrieve the value from @@ -208,7 +208,7 @@ namespace EQEmu { if(i >= offset_count_) { EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range."); } - + if(size > remaining_size_) { EQ_EXCEPT("Fixed Memory Hash Set", "Not enough room in hash set to insert this value."); } diff --git a/common/guild_base.cpp b/common/guild_base.cpp index 7a97adeba..a5b29ce3e 100644 --- a/common/guild_base.cpp +++ b/common/guild_base.cpp @@ -40,22 +40,22 @@ BaseGuildManager::~BaseGuildManager() { } bool BaseGuildManager::LoadGuilds() { - + ClearGuilds(); - + if(m_db == nullptr) { _log(GUILDS__DB, "Requested to load guilds when we have no database object."); return(false); } - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; map::iterator res; - + // load up all the guilds - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "SELECT id, name, leader, minstatus, motd, motd_setter,channel,url FROM guilds"), errbuf, &result)) { _log(GUILDS__ERROR, "Error loading guilds '%s': %s", query, errbuf); safe_delete_array(query); @@ -66,9 +66,9 @@ bool BaseGuildManager::LoadGuilds() { _CreateGuild(atoi(row[0]), row[1], atoi(row[2]), atoi(row[3]), row[4], row[5], row[6], row[7]); } mysql_free_result(result); - + //load up the rank info for each guild. - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "SELECT guild_id,rank,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks"), errbuf, &result)) { _log(GUILDS__ERROR, "Error loading guild ranks '%s': %s", query, errbuf); safe_delete_array(query); @@ -82,15 +82,15 @@ bool BaseGuildManager::LoadGuilds() { _log(GUILDS__ERROR, "Found invalid (too high) rank %d for guild %d, skipping.", rankn, guild_id); continue; } - + res = m_guilds.find(guild_id); if(res == m_guilds.end()) { _log(GUILDS__ERROR, "Found rank %d for non-existent guild %d, skipping.", rankn, guild_id); continue; } - + RankInfo &rank = res->second->ranks[rankn]; - + rank.name = row[2]; rank.permissions[GUILD_HEAR] = (row[3][0] == '1')?true:false; rank.permissions[GUILD_SPEAK] = (row[4][0] == '1')?true:false; @@ -102,7 +102,7 @@ bool BaseGuildManager::LoadGuilds() { rank.permissions[GUILD_WARPEACE] = (row[10][0] == '1')?true:false; } mysql_free_result(result); - + return(true); } @@ -111,16 +111,16 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) { _log(GUILDS__DB, "Requested to refresh guild %d when we have no database object.", guild_id); return(false); } - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; map::iterator res; GuildInfo *info; - + // load up all the guilds - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "SELECT name, leader, minstatus, motd, motd_setter, channel,url FROM guilds WHERE id=%lu", (unsigned long)guild_id), errbuf, &result)) { _log(GUILDS__ERROR, "Error reloading guilds '%s': %s", query, errbuf); safe_delete_array(query); @@ -135,9 +135,9 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) { return(false); } mysql_free_result(result); - + //load up the rank info for each guild. - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "SELECT guild_id,rank,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace " "FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id), errbuf, &result)) { _log(GUILDS__ERROR, "Error reloading guild ranks '%s': %s", query, errbuf); @@ -145,7 +145,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) { return(false); } safe_delete_array(query); - + while((row = mysql_fetch_row(result))) { uint8 rankn = atoi(row[1]); if(rankn > GUILD_MAX_RANK) { @@ -153,7 +153,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) { continue; } RankInfo &rank = info->ranks[rankn]; - + rank.name = row[2]; rank.permissions[GUILD_HEAR] = (row[3][0] == '1')?true:false; rank.permissions[GUILD_SPEAK] = (row[4][0] == '1')?true:false; @@ -165,23 +165,23 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) { rank.permissions[GUILD_WARPEACE] = (row[10][0] == '1')?true:false; } mysql_free_result(result); - + _log(GUILDS__DB, "Successfully refreshed guild %d from the database.", guild_id); - + return(true); } BaseGuildManager::GuildInfo *BaseGuildManager::_CreateGuild(uint32 guild_id, const char *guild_name, uint32 leader_char_id, uint8 minstatus, const char *guild_motd, const char *motd_setter, const char *Channel, const char *URL) { map::iterator res; - + //remove any old entry. res = m_guilds.find(guild_id); if(res != m_guilds.end()) { delete res->second; m_guilds.erase(res); } - + //make the new entry and store it into the map. GuildInfo *info = new GuildInfo; info->name = guild_name; @@ -192,7 +192,7 @@ BaseGuildManager::GuildInfo *BaseGuildManager::_CreateGuild(uint32 guild_id, con info->url = URL; info->channel = Channel; m_guilds[guild_id] = info; - + //now setup default ranks (everything defaults to false) info->ranks[0].name = "Member"; info->ranks[0].permissions[GUILD_HEAR] = true; @@ -212,7 +212,7 @@ BaseGuildManager::GuildInfo *BaseGuildManager::_CreateGuild(uint32 guild_id, con info->ranks[2].permissions[GUILD_DEMOTE] = true; info->ranks[2].permissions[GUILD_MOTD] = true; info->ranks[2].permissions[GUILD_WARPEACE] = true; - + return(info); } @@ -221,7 +221,7 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) { _log(GUILDS__DB, "Requested to store guild %d when we have no database object.", guild_id); return(false); } - + map::const_iterator res; res = m_guilds.find(guild_id); if(res == m_guilds.end()) { @@ -229,26 +229,26 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) { return(false); } GuildInfo *info = res->second; - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //clear out old `guilds` entry - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guilds WHERE id=%lu", (unsigned long)guild_id), errbuf)) { _log(GUILDS__ERROR, "Error clearing old guild record when storing %d '%s': %s", guild_id, query, errbuf); } safe_delete_array(query); - + //clear out old `guild_ranks` entries - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id), errbuf)) { _log(GUILDS__ERROR, "Error clearing old guild_ranks records when storing %d '%s': %s", guild_id, query, errbuf); } safe_delete_array(query); - + //escape our strings. char *name_esc = new char[info->name.length()*2+1]; char *motd_esc = new char[info->motd.length()*2+1]; @@ -256,10 +256,10 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) { m_db->DoEscapeString(name_esc, info->name.c_str(), info->name.length()); m_db->DoEscapeString(motd_esc, info->motd.c_str(), info->motd.length()); m_db->DoEscapeString(motd_set_esc, info->motd_setter.c_str(), info->motd_setter.length()); - + //insert the new `guilds` entry - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "INSERT INTO guilds (id,name,leader,minstatus,motd,motd_setter) VALUES(%lu,'%s',%lu,%d,'%s', '%s')", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "INSERT INTO guilds (id,name,leader,minstatus,motd,motd_setter) VALUES(%lu,'%s',%lu,%d,'%s', '%s')", (unsigned long)guild_id, name_esc, (unsigned long)info->leader_char_id, info->minstatus, motd_esc, motd_set_esc), errbuf)) { _log(GUILDS__ERROR, "Error inserting new guild record when storing %d. Giving up. '%s': %s", guild_id, query, errbuf); @@ -273,16 +273,16 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) { safe_delete_array(name_esc); safe_delete_array(motd_esc); safe_delete_array(motd_set_esc); - + //now insert the new ranks uint8 rank; for(rank = 0; rank <= GUILD_MAX_RANK; rank++) { const RankInfo &r = info->ranks[rank]; - + char *title_esc = new char[r.name.length()*2+1]; m_db->DoEscapeString(title_esc, r.name.c_str(), r.name.length()); - - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "INSERT INTO guild_ranks (guild_id,rank,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace)" " VALUES(%d,%d,'%s',%d,%d,%d,%d,%d,%d,%d,%d)", guild_id, rank, title_esc, @@ -303,9 +303,9 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) { safe_delete_array(query); safe_delete_array(title_esc); } - + _log(GUILDS__DB, "Stored guild %d in the database", guild_id); - + return(true); } @@ -314,18 +314,18 @@ uint32 BaseGuildManager::_GetFreeGuildID() { _log(GUILDS__DB, "Requested find a free guild ID when we have no database object."); return(GUILD_NONE); } - + char errbuf[MYSQL_ERRMSG_SIZE]; char query[100]; MYSQL_RES *result; - + //this has got to be one of the more retarded things I have seen. //none the less, im too lazy to rewrite it right now. - + uint16 x; for (x = 1; x < MAX_NUMBER_GUILDS; x++) { snprintf(query, 100, "SELECT id FROM guilds where id=%i;", x); - + if (m_db->RunQuery(query, strlen(query), errbuf, &result)) { if (mysql_num_rows(result) == 0) { mysql_free_result(result); @@ -338,39 +338,39 @@ uint32 BaseGuildManager::_GetFreeGuildID() { LogFile->write(EQEMuLog::Error, "Error in _GetFreeGuildID query '%s': %s", query, errbuf); } } - + _log(GUILDS__ERROR, "Unable to find a free guild ID when requested."); return GUILD_NONE; } - + uint32 BaseGuildManager::CreateGuild(const char* name, uint32 leader_char_id) { uint32 gid = DBCreateGuild(name, leader_char_id); if(gid == GUILD_NONE) return(GUILD_NONE); - + SendGuildRefresh(gid, true, false, false, false); SendCharRefresh(GUILD_NONE, gid, leader_char_id); - + return(gid); } bool BaseGuildManager::DeleteGuild(uint32 guild_id) { if(!DBDeleteGuild(guild_id)) return(false); - + SendGuildDelete(guild_id); - + return(true); } bool BaseGuildManager::RenameGuild(uint32 guild_id, const char* name) { if(!DBRenameGuild(guild_id, name)) return(false); - + SendGuildRefresh(guild_id, true, false, false, false); - + return(true); } @@ -382,23 +382,23 @@ bool BaseGuildManager::SetGuildLeader(uint32 guild_id, uint32 leader_char_id) { return(false); GuildInfo *info = res->second; uint32 old_leader = info->leader_char_id; - + if(!DBSetGuildLeader(guild_id, leader_char_id)) return(false); - + SendGuildRefresh(guild_id, false, false, false, false); SendCharRefresh(GUILD_NONE, guild_id, old_leader); SendCharRefresh(GUILD_NONE, guild_id, leader_char_id); - + return(true); } bool BaseGuildManager::SetGuildMOTD(uint32 guild_id, const char* motd, const char *setter) { if(!DBSetGuildMOTD(guild_id, motd, setter)) return(false); - + SendGuildRefresh(guild_id, false, true, false, false); - + return(true); } @@ -406,9 +406,9 @@ bool BaseGuildManager::SetGuildURL(uint32 GuildID, const char* URL) { if(!DBSetGuildURL(GuildID, URL)) return(false); - + SendGuildRefresh(GuildID, false, true, false, false); - + return(true); } @@ -416,28 +416,28 @@ bool BaseGuildManager::SetGuildChannel(uint32 GuildID, const char* Channel) { if(!DBSetGuildChannel(GuildID, Channel)) return(false); - + SendGuildRefresh(GuildID, false, true, false, false); - + return(true); } bool BaseGuildManager::SetGuild(uint32 charid, uint32 guild_id, uint8 rank) { if(rank > GUILD_MAX_RANK && guild_id != GUILD_NONE) return(false); - + //lookup their old guild, if they had one. uint32 old_guild = GUILD_NONE; CharGuildInfo gci; if(GetCharInfo(charid, gci)) { old_guild = gci.guild_id; } - + if(!DBSetGuild(charid, guild_id, rank)) return(false); - + SendCharRefresh(old_guild, guild_id, charid); - + return(true); } @@ -445,12 +445,12 @@ bool BaseGuildManager::SetGuild(uint32 charid, uint32 guild_id, uint8 rank) { bool BaseGuildManager::SetGuildRank(uint32 charid, uint8 rank) { if(rank > GUILD_MAX_RANK) return(false); - + if(!DBSetGuildRank(charid, rank)) return(false); - + SendCharRefresh(GUILD_NONE, 0, charid); - + return(true); } @@ -458,9 +458,9 @@ bool BaseGuildManager::SetGuildRank(uint32 charid, uint8 rank) { bool BaseGuildManager::SetBankerFlag(uint32 charid, bool is_banker) { if(!DBSetBankerFlag(charid, is_banker)) return(false); - + SendRankUpdate(charid); - + return(true); } @@ -468,7 +468,7 @@ bool BaseGuildManager::SetAltFlag(uint32 charid, bool is_alt) { if(!DBSetAltFlag(charid, is_alt)) return(false); - + SendRankUpdate(charid); return(true); @@ -477,18 +477,18 @@ bool BaseGuildManager::SetAltFlag(uint32 charid, bool is_alt) bool BaseGuildManager::SetTributeFlag(uint32 charid, bool enabled) { if(!DBSetTributeFlag(charid, enabled)) return(false); - + SendCharRefresh(GUILD_NONE, 0, charid); - + return(true); } bool BaseGuildManager::SetPublicNote(uint32 charid, const char *note) { if(!DBSetPublicNote(charid, note)) return(false); - + SendCharRefresh(GUILD_NONE, 0, charid); - + return(true); } @@ -497,24 +497,24 @@ uint32 BaseGuildManager::DBCreateGuild(const char* name, uint32 leader) { uint32 new_id = _GetFreeGuildID(); if(new_id == GUILD_NONE) return(GUILD_NONE); - + //now make the guild record in our local manager. //this also sets up the default ranks for us. _CreateGuild(new_id, name, leader, 0, "", "", "", ""); - + //now store the resulting guild setup into the DB. if(!_StoreGuildDB(new_id)) { _log(GUILDS__ERROR, "Error storing new guild. It may have been partially created which may need manual removal."); return(GUILD_NONE); } - + _log(GUILDS__DB, "Created guild %d in the database.", new_id); - + return(new_id); } bool BaseGuildManager::DBDeleteGuild(uint32 guild_id) { - + //remove the local entry map::iterator res; res = m_guilds.find(guild_id); @@ -522,32 +522,32 @@ bool BaseGuildManager::DBDeleteGuild(uint32 guild_id) { delete res->second; m_guilds.erase(res); } - + if(m_db == nullptr) { _log(GUILDS__DB, "Requested to delete guild %d when we have no database object.", guild_id); return(false); } - + char *query = 0; - + //clear out old `guilds` entry - _RunQuery(query, MakeAnyLenString(&query, + _RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guilds WHERE id=%lu", (unsigned long)guild_id), "clearing old guild record"); - + //clear out old `guild_ranks` entries - _RunQuery(query, MakeAnyLenString(&query, + _RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id), "clearing old guild_ranks records"); - + //clear out people belonging to this guild. - _RunQuery(query, MakeAnyLenString(&query, + _RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guild_members WHERE guild_id=%lu", (unsigned long)guild_id), "clearing chars in guild"); - + // Delete the guild bank - _RunQuery(query, MakeAnyLenString(&query, + _RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guild_bank WHERE guildid=%lu", (unsigned long)guild_id), "deleting guild bank"); - + _log(GUILDS__DB, "Deleted guild %d from the database.", guild_id); - + return(true); } @@ -556,24 +556,24 @@ bool BaseGuildManager::DBRenameGuild(uint32 guild_id, const char* name) { _log(GUILDS__DB, "Requested to rename guild %d when we have no database object.", guild_id); return(false); } - + map::const_iterator res; res = m_guilds.find(guild_id); if(res == m_guilds.end()) return(false); GuildInfo *info = res->second; - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //escape our strings. uint32 len = strlen(name); char *esc = new char[len*2+1]; m_db->DoEscapeString(esc, name, len); - + //insert the new `guilds` entry - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "UPDATE guilds SET name='%s' WHERE id=%d", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "UPDATE guilds SET name='%s' WHERE id=%d", esc, guild_id), errbuf)) { _log(GUILDS__ERROR, "Error renaming guild %d '%s': %s", guild_id, query, errbuf); @@ -583,11 +583,11 @@ bool BaseGuildManager::DBRenameGuild(uint32 guild_id, const char* name) { } safe_delete_array(query); safe_delete_array(esc); - + _log(GUILDS__DB, "Renamed guild %s (%d) to %s in database.", info->name.c_str(), guild_id, name); - + info->name = name; //update our local record. - + return(true); } @@ -596,19 +596,19 @@ bool BaseGuildManager::DBSetGuildLeader(uint32 guild_id, uint32 leader) { _log(GUILDS__DB, "Requested to set the leader for guild %d when we have no database object.", guild_id); return(false); } - + map::const_iterator res; res = m_guilds.find(guild_id); if(res == m_guilds.end()) return(false); GuildInfo *info = res->second; - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //insert the new `guilds` entry - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "UPDATE guilds SET leader='%d' WHERE id=%d", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "UPDATE guilds SET leader='%d' WHERE id=%d", leader, guild_id), errbuf)) { _log(GUILDS__ERROR, "Error changing leader on guild %d '%s': %s", guild_id, query, errbuf); @@ -616,18 +616,18 @@ bool BaseGuildManager::DBSetGuildLeader(uint32 guild_id, uint32 leader) { return(false); } safe_delete_array(query); - + //set the old leader to officer if(!DBSetGuildRank(info->leader_char_id, GUILD_OFFICER)) return(false); //set the new leader to leader if(!DBSetGuildRank(leader, GUILD_LEADER)) return(false); - + _log(GUILDS__DB, "Set guild leader for guild %d to %d in the database", guild_id, leader); - + info->leader_char_id = leader; //update our local record. - + return(true); } @@ -636,16 +636,16 @@ bool BaseGuildManager::DBSetGuildMOTD(uint32 guild_id, const char* motd, const c _log(GUILDS__DB, "Requested to set the MOTD for guild %d when we have no database object.", guild_id); return(false); } - + map::const_iterator res; res = m_guilds.find(guild_id); if(res == m_guilds.end()) return(false); GuildInfo *info = res->second; - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //escape our strings. uint32 len = strlen(motd); uint32 len2 = strlen(setter); @@ -653,10 +653,10 @@ bool BaseGuildManager::DBSetGuildMOTD(uint32 guild_id, const char* motd, const c char *esc_set = new char[len2*2+1]; m_db->DoEscapeString(esc, motd, len); m_db->DoEscapeString(esc_set, setter, len2); - + //insert the new `guilds` entry - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "UPDATE guilds SET motd='%s',motd_setter='%s' WHERE id=%d", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "UPDATE guilds SET motd='%s',motd_setter='%s' WHERE id=%d", esc, esc_set, guild_id), errbuf)) { _log(GUILDS__ERROR, "Error setting MOTD for guild %d '%s': %s", guild_id, query, errbuf); @@ -668,12 +668,12 @@ bool BaseGuildManager::DBSetGuildMOTD(uint32 guild_id, const char* motd, const c safe_delete_array(query); safe_delete_array(esc); safe_delete_array(esc_set); - + _log(GUILDS__DB, "Set MOTD for guild %d in the database", guild_id); - + info->motd = motd; //update our local record. info->motd_setter = setter; //update our local record. - + return(true); } @@ -681,7 +681,7 @@ bool BaseGuildManager::DBSetGuildURL(uint32 GuildID, const char* URL) { if(m_db == nullptr) return(false); - + map::const_iterator res; res = m_guilds.find(GuildID); @@ -690,17 +690,17 @@ bool BaseGuildManager::DBSetGuildURL(uint32 GuildID, const char* URL) return(false); GuildInfo *info = res->second; - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //escape our strings. uint32 len = strlen(URL); char *esc = new char[len*2+1]; m_db->DoEscapeString(esc, URL, len); - + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "UPDATE guilds SET url='%s' WHERE id=%d", esc, GuildID), errbuf)) { _log(GUILDS__ERROR, "Error setting URL for guild %d '%s': %s", GuildID, query, errbuf); @@ -710,11 +710,11 @@ bool BaseGuildManager::DBSetGuildURL(uint32 GuildID, const char* URL) } safe_delete_array(query); safe_delete_array(esc); - + _log(GUILDS__DB, "Set URL for guild %d in the database", GuildID); - + info->url = URL; //update our local record. - + return(true); } @@ -722,7 +722,7 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel) { if(m_db == nullptr) return(false); - + map::const_iterator res; res = m_guilds.find(GuildID); @@ -731,17 +731,17 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel) return(false); GuildInfo *info = res->second; - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //escape our strings. uint32 len = strlen(Channel); char *esc = new char[len*2+1]; m_db->DoEscapeString(esc, Channel, len); - + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "UPDATE guilds SET channel='%s' WHERE id=%d", esc, GuildID), errbuf)) { _log(GUILDS__ERROR, "Error setting Channel for guild %d '%s': %s", GuildID, query, errbuf); @@ -751,11 +751,11 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel) } safe_delete_array(query); safe_delete_array(esc); - + _log(GUILDS__DB, "Set Channel for guild %d in the database", GuildID); - + info->channel = Channel; //update our local record. - + return(true); } @@ -764,13 +764,13 @@ bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) { _log(GUILDS__DB, "Requested to set char to guild %d when we have no database object.", guild_id); return(false); } - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if(guild_id != GUILD_NONE) { - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "REPLACE INTO guild_members (char_id,guild_id,rank) VALUES(%d,%d,%d)", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "REPLACE INTO guild_members (char_id,guild_id,rank) VALUES(%d,%d,%d)", charid, guild_id, rank), errbuf)) { _log(GUILDS__ERROR, "Error Changing char %d to guild %d '%s': %s", charid, guild_id, query, errbuf); @@ -778,8 +778,8 @@ bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) { return(false); } } else { - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "DELETE FROM guild_members WHERE char_id=%d", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "DELETE FROM guild_members WHERE char_id=%d", charid), errbuf)) { _log(GUILDS__ERROR, "Error removing char %d from guild '%s': %s", charid, guild_id, query, errbuf); @@ -788,23 +788,23 @@ bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) { } } safe_delete_array(query); - + _log(GUILDS__DB, "Set char %d to guild %d and rank %d in the database.", charid, guild_id, rank); - + return(true); } bool BaseGuildManager::DBSetGuildRank(uint32 charid, uint8 rank) { char *query = 0; - return(_RunQuery(query, MakeAnyLenString(&query, - "UPDATE guild_members SET rank=%d WHERE char_id=%d", + return(_RunQuery(query, MakeAnyLenString(&query, + "UPDATE guild_members SET rank=%d WHERE char_id=%d", rank, charid), "setting a guild member's rank")); } bool BaseGuildManager::DBSetBankerFlag(uint32 charid, bool is_banker) { char *query = 0; - return(_RunQuery(query, MakeAnyLenString(&query, - "UPDATE guild_members SET banker=%d WHERE char_id=%d", + return(_RunQuery(query, MakeAnyLenString(&query, + "UPDATE guild_members SET banker=%d WHERE char_id=%d", is_banker?1:0, charid), "setting a guild member's banker flag")); } @@ -830,7 +830,7 @@ bool BaseGuildManager::GetBankerFlag(uint32 CharID) safe_delete_array(query); if(mysql_num_rows(result) != 1) - return false; + return false; row = mysql_fetch_row(result); @@ -845,8 +845,8 @@ bool BaseGuildManager::DBSetAltFlag(uint32 charid, bool is_alt) { char *query = 0; - return(_RunQuery(query, MakeAnyLenString(&query, - "UPDATE guild_members SET alt=%d WHERE char_id=%d", + return(_RunQuery(query, MakeAnyLenString(&query, + "UPDATE guild_members SET alt=%d WHERE char_id=%d", is_alt?1:0, charid), "setting a guild member's alt flag")); } @@ -872,7 +872,7 @@ bool BaseGuildManager::GetAltFlag(uint32 CharID) safe_delete_array(query); if(mysql_num_rows(result) != 1) - return false; + return false; row = mysql_fetch_row(result); @@ -885,26 +885,26 @@ bool BaseGuildManager::GetAltFlag(uint32 CharID) bool BaseGuildManager::DBSetTributeFlag(uint32 charid, bool enabled) { char *query = 0; - return(_RunQuery(query, MakeAnyLenString(&query, - "UPDATE guild_members SET tribute_enable=%d WHERE char_id=%d", + return(_RunQuery(query, MakeAnyLenString(&query, + "UPDATE guild_members SET tribute_enable=%d WHERE char_id=%d", enabled?1:0, charid), "setting a guild member's tribute flag")); } bool BaseGuildManager::DBSetPublicNote(uint32 charid, const char* note) { if(m_db == nullptr) return(false); - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //escape our strings. uint32 len = strlen(note); char *esc = new char[len*2+1]; m_db->DoEscapeString(esc, note, len); - + //insert the new `guilds` entry - if (!m_db->RunQuery(query, MakeAnyLenString(&query, - "UPDATE guild_members SET public_note='%s' WHERE char_id=%d", + if (!m_db->RunQuery(query, MakeAnyLenString(&query, + "UPDATE guild_members SET public_note='%s' WHERE char_id=%d", esc, charid), errbuf)) { _log(GUILDS__ERROR, "Error setting public note for char %d '%s': %s", charid, query, errbuf); @@ -914,18 +914,18 @@ bool BaseGuildManager::DBSetPublicNote(uint32 charid, const char* note) { } safe_delete_array(query); safe_delete_array(esc); - + _log(GUILDS__DB, "Set public not for char %d", charid); - + return(true); } bool BaseGuildManager::_RunQuery(char *&query, int len, const char *errmsg) { if(m_db == nullptr) return(false); - + char errbuf[MYSQL_ERRMSG_SIZE]; - + if (!m_db->RunQuery(query, len, errbuf)) { _log(GUILDS__ERROR, "Error %s: '%s': %s", errmsg, query, errbuf); @@ -933,7 +933,7 @@ bool BaseGuildManager::_RunQuery(char *&query, int len, const char *errmsg) { return(false); } safe_delete_array(query); - + return(true); } @@ -959,7 +959,7 @@ static void ProcessGuildMember(MYSQL_ROW &row, CharGuildInfo &into) { into.level = atoi(row[3]); into.time_last_on = atoul(row[4]); into.zone_id = atoi(row[5]); - + //fields from `guild_members`, leave at defaults if missing into.guild_id = row[6] ? atoi(row[6]) : GUILD_NONE; into.rank = row[7] ? atoi(row[7]) : (GUILD_MAX_RANK+1); @@ -969,7 +969,7 @@ static void ProcessGuildMember(MYSQL_ROW &row, CharGuildInfo &into) { into.banker = row[11]? (row[11][0] == '0'?false:true) : false; into.public_note = row[12]? row[12] : ""; into.alt = row[13]? (row[13][0] == '0'?false:true) : false; - + //a little sanity checking/cleanup if(into.guild_id == 0) into.guild_id = GUILD_NONE; @@ -980,17 +980,17 @@ static void ProcessGuildMember(MYSQL_ROW &row, CharGuildInfo &into) { bool BaseGuildManager::GetEntireGuild(uint32 guild_id, vector &members) { members.clear(); - + if(m_db == nullptr) return(false); - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + //load up the rank info for each guild. - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, GuildMemberBaseQuery " WHERE g.guild_id=%d", guild_id ), errbuf, &result)) { _log(GUILDS__ERROR, "Error loading guild member list '%s': %s", query, errbuf); @@ -998,16 +998,16 @@ bool BaseGuildManager::GetEntireGuild(uint32 guild_id, vector & return(false); } safe_delete_array(query); - + while ((row = mysql_fetch_row(result))) { CharGuildInfo *ci = new CharGuildInfo; ProcessGuildMember(row, *ci); members.push_back(ci); } mysql_free_result(result); - + _log(GUILDS__DB, "Retreived entire guild member list for guild %d from the database", guild_id); - + return(true); } @@ -1016,19 +1016,19 @@ bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) { _log(GUILDS__DB, "Requested char info on %s when we have no database object.", char_name); return(false); } - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + //escape our strings. uint32 nl = strlen(char_name); char *esc = new char[nl*2+1]; m_db->DoEscapeString(esc, char_name, nl); - + //load up the rank info for each guild. - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, GuildMemberBaseQuery " WHERE c.name='%s'", esc ), errbuf, &result)) { _log(GUILDS__ERROR, "Error loading guild member '%s': %s", query, errbuf); @@ -1038,7 +1038,7 @@ bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) { } safe_delete_array(query); safe_delete_array(esc); - + bool ret = true; if ((row = mysql_fetch_row(result))) { ProcessGuildMember(row, into); @@ -1047,10 +1047,10 @@ bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) { ret = true; } mysql_free_result(result); - + return(ret); - - + + } bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) { @@ -1058,14 +1058,14 @@ bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) { _log(GUILDS__DB, "Requested char info on %d when we have no database object.", char_id); return(false); } - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + //load up the rank info for each guild. - if (!m_db->RunQuery(query, MakeAnyLenString(&query, + if (!m_db->RunQuery(query, MakeAnyLenString(&query, #ifdef BOTS GuildMemberBaseQuery " WHERE c.id=%d AND c.mobtype = 'C'", char_id #else @@ -1077,7 +1077,7 @@ bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) { return(false); } safe_delete_array(query); - + bool ret = true; if ((row = mysql_fetch_row(result))) { ProcessGuildMember(row, into); @@ -1086,18 +1086,18 @@ bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) { ret = true; } mysql_free_result(result); - + return(ret); - + } //returns ownership of the buffer. uint8 *BaseGuildManager::MakeGuildList(const char *head_name, uint32 &length) const { //dynamic structs will make this a lot less painful. - + length = sizeof(GuildsList_Struct); uint8 *buffer = new uint8[length]; - + //a bit little better than memsetting the whole thing... uint32 r,pos; for(r = 0, pos = 0; r <= MAX_NUMBER_GUILDS; r++, pos += 64) { @@ -1106,9 +1106,9 @@ uint8 *BaseGuildManager::MakeGuildList(const char *head_name, uint32 &length) co // so just fill unused entries with an empty string instead. buffer[pos] = '\0'; } - + strn0cpy((char *) buffer, head_name, 64); - + map::const_iterator cur, end; cur = m_guilds.begin(); end = m_guilds.end(); @@ -1170,7 +1170,7 @@ bool BaseGuildManager::GetGuildMOTD(uint32 guild_id, char *motd_buffer, char *se strn0cpy(setter_buffer, res->second->motd_setter.c_str(), 64); return(true); } - + bool BaseGuildManager::GetGuildURL(uint32 GuildID, char *URLBuffer) const { map::const_iterator res; @@ -1181,7 +1181,7 @@ bool BaseGuildManager::GetGuildURL(uint32 GuildID, char *URLBuffer) const return(true); } - + bool BaseGuildManager::GetGuildChannel(uint32 GuildID, char *ChannelBuffer) const { map::const_iterator res; @@ -1191,7 +1191,7 @@ bool BaseGuildManager::GetGuildChannel(uint32 GuildID, char *ChannelBuffer) cons strn0cpy(ChannelBuffer, res->second->channel.c_str(), 128); return(true); } - + bool BaseGuildManager::GuildExists(uint32 guild_id) const { if(guild_id == GUILD_NONE) return(false); @@ -1242,19 +1242,19 @@ bool BaseGuildManager::CheckGMStatus(uint32 guild_id, uint8 status) const { _log(GUILDS__PERMISSIONS, "Check permission on guild %d with user status %d > 250, granted.", guild_id, status); return(true); //250+ as allowed anything } - + map::const_iterator res; res = m_guilds.find(guild_id); if(res == m_guilds.end()) { _log(GUILDS__PERMISSIONS, "Check permission on guild %d with user status %d, no such guild, denied.", guild_id, status); return(false); //invalid guild } - + bool granted = (res->second->minstatus <= status); - - _log(GUILDS__PERMISSIONS, "Check permission on guild %s (%d) with user status %d. Min status %d: %s", + + _log(GUILDS__PERMISSIONS, "Check permission on guild %s (%d) with user status %d. Min status %d: %s", res->second->name.c_str(), guild_id, status, res->second->minstatus, granted?"granted":"denied"); - + return(granted); } @@ -1271,15 +1271,15 @@ bool BaseGuildManager::CheckPermission(uint32 guild_id, uint8 rank, GuildAction guild_id, rank, GuildActionNames[act], act); return(false); //invalid guild } - + bool granted = res->second->ranks[rank].permissions[act]; - + _log(GUILDS__PERMISSIONS, "Check permission on guild %s (%d) and rank %s (%d) for action %s (%d): %s", - res->second->name.c_str(), guild_id, - res->second->ranks[rank].name.c_str(), rank, - GuildActionNames[act], act, + res->second->name.c_str(), guild_id, + res->second->ranks[rank].name.c_str(), rank, + GuildActionNames[act], act, granted?"granted":"denied"); - + return(granted); } @@ -1318,7 +1318,7 @@ uint32 BaseGuildManager::DoesAccountContainAGuildLeader(uint32 AccountID) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - + if (!m_db->RunQuery(query, MakeAnyLenString(&query, "select guild_id from guild_members where char_id in (select id from character_ where account_id = %i) and rank = 2", @@ -1329,10 +1329,10 @@ uint32 BaseGuildManager::DoesAccountContainAGuildLeader(uint32 AccountID) return 0; } safe_delete_array(query); - + uint32 Rows = mysql_num_rows(result); mysql_free_result(result); - + return Rows; } @@ -1345,7 +1345,7 @@ bool Database::LoadGuilds(GuildRanks_Struct* guilds) { // int i; MYSQL_RES *result; MYSQL_ROW row; - + for (int a = 0; a < 512; a++) { guilds[a].leader = 0; guilds[a].databaseID = 0; @@ -1376,7 +1376,7 @@ bool Database::LoadGuilds(GuildRanks_Struct* guilds) { Sleep(0); } - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, eqid, name, leader, minstatus, rank0title, rank1, rank1title, rank2, rank2title, rank3, rank3title, rank4, rank4title, rank5, rank5title from guilds"), errbuf, &result)) { safe_delete_array(query); @@ -1422,7 +1422,7 @@ bool Database::LoadGuilds(GuildRanks_Struct* guilds) { guilds[guildeqid].rank[i].motd = 0; guilds[guildeqid].rank[i].warpeace = 0; } - + if (guilds[guildeqid].rank[i].rankname[0] == 0) snprintf(guilds[guildeqid].rank[i].rankname, 100, "Guild Rank %i", i); } @@ -1438,7 +1438,7 @@ bool Database::LoadGuilds(GuildRanks_Struct* guilds) { safe_delete_array(query); return false; } - + return false; } @@ -1462,7 +1462,7 @@ bool Database::GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, eqid, name, leader, minstatus, rank0title, rank1, rank1title, rank2, rank2title, rank3, rank3title, rank4, rank4title, rank5, rank5title from guilds where eqid=%i;", guildeqid), errbuf, &result)) { safe_delete_array(query); @@ -1504,7 +1504,7 @@ bool Database::GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr) { gr->rank[i].motd = 0; gr->rank[i].warpeace = 0; } - + if (gr->rank[i].rankname[0] == 0) snprintf(gr->rank[i].rankname, 100, "Guild Rank %i", i); } @@ -1547,7 +1547,7 @@ bool Database::GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr) { safe_delete_array(query); return false; } - + return false; } diff --git a/common/guild_base.h b/common/guild_base.h index 0b3e2269e..f27afb3d0 100644 --- a/common/guild_base.h +++ b/common/guild_base.h @@ -17,7 +17,7 @@ public: uint16 level; uint32 time_last_on; uint32 zone_id; - + //fields from `guild_members` uint32 guild_id; uint8 rank; @@ -34,13 +34,13 @@ class BaseGuildManager { public: BaseGuildManager(); virtual ~BaseGuildManager(); - + //this must be called before doing anything else with this object void SetDatabase(Database *db) { m_db = db; } - + bool LoadGuilds(); bool RefreshGuild(uint32 guild_id); - + //guild edit actions. uint32 CreateGuild(const char* name, uint32 leader_char_id); bool DeleteGuild(uint32 guild_id); @@ -48,7 +48,7 @@ public: bool SetGuildMOTD(uint32 guild_id, const char* motd, const char *setter); bool SetGuildURL(uint32 GuildID, const char* URL); bool SetGuildChannel(uint32 GuildID, const char* Channel); - + //character edit actions bool SetGuildLeader(uint32 guild_id, uint32 leader_char_id); bool SetGuild(uint32 charid, uint32 guild_id, uint8 rank); @@ -59,7 +59,7 @@ public: bool GetBankerFlag(uint32 CharID); bool SetTributeFlag(uint32 charid, bool enabled); bool SetPublicNote(uint32 charid, const char *note); - + //queries bool GetCharInfo(const char *char_name, CharGuildInfo &into); bool GetCharInfo(uint32 char_id, CharGuildInfo &into); @@ -82,19 +82,19 @@ public: uint32 NumberInGuild(uint32 guild_id); // bool GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr); // bool EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* grl); - + uint8 *MakeGuildList(const char *head_name, uint32 &length) const; //make a guild list packet, returns ownership of the buffer. - + static const char *const GuildActionNames[_MaxGuildAction]; uint32 DoesAccountContainAGuildLeader(uint32 AccountID); - + protected: //the methods which must be defined by base classes. virtual void SendGuildRefresh(uint32 guild_id, bool name, bool motd, bool rank, bool relation) = 0; virtual void SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uint32 charid) = 0; virtual void SendRankUpdate(uint32 CharID) = 0; virtual void SendGuildDelete(uint32 guild_id) = 0; - + uint32 DBCreateGuild(const char* name, uint32 leader_char_id); bool DBDeleteGuild(uint32 guild_id); bool DBRenameGuild(uint32 guild_id, const char* name); @@ -110,9 +110,9 @@ protected: bool DBSetPublicNote(uint32 charid, const char *note); bool _RunQuery(char *&query, int len, const char *errmsg); // void DBSetPublicNote(uint32 guild_id,char* charname, char* note); - + bool LocalDeleteGuild(uint32 guild_id); - + class RankInfo { public: RankInfo(); @@ -133,12 +133,12 @@ protected: //tribute is not in here on purpose, since it is only valid in world! RankInfo ranks[GUILD_MAX_RANK+1]; }; - + std::map m_guilds; //we own the pointers in this map void ClearGuilds(); //clears internal structure - + Database *m_db; //we do not own this - + bool _StoreGuildDB(uint32 guild_id); GuildInfo *_CreateGuild(uint32 guild_id, const char *guild_name, uint32 account_id, uint8 minstatus, const char *guild_motd, const char *motd_setter, const char *Channel, const char *URL); uint32 _GetFreeGuildID(); diff --git a/common/guilds.cpp b/common/guilds.cpp index 83dd147d2..3e15c3307 100644 --- a/common/guilds.cpp +++ b/common/guilds.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -63,7 +63,7 @@ uint32 Database::NumberInGuild(uint32 guild_id) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "Select count(id) from character_ where guild=%i", guild_id), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) { @@ -85,7 +85,7 @@ bool Database::SetGuild(char* name, uint32 guild_id, uint8 guildrank) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET guild=%i, guildrank=%i WHERE name='%s'", guild_id, guildrank, name), errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) @@ -105,7 +105,7 @@ bool Database::SetGuild(uint32 charid, uint32 guild_id, uint8 guildrank) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET guild=%i, guildrank=%i WHERE id=%i", guild_id, guildrank, charid), errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) @@ -119,7 +119,7 @@ bool Database::SetGuild(uint32 charid, uint32 guild_id, uint8 guildrank) { safe_delete_array(query); return false; } - + return false; } @@ -129,7 +129,7 @@ bool Database::DeleteGuild(uint32 guild_id) char *query = 0; char *query2 = 0; uint32 affected_rows = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "DELETE FROM guilds WHERE id=%i;", guild_id), errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) { @@ -146,7 +146,7 @@ bool Database::DeleteGuild(uint32 guild_id) safe_delete_array(query); return false; } - + return false; } @@ -156,7 +156,7 @@ bool Database::RenameGuild(uint32 guild_id, const char* name) { uint32 affected_rows = 0; char buf[65]; DoEscapeString(buf, name, strlen(name)) ; - + if (RunQuery(query, MakeAnyLenString(&query, "Update guilds set name='%s' WHERE id=%i;", buf, guild_id), errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) @@ -169,7 +169,7 @@ bool Database::RenameGuild(uint32 guild_id, const char* name) { safe_delete_array(query); return false; } - + return false; } @@ -192,12 +192,12 @@ bool Database::EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* buf2[GUILD_DEMOTE] = grl->demote + '0'; buf2[GUILD_MOTD] = grl->motd + '0'; buf2[GUILD_WARPEACE] = grl->warpeace + '0'; - + if (ranknum == 0) chars = MakeAnyLenString(&query, "Update guilds set rank%ititle='%s' WHERE id=%i;", ranknum, buf, guild_id); else chars = MakeAnyLenString(&query, "Update guilds set rank%ititle='%s', rank%i='%s' WHERE id=%i;", ranknum, buf, ranknum, buf2, guild_id); - + if (RunQuery(query, chars, errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) @@ -210,7 +210,7 @@ bool Database::EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* safe_delete_array(query); return false; } - + return false; } @@ -219,8 +219,8 @@ bool Database::GetGuildNameByID(uint32 guild_id, char * name) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - MYSQL_ROW row; - + MYSQL_ROW row; + if (RunQuery(query, MakeAnyLenString(&query, "select name from guilds where id='%i'", guild_id), errbuf, &result)) { safe_delete_array(query); row = mysql_fetch_row(result); @@ -234,7 +234,7 @@ bool Database::GetGuildNameByID(uint32 guild_id, char * name) { safe_delete_array(query); return false; } - + return false; } @@ -244,7 +244,7 @@ uint32 Database::GetGuildIDbyLeader(uint32 leader) char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM guilds WHERE leader=%i", leader), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) @@ -260,7 +260,7 @@ uint32 Database::GetGuildIDbyLeader(uint32 leader) LogFile->write(EQEMuLog::Error, "Error in Getguild_idbyLeader query '%s': %s", query, errbuf); safe_delete_array(query); } - + return 0; } @@ -269,7 +269,7 @@ bool Database::SetGuildLeader(uint32 guild_id, uint32 leader) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "UPDATE guilds SET leader=%i WHERE id=%i", leader, guild_id), errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) @@ -282,7 +282,7 @@ bool Database::SetGuildLeader(uint32 guild_id, uint32 leader) safe_delete_array(query); return false; } - + return false; } @@ -291,11 +291,11 @@ bool Database::SetGuildMOTD(uint32 guild_id, const char* motd) { char *query = 0; char* motdbuf = 0; uint32 affected_rows = 0; - + motdbuf = new char[(strlen(motd)*2)+3]; DoEscapeString(motdbuf, motd, strlen(motd)) ; - + if (RunQuery(query, MakeAnyLenString(&query, "Update guilds set motd='%s' WHERE id=%i;", motdbuf, guild_id), errbuf, 0, &affected_rows)) { safe_delete_array(query); delete motdbuf; @@ -311,7 +311,7 @@ bool Database::SetGuildMOTD(uint32 guild_id, const char* motd) { delete motdbuf; return false; } - + return false; } diff --git a/common/ipc_mutex.h b/common/ipc_mutex.h index 1e11325a6..41e1f1731 100644 --- a/common/ipc_mutex.h +++ b/common/ipc_mutex.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -22,10 +22,10 @@ #include namespace EQEmu { - + //! Interprocess Named Binary Semaphore (Mutex) /*! - Important to note: while this can be used to synchronize processes, it is not in itself re-entrant or thread-safe + Important to note: while this can be used to synchronize processes, it is not in itself re-entrant or thread-safe and thus should be used from one thread and non-recursively. It was intended to be a simple synchronization method for our MemoryMappedFile loading. */ @@ -38,16 +38,16 @@ namespace EQEmu { \param name The name of this mutex. */ IPCMutex(std::string name); - + //! Destructor ~IPCMutex(); - + //! Lock the mutex /*! Same basic function as P(): for(;;) { if(S > 0) { S -= 1; break; } } */ bool Lock(); - + //! Unlocks the mutex /*! Same basic function as V(): S += 1; @@ -56,7 +56,7 @@ namespace EQEmu { private: IPCMutex(const IPCMutex&); const IPCMutex& operator=(const IPCMutex&); - + bool locked_; //!< Whether this mutex is locked or not Implementation *imp_; }; diff --git a/common/languages.h b/common/languages.h index 39aee2717..a5b4e5f5b 100644 --- a/common/languages.h +++ b/common/languages.h @@ -1,20 +1,20 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ #ifndef LANGUAGES_H #define LANGUAGES_H #include "../common/types.h" diff --git a/common/linked_list.h b/common/linked_list.h index 491ec5804..7f004407d 100644 --- a/common/linked_list.h +++ b/common/linked_list.h @@ -24,7 +24,7 @@ enum direction{FORWARD,BACKWARD}; template class LinkedListIterator; -template +template class ListElement { private: @@ -56,17 +56,17 @@ public: inline const TYPE& GetData () const { return data ; } void SetData ( const TYPE& d ) { data = d ; } // Quagmire - this may look like a mem leak, but dont change it, this behavior is expected where it's called - void SetLastNext ( ListElement* p ) + void SetLastNext ( ListElement* p ) { GetLast()->SetNext(p); - } - void SetNext (ListElement* n) { next = n ; } - void SetPrev (ListElement* p) { prev = p ; } + } + void SetNext (ListElement* n) { next = n ; } + void SetPrev (ListElement* p) { prev = p ; } void ReplaceData(const TYPE&); }; -template +template class LinkedList { private: @@ -94,20 +94,20 @@ public: friend class LinkedListIterator; }; -template +template class LinkedListIterator { private: LinkedList& list; ListElement* current_element; direction dir; - + public: LinkedListIterator(LinkedList& l,direction d = FORWARD) : list(l), dir(d) {}; void Advance(); const TYPE& GetData(); - bool IsFirst() + bool IsFirst() { if (current_element->GetPrev() == 0) return true; @@ -283,7 +283,7 @@ void LinkedListIterator::Reset() current_element=0; return; } - + if (dir == FORWARD) { current_element = list.first; @@ -389,7 +389,7 @@ template void LinkedList::Append(const TYPE& data) { ListElement* new_element = new ListElement(data); - + if (first == 0) { first = new_element; diff --git a/common/logsys.cpp b/common/logsys.cpp index a7cd2d698..16e365558 100644 --- a/common/logsys.cpp +++ b/common/logsys.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -33,7 +33,7 @@ const char *log_category_names[NUMBER_OF_LOG_CATEGORIES] = { //this array is private to this file, only a const version of it is exposed #define LOG_TYPE(category, type, enabled) { enabled, LOG_ ##category, #category "__" #type }, -static LogTypeStatus real_log_type_info[NUMBER_OF_LOG_TYPES+1] = +static LogTypeStatus real_log_type_info[NUMBER_OF_LOG_TYPES+1] = { #include "logtypes.h" { false, NUMBER_OF_LOG_CATEGORIES, "BAD TYPE" } /* dummy trailing record */ @@ -97,14 +97,14 @@ bool load_log_settings(const char *filename) { #ifdef _WINDOWS if (sscanf(linebuf, "%[^=]=%[^\n]\n", type_name, value) != 2) continue; -#else +#else if (sscanf(linebuf, "%[^=]=%[^\r\n]\n", type_name, value) != 2) continue; #endif - + if(type_name[0] == '\0' || type_name[0] == '#') continue; - + //first make sure we understand the value bool enabled; if(!strcasecmp(value, "on") || !strcasecmp(value, "true") || !strcasecmp(value, "yes") || !strcasecmp(value, "enabled") || !strcmp(value, "1")) @@ -115,7 +115,7 @@ bool load_log_settings(const char *filename) { printf("Unable to parse value '%s' from %s. Skipping line.", value, filename); continue; } - + int r; //first see if it is a category name for(r = 0; r < NUMBER_OF_LOG_CATEGORIES; r++) { @@ -135,7 +135,7 @@ bool load_log_settings(const char *filename) { } continue; } - + for(r = 0; r < NUMBER_OF_LOG_TYPES; r++) { if(!strcasecmp(log_type_info[r].name, type_name)) break; @@ -144,7 +144,7 @@ bool load_log_settings(const char *filename) { printf("Unable to locate log type %s from file %s. Skipping line.", type_name, filename); continue; } - + //got it all figured out, do something now... if(enabled) log_enable(LogType(r)); diff --git a/common/logsys.h b/common/logsys.h index a8c27fdf9..beb6856d7 100644 --- a/common/logsys.h +++ b/common/logsys.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -19,9 +19,9 @@ #define LOGSYS_H_ /* - * + * * Usage: - * + * * These are the main functions provided by logsys: * - _log(TYPE, fmt, ...) - Log a message in any context * - mlog(TYPE, fmt, ...) - Zone only. Log a message from a Mob:: context, prefixing it with the mob's name. @@ -32,14 +32,14 @@ * - _pkt(TYPE, BasePacket *) - Log a packet hex dump with header in any context. * - mhex(TYPE, data, length) - Zone only. Log a packet hex dump from a Mob:: context, prefixing it with the mob's name * Types are defined in logtypes.h - * - * - * - * + * + * + * + * * this is very C-ish, not C++ish, but thats how I felt like writting it - * - * - * + * + * + * */ #include @@ -180,7 +180,7 @@ extern bool load_log_settings(const char *filename); #endif /*LOGSYS_H_*/ - + diff --git a/common/logsys_eqemu.cpp b/common/logsys_eqemu.cpp index 56f4f2c5b..31f8621da 100644 --- a/common/logsys_eqemu.cpp +++ b/common/logsys_eqemu.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -33,7 +33,7 @@ void log_messageVA(LogType type, const char *fmt, va_list args) { char prefix_buffer[256]; snprintf(prefix_buffer, 255, "[%s] ", log_type_info[type].name); prefix_buffer[255] = '\0'; - + LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args); } diff --git a/common/logtypes.h b/common/logtypes.h index 156b22f18..2dfa7c61e 100644 --- a/common/logtypes.h +++ b/common/logtypes.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/common/md5.cpp b/common/md5.cpp index f44b590bb..b91d42389 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -61,7 +61,7 @@ MD5::operator const char* () { snprintf(pMD5String, sizeof(pMD5String), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", pMD5[0], pMD5[1], pMD5[2], pMD5[3], pMD5[4], pMD5[5], pMD5[6], pMD5[7], pMD5[8], pMD5[9], pMD5[10], pMD5[11], pMD5[12], pMD5[13], pMD5[14], pMD5[15]); return pMD5String; } - + bool MD5::operator== (const MD5& iMD5) { if (memcmp(pMD5, iMD5.pMD5, 16) == 0) return true; @@ -268,4 +268,4 @@ void MD5::Transform(uint32 hash[4], const uint32 input[16]) { MD5STEP(F4, b, c, d, a, input[ 9]+0xeb86d391, 21); hash[0] += a; hash[1] += b; hash[2] += c; hash[3] += d; -} +} diff --git a/common/md5.h b/common/md5.h index 958443c96..13dfd5f9e 100644 --- a/common/md5.h +++ b/common/md5.h @@ -11,7 +11,7 @@ public: uint32 input[16]; }; static void Generate(const uint8* buf, uint32 len, uint8 digest[16]); - + static void Init(struct MD5Context *context); static void Update(struct MD5Context *context, const uint8 *buf, uint32 len); static void Final(uint8 digest[16], struct MD5Context *context); @@ -21,7 +21,7 @@ public: MD5(const char* buf, uint32 len); MD5(const uint8 buf[16]); MD5(const char* iMD5String); - + void Generate(const char* iString); void Generate(const uint8* buf, uint32 len); bool Set(const uint8 buf[16]); diff --git a/common/memory_mapped_file.cpp b/common/memory_mapped_file.cpp index ca2ae0c6d..c12eafeaf 100644 --- a/common/memory_mapped_file.cpp +++ b/common/memory_mapped_file.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -40,45 +40,45 @@ namespace EQEmu { #endif }; - MemoryMappedFile::MemoryMappedFile(std::string filename, uint32 size) + MemoryMappedFile::MemoryMappedFile(std::string filename, uint32 size) : filename_(filename), size_(size) { imp_ = new Implementation; - + #ifdef _WINDOWS DWORD total_size = size + sizeof(shared_memory_struct); - HANDLE file = CreateFile(filename.c_str(), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, + HANDLE file = CreateFile(filename.c_str(), + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_ALWAYS, 0, nullptr); - + if(file == INVALID_HANDLE_VALUE) { EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); } - + imp_->mapped_object_ = CreateFileMapping(file, nullptr, - PAGE_READWRITE, + PAGE_READWRITE, 0, total_size, filename.c_str()); - + if(!imp_->mapped_object_) { EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); } - + memory_ = reinterpret_cast(MapViewOfFile(imp_->mapped_object_, FILE_MAP_ALL_ACCESS, 0, - 0, + 0, total_size)); - + if(!memory_) { EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); } - + #else size_t total_size = size + sizeof(shared_memory_struct); imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); @@ -98,11 +98,11 @@ namespace EQEmu { } #endif } - - MemoryMappedFile::MemoryMappedFile(std::string filename) + + MemoryMappedFile::MemoryMappedFile(std::string filename) : filename_(filename) { imp_ = new Implementation; - + //get existing size FILE *f = fopen(filename.c_str(), "rb"); if(!f) { @@ -115,39 +115,39 @@ namespace EQEmu { #ifdef _WINDOWS DWORD total_size = size + sizeof(shared_memory_struct); - HANDLE file = CreateFile(filename.c_str(), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, + HANDLE file = CreateFile(filename.c_str(), + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_ALWAYS, 0, nullptr); - + if(file == INVALID_HANDLE_VALUE) { EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); } - + imp_->mapped_object_ = CreateFileMapping(file, nullptr, - PAGE_READWRITE, + PAGE_READWRITE, 0, total_size, filename.c_str()); - + if(!imp_->mapped_object_) { EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); } - + memory_ = reinterpret_cast(MapViewOfFile(imp_->mapped_object_, FILE_MAP_ALL_ACCESS, 0, - 0, + 0, total_size)); - + if(!memory_) { EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); } - + #else size_t total_size = size + sizeof(shared_memory_struct); imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); @@ -182,7 +182,7 @@ namespace EQEmu { #endif delete imp_; } - + void MemoryMappedFile::ZeroFile() { memset(reinterpret_cast(memory_), 0, sizeof(shared_memory_struct)); memset(memory_->data, 0, size_); diff --git a/common/memory_mapped_file.h b/common/memory_mapped_file.h index e4de4c728..8ab588f34 100644 --- a/common/memory_mapped_file.h +++ b/common/memory_mapped_file.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -26,7 +26,7 @@ namespace EQEmu { //! Memory Backed Shared Memory /*! - Allows us to create shared memory that is backed by a file on both windows and unix platforms that + Allows us to create shared memory that is backed by a file on both windows and unix platforms that works in a consistent manner. Non-copyable. */ class MemoryMappedFile { @@ -40,15 +40,15 @@ namespace EQEmu { }; public: //! Constructor - /*! + /*! Creates a mmf for the given filename and of size. \param filename Actual filename of the mmf. \param size Size in bytes of the mmf. */ MemoryMappedFile(std::string filename, uint32 size); - + //! Constructor - /*! + /*! Creates a mmf for the given filename and gets the size based on the existing size. \param filename Actual filename of the mmf. */ @@ -59,19 +59,19 @@ namespace EQEmu { //! Get Data Operator inline void *operator->() const { return memory_->data; } - + //! Get Data Function inline void *Get() const { return memory_->data; } - + //! Get Size Function inline uint32 Size() const { return memory_->size; } - + //! Zeros all the memory in the file, and set it to be unloaded void ZeroFile(); private: //! Copy Constructor MemoryMappedFile(const MemoryMappedFile&); - + //! Assignment Operator const MemoryMappedFile& operator=(const MemoryMappedFile&); diff --git a/common/opcode_dispatch.h b/common/opcode_dispatch.h index a57408b66..352fc62ef 100644 --- a/common/opcode_dispatch.h +++ b/common/opcode_dispatch.h @@ -16,7 +16,7 @@ There are currently eight (times two) dispatch modes possible, the different modes for a given state differ only in the arguments which are passed to the dispatch function. -The variable length versions ensure that the packet is +The variable length versions ensure that the packet is AT LEAST as long as the supplied structure. The variable length versions should only be used when the packet @@ -76,7 +76,7 @@ IN_Cz(OP_ReqNewZone); IN_Cz(OP_SendExpZonein); //IN_Cr(OP_ZoneComplete); -//these three should stay raw, since we ignore their contents and +//these three should stay raw, since we ignore their contents and //they overlap with the connected opcodes IN_Cr(OP_SpawnAppearance); IN_Cr(OP_WearChange); @@ -477,14 +477,14 @@ OUT(OP_ZoneEntry, ServerZoneEntry_Struct); void Handle_##op (); #define INr(op) \ void Handle_##op (const EQApplicationPacket *app); -#define OUT_C(op, s) -#define OUT_Cv(op, s) -#define OUT_Cz(op) -#define OUT_Cr(op) -#define OUT(op, s) -#define OUTv(op, s) -#define OUTz(op) -#define OUTr(op) +#define OUT_C(op, s) +#define OUT_Cv(op, s) +#define OUT_Cz(op) +#define OUT_Cr(op) +#define OUT(op, s) +#define OUTv(op, s) +#define OUTz(op) +#define OUTr(op) #include "opcode_dispatch.h" #undef IN_C #undef IN_Cr @@ -514,7 +514,7 @@ public: RawOpcodeDispatcher(proc p) { d = p; } - + virtual void dispatch(Client *on, const EQApplicationPacket *app) { (on->*d)(app); } @@ -528,7 +528,7 @@ public: ZeroOpcodeDispatcher(proc p) { d = p; } - + virtual void dispatch(Client *on, const EQApplicationPacket *app) { if(app->size != 0) { //error.. @@ -548,7 +548,7 @@ public: d = p; struct_name = sn; } - + virtual void dispatch(Client *on, const EQApplicationPacket *app) { if(app->size != sizeof(T)) { //error.. @@ -557,7 +557,7 @@ public: T * tmp = (T *) app->pBuffer; (on->*d)(tmp); } - + protected: proc d; const char *struct_name; @@ -571,7 +571,7 @@ public: d = p; struct_name = sn; } - + virtual void dispatch(Client *on, const EQApplicationPacket *app) { if(app->size < sizeof(T)) { //error.. @@ -580,13 +580,13 @@ public: T * tmp = (T *) app->pBuffer; (on->*d)(tmp, app->size); } - + protected: proc d; const char *struct_name; }; - + //... client_packet.cpp void MapOpcodes() { @@ -607,14 +607,14 @@ void MapOpcodes() { ConnectedOpcodes[op] = new ZeroOpcodeDispatcher(&Client::Handle_##op); #define INr(op) \ ConnectedOpcodes[op] = new RawOpcodeDispatcher(&Client::Handle_##op); -#define OUT_C(op, s) -#define OUT_Cv(op, s) -#define OUT_Cz(op) -#define OUT_Cr(op) -#define OUT(op, s) -#define OUTv(op, s) -#define OUTz(op) -#define OUTr(op) +#define OUT_C(op, s) +#define OUT_Cv(op, s) +#define OUT_Cz(op) +#define OUT_Cr(op) +#define OUT(op, s) +#define OUTv(op, s) +#define OUTz(op) +#define OUTr(op) #include "opcode_dispatch.h" #undef IN_C #undef IN_Cr diff --git a/common/opcodemgr.cpp b/common/opcodemgr.cpp index 06e2bfab2..71bf97b7c 100644 --- a/common/opcodemgr.cpp +++ b/common/opcodemgr.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -37,9 +37,9 @@ bool OpcodeManager::LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, fprintf(stderr, "Unable to open opcodes file '%s'. Thats bad.\n", filename); return(false); } - + map eq; - + //load the opcode file into eq, could swap in a nice XML parser here char line[2048]; int lineno = 0; @@ -49,11 +49,11 @@ bool OpcodeManager::LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, line[0] = '\0'; //for blank line at end of file if(fgets(line, sizeof(line), opf) == nullptr) break; - + //ignore any line that dosent start with OP_ if(line[0] != 'O' || line[1] != 'P' || line[2] != '_') continue; - + char *num = line+3; //skip OP_ //look for the = sign while(*num != '=' && *num != '\0') { @@ -66,19 +66,19 @@ bool OpcodeManager::LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, } *num = '\0'; //null terminate the name num++; //num should point to the opcode - + //read the opcode if(sscanf(num, "0x%hx", &curop) != 1) { if(report_errors) fprintf(stderr, "Malformed opcode at %s:%d\n", filename, lineno); continue; } - + //we have a name and our opcode... stick it in the map eq[line] = curop; } fclose(opf); - - + + //do the mapping and store them in the shared memory array bool ret = true; EmuOpcode emu_op; @@ -92,7 +92,7 @@ bool OpcodeManager::LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, if(report_errors) printf("I will let you continue, since you may have gotten all the opcodes you need.\n"); break; } - + //find the opcode in the file res = eq.find(op_name); if(res == eq.end()) { @@ -100,11 +100,11 @@ bool OpcodeManager::LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, //ret = false; continue; //continue to give them a list of all missing opcodes } - + //ship the mapping off to shared mem. s->Set(emu_op, res->second); } - + return(ret); } @@ -148,17 +148,17 @@ bool RegularOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) NormalMemStrategy s; s.it = this; MOpcodes.lock(); - + loaded = true; eq_to_emu = new EmuOpcode[MAX_EQ_OPCODE]; emu_to_eq = new uint16[_maxEmuOpcode]; EQOpcodeCount = MAX_EQ_OPCODE; EmuOpcodeCount = _maxEmuOpcode; - + //dont need to set eq_to_emu cause every element should get a value memset(eq_to_emu, 0, sizeof(EmuOpcode)*MAX_EQ_OPCODE); memset(emu_to_eq, 0, sizeof(uint16)*_maxEmuOpcode); - + bool ret = LoadOpcodesFile(filename, &s, report_errors); MOpcodes.unlock(); return ret; @@ -167,15 +167,15 @@ bool RegularOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) bool RegularOpcodeManager::ReloadOpcodes(const char *filename, bool report_errors) { if(!loaded) return(LoadOpcodes(filename)); - + NormalMemStrategy s; s.it = this; MOpcodes.lock(); - + memset(eq_to_emu, 0, sizeof(uint16)*MAX_EQ_OPCODE); - + bool ret = LoadOpcodesFile(filename, &s, report_errors); - + MOpcodes.unlock(); return(ret); } @@ -209,12 +209,12 @@ EmuOpcode RegularOpcodeManager::EQToEmu(const uint16 eq_op) { } void RegularOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) { - + //clear out old mapping uint16 oldop = emu_to_eq[emu_op]; if(oldop != 0) eq_to_emu[oldop] = OP_Unknown; - + //use our strategy, since we have it NormalMemStrategy s; s.it = this; @@ -233,7 +233,7 @@ NullOpcodeManager::NullOpcodeManager() : MutableOpcodeManager() { } - + bool NullOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { return(true); } @@ -241,7 +241,7 @@ bool NullOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { bool NullOpcodeManager::ReloadOpcodes(const char *filename, bool report_errors) { return(true); } - + uint16 NullOpcodeManager::EmuToEQ(const EmuOpcode emu_op) { return(0); } @@ -254,7 +254,7 @@ EmptyOpcodeManager::EmptyOpcodeManager() : MutableOpcodeManager() { } - + bool EmptyOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { return(true); } @@ -262,7 +262,7 @@ bool EmptyOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { bool EmptyOpcodeManager::ReloadOpcodes(const char *filename, bool report_errors) { return(true); } - + uint16 EmptyOpcodeManager::EmuToEQ(const EmuOpcode emu_op) { map::iterator f; f = emu_to_eq.find(emu_op); diff --git a/common/opcodemgr.h b/common/opcodemgr.h index dba37c881..14e6fde7a 100644 --- a/common/opcodemgr.h +++ b/common/opcodemgr.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -38,18 +38,18 @@ class OpcodeManager { public: OpcodeManager(); virtual ~OpcodeManager() {} - + virtual bool Mutable() { return(false); } virtual bool LoadOpcodes(const char *filename, bool report_errors = false) = 0; virtual bool ReloadOpcodes(const char *filename, bool report_errors = false) = 0; - + virtual uint16 EmuToEQ(const EmuOpcode emu_op) = 0; virtual EmuOpcode EQToEmu(const uint16 eq_op) = 0; - + static const char *EmuToName(const EmuOpcode emu_op); const char *EQToName(const uint16 emu_op); EmuOpcode NameSearch(const char *name); - + //This has to be public for stupid visual studio class OpcodeSetStrategy { public: @@ -61,7 +61,7 @@ protected: bool loaded; //true if all opcodes loaded Mutex MOpcodes; //this only protects the local machine //in a shared manager, this dosent protect others - + static bool LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, bool report_errors); }; @@ -77,13 +77,13 @@ public: class SharedOpcodeManager : public OpcodeManager { public: virtual ~SharedOpcodeManager() {} - + virtual bool LoadOpcodes(const char *filename, bool report_errors = false); virtual bool ReloadOpcodes(const char *filename, bool report_errors = false); - + virtual uint16 EmuToEQ(const EmuOpcode emu_op); virtual EmuOpcode EQToEmu(const uint16 eq_op); - + protected: class SharedMemStrategy : public OpcodeManager::OpcodeSetStrategy { public: @@ -99,17 +99,17 @@ class RegularOpcodeManager : public MutableOpcodeManager { public: RegularOpcodeManager(); virtual ~RegularOpcodeManager(); - + virtual bool Editable() { return(true); } virtual bool LoadOpcodes(const char *filename, bool report_errors = false); virtual bool ReloadOpcodes(const char *filename, bool report_errors = false); - + virtual uint16 EmuToEQ(const EmuOpcode emu_op); virtual EmuOpcode EQToEmu(const uint16 eq_op); - + //implement our editing interface virtual void SetOpcode(EmuOpcode emu_op, uint16 eq_op); - + protected: class NormalMemStrategy : public OpcodeManager::OpcodeSetStrategy { public: @@ -118,7 +118,7 @@ protected: void Set(EmuOpcode emu_op, uint16 eq_op); }; friend class NormalMemStrategy; - + uint16 *emu_to_eq; EmuOpcode *eq_to_emu; uint32 EQOpcodeCount; @@ -129,13 +129,13 @@ protected: class NullOpcodeManager : public MutableOpcodeManager { public: NullOpcodeManager(); - + virtual bool LoadOpcodes(const char *filename, bool report_errors = false); virtual bool ReloadOpcodes(const char *filename, bool report_errors = false); - + virtual uint16 EmuToEQ(const EmuOpcode emu_op); virtual EmuOpcode EQToEmu(const uint16 eq_op); - + //fake it, just used for testing anyways virtual void SetOpcode(EmuOpcode emu_op, uint16 eq_op) {} }; @@ -146,13 +146,13 @@ public: class EmptyOpcodeManager : public MutableOpcodeManager { public: EmptyOpcodeManager(); - + virtual bool LoadOpcodes(const char *filename, bool report_errors = false); virtual bool ReloadOpcodes(const char *filename, bool report_errors = false); - + virtual uint16 EmuToEQ(const EmuOpcode emu_op); virtual EmuOpcode EQToEmu(const uint16 eq_op); - + //fake it, just used for testing anyways virtual void SetOpcode(EmuOpcode emu_op, uint16 eq_op); protected: diff --git a/common/packet_dump.cpp b/common/packet_dump.cpp index 1a1d26d3a..1b6a9710d 100644 --- a/common/packet_dump.cpp +++ b/common/packet_dump.cpp @@ -55,8 +55,8 @@ void DumpPacketHex(const uchar* buf, uint32 size, uint32 cols, uint32 skip) { return; // Output as HEX char output[4]; - int j = 0; - char* ascii = new char[cols+1]; + int j = 0; + char* ascii = new char[cols+1]; memset(ascii, 0, cols+1); uint32 i; for(i=skip; i> 3; - + uint64 swap = data[0]; data[0] = data[len/2]; data[len/2] = swap; - + for(uint32 i=0; i>0x19)|(data[i]<<0x27))+0x422437A9; @@ -61,11 +61,11 @@ void EncryptZoneSpawnPacket(uchar* pBuffer, uint32 size) { uint64 crypt = 0x0000; uint64 next_crypt; uint32 len = size >> 3; - + uint64 swap = data[0]; data[0] = data[len/2]; data[len/2] = swap; - + for(uint32 i=0; i>0x23))+0x659365E7; @@ -101,7 +101,7 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou static bool inited = false; static z_stream zstream; int zerror; - + if(in_data == nullptr && out_data == nullptr && in_length == 0 && max_out_length == 0) { //special delete state deflateEnd(&zstream); @@ -114,7 +114,7 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou zstream.opaque = Z_NULL; deflateInit(&zstream, Z_FINISH); } - + zstream.next_in = const_cast(in_data); zstream.avail_in = in_length; /* zstream.zalloc = Z_NULL; @@ -124,9 +124,9 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou zstream.next_out = out_data; zstream.avail_out = max_out_length; zerror = deflate(&zstream, Z_FINISH); - + deflateReset(&zstream); - + if (zerror == Z_STREAM_END) { // deflateEnd(&zstream); @@ -141,11 +141,11 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou if(in_data == nullptr) { return(0); } - + z_stream zstream; memset(&zstream, 0, sizeof(zstream)); int zerror; - + zstream.next_in = const_cast(in_data); zstream.avail_in = in_length; zstream.zalloc = eqemu_alloc_func; @@ -155,7 +155,7 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou zstream.next_out = out_data; zstream.avail_out = max_out_length; zerror = deflate(&zstream, Z_FINISH); - + if (zerror == Z_STREAM_END) { deflateEnd(&zstream); @@ -174,7 +174,7 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint static bool inited = false; static z_stream zstream; int zerror; - + if(indata == nullptr && outdata == nullptr && indatalen == 0 && outdatalen == 0) { //special delete state inflateEnd(&zstream); @@ -194,16 +194,16 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint zstream.zalloc = eqemu_alloc_func; zstream.zfree = eqemu_free_func; zstream.opaque = Z_NULL; - - i = inflateInit2( &zstream, 15 ); - if (i != Z_OK) { + + i = inflateInit2( &zstream, 15 ); + if (i != Z_OK) { return 0; } - + zerror = inflate( &zstream, Z_FINISH ); - + inflateReset(&zstream); - + if(zerror == Z_STREAM_END) { return zstream.total_out; } @@ -217,22 +217,22 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint DumpPacket(indata-16, indatalen+16); #endif } - + if (zerror == -4 && zstream.msg == 0) { return 0; } - + return 0; } #else if(indata == nullptr) return(0); - + z_stream zstream; int zerror = 0; int i; - + zstream.next_in = const_cast(indata); zstream.avail_in = indatalen; zstream.next_out = outdata; @@ -240,14 +240,14 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint zstream.zalloc = eqemu_alloc_func; zstream.zfree = eqemu_free_func; zstream.opaque = Z_NULL; - - i = inflateInit2( &zstream, 15 ); - if (i != Z_OK) { + + i = inflateInit2( &zstream, 15 ); + if (i != Z_OK) { return 0; } - + zerror = inflate( &zstream, Z_FINISH ); - + if(zerror == Z_STREAM_END) { inflateEnd( &zstream ); return zstream.total_out; @@ -262,12 +262,12 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint DumpPacket(indata-16, indatalen+16); #endif } - + if (zerror == -4 && zstream.msg == 0) { return 0; } - + zerror = inflateEnd( &zstream ); return 0; } @@ -293,30 +293,30 @@ uint64 rorl(uint64 in, uint8 bits) { uint32 CRCLookup(uchar idx) { if (idx == 0) return 0x00000000; - + if (idx == 1) return 0x77073096; - + if (idx == 2) return roll(CRCLookup(1), 1); - + if (idx == 4) return 0x076DC419; - + for (uchar b=7; b>0; b--) { uchar bv = 1 << b; - + if (!(idx ^ bv)) { // bit is only one set return ( roll(CRCLookup (4), b - 2) ); } - + if (idx&bv) { // bit is set return( CRCLookup(bv) ^ CRCLookup(idx&(bv - 1)) ); } } - + //Failure return false; } @@ -325,10 +325,10 @@ uint32 GenerateCRC(uint32 b, uint32 bufsize, uchar *buf) { uint32 CRC = (b ^ 0xFFFFFFFF); uint32 bufremain = bufsize; uchar* bufptr = buf; - + while (bufremain--) { CRC = CRCLookup((uchar)(*(bufptr++)^ (CRC&0xFF))) ^ (CRC >> 8); } - + return (htonl (CRC ^ 0xFFFFFFFF)); } diff --git a/common/packetfile.cpp b/common/packetfile.cpp index ad4937e0d..bbd251968 100644 --- a/common/packetfile.cpp +++ b/common/packetfile.cpp @@ -3,7 +3,7 @@ #else #include #endif - + #include #include #include @@ -32,15 +32,15 @@ bool PacketFileWriter::SetPacketStamp(const char *name, uint32 stamp) { fprintf(stderr, "Error opening packet file '%s': %s\n", name, strerror(errno)); return(false); } - + unsigned long magic = 0; - + if(fread(&magic, sizeof(magic), 1, in) != 1) { fprintf(stderr, "Error reading header from packet file: %s\n", strerror(errno)); fclose(in); return(false); } - + PacketFileReader *ret = NULL; if(magic == OLD_PACKET_FILE_MAGIC) { OldPacketFileHeader *pos = 0; @@ -69,33 +69,33 @@ bool PacketFileWriter::SetPacketStamp(const char *name, uint32 stamp) { fclose(in); return(false); } - + fclose(in); return(true); } - + bool PacketFileWriter::OpenFile(const char *name) { CloseFile(); - + printf("Opening packet file: %s\n", name); - + out = fopen(name, "wb"); if(out == NULL) { fprintf(stderr, "Error opening packet file '%s': %s\n", name, strerror(errno)); return(false); } - + PacketFileHeader head; head.packet_file_magic = PACKET_FILE_MAGIC; head.packet_file_version = PACKET_FILE_CURRENT_VERSION; head.packet_file_stamp = time(NULL); - + if(fwrite(&head, sizeof(head), 1, out) != 1) { fprintf(stderr, "Error writting header to packet file: %s\n", strerror(errno)); fclose(out); return(false); } - + return(true); } @@ -110,13 +110,13 @@ void PacketFileWriter::CloseFile() { void PacketFileWriter::WritePacket(uint16 eq_op, uint32 packlen, const unsigned char *packet, bool to_server, const struct timeval &tv) { if(out == NULL) return; - + _WriteBlock(eq_op, packet, packlen, to_server, tv); - + /* Could log only the packets we care about, but this is most of the stream, so just log them all... - + switch(eq_op) { case OP_NewZone: case OP_ZoneSpawns: @@ -139,23 +139,23 @@ void PacketFileWriter::WritePacket(uint16 eq_op, uint32 packlen, const unsigned bool PacketFileWriter::_WriteBlock(uint16 eq_op, const void *d, uint16 len, bool to_server, const struct timeval &tv) { if(out == NULL) return(false); - + PacketFileSection s; s.opcode = eq_op; s.len = len; s.tv_sec = tv.tv_sec; s.tv_msec = tv.tv_usec/1000; - + if(to_server) SetToServer(s); else SetToClient(s); - + if(fwrite(&s, sizeof(s), 1, out) != 1) { fprintf(stderr, "Error writting block header: %s\n", strerror(errno)); return(false); } - + if(fwrite(d, 1, len, out) != len) { fprintf(stderr, "Error writting block body: %s\n", strerror(errno)); return(false); @@ -163,7 +163,7 @@ bool PacketFileWriter::_WriteBlock(uint16 eq_op, const void *d, uint16 len, bool if(force_flush) fflush(out); - + return(true); } @@ -179,15 +179,15 @@ PacketFileReader *PacketFileReader::OpenPacketFile(const char *name) { fprintf(stderr, "Error opening packet file '%s': %s\n", name, strerror(errno)); return(NULL); } - + unsigned long magic = 0; - + if(fread(&magic, sizeof(magic), 1, in) != 1) { fprintf(stderr, "Error reading header to packet file: %s\n", strerror(errno)); fclose(in); return(NULL); } - + PacketFileReader *ret = NULL; if(magic == OLD_PACKET_FILE_MAGIC) { ret = new OldPacketFileReader(); @@ -198,12 +198,12 @@ PacketFileReader *PacketFileReader::OpenPacketFile(const char *name) { fclose(in); return(NULL); } - + if(!ret->OpenFile(name)) { safe_delete(ret); return(NULL); } - + return(ret); } @@ -220,26 +220,26 @@ OldPacketFileReader::OldPacketFileReader() OldPacketFileReader::~OldPacketFileReader() { CloseFile(); } - + bool OldPacketFileReader::OpenFile(const char *name) { CloseFile(); - + //printf("Opening packet file: %s\n", name); - + in = fopen(name, "rb"); if(in == NULL) { fprintf(stderr, "Error opening packet file '%s': %s\n", name, strerror(errno)); return(false); } - + OldPacketFileHeader head; - + if(fread(&head, sizeof(head), 1, in) != 1) { fprintf(stderr, "Error reading header to packet file: %s\n", strerror(errno)); fclose(in); return(false); } - + if(head.packet_file_magic != OLD_PACKET_FILE_MAGIC) { fclose(in); if(head.packet_file_magic > (OLD_PACKET_FILE_MAGIC)) { @@ -249,16 +249,16 @@ bool OldPacketFileReader::OpenFile(const char *name) { } return(false); } - + uint32 now = time(NULL); if(head.packet_file_stamp > now) { fprintf(stderr, "Error: invalid timestamp in file. Your clock or the collector's is wrong (%d sec ahead).\n", head.packet_file_stamp-now); fclose(in); return(false); } - + packet_file_stamp = head.packet_file_stamp; - + return(true); } @@ -274,14 +274,14 @@ bool OldPacketFileReader::ResetFile() { if(in == NULL) return(false); rewind(in); - + //gotta read past the header again OldPacketFileHeader head; - + if(fread(&head, sizeof(head), 1, in) != 1) { return(false); } - + return(true); } @@ -290,23 +290,23 @@ bool OldPacketFileReader::ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned ch return(false); if(feof(in)) return(false); - + OldPacketFileSection s; - + if(fread(&s, sizeof(s), 1, in) != 1) { if(!feof(in)) fprintf(stderr, "Error reading section header: %s\n", strerror(errno)); return(false); } - + eq_op = s.opcode; - + if(packlen < s.len) { fprintf(stderr, "Packet buffer is too small! %d < %d, skipping\n", packlen, s.len); fseek(in, s.len, SEEK_CUR); return(false); } - + if(fread(packet, 1, s.len, in) != s.len) { if(feof(in)) fprintf(stderr, "Error: EOF encountered when expecting packet data.\n"); @@ -314,12 +314,12 @@ bool OldPacketFileReader::ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned ch fprintf(stderr, "Error reading packet body: %s\n", strerror(errno)); return(false); } - + packlen = s.len; to_server = false; tv.tv_sec = 0; tv.tv_usec = 0; - + return(true); } @@ -333,26 +333,26 @@ NewPacketFileReader::NewPacketFileReader() NewPacketFileReader::~NewPacketFileReader() { CloseFile(); } - + bool NewPacketFileReader::OpenFile(const char *name) { CloseFile(); - + //printf("Opening packet file: %s\n", name); - + in = fopen(name, "rb"); if(in == NULL) { fprintf(stderr, "Error opening packet file '%s': %s\n", name, strerror(errno)); return(false); } - + PacketFileHeader head; - + if(fread(&head, sizeof(head), 1, in) != 1) { fprintf(stderr, "Error reading header to packet file: %s\n", strerror(errno)); fclose(in); return(false); } - + if(head.packet_file_magic != PACKET_FILE_MAGIC) { fclose(in); if(head.packet_file_magic == (PACKET_FILE_MAGIC+1)) { @@ -362,16 +362,16 @@ bool NewPacketFileReader::OpenFile(const char *name) { } return(false); } - + uint32 now = time(NULL); if(head.packet_file_stamp > now) { fprintf(stderr, "Error: invalid timestamp in file. Your clock or the collector's is wrong (%d sec ahead).\n", head.packet_file_stamp-now); fclose(in); return(false); } - + packet_file_stamp = head.packet_file_stamp; - + return(true); } @@ -387,14 +387,14 @@ bool NewPacketFileReader::ResetFile() { if(in == NULL) return(false); rewind(in); - + //gotta read past the header again PacketFileHeader head; - + if(fread(&head, sizeof(head), 1, in) != 1) { return(false); } - + return(true); } @@ -403,23 +403,23 @@ bool NewPacketFileReader::ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned ch return(false); if(feof(in)) return(false); - + PacketFileSection s; - + if(fread(&s, sizeof(s), 1, in) != 1) { if(!feof(in)) fprintf(stderr, "Error reading section header: %s\n", strerror(errno)); return(false); } - + eq_op = s.opcode; - + if(packlen < s.len) { fprintf(stderr, "Packet buffer is too small! %d < %d, skipping\n", packlen, s.len); fseek(in, s.len, SEEK_CUR); return(false); } - + if(fread(packet, 1, s.len, in) != s.len) { if(feof(in)) fprintf(stderr, "Error: EOF encountered when expecting packet data.\n"); @@ -427,12 +427,12 @@ bool NewPacketFileReader::ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned ch fprintf(stderr, "Error reading packet body: %s\n", strerror(errno)); return(false); } - + packlen = s.len; to_server = IsToServer(s); tv.tv_sec = s.tv_sec; tv.tv_usec = 1000*s.tv_msec; - + return(true); } diff --git a/common/packetfile.h b/common/packetfile.h index 35585f83a..bacbbc2b4 100644 --- a/common/packetfile.h +++ b/common/packetfile.h @@ -49,17 +49,17 @@ class PacketFileWriter { public: PacketFileWriter(bool force_flush); ~PacketFileWriter(); - + bool OpenFile(const char *name); void CloseFile(); - + void WritePacket(uint16 eq_op, uint32 packlen, const unsigned char *packet, bool to_server, const struct timeval &tv); - + static bool SetPacketStamp(const char *file, uint32 stamp); - + protected: bool _WriteBlock(uint16 eq_op, const void *d, uint16 len, bool to_server, const struct timeval &tv); - + //gzFile out; FILE *out; bool force_flush; @@ -69,20 +69,20 @@ protected: class PacketFileReader { public: PacketFileReader(); - + virtual bool OpenFile(const char *name) = 0; virtual void CloseFile() = 0; virtual bool ResetFile() = 0; //aka rewind - + virtual bool ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned char *packet, bool &to_server, struct timeval &tv) = 0; - + time_t GetStamp() { return(time_t(packet_file_stamp)); } - + //factory method to open the right packet file. static PacketFileReader *OpenPacketFile(const char *name); - + protected: - + uint32 packet_file_stamp; }; @@ -90,38 +90,38 @@ class OldPacketFileReader : public PacketFileReader { public: OldPacketFileReader(); virtual ~OldPacketFileReader(); - + bool OpenFile(const char *name); void CloseFile(); bool ResetFile(); //aka rewind - + bool ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned char *packet, bool &to_server, struct timeval &tv); - + time_t GetStamp() { return(time_t(packet_file_stamp)); } - + protected: - + //gzFile in; - FILE *in; + FILE *in; }; class NewPacketFileReader: public PacketFileReader { public: NewPacketFileReader(); virtual ~NewPacketFileReader(); - + bool OpenFile(const char *name); void CloseFile(); bool ResetFile(); //aka rewind - + bool ReadPacket(uint16 &eq_op, uint32 &packlen, unsigned char *packet, bool &to_server, struct timeval &tv); - + time_t GetStamp() { return(time_t(packet_file_stamp)); } - + protected: - + //gzFile in; - FILE *in; + FILE *in; }; diff --git a/common/patches/Client62.cpp b/common/patches/Client62.cpp index 1a535a7f0..6f5f52fbf 100644 --- a/common/patches/Client62.cpp +++ b/common/patches/Client62.cpp @@ -19,7 +19,7 @@ static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth); - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == nullptr) { @@ -35,35 +35,35 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; string pname; - + //register our world signature. pname = string(name) + "_world"; signature.ignore_eq_opcode = 0; signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + //register our zone signature. pname = string(name) + "_zone"; signature.ignore_eq_opcode = opcodes->EmuToEQ(OP_AckPacket); signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + _log(NET__IDENTIFY, "Registered patch %s", name); } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != nullptr) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -138,10 +138,10 @@ ENCODE(OP_SendCharInfo) { ENCODE(OP_SendAATable) { ENCODE_LENGTH_ATLEAST(SendAA_Struct); - + SETUP_VAR_ENCODE(SendAA_Struct); ALLOC_VAR_ENCODE(structs::SendAA_Struct, sizeof(structs::SendAA_Struct) + emu->total_abilities*sizeof(structs::AA_Ability)); - + // Check clientver field to verify this AA should be sent for SoF // clientver 1 is for all clients and 2 is for 6.2 if (emu->clientver <= 2 ) @@ -178,7 +178,7 @@ ENCODE(OP_SendAATable) { OUT(abilities[r].slot); } } - + FINISH_ENCODE(); } @@ -199,19 +199,19 @@ ENCODE(OP_DeleteSpawn) { ENCODE(OP_PlayerProfile) { SETUP_DIRECT_ENCODE(PlayerProfile_Struct, structs::PlayerProfile_Struct); - + uint32 r; - + memset(eq->unknown3224, 0xff, 448); memset(eq->unknown3704, 0xff, 32); - + // OUT(checksum); OUT(gender); OUT(race); OUT(class_); OUT(level); eq->level2 = emu->level; - + eq->bind_zone_id = emu->binds[0].zoneId; eq->bind_x[0] = emu->binds[0].x; eq->bind_y[0] = emu->binds[0].y; @@ -222,8 +222,8 @@ ENCODE(OP_PlayerProfile) { eq->zone_safe_y = emu->binds[4].y; eq->zone_safe_z = emu->binds[4].z; eq->zone_safe_heading = emu->binds[4].heading; - - + + OUT(deity); OUT(intoxication); OUT_array(spellSlotRefresh, structs::MAX_PP_MEMSPELL); @@ -361,10 +361,10 @@ ENCODE(OP_PlayerProfile) { OUT(raidAutoconsent); OUT(guildAutoconsent); // OUT(showhelm); - + //set the checksum... CRC32::SetEQChecksum(__packet->pBuffer, sizeof(structs::PlayerProfile_Struct)-4); - + FINISH_ENCODE(); } @@ -408,11 +408,11 @@ ENCODE(OP_ZoneSpawns) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Spawn_Struct *emu = (Spawn_Struct *) __emu_buffer; - + //determine and verify length int entrycount = in->size / sizeof(Spawn_Struct); if(entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { @@ -420,16 +420,16 @@ ENCODE(OP_ZoneSpawns) { delete in; return; } - + //make the EQ struct. in->size = sizeof(structs::Spawn_Struct)*entrycount; in->pBuffer = new unsigned char[in->size]; structs::Spawn_Struct *eq = (structs::Spawn_Struct *) in->pBuffer; - + //zero out the packet. We could avoid this memset by setting all fields (including unknowns) //in the loop. memset(in->pBuffer, 0, in->size); - + //do the transform... int r; int k; @@ -492,7 +492,7 @@ ENCODE(OP_ZoneSpawns) { eq->lfg = emu->lfg; eq->flymode = emu->flymode; } - + //kill off the emu structure and send the eq packet. delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -503,7 +503,7 @@ ENCODE(OP_ItemPacket) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; ItemPacket_Struct *old_item_pkt=(ItemPacket_Struct *)__emu_buffer; @@ -532,7 +532,7 @@ ENCODE(OP_CharInventory) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; @@ -543,7 +543,7 @@ ENCODE(OP_CharInventory) { return; } InternalSerializedItem_Struct *eq = (InternalSerializedItem_Struct *) in->pBuffer; - + //do the transform... int r; string serial_string; @@ -556,7 +556,7 @@ ENCODE(OP_CharInventory) { } else { _log(NET__STRUCTS, "Serialization failed on item slot %d during OP_CharInventory. Item skipped.",eq->slot_id); } - + } in->size = serial_string.length(); @@ -571,39 +571,39 @@ ENCODE(OP_GuildMemberList) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Internal_GuildMembers_Struct *emu = (Internal_GuildMembers_Struct *) in->pBuffer; - - - + + + //make a new EQ buffer. uint32 pnl = strlen(emu->player_name); - uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + + uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + emu->count*sizeof(structs::GuildMemberEntry_Struct) + emu->name_length + emu->note_length; in->pBuffer = new uint8[length]; in->size = length; //no memset since we fill every byte. - + uint8 *buffer; buffer = in->pBuffer; - + //easier way to setup GuildMembers_Struct //set prefix name strcpy((char *)buffer, emu->player_name); buffer += pnl; *buffer = '\0'; buffer++; - + //add member count. *((uint32 *) buffer) = htonl( emu->count ); buffer += sizeof(uint32); - + if(emu->count > 0) { Internal_GuildMemberEntry_Struct *emu_e = emu->member; - const char *emu_name = (const char *) (__emu_buffer + + const char *emu_name = (const char *) (__emu_buffer + sizeof(Internal_GuildMembers_Struct) + //skip header emu->count * sizeof(Internal_GuildMemberEntry_Struct) //skip static length member data ); @@ -611,14 +611,14 @@ ENCODE(OP_GuildMemberList) { emu->name_length + //skip name contents emu->count //skip string terminators ); - + structs::GuildMemberEntry_Struct *e = (structs::GuildMemberEntry_Struct *) buffer; - + uint32 r; for(r = 0; r < emu->count; r++, emu_e++) { - + //the order we set things here must match the struct - + //nice helper macro /*#define SlideStructString(field, str) \ strcpy(e->field, str.c_str()); \ @@ -632,7 +632,7 @@ ENCODE(OP_GuildMemberList) { } #define PutFieldN(field) \ e->field = htonl(emu_e->field) - + SlideStructString( name, emu_name ); PutFieldN(level); PutFieldN(banker); @@ -647,7 +647,7 @@ ENCODE(OP_GuildMemberList) { e->zone_id = htons(emu_e->zone_id); #undef SlideStructString #undef PutFieldN - + e++; } } @@ -661,9 +661,9 @@ ENCODE(OP_ReadBook) { EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; - + BookText_Struct *emu_BookText_Struct = (BookText_Struct *)__emu_buffer; in->size = sizeof(structs::BookText_Struct) + strlen(emu_BookText_Struct->booktext); @@ -857,14 +857,14 @@ DECODE(OP_ItemLinkClick) { DECODE_LENGTH_EXACT(structs::ItemViewRequest_Struct); SETUP_DIRECT_DECODE(ItemViewRequest_Struct, structs::ItemViewRequest_Struct); MEMSET_IN(ItemViewRequest_Struct); - + IN(item_id); int r; for (r = 0; r < 5; r++) { IN(augments[r]); } IN(link_hash); - + FINISH_DIRECT_DECODE(); } @@ -918,7 +918,7 @@ DECODE(OP_WhoAllRequest) { IN(lvlhigh); IN(gmlookup); emu->type = 3; - + FINISH_DIRECT_DECODE(); } @@ -983,7 +983,7 @@ char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 d } } - + *length=MakeAnyLenString(&serialization, "%.*s%s" // For leading quotes (and protection) if a subitem; "%s" // Instance data diff --git a/common/patches/Client62.h b/common/patches/Client62.h index e34b8cb48..f4a70bc90 100644 --- a/common/patches/Client62.h +++ b/common/patches/Client62.h @@ -7,31 +7,31 @@ class EQStreamIdentifier; namespace Client62 { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + //magic macro to declare our opcode processors #include "SSDeclare.h" #include "Client62_ops.h" }; - + }; #endif /*CLIENT62_H_*/ diff --git a/common/patches/Client62_structs.h b/common/patches/Client62_structs.h index aa48fc0e6..c03777610 100644 --- a/common/patches/Client62_structs.h +++ b/common/patches/Client62_structs.h @@ -62,7 +62,7 @@ struct DuelResponse_Struct }; /* Cofruben: - Adventure stuff,not a net one,just one for our use + Adventure stuff,not a net one,just one for our use */ static const uint32 ADVENTURE_COLLECT = 0; static const uint32 ADVENTURE_MASSKILL = 1; @@ -155,15 +155,15 @@ struct CharacterSelect_Struct { ** */ -/* -** Generic Spawn Struct -** Length: 383 Octets -** Used in: +/* +** Generic Spawn Struct +** Length: 383 Octets +** Used in: ** spawnZoneStruct ** dbSpawnStruct ** petStruct ** newSpawnStruct -*/ +*/ struct Spawn_Struct { /*0000*/ uint8 NPC; // 0=player,1=npc,2=pc corpse,3=npc corpse,a @@ -188,9 +188,9 @@ struct Spawn_Struct signed padding0070:19; // ***Placeholder /*0074*/ uint16 deity; // Player's Deity /*0076*/ uint8 unknown[2]; -/*0078*/ union +/*0078*/ union { - struct + struct { /*0078*/ uint32 equip_helmet; // Equipment: Helmet Visual /*0082*/ uint32 equip_chest; // Equipment: Chest Visual @@ -223,9 +223,9 @@ struct Spawn_Struct /*0166*/ uint8 is_npc; // 0=no, 1=yes /*0167*/ uint8 flymode; //seems to be 3 for 'useable' npc classes /*0168*/ uint32 guildID; // Current guild -/*0172*/ union +/*0172*/ union { - struct + struct { /*0172*/ Color_Struct color_helmet; // Color of helmet item /*0176*/ Color_Struct color_chest; // Color of chest item @@ -246,12 +246,12 @@ struct Spawn_Struct /*0217*/ uint8 beardcolor; // Beard color /*0218*/ float size; // Model size /*0222*/ uint8 findable; // 0=can't be found, 1=can be found -/*0223*/ float unknown_float; +/*0223*/ float unknown_float; /*0227*/ char suffix[32]; // Player's suffix (of Veeshan, etc.) /*0259*/ uint8 unknown0259[4]; //[0] is sometimes 100 /*0263*/ uint8 guildrank; // 0=normal, 1=officer, 2=leader /*0264*/ uint8 unknown0264[3]; -union +union { /*0267*/ uint8 equip_chest2; // Second place in packet for chest texture (usually 0xFF in live packets) // Not sure why there are 2 of them, but it effects chest texture! @@ -337,9 +337,9 @@ struct NewZone_Struct { ** Length: 12 Bytes ** */ -struct MemorizeSpell_Struct { -uint32 slot; // Spot in the spell book/memorized slot -uint32 spell_id; // Spell id (200 or c8 is minor healing, etc) +struct MemorizeSpell_Struct { +uint32 slot; // Spot in the spell book/memorized slot +uint32 spell_id; // Spell id (200 or c8 is minor healing, etc) uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming uint32 unknown12; }; @@ -373,20 +373,20 @@ struct DeleteSpell_Struct }; struct ManaChange_Struct -{ +{ uint32 new_mana; // New Mana AMount uint32 stamina; uint32 spell_id; uint32 unknown12; }; -struct SwapSpell_Struct -{ - uint32 from_slot; - uint32 to_slot; +struct SwapSpell_Struct +{ + uint32 from_slot; + uint32 to_slot; -}; +}; struct BeginCast_Struct { @@ -526,8 +526,8 @@ struct CharCreate_Struct /*0092*/ int32 hairstyle; /*0096*/ uint32 deity; ///*0072*/ int32 deity; - - + + // 0 = odus // 1 = qeynos // 2 = halas @@ -563,7 +563,7 @@ struct CharCreate_Struct struct AA_Array { uint32 AA; - uint32 value; + uint32 value; }; @@ -603,7 +603,7 @@ struct Bandolier_Struct { struct PotionBelt_Struct { BandolierItem_Struct items[MAX_PLAYER_BANDOLIER_ITEMS]; }; - + static const uint32 MAX_GROUP_LEADERSHIP_AA_ARRAY = 16; static const uint32 MAX_RAID_LEADERSHIP_AA_ARRAY = 16; static const uint32 MAX_LEADERSHIP_AA_ARRAY = (MAX_GROUP_LEADERSHIP_AA_ARRAY+MAX_RAID_LEADERSHIP_AA_ARRAY); @@ -650,17 +650,17 @@ struct PlayerProfile_Struct /*0200*/ float bind_heading[4]; // /*0216*/ float zone_safe_heading; /*0220*/ uint32 deity; // deity -/*0224*/ uint32 guild_id; +/*0224*/ uint32 guild_id; /*0228*/ uint32 birthday; // characters bday /*0232*/ uint32 lastlogin; // last login or zone time /*0236*/ uint32 timePlayedMin; // in minutes -/*0240*/ uint8 pvp; +/*0240*/ uint8 pvp; /*0241*/ uint8 level2; //no idea why this is here, but thats how it is on live /*0242*/ uint8 anon; // 2=roleplay, 1=anon, 0=not anon /*0243*/ uint8 gm; /*0244*/ uint8 guildrank; /*0245*/ uint8 unknown0245[7]; // -/*0252*/ uint32 intoxication; +/*0252*/ uint32 intoxication; /*0256*/ uint32 spellSlotRefresh[MAX_PP_MEMSPELL]; //in ms /*0292*/ uint32 abilitySlotRefresh; /*0296*/ uint8 haircolor; // Player hair color @@ -684,7 +684,7 @@ struct PlayerProfile_Struct /*2416*/ char suffix[32]; //length might be wrong /*2448*/ uint32 guildid2; // /*2452*/ uint32 exp; // Current Experience -/*2456*/ uint32 unknown1496; +/*2456*/ uint32 unknown1496; /*2460*/ uint32 points; // Unspent Practice points /*2464*/ uint32 mana; // current mana /*2468*/ uint32 cur_hp; // current hp @@ -701,7 +701,7 @@ struct PlayerProfile_Struct /*2552*/ uint8 languages[MAX_PP_LANGUAGE]; /*2580*/ uint8 unknown1620[4]; /*2584*/ uint32 spell_book[MAX_PP_SPELLBOOK]; -/*4184*/ uint8 unknown3224[448]; // all 0xff +/*4184*/ uint8 unknown3224[448]; // all 0xff /*4632*/ uint32 mem_spells[MAX_PP_MEMSPELL]; /*4668*/ uint8 unknown3704[32]; // /*4700*/ float y; // Player y position @@ -741,7 +741,7 @@ struct PlayerProfile_Struct /*5476*/ int32 hunger_level; /*5480*/ int32 thirst_level; /*5484*/ uint32 ability_up; -/*5488*/ char unknown4524[16]; +/*5488*/ char unknown4524[16]; /*5504*/ uint16 zone_id; // Current zone of the player /*5506*/ uint16 zoneInstance; // Instance ID /*5508*/ SpellBuff_Struct buffs[BUFF_COUNT]; // Buffs currently on the player @@ -900,7 +900,7 @@ struct BindWound_Struct /* ** Type: Zone Change Request (before hand) -** Length: 88 bytes +** Length: 88 bytes ** OpCode: a320 */ @@ -923,7 +923,7 @@ struct RequestClientZoneChange_Struct { /*08*/ float x; /*12*/ float z; /*16*/ float heading; -/*20*/ uint32 type; //unknown... values +/*20*/ uint32 type; //unknown... values }; struct Animation_Struct { @@ -1203,13 +1203,13 @@ struct TradeMoneyUpdate_Struct{ ** Surname struct ** Size: 100 bytes */ -struct Surname_Struct -{ +struct Surname_Struct +{ /*0000*/ char name[64]; /*0064*/ uint32 unknown0064; /*0068*/ char lastname[32]; /*0100*/ -}; +}; struct GuildsListEntry_Struct { char name[64]; @@ -1465,7 +1465,7 @@ struct Merchant_Click_Struct { /*000*/ uint32 npcid; // Merchant NPC's entity id /*004*/ uint32 playerid; /*008*/ uint32 command; //1=open, 0=cancel/close -/*012*/ float rate; //cost multiplier, dosent work anymore +/*012*/ float rate; //cost multiplier, dosent work anymore }; /* Unknowns: @@ -1584,7 +1584,7 @@ struct Illusion_Struct { /*068*/ uint16 race; /*070*/ char unknown070[2]; /*072*/ uint8 gender; -/*073*/ uint8 texture; +/*073*/ uint8 texture; /*074*/ uint8 helmtexture; /*075*/ uint8 unknown075; /*076*/ uint32 face; @@ -1636,14 +1636,14 @@ struct GroupCancel_Struct { uint8 toggle; }; -struct GroupUpdate_Struct { +struct GroupUpdate_Struct { /*0000*/ uint32 action; /*0004*/ char yourname[64]; /*0068*/ char membername[5][64]; /*0388*/ char leadersname[64]; }; -struct GroupUpdate2_Struct { +struct GroupUpdate2_Struct { /*0000*/ uint32 action; /*0004*/ char yourname[64]; /*0068*/ char membername[5][64]; @@ -1652,7 +1652,7 @@ struct GroupUpdate2_Struct { /*0580*/ uint8 unknown[188]; /*0768*/ }; -struct GroupJoin_Struct { +struct GroupJoin_Struct { /*0000*/ uint32 action; /*0004*/ char yourname[64]; /*0068*/ char membername[64]; @@ -1666,10 +1666,10 @@ struct FaceChange_Struct { /*003*/ uint8 eyecolor2; /*004*/ uint8 hairstyle; /*005*/ uint8 beard; // vesuvias -/*006*/ uint8 face; +/*006*/ uint8 face; //vesuvias: //there are only 10 faces for barbs changing woad just -//increase the face value by ten so if there were 8 woad +//increase the face value by ten so if there were 8 woad //designs then there would be 80 barb faces }; @@ -1751,11 +1751,11 @@ struct Who_All_Struct { // 76 length total /*140*/ }; -struct Stun_Struct { // 4 bytes total +struct Stun_Struct { // 4 bytes total uint32 duration; // Duration of stun }; -struct AugmentItem_Struct { +struct AugmentItem_Struct { /*00*/ int16 container_slot; /*02*/ char unknown02[2]; /*04*/ int32 augment_slot; @@ -1769,11 +1769,11 @@ struct Emote_Struct { /*1028*/ }; -// Inspect -struct Inspect_Struct { - uint16 TargetID; - uint16 PlayerID; -}; +// Inspect +struct Inspect_Struct { + uint16 TargetID; + uint16 PlayerID; +}; //OP_InspectAnswer struct InspectResponse_Struct{//Cofruben:need to send two of this for the inspect response. /*000*/ uint32 TargetID; @@ -1958,7 +1958,7 @@ struct CloseContainer_Struct { /* ** Generic Door Struct ** Length: 52 Octets -** Used in: +** Used in: ** cDoorSpawnsStruct(f721) ** */ @@ -2557,7 +2557,7 @@ struct Split_Struct ** Last Updated: Oct-15-2003 ** */ -struct NewCombine_Struct { +struct NewCombine_Struct { /*00*/ int16 container_slot; /*02*/ char unknown02[2]; /*04*/ @@ -2862,7 +2862,7 @@ struct RaidDetails_Struct { /*000*/ uint32 action; //=6,20 /*004*/ char leader_name[64]; /*068*/ uint32 unknown68[4]; -/*084*/ LeadershipAA_Struct abilities; //ranks in backwards byte order +/*084*/ LeadershipAA_Struct abilities; //ranks in backwards byte order /*128*/ uint8 unknown128[142]; /*354*/ uint32 leader_id; }; @@ -3022,7 +3022,7 @@ struct AA_Action { }; struct AA_Skills { //this should be removed and changed to AA_Array -/*00*/ uint32 aa_skill; +/*00*/ uint32 aa_skill; /*04*/ uint32 aa_value; }; @@ -3053,13 +3053,13 @@ struct AATable_Struct { struct Weather_Struct { uint32 val1; //generall 0x000000FF uint32 type; //0x31=rain, 0x02=snow(i think), 0 = normal - uint32 mode; + uint32 mode; }; struct ZoneInUnknown_Struct { uint32 val1; uint32 val2; - uint32 val3; + uint32 val3; }; struct MobHealth_Struct { diff --git a/common/patches/RoF.cpp b/common/patches/RoF.cpp index 0f62d1081..b6eeb49d0 100644 --- a/common/patches/RoF.cpp +++ b/common/patches/RoF.cpp @@ -22,7 +22,7 @@ static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; char* SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth); - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == nullptr) { @@ -38,37 +38,37 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; string pname; - + //register our world signature. pname = string(name) + "_world"; signature.ignore_eq_opcode = 0; signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + //register our zone signature. pname = string(name) + "_zone"; signature.ignore_eq_opcode = opcodes->EmuToEQ(OP_AckPacket); signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - - - + + + _log(NET__IDENTIFY, "Registered patch %s", name); } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != nullptr) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -103,7 +103,7 @@ const EQClientVersion Strategy::ClientVersion() const { return EQClientRoF; } - + #include "SSDefine.h" // Converts Titanium Slot IDs to RoF Slot IDs for use in Encodes @@ -134,7 +134,7 @@ static inline structs::ItemSlotStruct TitaniumToRoFSlot(uint32 TitaniumSlot) { RoFSlot.MainSlot += 1; } - + } /*else if (TitaniumSlot < 51) // Cursor Buffer { @@ -430,13 +430,13 @@ ENCODE(OP_TaskHistoryReply) // Skip past Text2 while(in->ReadUInt8()) ++Text2Length; - + in->ReadUInt32(); in->ReadUInt32(); in->ReadUInt32(); uint32 ZoneID = in->ReadUInt32(); in->ReadUInt32(); - + // Skip past Text3 while(in->ReadUInt8()) ++Text3Length; @@ -444,7 +444,7 @@ ENCODE(OP_TaskHistoryReply) char ZoneNumber[10]; sprintf(ZoneNumber, "%i", ZoneID); - + OutboundPacketSize += (24 + Text1Length + 1 + Text2Length + Text3Length + 1 + 7 + (strlen(ZoneNumber) * 2)); } @@ -478,7 +478,7 @@ ENCODE(OP_TaskHistoryReply) outapp->WriteUInt32(Text2Length); in->SetReadPosition(CurrentPosition); - + // Copy Text2 while(uint8 c = in->ReadUInt8()) outapp->WriteUInt8(c); @@ -494,11 +494,11 @@ ENCODE(OP_TaskHistoryReply) sprintf(ZoneNumber, "%i", ZoneID); outapp->WriteUInt32(2); - outapp->WriteUInt8(0x2d); // "-" + outapp->WriteUInt8(0x2d); // "-" outapp->WriteUInt8(0x31); // "1" outapp->WriteUInt32(2); - outapp->WriteUInt8(0x2d); // "-" + outapp->WriteUInt8(0x2d); // "-" outapp->WriteUInt8(0x31); // "1" outapp->WriteString(ZoneNumber); @@ -509,7 +509,7 @@ ENCODE(OP_TaskHistoryReply) outapp->WriteUInt8(c); outapp->WriteUInt8(0); // Text3 has a null terminator - + outapp->WriteUInt8(0x31); // "1" outapp->WriteString(ZoneNumber); } @@ -565,7 +565,7 @@ ENCODE(OP_OpenNewTasksWindow) { EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; __emu_AvailableTaskHeader = (AvailableTaskHeader_Struct*)__emu_buffer; @@ -601,7 +601,7 @@ ENCODE(OP_OpenNewTasksWindow) { __eq_AvailableTaskData1->TaskID = __emu_AvailableTaskData1->TaskID; // This next unknown seems to affect the colour of the task title. 0x3f80000 is what I have seen // in RoF packets. Changing it to 0x3f000000 makes the title red. - __eq_AvailableTaskData1->unknown1 = 0x3f800000; + __eq_AvailableTaskData1->unknown1 = 0x3f800000; __eq_AvailableTaskData1->TimeLimit = __emu_AvailableTaskData1->TimeLimit; __eq_AvailableTaskData1->unknown2 = __emu_AvailableTaskData1->unknown2; @@ -660,7 +660,7 @@ ENCODE(OP_OpenNewTasksWindow) { } delete[] __emu_buffer; - + dest->FastQueuePacket(&in, ack_req); } */ @@ -668,8 +668,8 @@ ENCODE(OP_OpenNewTasksWindow) { ENCODE(OP_SendCharInfo) { ENCODE_LENGTH_EXACT(CharacterSelect_Struct); SETUP_VAR_ENCODE(CharacterSelect_Struct); - - + + //EQApplicationPacket *packet = *p; //const CharacterSelect_Struct *emu = (CharacterSelect_Struct *) packet->pBuffer; @@ -688,10 +688,10 @@ ENCODE(OP_SendCharInfo) { + namelen; ALLOC_VAR_ENCODE(structs::CharacterSelect_Struct, total_length); - + //unsigned char *eq_buffer = new unsigned char[total_length]; //structs::CharacterSelect_Struct *eq_head = (structs::CharacterSelect_Struct *) eq_buffer; - + eq->char_count = char_count; //eq->total_chars = 10; @@ -747,9 +747,9 @@ ENCODE(OP_SendCharInfo) { } bufptr += sizeof(structs::CharacterSelectEntry_Struct); } - + FINISH_ENCODE(); - + } ENCODE(OP_ZoneServerInfo) { @@ -780,10 +780,10 @@ ENCODE(OP_SendZonepoints) { ENCODE(OP_SendAATable) { ENCODE_LENGTH_ATLEAST(SendAA_Struct); - + SETUP_VAR_ENCODE(SendAA_Struct); ALLOC_VAR_ENCODE(structs::SendAA_Struct, sizeof(structs::SendAA_Struct) + emu->total_abilities*sizeof(structs::AA_Ability)); - + // Check clientver field to verify this AA should be sent for SoF // clientver 1 is for all clients and 5 is for Live if (emu->clientver <= 5 ) @@ -869,9 +869,9 @@ ENCODE(OP_PlayerProfile) outapp->WriteUInt8(emu->level); // Level outapp->WriteUInt8(emu->level); // Level1 - + outapp->WriteUInt32(5); // Bind count - + for(int r = 0; r < 5; r++) { outapp->WriteUInt32(emu->binds[r].zoneId); @@ -885,7 +885,7 @@ ENCODE(OP_PlayerProfile) outapp->WriteUInt32(emu->intoxication); outapp->WriteUInt32(10); // Unknown count - + for(int r = 0; r < 10; r++) { outapp->WriteUInt32(0); // Unknown @@ -1072,7 +1072,7 @@ ENCODE(OP_PlayerProfile) } outapp->WriteUInt32(structs::MAX_PP_SPELLBOOK); // Spellbook slots - + for(uint32 r = 0; r < MAX_PP_SPELLBOOK; r++) { outapp->WriteUInt32(emu->spell_book[r]); @@ -1469,7 +1469,7 @@ ENCODE(OP_PlayerProfile) outapp->WriteUInt32(emu->air_remaining); // ? // PVP Stats - + outapp->WriteUInt32(emu->PVPKills); outapp->WriteUInt32(emu->PVPDeaths); outapp->WriteUInt32(emu->PVPCurrentPoints); @@ -1479,7 +1479,7 @@ ENCODE(OP_PlayerProfile) outapp->WriteUInt32(emu->PVPCurrentKillStreak); // Last PVP Kill - + outapp->WriteString(emu->PVPLastKill.Name); outapp->WriteUInt32(emu->PVPLastKill.Level); outapp->WriteUInt32(emu->PVPLastKill.Race); @@ -1489,7 +1489,7 @@ ENCODE(OP_PlayerProfile) outapp->WriteUInt32(emu->PVPLastKill.Points); // Last PVP Death - + outapp->WriteString(emu->PVPLastDeath.Name); outapp->WriteUInt32(emu->PVPLastDeath.Level); outapp->WriteUInt32(emu->PVPLastDeath.Race); @@ -1555,7 +1555,7 @@ ENCODE(OP_PlayerProfile) outapp->size = outapp->GetWritePosition(); outapp->SetWritePosition(4); outapp->WriteUInt32(outapp->size - 9); - + CRC32::SetEQChecksum(outapp->pBuffer, outapp->size - 1, 8); //_hex(NET__ERROR, outapp->pBuffer, outapp->size); @@ -1601,7 +1601,7 @@ ENCODE(OP_NewZone) { OUT(SuspendBuffs); eq->FogDensity = emu->fog_density; - + /*fill in some unknowns with observed values, hopefully it will help */ eq->unknown800 = -1; eq->unknown844 = 600; @@ -1684,7 +1684,7 @@ ENCODE(OP_PetBuffWindow) __packet->size = sz; __packet->pBuffer = new unsigned char[sz]; memset(__packet->pBuffer, 0, sz); - + __packet->WriteUInt32(emu->petid); __packet->WriteUInt32(0); // PlayerID ? __packet->WriteUInt8(1); // 1 indicates all buffs on the pet (0 to add or remove a single buff) @@ -1698,7 +1698,7 @@ ENCODE(OP_PetBuffWindow) __packet->WriteUInt32(emu->spellid[i]); __packet->WriteUInt32(emu->ticsremaining[i]); __packet->WriteUInt32(0); // Unknown - __packet->WriteString(""); + __packet->WriteString(""); } } __packet->WriteUInt8(0); // Unknown @@ -1744,7 +1744,7 @@ ENCODE(OP_Barter) delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); - + } ENCODE(OP_BazaarSearch) @@ -1808,11 +1808,11 @@ ENCODE(OP_ZoneSpawns) //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Spawn_Struct *emu = (Spawn_Struct *) __emu_buffer; - + //determine and verify length int entrycount = in->size / sizeof(Spawn_Struct); if(entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { @@ -1821,7 +1821,7 @@ ENCODE(OP_ZoneSpawns) return; } - + //_log(NET__STRUCTS, "Spawn name is [%s]", emu->name); emu = (Spawn_Struct *) __emu_buffer; @@ -1830,7 +1830,7 @@ ENCODE(OP_ZoneSpawns) char *Buffer = (char *) in->pBuffer, *BufferStart; - + int r; int k; for(r = 0; r < entrycount; r++, emu++) { @@ -1848,7 +1848,7 @@ ENCODE(OP_ZoneSpawns) if(strlen(emu->suffix)) PacketSize += strlen(emu->suffix) + 1; - + bool ShowName = 1; if(emu->bodytype >= 66) { @@ -1902,7 +1902,7 @@ ENCODE(OP_ZoneSpawns) Bitfields->targetable = 1; Bitfields->targetable_with_hotkey = (emu->IsMercenary ? 0 : 1); Bitfields->showname = ShowName; - + // Not currently found // Bitfields->statue = 0; // Bitfields->buyer = 0; @@ -1912,7 +1912,7 @@ ENCODE(OP_ZoneSpawns) uint8 OtherData = 0; if(strlen(emu->title)) - OtherData = OtherData | 16; + OtherData = OtherData | 16; if(strlen(emu->suffix)) OtherData = OtherData | 32; @@ -1949,7 +1949,7 @@ ENCODE(OP_ZoneSpawns) VARSTRUCT_ENCODE_TYPE(float, Buffer, emu->runspeed); VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->race); - + VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); // ShowEQ calls this 'Holding' VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->deity); if(emu->NPC) @@ -2041,7 +2041,7 @@ ENCODE(OP_ZoneSpawns) Position->deltaZ = emu->deltaZ; Buffer += sizeof(structs::Spawn_Struct_Position); - + if(strlen(emu->title)) { VARSTRUCT_ENCODE_STRING(Buffer, emu->title); @@ -2052,7 +2052,7 @@ ENCODE(OP_ZoneSpawns) VARSTRUCT_ENCODE_STRING(Buffer, emu->suffix); } - Buffer += 8; + Buffer += 8; VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->IsMercenary); VARSTRUCT_ENCODE_STRING(Buffer, "0000000000000000"); VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); @@ -2067,7 +2067,7 @@ ENCODE(OP_ZoneSpawns) //_hex(NET__ERROR, outapp->pBuffer, outapp->size); dest->FastQueuePacket(&outapp, ack_req); } - + delete in; } @@ -2075,7 +2075,7 @@ ENCODE(OP_MercenaryDataResponse) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; MercenaryMerchantList_Struct *emu = (MercenaryMerchantList_Struct *) __emu_buffer; @@ -2139,7 +2139,7 @@ ENCODE(OP_MercenaryDataUpdate) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; MercenaryDataUpdate_Struct *emu = (MercenaryDataUpdate_Struct *) __emu_buffer; @@ -2219,7 +2219,7 @@ ENCODE(OP_ItemPacket) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; ItemPacket_Struct *old_item_pkt=(ItemPacket_Struct *)__emu_buffer; InternalSerializedItem_Struct *int_struct=(InternalSerializedItem_Struct *)(old_item_pkt->SerializedItem); @@ -2261,7 +2261,7 @@ ENCODE(OP_CharInventory) { return; } - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; @@ -2269,7 +2269,7 @@ ENCODE(OP_CharInventory) { if(ItemCount == 0 || (in->size % sizeof(InternalSerializedItem_Struct)) != 0) { - _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", + _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(InternalSerializedItem_Struct)); delete in; @@ -2282,7 +2282,7 @@ ENCODE(OP_CharInventory) { in->pBuffer = new uchar[4]; *(uint32 *)in->pBuffer = ItemCount; - + in->size = 4; for(int r = 0; r < ItemCount; r++, eq++) { @@ -2326,42 +2326,42 @@ ENCODE(OP_GuildMemberList) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Internal_GuildMembers_Struct *emu = (Internal_GuildMembers_Struct *) in->pBuffer; - - - + + + //make a new EQ buffer. uint32 pnl = strlen(emu->player_name); - uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + + uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + emu->count*sizeof(structs::GuildMemberEntry_Struct) + emu->name_length + emu->note_length; in->pBuffer = new uint8[length]; in->size = length; //no memset since we fill every byte. - + uint8 *buffer; buffer = in->pBuffer; - + //easier way to setup GuildMembers_Struct //set prefix name strcpy((char *)buffer, emu->player_name); buffer += pnl; *buffer = '\0'; buffer++; - + // Guild ID buffer += sizeof(uint32); //add member count. *((uint32 *) buffer) = htonl( emu->count ); buffer += sizeof(uint32); - + if(emu->count > 0) { Internal_GuildMemberEntry_Struct *emu_e = emu->member; - const char *emu_name = (const char *) (__emu_buffer + + const char *emu_name = (const char *) (__emu_buffer + sizeof(Internal_GuildMembers_Struct) + //skip header emu->count * sizeof(Internal_GuildMemberEntry_Struct) //skip static length member data ); @@ -2369,12 +2369,12 @@ ENCODE(OP_GuildMemberList) { emu->name_length + //skip name contents emu->count //skip string terminators ); - + structs::GuildMemberEntry_Struct *e = (structs::GuildMemberEntry_Struct *) buffer; - + uint32 r; for(r = 0; r < emu->count; r++, emu_e++) { - + //the order we set things here must match the struct //nice helper macro @@ -2387,7 +2387,7 @@ ENCODE(OP_GuildMemberList) { } #define PutFieldN(field) \ e->field = htonl(emu_e->field) - + SlideStructString( name, emu_name ); PutFieldN(level); PutFieldN(banker); @@ -2404,15 +2404,15 @@ ENCODE(OP_GuildMemberList) { e->zone_id = htons(emu_e->zone_id); e->unknown_one2 = htonl(1); e->unknown04 = 0; - - + + #undef SlideStructString #undef PutFieldN - + e++; } } - + delete[] __emu_buffer; @@ -2465,7 +2465,7 @@ ENCODE(OP_GroundSpawn) in->size = strlen(emu->object_name) + sizeof(Object_Struct) - 1; in->pBuffer = new unsigned char[in->size]; - + char *OutBuffer = (char *)in->pBuffer; VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->drop_id); @@ -2484,7 +2484,7 @@ ENCODE(OP_GroundSpawn) VARSTRUCT_ENCODE_TYPE(int32, OutBuffer, emu->object_type); // Unknown, observed 0x00000014 delete[] __emu_buffer; - + dest->FastQueuePacket(&in, ack_req); } @@ -2504,7 +2504,7 @@ ENCODE(OP_ClickObjectAction) { ENCODE(OP_SendMembership) { ENCODE_LENGTH_EXACT(Membership_Struct); SETUP_DIRECT_ENCODE(Membership_Struct, structs::Membership_Struct); - + eq->membership = emu->membership; eq->races = emu->races; eq->classes = emu->classes; @@ -2677,7 +2677,7 @@ ENCODE(OP_LogServer) { ENCODE_LENGTH_EXACT(LogServer_Struct); SETUP_DIRECT_ENCODE(LogServer_Struct, structs::LogServer_Struct); strncpy(eq->worldshortname, emu->worldshortname, sizeof(eq->worldshortname)); - + //OUT(enablevoicemacros); // These two are lost, but must be one of the 1s in unknown[249] //OUT(enablemail); OUT(enable_pvp); @@ -3030,7 +3030,7 @@ ENCODE(OP_Stun) { FINISH_ENCODE(); } -ENCODE(OP_ZonePlayerToBind) +ENCODE(OP_ZonePlayerToBind) { ENCODE_LENGTH_ATLEAST(ZonePlayerToBind_Struct); ZonePlayerToBind_Struct *zps = (ZonePlayerToBind_Struct*)(*p)->pBuffer; @@ -3083,7 +3083,7 @@ ENCODE(OP_AdventureMerchantSell) { FINISH_ENCODE(); } -ENCODE(OP_RaidUpdate) +ENCODE(OP_RaidUpdate) { EQApplicationPacket *inapp = *p; *p = nullptr; @@ -3096,7 +3096,7 @@ ENCODE(OP_RaidUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct)); structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer; - + add_member->raidGen.action = in_add_member->raidGen.action; add_member->raidGen.parameter = in_add_member->raidGen.parameter; strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64); @@ -3173,7 +3173,7 @@ ENCODE(OP_VetRewardsAvaliable) old_data += sizeof(InternalVeteranReward); data += sizeof(structs::VeteranReward); } - + dest->FastQueuePacket(&outapp_create); delete inapp; } @@ -3331,7 +3331,7 @@ ENCODE(OP_GroupUpdate) EQApplicationPacket *in = *p; GroupJoin_Struct *gjs = (GroupJoin_Struct*)in->pBuffer; - + //_log(NET__ERROR, "Received outgoing OP_GroupUpdate with action code %i", gjs->action); if((gjs->action == groupActLeave) || (gjs->action == groupActDisband)) { @@ -3377,10 +3377,10 @@ ENCODE(OP_GroupUpdate) { // Group Update2 //_log(NET__ERROR, "Struct is GroupUpdate2"); - + unsigned char *__emu_buffer = in->pBuffer; GroupUpdate2_Struct *gu2 = (GroupUpdate2_Struct*) __emu_buffer; - + //_log(NET__ERROR, "Yourname is %s", gu2->yourname); int MemberCount = 1; @@ -3402,7 +3402,7 @@ ENCODE(OP_GroupUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_GroupUpdateB, PacketLength); char *Buffer = (char *)outapp->pBuffer; - + // Header VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // Think this should be SpawnID, but it doesn't seem to matter VARSTRUCT_ENCODE_TYPE(uint32, Buffer, MemberCount); @@ -3410,7 +3410,7 @@ ENCODE(OP_GroupUpdate) // Leader // - + VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); VARSTRUCT_ENCODE_STRING(Buffer, gu2->yourname); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); @@ -3452,7 +3452,7 @@ ENCODE(OP_GroupUpdate) GLAAus->NPCMarkerID = gu2->NPCMarkerID; memcpy(&GLAAus->LeaderAAs, &gu2->leader_aas, sizeof(GLAAus->LeaderAAs)); - + dest->FastQueuePacket(&outapp); delete in; @@ -3490,7 +3490,7 @@ ENCODE(OP_ChannelMessage) in->size = strlen(emu->sender) + 1 + strlen(emu->targetname) + 1 + strlen(emu->message) + 1 + 36; in->pBuffer = new unsigned char[in->size]; - + char *OutBuffer = (char *)in->pBuffer; VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sender); @@ -3538,7 +3538,7 @@ ENCODE(OP_GuildsList) } InBuffer += 64; } - + PacketSize++; // Appears to be an extra 0x00 at the very end. in->size = PacketSize; @@ -3625,7 +3625,7 @@ ENCODE(OP_DzMemberList) ss.write((const char*)&null_term, sizeof(char)); ss.write((const char*)&emu->entries[i].status, sizeof(char)); } - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -3682,7 +3682,7 @@ ENCODE(OP_DzLeaderStatus) ss.write((const char*)&client_id, sizeof(uint32)); ss.write((const char*)&client_id, sizeof(uint32));//1 ss.write((const char*)&client_id, sizeof(uint32)); - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -3708,7 +3708,7 @@ ENCODE(OP_BuffCreate) __packet->size = sz; __packet->pBuffer = new unsigned char[sz]; memset(__packet->pBuffer, 0, sz); - + __packet->WriteUInt32(emu->entity_id); __packet->WriteUInt32(0); // PlayerID ? __packet->WriteUInt8(1); // 1 indicates all buffs on the player (0 to add or remove a single buff) @@ -3727,7 +3727,7 @@ ENCODE(OP_BuffCreate) __packet->WriteUInt32(emu->entries[i].spell_id); __packet->WriteUInt32(emu->entries[i].tics_remaining); __packet->WriteUInt32(0); // Unknown - __packet->WriteString(""); + __packet->WriteString(""); } __packet->WriteUInt8(0); // Unknown @@ -3779,7 +3779,7 @@ ENCODE(OP_SpawnAppearance) dest->FastQueuePacket(&in, ack_req); return; } - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_ChangeSize, sizeof(ChangeSize_Struct)); ChangeSize_Struct *css = (ChangeSize_Struct *)outapp->pBuffer; @@ -3790,7 +3790,7 @@ ENCODE(OP_SpawnAppearance) css->Unknown12 = 1.0f; dest->FastQueuePacket(&outapp, ack_req); - + delete in; } @@ -3857,7 +3857,7 @@ ENCODE(OP_RespondAA) { FINISH_ENCODE(); } -ENCODE(OP_AltCurrencySell) +ENCODE(OP_AltCurrencySell) { ENCODE_LENGTH_EXACT(AltCurrencySellItem_Struct); SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); @@ -3880,7 +3880,7 @@ ENCODE(OP_AltCurrency) if(opcode == 8) { AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer; - EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(structs::AltCurrencyPopulate_Struct) + EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(structs::AltCurrencyPopulate_Struct) + sizeof(structs::AltCurrencyPopulateEntry_Struct) * populate->count); structs::AltCurrencyPopulate_Struct *out_populate = (structs::AltCurrencyPopulate_Struct*)outapp->pBuffer; @@ -4064,7 +4064,7 @@ DECODE(OP_PetCommands) FINISH_DIRECT_DECODE(); } -DECODE(OP_AltCurrencySellSelection) +DECODE(OP_AltCurrencySellSelection) { DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); @@ -4073,7 +4073,7 @@ DECODE(OP_AltCurrencySellSelection) FINISH_DIRECT_DECODE(); } -DECODE(OP_AltCurrencySell) +DECODE(OP_AltCurrencySell) { DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); @@ -4094,7 +4094,7 @@ DECODE(OP_ShopRequest) { FINISH_DIRECT_DECODE(); } -DECODE(OP_GuildRemove) +DECODE(OP_GuildRemove) { DECODE_LENGTH_EXACT(structs::GuildCommand_Struct); SETUP_DIRECT_DECODE(GuildCommand_Struct, structs::GuildCommand_Struct); @@ -4105,7 +4105,7 @@ DECODE(OP_GuildRemove) FINISH_DIRECT_DECODE(); } -DECODE(OP_GuildDemote) +DECODE(OP_GuildDemote) { DECODE_LENGTH_EXACT(structs::GuildDemoteStruct); SETUP_DIRECT_DECODE(GuildDemoteStruct, structs::GuildDemoteStruct); @@ -4144,7 +4144,7 @@ DECODE(OP_InspectRequest) { /*DECODE(OP_InspectAnswer) { DECODE_LENGTH_EXACT(structs::InspectResponse_Struct); SETUP_DIRECT_DECODE(InspectResponse_Struct, structs::InspectResponse_Struct); - + IN(TargetID); IN(playerid); @@ -4278,7 +4278,7 @@ DECODE(OP_ItemLinkClick) { DECODE_LENGTH_EXACT(structs::ItemViewRequest_Struct); SETUP_DIRECT_DECODE(ItemViewRequest_Struct, structs::ItemViewRequest_Struct); MEMSET_IN(ItemViewRequest_Struct); - + IN(item_id); int r; for (r = 0; r < 5; r++) { @@ -4287,7 +4287,7 @@ DECODE(OP_ItemLinkClick) { // Max Augs is now 6, but no code to support that many yet IN(link_hash); IN(icon); - + FINISH_DIRECT_DECODE(); } @@ -4331,7 +4331,7 @@ DECODE(OP_ShopPlayerBuy) } DECODE(OP_ClientUpdate) { - // for some odd reason, there is an extra byte on the end of this on occasion.. + // for some odd reason, there is an extra byte on the end of this on occasion.. DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct); SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct); IN(spawn_id); @@ -4351,7 +4351,7 @@ DECODE(OP_ClientUpdate) { DECODE(OP_CharacterCreate) { DECODE_LENGTH_EXACT(structs::CharCreate_Struct); SETUP_DIRECT_DECODE(CharCreate_Struct, structs::CharCreate_Struct); - + IN(gender); IN(race); IN(class_); @@ -4361,7 +4361,7 @@ DECODE(OP_CharacterCreate) { emu->start_zone = RuleI(World, TutorialZoneID); else emu->start_zone = eq->start_zone; - + IN(haircolor); IN(beard); IN(beardcolor); @@ -4396,7 +4396,7 @@ DECODE(OP_WhoAllRequest) { IN(gmlookup); IN(guildid); IN(type); - + FINISH_DIRECT_DECODE(); } @@ -4842,7 +4842,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint const Item_Struct *item = inst->GetItem(); //_log(NET__ERROR, "Serialize called for: %s", item->Name); - + RoF::structs::ItemSerializationHeader hdr; //sprintf(hdr.unknown000, "06e0002Y1W00"); @@ -5090,7 +5090,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint //_log(NET__ERROR, "ItemBody tertiary struct is %i bytes", sizeof(RoF::structs::ItemTertiaryBodyStruct)); RoF::structs::ItemTertiaryBodyStruct itbs; memset(&itbs, 0, sizeof(RoF::structs::ItemTertiaryBodyStruct)); - + itbs.loregroup = item->LoreGroup; itbs.artifact = item->ArtifactFlag; itbs.summonedflag = item->SummonedFlag; @@ -5306,7 +5306,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint uint32 SubLengths[10]; for(int x = 0; x < 10; ++x) { - + SubSerializations[x] = nullptr; const ItemInst* subitem = ((const ItemInst*)inst)->GetItem(x); diff --git a/common/patches/RoF.h b/common/patches/RoF.h index 411a0a99b..fc2e94c95 100644 --- a/common/patches/RoF.h +++ b/common/patches/RoF.h @@ -6,30 +6,30 @@ class EQStreamIdentifier; namespace RoF { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + //magic macro to declare our opcode processors #include "SSDeclare.h" #include "RoF_ops.h" }; - + }; diff --git a/common/patches/RoF_structs.h b/common/patches/RoF_structs.h index f3565d2ce..194bbdad0 100644 --- a/common/patches/RoF_structs.h +++ b/common/patches/RoF_structs.h @@ -32,21 +32,21 @@ struct WorldObjectsSent_Struct { struct ItemSlotStruct { /*000*/ int16 SlotType; // Worn and Normal inventory = 0, Bank = 1, Shared Bank = 2, Delete Item = -1 /*002*/ int16 Unknown02; -/*004*/ int16 MainSlot; +/*004*/ int16 MainSlot; /*006*/ int16 SubSlot; /*008*/ int16 AugSlot; // Guessing - Seen 0xffff /*010*/ int16 Unknown01; // Normally 0 - Seen 13262 when deleting an item, but didn't match item ID -/*012*/ +/*012*/ }; // New for RoF - Used for Merchant_Purchase_Struct // Can't sellfrom other than main inventory so Slot Type is not needed. struct MainInvItemSlotStruct { -/*000*/ int16 MainSlot; +/*000*/ int16 MainSlot; /*002*/ int16 SubSlot; /*004*/ int16 AugSlot; /*006*/ int16 Unknown01; -/*008*/ +/*008*/ }; /* Name Approval Struct */ @@ -217,7 +217,7 @@ struct Membership_Entry_Struct { /*000*/ uint32 purchase_id; // Seen 1, then increments 90287 to 90300 /*004*/ uint32 bitwise_entry; // Seen 16 to 65536 - Skips 4096 -/*008*/ +/*008*/ }; struct Membership_Setting_Struct @@ -225,7 +225,7 @@ struct Membership_Setting_Struct /*000*/ uint32 setting_index; // 0, 1, or 2 /*004*/ uint32 setting_id; // 0 to 21 /*008*/ int32 setting_value; // All can be 0, 1, or -1 -/*012*/ +/*012*/ }; struct Membership_Details_Struct @@ -249,7 +249,7 @@ struct Membership_Struct /*008*/ uint32 classes; // Seen ff ff 01 01 /*012*/ uint32 entrysize; // Seen 22 /*016*/ int32 entries[22]; // Most -1, 1, and 0 for Gold Status -/*104*/ +/*104*/ }; @@ -328,7 +328,7 @@ struct Spawn_Struct_Position signed padding0001:1; /*004*/ signed deltaX:13; // change in x - signed deltaHeading:10;// change in heading + signed deltaHeading:10;// change in heading signed padding0008:9; /*008*/ signed deltaY:13; @@ -343,7 +343,7 @@ struct Spawn_Struct_Position signed padding0020:7; }; -/* +/* struct Spawn_Struct_Position { signed padding0000:12; // ***Placeholder @@ -461,7 +461,7 @@ struct Spawn_Struct /*0000*/ //char suffix[0]; // only read if(hasTitleOrSuffix & 8) char unknown20[8]; uint8 IsMercenary; // If NPC == 1 and this == 1, then the NPC name is Orange. -/*0000*/ char unknown21[55]; +/*0000*/ char unknown21[55]; }; @@ -638,7 +638,7 @@ struct BeginCast_Struct /*000*/ uint32 spell_id; /*004*/ uint16 caster_id; /*006*/ uint32 cast_time; // in miliseconds -/*010*/ +/*010*/ }; struct CastSpell_Struct @@ -707,7 +707,7 @@ struct SpellBuffFade_Struct_Live { /*008*/ float unknown008; /*012*/ uint32 spellid; /*016*/ uint32 duration; -/*020*/ uint32 playerId; // Global player ID? +/*020*/ uint32 playerId; // Global player ID? /*024*/ uint8 unknown0028[68]; /*092*/ uint32 slotid; /*096*/ uint32 bufffade; @@ -917,10 +917,10 @@ struct BindStruct { struct PlayerProfile_Struct { /*00000*/ uint32 checksum; // -/*00004*/ uint32 checksum_size; // Value = ( Packet Size - 9 ) -/*00008*/ uint8 checksum_byte; // -/*00009*/ uint8 unknown_rof1[3]; // -/*00012*/ uint32 unknown_rof2; // +/*00004*/ uint32 checksum_size; // Value = ( Packet Size - 9 ) +/*00008*/ uint8 checksum_byte; // +/*00009*/ uint8 unknown_rof1[3]; // +/*00012*/ uint32 unknown_rof2; // /*00016*/ uint8 gender; // Player Gender - 0 Male, 1 Female /*00017*/ uint32 race; // Player race /*00021*/ uint8 class_; // Player class @@ -959,7 +959,7 @@ union /*00544*/ EquipStruct equip_ring2; // Equiptment: Non-visual /*00564*/ EquipStruct equip_waist; // Equiptment: Non-visual /*00584*/ EquipStruct equip_powersource; // Equiptment: Non-visual - /*00604*/ EquipStruct equip_ammo; // Equiptment: Non-visual + /*00604*/ EquipStruct equip_ammo; // Equiptment: Non-visual } equip; /*00184*/ EquipStruct equipment[22]; }; @@ -980,10 +980,10 @@ union /*00899*/ uint32 drakkin_heritage; // /*00903*/ uint32 drakkin_tattoo; // /*00907*/ uint32 drakkin_details; // -/*00911*/ uint8 unknown_rof6; // +/*00911*/ uint8 unknown_rof6; // /*00912*/ int8 unknown_rof7; // seen -1 -/*00913*/ uint8 unknown_rof8; // -/*00914*/ uint8 unknown_rof9; // +/*00913*/ uint8 unknown_rof8; // +/*00914*/ uint8 unknown_rof9; // /*00915*/ uint8 unknown_rof10; // Seen 1 or 0 (on a female?) /*00916*/ float height; // Seen 7.0 (barb), 5.0 (woodelf), 5.5 (halfelf) /*00920*/ float unknown_rof11; // Seen 3.0 @@ -1035,7 +1035,7 @@ union /*12897*/ uint32 copper_cursor; // Copper Pieces on cursor /*12901*/ uint32 intoxication; // Alcohol level (in ticks till sober?) - Position Guessed /*12905*/ uint32 toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) - Position Guessed -/*12909*/ uint32 unknown_rof19; // +/*12909*/ uint32 unknown_rof19; // /*12913*/ uint32 thirst_level; // Drink (ticks till next drink) - Position Guessed /*12917*/ uint32 hunger_level; // Food (ticks till next eat) - Position Guessed /*12921*/ uint32 aapoints_spent; // Number of spent AA points @@ -1046,7 +1046,7 @@ union /*12941*/ uint32 aa_spent_class; // Seen 103 /*12945*/ uint32 aa_spent_special; // Seen 0 /*12949*/ uint32 aapoints; // Unspent AA points - Seen 1 -/*12953*/ uint16 unknown_rof20; // +/*12953*/ uint16 unknown_rof20; // /*12955*/ uint32 bandolier_count; // Seen 20 /*12959*/ Bandolier_Struct bandoliers[MAX_PLAYER_BANDOLIER]; // [20] 740 bytes (Variable Name Sizes) - bandolier contents /*13699*/ uint32 potionbelt_count; // Seen 5 @@ -1057,15 +1057,15 @@ union /*13760*/ int32 mana_total; // Guessed - Only seen on casters so far - Matches above field if caster /*13764*/ uint32 unknown_rof22[12]; // Same for all seen PPs - 48 bytes: /* -19 00 00 00 19 00 00 00 19 00 00 00 0f 00 00 00 -0f 00 00 00 0f 00 00 00 0f 00 00 00 1f 85 eb 3e +19 00 00 00 19 00 00 00 19 00 00 00 0f 00 00 00 +0f 00 00 00 0f 00 00 00 0f 00 00 00 1f 85 eb 3e 33 33 33 3f 08 00 00 00 02 00 00 00 01 00 00 00 */ /*13812*/ uint32 unknown_rof23; // Seen 5, 19, and 20 in examples -/*13816*/ uint32 unknown_rof24[4]; // +/*13816*/ uint32 unknown_rof24[4]; // /*13832*/ uint32 unknown_rof25[2]; // Seen random numbers from 0 to 2165037 /*13840*/ uint32 unknown_rof26; // Seen 106 -//END SUB-STRUCT used for shrouding. +//END SUB-STRUCT used for shrouding. /*13844*/ uint32 name_str_len; // Seen 64 /*13848*/ char name[64]; // Name of player - 19960 for Live 1180 difference /*13912*/ uint32 last_name_str_len; // Seen 32 @@ -1086,34 +1086,34 @@ union /*14024*/ float heading; // Players heading /*14028*/ uint32 air_remaining; // Air supply (seconds) /*14032*/ int32 unknown_rof28; // Seen -1 -/*14036*/ uint8 unknown_rof29[10]; // +/*14036*/ uint8 unknown_rof29[10]; // /*14046*/ uint32 unknown_rof30; // Random large number or 0 -/*14050*/ uint32 unknown_rof31; // -/*14054*/ uint32 unknown32_count; // Seen 5 -/*14058*/ uint8 unknown_rof32[29]; // +/*14050*/ uint32 unknown_rof31; // +/*14054*/ uint32 unknown32_count; // Seen 5 +/*14058*/ uint8 unknown_rof32[29]; // /*14087*/ uint32 unknown33_count; // Seen 32 for melee/hybrid and 21 for druid, 34 for mage /*14091*/ uint32 unknown_rof33[64]; // Struct contains 2 ints, so double 32 count (Variable Sized) // Position Varies after this point - Really starts varying at Bandolier names, but if no names set it starts here /*00000*/ int32 unknown_rof34; // Seen -1 /*00000*/ int32 unknown_rof35; // Seen -1 -/*00000*/ uint8 unknown_rof36[18]; // +/*00000*/ uint8 unknown_rof36[18]; // /*00000*/ uint32 unknown37_count; // Seen 5 /*00000*/ int32 unknown_rof37[10]; // Alternates -1 and 0 - Struct contains 2 ints /*00000*/ uint32 unknown38_count; // Seen 10 /*00000*/ int32 unknown_rof38[20]; // Alternates -1 and 0 - Struct contains 2 ints -/*00000*/ uint8 unknown_rof39[137]; // +/*00000*/ uint8 unknown_rof39[137]; // /*00000*/ float unknown_rof40; // Seen 1.0 -/*00000*/ uint32 unknown_rof41[9]; // +/*00000*/ uint32 unknown_rof41[9]; // /*00000*/ uint32 unknown_rof42; // Seen 0 or 1 /*00000*/ uint32 unknown_string1_count; // Seen 64 -/*00000*/ char unknown_string1[64]; // -/*00000*/ uint8 unknown_rof43[30]; // +/*00000*/ char unknown_string1[64]; // +/*00000*/ uint8 unknown_rof43[30]; // /*00000*/ uint32 unknown_string2_count; // Seen 64 -/*00000*/ char unknown_string2[64]; // +/*00000*/ char unknown_string2[64]; // /*00000*/ uint32 unknown_string3_count; // Seen 64 -/*00000*/ char unknown_string3[64]; // +/*00000*/ char unknown_string3[64]; // /*00000*/ uint32 unknown_rof44; // Seen 0 or 50 -/*00000*/ uint8 unknown_rof45[663]; // +/*00000*/ uint8 unknown_rof45[663]; // /*00000*/ uint32 char_id; // Guessed based on char creation date and values /*00000*/ uint8 unknown_rof46; // Seen 0 or 1 /*00000*/ uint32 unknown_rof47; // Seen 6 @@ -1121,7 +1121,7 @@ union /*00000*/ uint32 unknown_rof49; // Seen 64 /*00000*/ uint8 unknown_rof50[256]; // Seen mostly 0s, but one example had a 2 in the middle /*00000*/ uint32 unknown_rof51; // Seen 100 or 0 -/*00000*/ uint8 unknown_rof52[82]; // +/*00000*/ uint8 unknown_rof52[82]; // /*00000*/ uint32 unknown_rof53; // Seen 50 uint8 unknown_rof54[1325]; // Unknown Section @@ -1418,7 +1418,7 @@ struct CombatDamage_Struct /* 21 */ uint8 unknown19[9]; // was [9] /* 30 */ }; - + /* ** Consider Struct @@ -1431,7 +1431,7 @@ struct Consider_Struct{ /*012*/ uint32 level; // Level /*016*/ uint8 pvpcon; // Pvp con flag 0/1 /*017*/ uint8 unknown017[3]; // -/*020*/ +/*020*/ }; /* @@ -1526,7 +1526,7 @@ struct PlayerPositionUpdateServer_Struct signed y_pos:19; // y coord unsigned padding:1; /*0008*/ signed delta_x:13; // change in x - signed delta_heading:10;// change in heading + signed delta_heading:10;// change in heading signed padding0008:9; /*0012*/ signed delta_y:13; // change in y signed z_pos:19; // z coord @@ -1555,14 +1555,14 @@ struct PlayerPositionUpdateClient_Struct /*0014*/ float x_pos; // x coord (2nd loc value) /*0018*/ float y_pos; // y coord (1st loc value) /*0022*/ signed delta_heading:10; // change in heading - unsigned animation:10; // ***Placeholder + unsigned animation:10; // ***Placeholder unsigned padding0024:12; // animation /*0026*/ float delta_z; // Change in z /*0030*/ float delta_x; // Change in x /*0034*/ float z_pos; // z coord (3rd loc value) /*0038*/ unsigned heading:12; // Directional heading - unsigned padding0040:10; // ***Placeholder - unsigned padding0041:10; // ***Placeholder + unsigned padding0040:10; // ***Placeholder + unsigned padding0041:10; // ***Placeholder /*0042*/ }; @@ -2004,7 +2004,7 @@ struct Merchant_Click_Struct { /*012*/ float rate; // cost multiplier, dosent work anymore /*016*/ int32 unknown01; // Seen 3 from Server or -1 from Client /*020*/ int32 unknown02; // Seen 2592000 from Server or -1 from Client -/*024*/ +/*024*/ }; /* Unknowns: @@ -2097,7 +2097,7 @@ struct AltCurrencyUpdate_Struct { /*084*/ uint32 unknown084; //seen 0 }; -//Client -> Server +//Client -> Server //When an item is selected while the alt currency merchant window is open struct AltCurrencySelectItem_Struct { /*000*/ uint32 merchant_entity_id; @@ -2128,7 +2128,7 @@ struct AltCurrencySelectItem_Struct { //eg: "I will give you no doubloons for a cloth cap." //Probably also sends amounts somewhere struct AltCurrencySelectItemReply_Struct { -/*000*/ uint32 unknown000; +/*000*/ uint32 unknown000; /*004*/ uint8 unknown004; //0xff /*005*/ uint8 unknown005; //0xff /*006*/ uint8 unknown006; //0xff @@ -2232,7 +2232,7 @@ struct AdventureLeaderboard_Struct /*008*/ uint32 success; /*012*/ uint32 failure; /*016*/ uint32 our_rank; -/*020*/ +/*020*/ }; /*struct Item_Shop_Struct { @@ -2501,7 +2501,7 @@ struct Who_All_Struct { // 156 length total /*080*/ uint32 gmlookup; // FF FF = not doing /who all gm /*084*/ uint32 guildid; // Also used for Buyer/Trader/LFG /*152*/ uint32 type; // 0 = /who 3 = /who all -/*156*/ +/*156*/ }; struct Stun_Struct { // 8 bytes total @@ -2637,9 +2637,9 @@ struct BookRequest_Struct { /*0000*/ uint32 window; // where to display the text (0xFFFFFFFF means new window). /*0004*/ uint16 invslot; // Is the slot, but the RoF conversion causes it to fail. Turned to 0 since it isnt required anyway. /*0008*/ uint32 unknown006; // Seen FFFFFFFF -/*0010*/ uint16 unknown008; // seen 0000 +/*0010*/ uint16 unknown008; // seen 0000 /*0012*/ uint32 type; // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others -/*0016*/ uint32 unknown0012; +/*0016*/ uint32 unknown0012; /*0020*/ uint16 unknown0016; /*0022*/ char txtfile[8194]; }; @@ -2735,7 +2735,7 @@ struct Door_Struct /*0054*/ uint8 unknown0054[4]; // 00 00 00 00 /*0060*/ uint8 doorId; // door's id # /*0061*/ uint8 opentype; -/*0062*/ uint8 state_at_spawn; +/*0062*/ uint8 state_at_spawn; /*0063*/ uint8 invert_state; // if this is 1, the door is normally open /*0064*/ uint32 door_param; // normally ff ff ff ff (-1) /*0068*/ uint32 unknown0068; // 00 00 00 00 @@ -3046,7 +3046,7 @@ struct Tracking_Struct_New { struct Track_Struct_New { uint16 entityid; // Entity ID uint16 unknown002; // 00 00 - uint32 unknown004; // + uint32 unknown004; // uint8 level; // level of mob uint8 unknown009; // 01 maybe type of mob? player/npc? char name[1]; // name of mob @@ -3242,13 +3242,13 @@ struct GuildMemberEntry_Struct { char name[1]; // variable length uint32 level; uint32 banker; // 1=yes, 0=no - uint32 class_; - uint32 rank; - uint32 time_last_on; - uint32 tribute_enable; + uint32 class_; + uint32 rank; + uint32 time_last_on; + uint32 tribute_enable; uint32 unknown01; // Seen 0 uint32 total_tribute; // total guild tribute donated, network byte order - uint32 last_tribute; // unix timestamp + uint32 last_tribute; // unix timestamp uint32 unknown_one; // unknown, set to 1 char public_note[1]; // variable length. uint16 zoneinstance; // Seen 0s or -1 in RoF @@ -3258,7 +3258,7 @@ struct GuildMemberEntry_Struct { }; //just for display purposes, this is not actually used in the message encoding other than for size. -struct GuildMembers_Struct { +struct GuildMembers_Struct { char player_name[1]; // variable length. uint32 guildid; // Was unknown02 - network byte order uint32 count; // network byte order @@ -3695,7 +3695,7 @@ struct TaskDescription_Struct { /*044*/ uint16 unknown39; /*046*/ char reward_link[1]; //variable length, 0 terminated /*047*/ uint32 unknown43; //maybe crystal count? -/*051*/ +/*051*/ }; #endif @@ -3724,7 +3724,7 @@ struct TaskActivity_Struct { /*032*/ char Text1[1]; // Variable length - Null terminated /*000*/ uint32 Text2Len; // Lenth of the following string /*000*/ char Text2[1]; // Variable length - not Null terminated -/*000*/ uint32 GoalCount; +/*000*/ uint32 GoalCount; /*000*/ uint32 String1Len; // Lenth of the following string - Seen 2 /*000*/ char String1[1]; // Numeric String - Seen "-1" - not Null terminated /*000*/ uint32 String2Len; // Lenth of the following string - Seen 2 @@ -4338,7 +4338,7 @@ struct ItemBodyStruct uint32 icon; uint8 unknown1; uint8 unknown2; - uint32 BenefitFlag; + uint32 BenefitFlag; uint8 tradeskills; int8 CR; int8 DR; @@ -4468,9 +4468,9 @@ struct ItemTertiaryBodyStruct uint8 no_transfer; uint16 expendablearrow; - uint32 unknown8; - uint32 unknown9; - uint32 unknown10; + uint32 unknown8; + uint32 unknown9; + uint32 unknown10; uint32 unknown11; uint8 unknown12; uint8 unknown13; @@ -4549,7 +4549,7 @@ struct ItemQuaternaryBodyStruct int32 clairvoyance; uint8 unknown18; //Power Source Capacity or evolve filename? uint32 evolve_string; // Some String, but being evolution related is just a guess - uint8 unknown19; + uint8 unknown19; uint32 unknown20; // Bard Stuff? //uint32 unknown21; uint8 unknown22; @@ -4559,7 +4559,7 @@ struct ItemQuaternaryBodyStruct float unknown26; float unknown27; uint32 unknown_RoF6; // 0 New to March 21 2012 client - uint32 unknown28; // 0xffffffff + uint32 unknown28; // 0xffffffff uint16 unknown29; uint32 unknown30; // 0xffffffff uint16 unknown31; diff --git a/common/patches/SSDefine.h b/common/patches/SSDefine.h index ea301e0de..23d5dbbad 100644 --- a/common/patches/SSDefine.h +++ b/common/patches/SSDefine.h @@ -1,5 +1,5 @@ -#define ENCODE(x) void Strategy::Encode_##x(EQApplicationPacket **p, EQStream *dest, bool ack_req) +#define ENCODE(x) void Strategy::Encode_##x(EQApplicationPacket **p, EQStream *dest, bool ack_req) #define DECODE(x) void Strategy::Decode_##x(EQApplicationPacket *__packet) #define StructDist(in, f1, f2) (uint32(&in->f2)-uint32(&in->f1)) @@ -10,9 +10,9 @@ /* - * + * * for encoders - * + * */ //more complex operations and variable length packets #define FASTQUEUE(packet) dest->FastQueuePacket(&packet, ack_req); @@ -55,7 +55,7 @@ #define FAIL_ENCODE() \ delete[] __emu_buffer; \ delete __packet; - + //call to finish an encoder using SETUP_DIRECT_ENCODE #define FINISH_ENCODE() \ delete[] __emu_buffer; \ @@ -93,9 +93,9 @@ /* - * + * * for decoders: - * + * */ //simple buffer-to-buffer movement for fixed length packets @@ -118,10 +118,10 @@ #define FAIL_DIRECT_DECODE() \ delete[] __eq_buffer; \ p->SetOpcode(OP_Unknown); - + //call to finish an encoder using SETUP_DIRECT_DECODE #define FINISH_DIRECT_DECODE() \ - delete[] __eq_buffer; + delete[] __eq_buffer; //check length of packet before decoding. Call before setup. #define DECODE_LENGTH_EXACT(struct_) \ diff --git a/common/patches/SoD.cpp b/common/patches/SoD.cpp index 7cbeae210..729388c41 100644 --- a/common/patches/SoD.cpp +++ b/common/patches/SoD.cpp @@ -22,7 +22,7 @@ static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; char* SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth); - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == nullptr) { @@ -38,37 +38,37 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; string pname; - + //register our world signature. pname = string(name) + "_world"; signature.ignore_eq_opcode = 0; signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + //register our zone signature. pname = string(name) + "_zone"; signature.ignore_eq_opcode = opcodes->EmuToEQ(OP_AckPacket); signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - - - + + + _log(NET__IDENTIFY, "Registered patch %s", name); } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != nullptr) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -98,7 +98,7 @@ std::string Strategy::Describe() const { r += name; return(r); } - + const EQClientVersion Strategy::ClientVersion() const { return EQClientSoD; @@ -115,7 +115,7 @@ static inline uint32 TitaniumToSoDSlot(uint32 TitaniumSlot) { { SoDSlot = TitaniumSlot + 1; } - else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor + else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor { SoDSlot = TitaniumSlot + 11; } @@ -134,20 +134,20 @@ static inline uint32 TitaniumToSoDSlot(uint32 TitaniumSlot) { else { SoDSlot = TitaniumSlot; - } - + } + return SoDSlot; } // Converts SoD Slot IDs to Titanium Slot IDs for use in Decodes static inline uint32 SoDToTitaniumSlot(uint32 SoDSlot) { uint32 TitaniumSlot = 0; - + if(SoDSlot >= 22 && SoDSlot <= 54) // Cursor/Ammo/Power Source and Normal Inventory Slots { TitaniumSlot = SoDSlot - 1; } - else if(SoDSlot >= 262 && SoDSlot <= 351) // Bag Slots for Normal Inventory and Cursor + else if(SoDSlot >= 262 && SoDSlot <= 351) // Bag Slots for Normal Inventory and Cursor { TitaniumSlot = SoDSlot - 11; } @@ -186,7 +186,7 @@ ENCODE(OP_OpenNewTasksWindow) { EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; __emu_AvailableTaskHeader = (AvailableTaskHeader_Struct*)__emu_buffer; @@ -222,7 +222,7 @@ ENCODE(OP_OpenNewTasksWindow) { __eq_AvailableTaskData1->TaskID = __emu_AvailableTaskData1->TaskID; // This next unknown seems to affect the colour of the task title. 0x3f80000 is what I have seen // in Live packets. Changing it to 0x3f000000 makes the title red. - __eq_AvailableTaskData1->unknown1 = 0x3f800000; + __eq_AvailableTaskData1->unknown1 = 0x3f800000; __eq_AvailableTaskData1->TimeLimit = __emu_AvailableTaskData1->TimeLimit; __eq_AvailableTaskData1->unknown2 = __emu_AvailableTaskData1->unknown2; @@ -281,7 +281,7 @@ ENCODE(OP_OpenNewTasksWindow) { } delete[] __emu_buffer; - + dest->FastQueuePacket(&in, ack_req); } @@ -289,8 +289,8 @@ ENCODE(OP_OpenNewTasksWindow) { ENCODE(OP_SendCharInfo) { ENCODE_LENGTH_EXACT(CharacterSelect_Struct); SETUP_VAR_ENCODE(CharacterSelect_Struct); - - + + //EQApplicationPacket *packet = *p; //const CharacterSelect_Struct *emu = (CharacterSelect_Struct *) packet->pBuffer; @@ -309,10 +309,10 @@ ENCODE(OP_SendCharInfo) { + namelen; ALLOC_VAR_ENCODE(structs::CharacterSelect_Struct, total_length); - + //unsigned char *eq_buffer = new unsigned char[total_length]; //structs::CharacterSelect_Struct *eq_head = (structs::CharacterSelect_Struct *) eq_buffer; - + eq->char_count = char_count; eq->total_chars = 10; @@ -359,9 +359,9 @@ ENCODE(OP_SendCharInfo) { } bufptr += sizeof(structs::CharacterSelectEntry_Struct); } - + FINISH_ENCODE(); - + } ENCODE(OP_ZoneServerInfo) { @@ -369,8 +369,8 @@ ENCODE(OP_ZoneServerInfo) { OUT_str(ip); OUT(port); FINISH_ENCODE(); - - //this is SUCH bullshit to be doing from down here. but the + + //this is SUCH bullshit to be doing from down here. but the // new client requires us to close immediately following this // packet, so do it. //dest->Close(); @@ -379,17 +379,17 @@ ENCODE(OP_ZoneServerInfo) { //hack hack hack ENCODE(OP_SendZonepoints) { ENCODE_LENGTH_ATLEAST(ZonePoints); - + SETUP_VAR_ENCODE(ZonePoints); ALLOC_VAR_ENCODE(structs::ZonePoints, __packet->size); - + memcpy(eq, emu, __packet->size); - + FINISH_ENCODE(); // unknown0xxx[24]; //this is utter crap... the client is waiting for this //certain 0 length opcode to come after the reqclientspawn - //stuff... so this is a dirty way to put it in there. + //stuff... so this is a dirty way to put it in there. // this needs to be done better //EQApplicationPacket hack_test(OP_PetitionUnCheckout, 0); @@ -399,10 +399,10 @@ ENCODE(OP_SendZonepoints) { ENCODE(OP_SendAATable) { ENCODE_LENGTH_ATLEAST(SendAA_Struct); - + SETUP_VAR_ENCODE(SendAA_Struct); ALLOC_VAR_ENCODE(structs::SendAA_Struct, sizeof(structs::SendAA_Struct) + emu->total_abilities*sizeof(structs::AA_Ability)); - + // Check clientver field to verify this AA should be sent for SoF // clientver 1 is for all clients and 5 is for SoD if (emu->clientver <= 5 ) @@ -459,13 +459,13 @@ ENCODE(OP_LeadershipExpUpdate) { ENCODE(OP_PlayerProfile) { SETUP_DIRECT_ENCODE(PlayerProfile_Struct, structs::PlayerProfile_Struct); - + uint32 r; - + eq->available_slots=0xffffffff; memset(eq->unknown4184, 0xff, sizeof(eq->unknown4184)); memset(eq->unknown04396, 0xff, sizeof(eq->unknown04396)); - + // OUT(checksum); OUT(gender); OUT(race); @@ -558,7 +558,7 @@ ENCODE(OP_PlayerProfile) { OUT(aapoints_spent); OUT(aapoints); // OUT(unknown06160[4]); - //NOTE: new client supports 20 bandoliers, our internal rep + //NOTE: new client supports 20 bandoliers, our internal rep //only supports 4.. for(r = 0; r < 4; r++) { OUT_str(bandoliers[r].name); @@ -681,12 +681,12 @@ const uint8 bytes[] = { }; memcpy(eq->unknown12864, bytes, sizeof(bytes)); - - + + //set the checksum... CRC32::SetEQChecksum(__packet->pBuffer, sizeof(structs::PlayerProfile_Struct)-4); - + FINISH_ENCODE(); } @@ -721,7 +721,7 @@ ENCODE(OP_NewZone) { OUT_str(zone_short_name2); OUT(zone_id); OUT(zone_instance); - OUT(SuspendBuffs); + OUT(SuspendBuffs); /*fill in some unknowns with observed values, hopefully it will help */ eq->unknown800 = -1; eq->unknown844 = 600; @@ -867,7 +867,7 @@ ENCODE(OP_Barter) delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); - + } ENCODE(OP_InspectRequest) { @@ -946,11 +946,11 @@ ENCODE(OP_ZoneSpawns) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Spawn_Struct *emu = (Spawn_Struct *) __emu_buffer; - + //determine and verify length int entrycount = in->size / sizeof(Spawn_Struct); if(entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { @@ -959,7 +959,7 @@ ENCODE(OP_ZoneSpawns) { return; } - + //_log(NET__STRUCTS, "Spawn name is [%s]", emu->name); emu = (Spawn_Struct *) __emu_buffer; @@ -968,7 +968,7 @@ ENCODE(OP_ZoneSpawns) { char *Buffer = (char *) in->pBuffer; - + int r; int k; for(r = 0; r < entrycount; r++, emu++) { @@ -1141,7 +1141,7 @@ ENCODE(OP_ZoneSpawns) { { VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); } - + VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->curHp); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->haircolor); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->beardcolor); @@ -1199,7 +1199,7 @@ ENCODE(OP_ZoneSpawns) { Position->deltaZ = emu->deltaZ; Buffer += sizeof(structs::Spawn_Struct_Position); - + if((emu->NPC == 0) || (emu->race <=12) || (emu->race == 128) || (emu ->race == 130) || (emu->race == 330) || (emu->race == 522)) { for(k = 0; k < 9; ++k) @@ -1254,7 +1254,7 @@ ENCODE(OP_ZoneSpawns) { dest->FastQueuePacket(&outapp, ack_req); } - + delete in; } @@ -1262,7 +1262,7 @@ ENCODE(OP_MercenaryDataResponse) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; MercenaryMerchantList_Struct *emu = (MercenaryMerchantList_Struct *) __emu_buffer; @@ -1329,7 +1329,7 @@ ENCODE(OP_MercenaryDataUpdate) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; MercenaryDataUpdate_Struct *emu = (MercenaryDataUpdate_Struct *) __emu_buffer; @@ -1400,7 +1400,7 @@ ENCODE(OP_ItemPacket) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; ItemPacket_Struct *old_item_pkt=(ItemPacket_Struct *)__emu_buffer; InternalSerializedItem_Struct *int_struct=(InternalSerializedItem_Struct *)(old_item_pkt->SerializedItem); @@ -1442,7 +1442,7 @@ ENCODE(OP_CharInventory) { return; } - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; @@ -1450,7 +1450,7 @@ ENCODE(OP_CharInventory) { if(ItemCount == 0 || (in->size % sizeof(InternalSerializedItem_Struct)) != 0) { - _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", + _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(InternalSerializedItem_Struct)); delete in; @@ -1463,7 +1463,7 @@ ENCODE(OP_CharInventory) { in->pBuffer = new uchar[4]; *(uint32 *)in->pBuffer = ItemCount; - + in->size = 4; for(int r = 0; r < ItemCount; r++, eq++) { @@ -1507,39 +1507,39 @@ ENCODE(OP_GuildMemberList) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Internal_GuildMembers_Struct *emu = (Internal_GuildMembers_Struct *) in->pBuffer; - - - + + + //make a new EQ buffer. uint32 pnl = strlen(emu->player_name); - uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + + uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + emu->count*sizeof(structs::GuildMemberEntry_Struct) + emu->name_length + emu->note_length; in->pBuffer = new uint8[length]; in->size = length; //no memset since we fill every byte. - + uint8 *buffer; buffer = in->pBuffer; - + //easier way to setup GuildMembers_Struct //set prefix name strcpy((char *)buffer, emu->player_name); buffer += pnl; *buffer = '\0'; buffer++; - + //add member count. *((uint32 *) buffer) = htonl( emu->count ); buffer += sizeof(uint32); - + if(emu->count > 0) { Internal_GuildMemberEntry_Struct *emu_e = emu->member; - const char *emu_name = (const char *) (__emu_buffer + + const char *emu_name = (const char *) (__emu_buffer + sizeof(Internal_GuildMembers_Struct) + //skip header emu->count * sizeof(Internal_GuildMemberEntry_Struct) //skip static length member data ); @@ -1547,12 +1547,12 @@ ENCODE(OP_GuildMemberList) { emu->name_length + //skip name contents emu->count //skip string terminators ); - + structs::GuildMemberEntry_Struct *e = (structs::GuildMemberEntry_Struct *) buffer; - + uint32 r; for(r = 0; r < emu->count; r++, emu_e++) { - + //the order we set things here must match the struct //nice helper macro @@ -1568,7 +1568,7 @@ ENCODE(OP_GuildMemberList) { } #define PutFieldN(field) \ e->field = htonl(emu_e->field) - + SlideStructString( name, emu_name ); PutFieldN(level); PutFieldN(banker); @@ -1582,15 +1582,15 @@ ENCODE(OP_GuildMemberList) { SlideStructString( public_note, emu_note ); e->zoneinstance = 0; e->zone_id = htons(emu_e->zone_id); - - + + #undef SlideStructString #undef PutFieldN - + e++; } } - + delete[] __emu_buffer; @@ -1741,16 +1741,16 @@ ENCODE(OP_LogServer) { ENCODE_LENGTH_EXACT(LogServer_Struct); SETUP_DIRECT_ENCODE(LogServer_Struct, structs::LogServer_Struct); strcpy(eq->worldshortname, emu->worldshortname); - + OUT(enablevoicemacros); OUT(enablemail); OUT(enable_pvp); OUT(enable_FV); - + // These next two need to be set like this for the Tutorial Button to work. eq->unknown263[0] = 0; eq->unknown263[2] = 1; - + FINISH_ENCODE(); } @@ -1977,7 +1977,7 @@ ENCODE(OP_Stun) { FINISH_ENCODE(); } -ENCODE(OP_ZonePlayerToBind) +ENCODE(OP_ZonePlayerToBind) { ENCODE_LENGTH_ATLEAST(ZonePlayerToBind_Struct); ZonePlayerToBind_Struct *zps = (ZonePlayerToBind_Struct*)(*p)->pBuffer; @@ -2030,7 +2030,7 @@ ENCODE(OP_AdventureMerchantSell) { FINISH_ENCODE(); } -ENCODE(OP_RaidUpdate) +ENCODE(OP_RaidUpdate) { EQApplicationPacket *inapp = *p; *p = nullptr; @@ -2043,7 +2043,7 @@ ENCODE(OP_RaidUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct)); structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer; - + add_member->raidGen.action = in_add_member->raidGen.action; add_member->raidGen.parameter = in_add_member->raidGen.parameter; strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64); @@ -2120,7 +2120,7 @@ ENCODE(OP_VetRewardsAvaliable) old_data += sizeof(InternalVeteranReward); data += sizeof(structs::VeteranReward); } - + dest->FastQueuePacket(&outapp_create); delete inapp; } @@ -2273,7 +2273,7 @@ ENCODE(OP_DzMemberList) ss.write((const char*)&null_term, sizeof(char)); ss.write((const char*)&emu->entries[i].status, sizeof(char)); } - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -2330,7 +2330,7 @@ ENCODE(OP_DzLeaderStatus) ss.write((const char*)&client_id, sizeof(uint32)); ss.write((const char*)&client_id, sizeof(uint32));//1 ss.write((const char*)&client_id, sizeof(uint32)); - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -2359,7 +2359,7 @@ ENCODE(OP_TargetBuffs) uchar *ptr = __packet->pBuffer; *((uint32*)ptr) = emu->entity_id; ptr += sizeof(uint32); - + *((uint16*)ptr) = emu->count; ptr += sizeof(uint16); @@ -2401,7 +2401,7 @@ ENCODE(OP_GroupUpdate) EQApplicationPacket *in = *p; GroupJoin_Struct *gjs = (GroupJoin_Struct*)in->pBuffer; - + //_log(NET__ERROR, "Received outgoing OP_GroupUpdate with action code %i", gjs->action); if((gjs->action == groupActLeave) || (gjs->action == groupActDisband)) { @@ -2447,10 +2447,10 @@ ENCODE(OP_GroupUpdate) { // Group Update2 //_log(NET__ERROR, "Struct is GroupUpdate2"); - + unsigned char *__emu_buffer = in->pBuffer; GroupUpdate2_Struct *gu2 = (GroupUpdate2_Struct*) __emu_buffer; - + //_log(NET__ERROR, "Yourname is %s", gu2->yourname); int MemberCount = 1; @@ -2472,7 +2472,7 @@ ENCODE(OP_GroupUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_GroupUpdateB, PacketLength); char *Buffer = (char *)outapp->pBuffer; - + // Header VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // Think this should be SpawnID, but it doesn't seem to matter VARSTRUCT_ENCODE_TYPE(uint32, Buffer, MemberCount); @@ -2480,7 +2480,7 @@ ENCODE(OP_GroupUpdate) // Leader // - + VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); VARSTRUCT_ENCODE_STRING(Buffer, gu2->yourname); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); @@ -2522,7 +2522,7 @@ ENCODE(OP_GroupUpdate) GLAAus->NPCMarkerID = gu2->NPCMarkerID; memcpy(&GLAAus->LeaderAAs, &gu2->leader_aas, sizeof(GLAAus->LeaderAAs)); - + dest->FastQueuePacket(&outapp); delete in; @@ -2548,7 +2548,7 @@ ENCODE(OP_GroupUpdate) dest->FastQueuePacket(&outapp); } -ENCODE(OP_AltCurrencySell) +ENCODE(OP_AltCurrencySell) { ENCODE_LENGTH_EXACT(AltCurrencySellItem_Struct); SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); @@ -2689,7 +2689,7 @@ DECODE(OP_ItemLinkClick) { DECODE_LENGTH_EXACT(structs::ItemViewRequest_Struct); SETUP_DIRECT_DECODE(ItemViewRequest_Struct, structs::ItemViewRequest_Struct); MEMSET_IN(ItemViewRequest_Struct); - + IN(item_id); int r; for (r = 0; r < 5; r++) { @@ -2697,7 +2697,7 @@ DECODE(OP_ItemLinkClick) { } IN(link_hash); IN(icon); - + FINISH_DIRECT_DECODE(); } @@ -2740,7 +2740,7 @@ DECODE(OP_ShopPlayerBuy) } DECODE(OP_ClientUpdate) { - // for some odd reason, there is an extra byte on the end of this on occasion.. + // for some odd reason, there is an extra byte on the end of this on occasion.. DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct); SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct); IN(spawn_id); @@ -2771,7 +2771,7 @@ DECODE(OP_CharacterCreate) { emu->start_zone = RuleI(World, TutorialZoneID); else emu->start_zone = eq->start_zone; - + IN(haircolor); IN(deity); IN(STR); @@ -2803,7 +2803,7 @@ DECODE(OP_WhoAllRequest) { IN(gmlookup); IN(guildid); IN(type); - + FINISH_DIRECT_DECODE(); } @@ -3277,7 +3277,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint SoD::structs::ItemTertiaryBodyStruct itbs; memset(&itbs, 0, sizeof(SoD::structs::ItemTertiaryBodyStruct)); - + itbs.loregroup = item->LoreGroup; itbs.artifact = item->ArtifactFlag; itbs.summonedflag = item->SummonedFlag; @@ -3452,7 +3452,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint uint32 SubLengths[10]; for(int x = 0; x < 10; ++x) { - + SubSerializations[x] = nullptr; const ItemInst* subitem = ((const ItemInst*)inst)->GetItem(x); @@ -3512,11 +3512,11 @@ DECODE(OP_Bug) strn0cpy(emu->target_name, eq->target_name, sizeof(emu->target_name)); strn0cpy(emu->bug, eq->bug, sizeof(emu->bug)); strn0cpy(emu->system_info, eq->system_info, sizeof(emu->system_info)); - + FINISH_DIRECT_DECODE(); } -DECODE(OP_AltCurrencySellSelection) +DECODE(OP_AltCurrencySellSelection) { DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); @@ -3525,7 +3525,7 @@ DECODE(OP_AltCurrencySellSelection) FINISH_DIRECT_DECODE(); } -DECODE(OP_AltCurrencySell) +DECODE(OP_AltCurrencySell) { DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); diff --git a/common/patches/SoD.h b/common/patches/SoD.h index 7af599e4b..960cd2afa 100644 --- a/common/patches/SoD.h +++ b/common/patches/SoD.h @@ -6,30 +6,30 @@ class EQStreamIdentifier; namespace SoD { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + //magic macro to declare our opcode processors #include "SSDeclare.h" #include "SoD_ops.h" }; - + }; diff --git a/common/patches/SoD_structs.h b/common/patches/SoD_structs.h index 95f4b22ef..2f1dcd990 100644 --- a/common/patches/SoD_structs.h +++ b/common/patches/SoD_structs.h @@ -621,7 +621,7 @@ struct CharCreate_Struct { /*0000*/ uint32 class_; /*0004*/ uint32 haircolor; -/*0008*/ uint32 beard; +/*0008*/ uint32 beard; /*0012*/ uint32 beardcolor; /*0016*/ uint32 gender; /*0020*/ uint32 race; @@ -845,7 +845,7 @@ struct PlayerProfile_Struct /*04160*/ uint32 INT; // Intelligence - 3c 00 00 00 - 60 /*04164*/ uint32 AGI; // Agility - 5f 00 00 00 - 95 /*04168*/ uint32 WIS; // Wisdom - 46 00 00 00 - 70 -/*04172*/ uint8 unknown04172[28]; // +/*04172*/ uint8 unknown04172[28]; // /*04200*/ uint8 face; // Player face /*04201*/ uint8 unknown02264[147]; // was [175] /*04348*/ uint32 spell_book[MAX_PP_SPELLBOOK]; // List of the Spells in spellbook 480 = 60 pages [1920] @@ -967,7 +967,7 @@ struct PlayerProfile_Struct /*22448*/ uint32 level3; // SoF looks at the level here to determine how many leadership AA you can bank. /*22452*/ uint32 showhelm; // 0=no, 1=yes /*22456*/ uint32 RestTimer; -/*22460*/ uint8 unknown19584[1028]; // ***Placeholder (2/13/2007) was[1028]or[940]or[1380] - END of Struct +/*22460*/ uint8 unknown19584[1028]; // ***Placeholder (2/13/2007) was[1028]or[940]or[1380] - END of Struct /*23488*/ }; @@ -1223,7 +1223,7 @@ struct Consider_Struct{ /*012*/ uint32 level; // Level /*016*/ uint8 pvpcon; // Pvp con flag 0/1 /*017*/ uint8 unknown017[3]; // -/*020*/ +/*020*/ }; /* @@ -1346,14 +1346,14 @@ struct PlayerPositionUpdateClient_Struct /*0012*/ float y_pos; // y coord (1st loc value) /*0016*/ signed delta_heading:10; // change in heading unsigned padding0036:10; // animation - unsigned padding0016:12; // ***Placeholder + unsigned padding0016:12; // ***Placeholder /*0020*/ float delta_x; // Change in x /*0024*/ float delta_y; // Change in y /*0028*/ float z_pos; // z coord (3rd loc value) /*0032*/ float delta_z; // Change in z -/*0036*/ unsigned animation:10; // ***Placeholder +/*0036*/ unsigned animation:10; // ***Placeholder unsigned heading:12; // Directional heading - unsigned padding0037:10; // ***Placeholder + unsigned padding0037:10; // ***Placeholder /*0040*/ }; @@ -1900,7 +1900,7 @@ struct AdventureLeaderboard_Struct /*008*/ uint32 success; /*012*/ uint32 failure; /*016*/ uint32 our_rank; -/*020*/ +/*020*/ }; /*struct Item_Shop_Struct { @@ -1925,15 +1925,15 @@ struct Illusion_Struct { //size: 256 /*079*/ uint8 unknown079; // /*080*/ uint32 face; // /*084*/ uint8 hairstyle; // Some Races don't change Hair Style Properly in SoF -/*085*/ uint8 haircolor; // -/*086*/ uint8 beard; // -/*087*/ uint8 beardcolor; // -/*088*/ float size; // +/*085*/ uint8 haircolor; // +/*086*/ uint8 beard; // +/*087*/ uint8 beardcolor; // +/*088*/ float size; // /*092*/ uint8 unknown092[148]; /*240*/ uint32 unknown240; // Removes armor? -/*244*/ uint32 drakkin_heritage; // -/*248*/ uint32 drakkin_tattoo; // -/*252*/ uint32 drakkin_details; // +/*244*/ uint32 drakkin_heritage; // +/*248*/ uint32 drakkin_tattoo; // +/*252*/ uint32 drakkin_details; // /*256*/ }; @@ -2291,7 +2291,7 @@ struct BookRequest_Struct { /*0000*/ uint32 window; // where to display the text (0xFFFFFFFF means new window). /*0004*/ uint32 invslot; // The inventory slot the book is in. Not used, but echoed in the response packet. /*0008*/ uint32 type; // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others -/*0012*/ uint32 unknown0012; +/*0012*/ uint32 unknown0012; /*0016*/ uint16 unknown0016; /*0018*/ char txtfile[8194]; }; @@ -2392,7 +2392,7 @@ struct Door_Struct /*0054*/ uint8 unknown0054[4]; // 00 00 00 00 /*0060*/ uint8 doorId; // door's id # /*0061*/ uint8 opentype; -/*0062*/ uint8 state_at_spawn; +/*0062*/ uint8 state_at_spawn; /*0063*/ uint8 invert_state; // if this is 1, the door is normally open /*0064*/ uint32 door_param; // normally ff ff ff ff (-1) /*0068*/ uint32 unknown0068; // 00 00 00 00 @@ -2694,7 +2694,7 @@ struct Tracking_Struct_New { struct Track_Struct_New { uint16 entityid; // Entity ID uint16 unknown002; // 00 00 - uint32 unknown004; // + uint32 unknown004; // uint8 level; // level of mob uint8 unknown009; // 01 maybe type of mob? player/npc? char name[1]; // name of mob @@ -3893,7 +3893,7 @@ struct ItemBodyStruct uint32 icon; uint8 unknown1; uint8 unknown2; - uint32 BenefitFlag; + uint32 BenefitFlag; uint8 tradeskills; int8 CR; int8 DR; @@ -3963,7 +3963,7 @@ struct ItemBodyStruct uint32 FactionMod4; int32 FactionAmt4; //int16 unknown14; - + }; struct AugSlotStruct @@ -3998,9 +3998,9 @@ struct ItemTertiaryBodyStruct uint8 no_transfer; uint16 expendablearrow; - uint32 unknown8; - uint32 unknown9; - uint32 unknown10; + uint32 unknown8; + uint32 unknown9; + uint32 unknown10; uint32 unknown11; uint8 unknown12; uint8 unknown13; @@ -4205,7 +4205,7 @@ struct AltCurrencySellItem_Struct { }; struct MercenaryGrade_Struct { -uint32 GradeCountEntry; +uint32 GradeCountEntry; }; // Used by MercenaryListEntry_Struct @@ -4267,7 +4267,7 @@ struct MercenaryData_Struct { // [OPCode: 0x6537] On Live as of April 2 2012 [Server->Client] // Should be named OP_MercenaryDataResponse, but the current opcode using that name should be renamed first // Size varies if mercenary is hired or if browsing Mercenary Merchant -// This may also be the response for Client->Server 0x0327 (size 0) packet On Live as of April 2 2012 +// This may also be the response for Client->Server 0x0327 (size 0) packet On Live as of April 2 2012 struct MercenaryDataUpdate_Struct { /*0000*/ int32 MercStatus; // Seen 0 with merc and -1 with no merc hired /*0004*/ uint32 MercCount; // Seen 1 with 1 merc hired and 0 with no merc hired diff --git a/common/patches/SoF.cpp b/common/patches/SoF.cpp index 823f62d11..67610bc30 100644 --- a/common/patches/SoF.cpp +++ b/common/patches/SoF.cpp @@ -22,7 +22,7 @@ static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; char* SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth); - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == nullptr) { @@ -38,37 +38,37 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; string pname; - + //register our world signature. pname = string(name) + "_world"; signature.ignore_eq_opcode = 0; signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + //register our zone signature. pname = string(name) + "_zone"; signature.ignore_eq_opcode = opcodes->EmuToEQ(OP_AckPacket); signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - - - + + + _log(NET__IDENTIFY, "Registered patch %s", name); } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != nullptr) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -98,7 +98,7 @@ std::string Strategy::Describe() const { r += name; return(r); } - + const EQClientVersion Strategy::ClientVersion() const { return EQClientSoF; @@ -115,7 +115,7 @@ static inline uint32 TitaniumToSoFSlot(uint32 TitaniumSlot) { { SoFSlot = TitaniumSlot + 1; } - else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor + else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor { SoFSlot = TitaniumSlot + 11; } @@ -134,20 +134,20 @@ static inline uint32 TitaniumToSoFSlot(uint32 TitaniumSlot) { else { SoFSlot = TitaniumSlot; - } - + } + return SoFSlot; } // Converts Sof Slot IDs to Titanium Slot IDs for use in Decodes static inline uint32 SoFToTitaniumSlot(uint32 SoFSlot) { uint32 TitaniumSlot = 0; - + if(SoFSlot >= 22 && SoFSlot <= 54) // Cursor/Ammo/Power Source and Normal Inventory Slots { TitaniumSlot = SoFSlot - 1; } - else if(SoFSlot >= 262 && SoFSlot <= 351) // Bag Slots for Normal Inventory and Cursor + else if(SoFSlot >= 262 && SoFSlot <= 351) // Bag Slots for Normal Inventory and Cursor { TitaniumSlot = SoFSlot - 11; } @@ -186,7 +186,7 @@ ENCODE(OP_OpenNewTasksWindow) { EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; __emu_AvailableTaskHeader = (AvailableTaskHeader_Struct*)__emu_buffer; @@ -222,7 +222,7 @@ ENCODE(OP_OpenNewTasksWindow) { __eq_AvailableTaskData1->TaskID = __emu_AvailableTaskData1->TaskID; // This next unknown seems to affect the colour of the task title. 0x3f80000 is what I have seen // in Live packets. Changing it to 0x3f000000 makes the title red. - __eq_AvailableTaskData1->unknown1 = 0x3f800000; + __eq_AvailableTaskData1->unknown1 = 0x3f800000; __eq_AvailableTaskData1->TimeLimit = __emu_AvailableTaskData1->TimeLimit; __eq_AvailableTaskData1->unknown2 = __emu_AvailableTaskData1->unknown2; @@ -281,7 +281,7 @@ ENCODE(OP_OpenNewTasksWindow) { } delete[] __emu_buffer; - + dest->FastQueuePacket(&in, ack_req); } @@ -289,8 +289,8 @@ ENCODE(OP_OpenNewTasksWindow) { ENCODE(OP_SendCharInfo) { ENCODE_LENGTH_EXACT(CharacterSelect_Struct); SETUP_VAR_ENCODE(CharacterSelect_Struct); - - + + //EQApplicationPacket *packet = *p; //const CharacterSelect_Struct *emu = (CharacterSelect_Struct *) packet->pBuffer; @@ -309,10 +309,10 @@ ENCODE(OP_SendCharInfo) { + namelen; ALLOC_VAR_ENCODE(structs::CharacterSelect_Struct, total_length); - + //unsigned char *eq_buffer = new unsigned char[total_length]; //structs::CharacterSelect_Struct *eq_head = (structs::CharacterSelect_Struct *) eq_buffer; - + eq->char_count = char_count; eq->total_chars = 10; @@ -359,9 +359,9 @@ ENCODE(OP_SendCharInfo) { } bufptr += sizeof(structs::CharacterSelectEntry_Struct); } - + FINISH_ENCODE(); - + } ENCODE(OP_ZoneServerInfo) { @@ -369,8 +369,8 @@ ENCODE(OP_ZoneServerInfo) { OUT_str(ip); OUT(port); FINISH_ENCODE(); - - //this is SUCH bullshit to be doing from down here. but the + + //this is SUCH bullshit to be doing from down here. but the // new client requires us to close immediately following this // packet, so do it. //dest->Close(); @@ -379,17 +379,17 @@ ENCODE(OP_ZoneServerInfo) { //hack hack hack ENCODE(OP_SendZonepoints) { ENCODE_LENGTH_ATLEAST(ZonePoints); - + SETUP_VAR_ENCODE(ZonePoints); ALLOC_VAR_ENCODE(structs::ZonePoints, __packet->size); - + memcpy(eq, emu, __packet->size); - + FINISH_ENCODE(); // unknown0xxx[24]; //this is utter crap... the client is waiting for this //certain 0 length opcode to come after the reqclientspawn - //stuff... so this is a dirty way to put it in there. + //stuff... so this is a dirty way to put it in there. // this needs to be done better //EQApplicationPacket hack_test(OP_PetitionUnCheckout, 0); @@ -399,10 +399,10 @@ ENCODE(OP_SendZonepoints) { ENCODE(OP_SendAATable) { ENCODE_LENGTH_ATLEAST(SendAA_Struct); - + SETUP_VAR_ENCODE(SendAA_Struct); ALLOC_VAR_ENCODE(structs::SendAA_Struct, sizeof(structs::SendAA_Struct) + emu->total_abilities*sizeof(structs::AA_Ability)); - + // Check clientver field to verify this AA should be sent for SoF // clientver 1 is for all clients and 4 is for SoF if (emu->clientver <= 4 ) @@ -459,13 +459,13 @@ ENCODE(OP_LeadershipExpUpdate) { ENCODE(OP_PlayerProfile) { SETUP_DIRECT_ENCODE(PlayerProfile_Struct, structs::PlayerProfile_Struct); - + uint32 r; - + eq->available_slots=0xffffffff; memset(eq->unknown4184, 0xff, sizeof(eq->unknown4184)); memset(eq->unknown04396, 0xff, sizeof(eq->unknown04396)); - + // OUT(checksum); OUT(gender); OUT(race); @@ -558,7 +558,7 @@ ENCODE(OP_PlayerProfile) { OUT(aapoints_spent); OUT(aapoints); // OUT(unknown06160[4]); - //NOTE: new client supports 20 bandoliers, our internal rep + //NOTE: new client supports 20 bandoliers, our internal rep //only supports 4.. for(r = 0; r < 4; r++) { OUT_str(bandoliers[r].name); @@ -681,12 +681,12 @@ const uint8 bytes[] = { }; memcpy(eq->unknown12864, bytes, sizeof(bytes)); - - + + //set the checksum... CRC32::SetEQChecksum(__packet->pBuffer, sizeof(structs::PlayerProfile_Struct)-4); - + FINISH_ENCODE(); } @@ -722,7 +722,7 @@ ENCODE(OP_NewZone) { OUT(zone_id); OUT(zone_instance); OUT(SuspendBuffs); - + /*fill in some unknowns with observed values, hopefully it will help */ eq->unknown796 = -1; eq->unknown840 = 600; @@ -784,11 +784,11 @@ ENCODE(OP_ZoneSpawns) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Spawn_Struct *emu = (Spawn_Struct *) __emu_buffer; - + //determine and verify length int entrycount = in->size / sizeof(Spawn_Struct); if(entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { @@ -796,16 +796,16 @@ ENCODE(OP_ZoneSpawns) { delete in; return; } - + //make the EQ struct. in->size = sizeof(structs::Spawn_Struct)*entrycount; in->pBuffer = new unsigned char[in->size]; structs::Spawn_Struct *eq = (structs::Spawn_Struct *) in->pBuffer; - + //zero out the packet. We could avoid this memset by setting all fields (including unknowns) //in the loop. memset(in->pBuffer, 0, in->size); - + //do the transform... int r; int k; @@ -931,7 +931,7 @@ ENCODE(OP_ZoneSpawns) { } char hex[] = "0123456789ABCDEF"; - + eq->lastName[len + 0] = ' '; eq->lastName[len + 1] = code; eq->lastName[len + 2] = '0' + ((ofs / 1000) % 10); @@ -997,14 +997,14 @@ ENCODE(OP_ZoneSpawns) { } }*/ } - - + + //kill off the emu structure and send the eq packet. delete[] __emu_buffer; - + //_log(NET__ERROR, "Sending zone spawns"); //_hex(NET__ERROR, in->pBuffer, in->size); - + dest->FastQueuePacket(&in, ack_req); } @@ -1013,7 +1013,7 @@ ENCODE(OP_ItemPacket) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; ItemPacket_Struct *old_item_pkt=(ItemPacket_Struct *)__emu_buffer; InternalSerializedItem_Struct *int_struct=(InternalSerializedItem_Struct *)(old_item_pkt->SerializedItem); @@ -1055,7 +1055,7 @@ ENCODE(OP_CharInventory) { return; } - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; @@ -1063,7 +1063,7 @@ ENCODE(OP_CharInventory) { if(ItemCount == 0 || (in->size % sizeof(InternalSerializedItem_Struct)) != 0) { - _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", + _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(InternalSerializedItem_Struct)); delete in; @@ -1076,7 +1076,7 @@ ENCODE(OP_CharInventory) { in->pBuffer = new uchar[4]; *(uint32 *)in->pBuffer = ItemCount; - + in->size = 4; for(int r = 0; r < ItemCount; r++, eq++) { @@ -1120,39 +1120,39 @@ ENCODE(OP_GuildMemberList) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Internal_GuildMembers_Struct *emu = (Internal_GuildMembers_Struct *) in->pBuffer; - - - + + + //make a new EQ buffer. uint32 pnl = strlen(emu->player_name); - uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + + uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + emu->count*sizeof(structs::GuildMemberEntry_Struct) + emu->name_length + emu->note_length; in->pBuffer = new uint8[length]; in->size = length; //no memset since we fill every byte. - + uint8 *buffer; buffer = in->pBuffer; - + //easier way to setup GuildMembers_Struct //set prefix name strcpy((char *)buffer, emu->player_name); buffer += pnl; *buffer = '\0'; buffer++; - + //add member count. *((uint32 *) buffer) = htonl( emu->count ); buffer += sizeof(uint32); - + if(emu->count > 0) { Internal_GuildMemberEntry_Struct *emu_e = emu->member; - const char *emu_name = (const char *) (__emu_buffer + + const char *emu_name = (const char *) (__emu_buffer + sizeof(Internal_GuildMembers_Struct) + //skip header emu->count * sizeof(Internal_GuildMemberEntry_Struct) //skip static length member data ); @@ -1160,12 +1160,12 @@ ENCODE(OP_GuildMemberList) { emu->name_length + //skip name contents emu->count //skip string terminators ); - + structs::GuildMemberEntry_Struct *e = (structs::GuildMemberEntry_Struct *) buffer; - + uint32 r; for(r = 0; r < emu->count; r++, emu_e++) { - + //the order we set things here must match the struct //nice helper macro @@ -1181,7 +1181,7 @@ ENCODE(OP_GuildMemberList) { } #define PutFieldN(field) \ e->field = htonl(emu_e->field) - + SlideStructString( name, emu_name ); PutFieldN(level); PutFieldN(banker); @@ -1195,15 +1195,15 @@ ENCODE(OP_GuildMemberList) { SlideStructString( public_note, emu_note ); e->zoneinstance = 0; e->zone_id = htons(emu_e->zone_id); - - + + #undef SlideStructString #undef PutFieldN - + e++; } } - + delete[] __emu_buffer; @@ -1325,16 +1325,16 @@ ENCODE(OP_LogServer) { ENCODE_LENGTH_EXACT(LogServer_Struct); SETUP_DIRECT_ENCODE(LogServer_Struct, structs::LogServer_Struct); strcpy(eq->worldshortname, emu->worldshortname); - + OUT(enablevoicemacros); OUT(enablemail); OUT(enable_pvp); OUT(enable_FV); - + // These next two need to be set like this for the Tutorial Button to work. eq->unknown263[0] = 0; eq->unknown263[2] = 1; - + FINISH_ENCODE(); } @@ -1476,7 +1476,7 @@ ENCODE(OP_BazaarSearch) { //determine and verify length int entrycount = in->size / sizeof(BazaarSearchResults_Struct); if(entrycount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0) { - _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", + _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct)); delete in; return; @@ -1615,7 +1615,7 @@ ENCODE(OP_Stun) { FINISH_ENCODE(); } -ENCODE(OP_ZonePlayerToBind) +ENCODE(OP_ZonePlayerToBind) { ENCODE_LENGTH_ATLEAST(ZonePlayerToBind_Struct); ZonePlayerToBind_Struct *zps = (ZonePlayerToBind_Struct*)(*p)->pBuffer; @@ -1668,7 +1668,7 @@ ENCODE(OP_AdventureMerchantSell) { FINISH_ENCODE(); } -ENCODE(OP_RaidUpdate) +ENCODE(OP_RaidUpdate) { EQApplicationPacket *inapp = *p; *p = nullptr; @@ -1681,7 +1681,7 @@ ENCODE(OP_RaidUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct)); structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer; - + add_member->raidGen.action = in_add_member->raidGen.action; add_member->raidGen.parameter = in_add_member->raidGen.parameter; strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64); @@ -1758,7 +1758,7 @@ ENCODE(OP_VetRewardsAvaliable) old_data += sizeof(InternalVeteranReward); data += sizeof(structs::VeteranReward); } - + dest->FastQueuePacket(&outapp_create); delete inapp; } @@ -1819,7 +1819,7 @@ ENCODE(OP_DzMemberList) ss.write((const char*)&null_term, sizeof(char)); ss.write((const char*)&emu->entries[i].status, sizeof(char)); } - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -1876,7 +1876,7 @@ ENCODE(OP_DzLeaderStatus) ss.write((const char*)&client_id, sizeof(uint32)); ss.write((const char*)&client_id, sizeof(uint32));//1 ss.write((const char*)&client_id, sizeof(uint32)); - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -1940,7 +1940,7 @@ ENCODE(OP_OnLevelMessage) FINISH_ENCODE(); } -ENCODE(OP_AltCurrencySell) +ENCODE(OP_AltCurrencySell) { ENCODE_LENGTH_EXACT(AltCurrencySellItem_Struct); SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); @@ -2078,7 +2078,7 @@ DECODE(OP_ItemLinkClick) { DECODE_LENGTH_EXACT(structs::ItemViewRequest_Struct); SETUP_DIRECT_DECODE(ItemViewRequest_Struct, structs::ItemViewRequest_Struct); MEMSET_IN(ItemViewRequest_Struct); - + IN(item_id); int r; for (r = 0; r < 5; r++) { @@ -2086,7 +2086,7 @@ DECODE(OP_ItemLinkClick) { } IN(link_hash); IN(icon); - + FINISH_DIRECT_DECODE(); } @@ -2115,7 +2115,7 @@ DECODE(OP_Consider) { } DECODE(OP_ClientUpdate) { - // for some odd reason, there is an extra byte on the end of this on occasion.. + // for some odd reason, there is an extra byte on the end of this on occasion.. DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct); SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct); IN(spawn_id); @@ -2146,7 +2146,7 @@ DECODE(OP_CharacterCreate) { emu->start_zone = RuleI(World, TutorialZoneID); else emu->start_zone = eq->start_zone; - + IN(haircolor); IN(deity); IN(STR); @@ -2178,7 +2178,7 @@ DECODE(OP_WhoAllRequest) { IN(gmlookup); IN(guildid); IN(type); - + FINISH_DIRECT_DECODE(); } @@ -2596,7 +2596,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint SoF::structs::ItemTertiaryBodyStruct itbs; memset(&itbs, 0, sizeof(SoF::structs::ItemTertiaryBodyStruct)); - + itbs.loregroup = item->LoreGroup; itbs.artifact = item->ArtifactFlag; itbs.summonedflag = item->SummonedFlag; @@ -2771,7 +2771,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint uint32 SubLengths[10]; for(int x = 0; x < 10; ++x) { - + SubSerializations[x] = nullptr; const ItemInst* subitem = ((const ItemInst*)inst)->GetItem(x); @@ -2817,7 +2817,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint return item_serial; } -DECODE(OP_AltCurrencySellSelection) +DECODE(OP_AltCurrencySellSelection) { DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); @@ -2826,7 +2826,7 @@ DECODE(OP_AltCurrencySellSelection) FINISH_DIRECT_DECODE(); } -DECODE(OP_AltCurrencySell) +DECODE(OP_AltCurrencySell) { DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); diff --git a/common/patches/SoF.h b/common/patches/SoF.h index c3d7da4ce..615bc1f99 100644 --- a/common/patches/SoF.h +++ b/common/patches/SoF.h @@ -6,30 +6,30 @@ class EQStreamIdentifier; namespace SoF { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + //magic macro to declare our opcode processors #include "SSDeclare.h" #include "SoF_ops.h" }; - + }; diff --git a/common/patches/SoF_opcode_list.h b/common/patches/SoF_opcode_list.h index ec5d8b11c..28a1ce650 100644 --- a/common/patches/SoF_opcode_list.h +++ b/common/patches/SoF_opcode_list.h @@ -3,7 +3,7 @@ // This File is not used in the build, but here as a reference for SoF. // This should be a complete list of all opcodes for SoF. // The list was generated from IDA using a script from the ShowEQ project. -// This file can be removed at any time. +// This file can be removed at any time. // It is only a reference the project to upgrade the emulator to use SoF. 0x10ff, OP_SenseTraps diff --git a/common/patches/SoF_structs.h b/common/patches/SoF_structs.h index 3305719cb..7a778767d 100644 --- a/common/patches/SoF_structs.h +++ b/common/patches/SoF_structs.h @@ -253,7 +253,7 @@ struct Spawn_Struct { /*0614*/ uint8 unknown0614[11]; /*0625*/ uint8 bodytype2; //New Field - Seems to do the same thing as bodytype /*0626*/ uint8 unknown0626[28]; -union +union { /*0654*/ uint8 equip_chest2; // This is Texture for NPCs /*0654*/ uint8 mount_color; // This should be merged into 1 field, "texture" @@ -599,7 +599,7 @@ struct CharCreate_Struct { /*0000*/ uint32 class_; /*0004*/ uint32 haircolor; -/*0008*/ uint32 beard; +/*0008*/ uint32 beard; /*0012*/ uint32 beardcolor; /*0016*/ uint32 gender; /*0020*/ uint32 race; @@ -1200,7 +1200,7 @@ struct Consider_Struct{ /*012*/ uint32 level; // Level /*016*/ uint8 pvpcon; // Pvp con flag 0/1 /*017*/ uint8 unknown017[3]; // -/*020*/ +/*020*/ }; /* @@ -1874,7 +1874,7 @@ struct AdventureLeaderboard_Struct /*008*/ uint32 success; /*012*/ uint32 failure; /*016*/ uint32 our_rank; -/*020*/ +/*020*/ }; /*struct Item_Shop_Struct { @@ -1899,15 +1899,15 @@ struct Illusion_Struct { //size: 256 /*079*/ uint8 unknown079; // /*080*/ uint32 face; // /*084*/ uint8 hairstyle; // Some Races don't change Hair Style Properly in SoF -/*085*/ uint8 haircolor; // -/*086*/ uint8 beard; // -/*087*/ uint8 beardcolor; // -/*088*/ float size; // +/*085*/ uint8 haircolor; // +/*086*/ uint8 beard; // +/*087*/ uint8 beardcolor; // +/*088*/ float size; // /*092*/ uint8 unknown092[148]; /*240*/ uint32 unknown240; // Removes armor? -/*244*/ uint32 drakkin_heritage; // -/*248*/ uint32 drakkin_tattoo; // -/*252*/ uint32 drakkin_details; // +/*244*/ uint32 drakkin_heritage; // +/*248*/ uint32 drakkin_tattoo; // +/*252*/ uint32 drakkin_details; // /*256*/ }; @@ -2225,7 +2225,7 @@ struct BookRequest_Struct { /*0000*/ uint32 window; // where to display the text (0xFFFFFFFF means new window). /*0004*/ uint32 invslot; // The inventory slot the book is in. Not used, but echoed in the response packet. /*0008*/ uint32 type; // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others -/*0012*/ uint32 unknown0012; +/*0012*/ uint32 unknown0012; /*0016*/ uint16 unknown0016; /*0018*/ char txtfile[8194]; }; @@ -2326,7 +2326,7 @@ struct Door_Struct /*0054*/ uint8 unknown0054[4]; // 00 00 00 00 /*0060*/ uint8 doorId; // door's id # /*0061*/ uint8 opentype; -/*0062*/ uint8 state_at_spawn; +/*0062*/ uint8 state_at_spawn; /*0063*/ uint8 invert_state; // if this is 1, the door is normally open /*0064*/ uint32 door_param; // normally ff ff ff ff (-1) /*0068*/ uint32 unknown0068; // 00 00 00 00 @@ -2591,7 +2591,7 @@ struct Tracking_Struct_New { struct Track_Struct_New { uint16 entityid; // Entity ID uint16 unknown002; // 00 00 - uint32 unknown004; // + uint32 unknown004; // uint8 level; // level of mob uint8 unknown009; // 01 maybe type of mob? player/npc? char name[1]; // name of mob @@ -3750,7 +3750,7 @@ struct ItemBodyStruct uint32 icon; uint8 unknown1; uint8 unknown2; - uint32 BenefitFlag; + uint32 BenefitFlag; uint8 tradeskills; int8 CR; int8 DR; @@ -3819,7 +3819,7 @@ struct ItemBodyStruct int32 FactionAmt3; uint32 FactionMod4; int32 FactionAmt4; - + }; struct AugSlotStruct @@ -3854,9 +3854,9 @@ struct ItemTertiaryBodyStruct uint8 no_transfer; uint16 expendablearrow; - uint32 unknown8; - uint32 unknown9; - uint32 unknown10; + uint32 unknown8; + uint32 unknown9; + uint32 unknown10; uint32 unknown11; uint8 unknown12; uint8 unknown13; diff --git a/common/patches/Titanium.cpp b/common/patches/Titanium.cpp index bfc88040d..bf92ce3c6 100644 --- a/common/patches/Titanium.cpp +++ b/common/patches/Titanium.cpp @@ -20,7 +20,7 @@ static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth); - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == nullptr) { @@ -36,37 +36,37 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; string pname; - + //register our world signature. pname = string(name) + "_world"; signature.ignore_eq_opcode = 0; signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + //register our zone signature. pname = string(name) + "_zone"; signature.ignore_eq_opcode = opcodes->EmuToEQ(OP_AckPacket); signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - - - + + + _log(NET__IDENTIFY, "Registered patch %s", name); } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != nullptr) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -96,7 +96,7 @@ std::string Strategy::Describe() const { r += name; return(r); } - + const EQClientVersion Strategy::ClientVersion() const { return EQClientTitanium; @@ -147,10 +147,10 @@ ENCODE(OP_SendCharInfo) { ENCODE(OP_SendAATable) { ENCODE_LENGTH_ATLEAST(SendAA_Struct); - + SETUP_VAR_ENCODE(SendAA_Struct); ALLOC_VAR_ENCODE(structs::SendAA_Struct, sizeof(structs::SendAA_Struct) + emu->total_abilities*sizeof(structs::AA_Ability)); - + // Check clientver field to verify this AA should be sent for Titanium // clientver 1 is for all clients and 3 is for Titanium if (emu->clientver <= 3 ) @@ -202,13 +202,13 @@ ENCODE(OP_LeadershipExpUpdate) { ENCODE(OP_PlayerProfile) { SETUP_DIRECT_ENCODE(PlayerProfile_Struct, structs::PlayerProfile_Struct); - + uint32 r; - + eq->available_slots=0xffffffff; memset(eq->unknown4184, 0xff, sizeof(eq->unknown4184)); memset(eq->unknown04396, 0xff, sizeof(eq->unknown04396)); - + // OUT(checksum); OUT(gender); OUT(race); @@ -409,12 +409,12 @@ const uint8 bytes[] = { 0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x14 }; memcpy(eq->unknown12864, bytes, sizeof(bytes)); - - + + //set the checksum... CRC32::SetEQChecksum(__packet->pBuffer, sizeof(structs::PlayerProfile_Struct)-4); - + FINISH_ENCODE(); } @@ -458,11 +458,11 @@ ENCODE(OP_ZoneSpawns) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Spawn_Struct *emu = (Spawn_Struct *) __emu_buffer; - + //determine and verify length int entrycount = in->size / sizeof(Spawn_Struct); if(entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { @@ -470,16 +470,16 @@ ENCODE(OP_ZoneSpawns) { delete in; return; } - + //make the EQ struct. in->size = sizeof(structs::Spawn_Struct)*entrycount; in->pBuffer = new unsigned char[in->size]; structs::Spawn_Struct *eq = (structs::Spawn_Struct *) in->pBuffer; - + //zero out the packet. We could avoid this memset by setting all fields (including unknowns) //in the loop. memset(in->pBuffer, 0, in->size); - + //do the transform... int r; int k; @@ -571,7 +571,7 @@ ENCODE(OP_ZoneSpawns) { eq->spawnId = emu->spawnId; // eq->unknown0344[4] = emu->unknown0344[4]; eq->lfg = emu->lfg; - + /* if (emu->face == 99) {eq->face = 0;} if (emu->eyecolor1 == 99) {eq->eyecolor1 = 0;} @@ -583,8 +583,8 @@ ENCODE(OP_ZoneSpawns) { */ } - - + + //kill off the emu structure and send the eq packet. delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); @@ -595,7 +595,7 @@ ENCODE(OP_ItemPacket) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; ItemPacket_Struct *old_item_pkt=(ItemPacket_Struct *)__emu_buffer; @@ -625,7 +625,7 @@ ENCODE(OP_CharInventory) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; @@ -636,7 +636,7 @@ ENCODE(OP_CharInventory) { return; } InternalSerializedItem_Struct *eq = (InternalSerializedItem_Struct *) in->pBuffer; - + //do the transform... int r; string serial_string; @@ -649,7 +649,7 @@ ENCODE(OP_CharInventory) { } else { _log(NET__STRUCTS, "Serialization failed on item slot %d during OP_CharInventory. Item skipped.",eq->slot_id); } - + } in->size = serial_string.length(); @@ -682,7 +682,7 @@ ENCODE(OP_BazaarSearch) { //determine and verify length int entrycount = in->size / sizeof(BazaarSearchResults_Struct); if(entrycount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0) { - _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", + _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct)); delete in; return; @@ -746,39 +746,39 @@ ENCODE(OP_GuildMemberList) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Internal_GuildMembers_Struct *emu = (Internal_GuildMembers_Struct *) in->pBuffer; - - - + + + //make a new EQ buffer. uint32 pnl = strlen(emu->player_name); - uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + + uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + emu->count*sizeof(structs::GuildMemberEntry_Struct) + emu->name_length + emu->note_length; in->pBuffer = new uint8[length]; in->size = length; //no memset since we fill every byte. - + uint8 *buffer; buffer = in->pBuffer; - + //easier way to setup GuildMembers_Struct //set prefix name strcpy((char *)buffer, emu->player_name); buffer += pnl; *buffer = '\0'; buffer++; - + //add member count. *((uint32 *) buffer) = htonl( emu->count ); buffer += sizeof(uint32); - + if(emu->count > 0) { Internal_GuildMemberEntry_Struct *emu_e = emu->member; - const char *emu_name = (const char *) (__emu_buffer + + const char *emu_name = (const char *) (__emu_buffer + sizeof(Internal_GuildMembers_Struct) + //skip header emu->count * sizeof(Internal_GuildMemberEntry_Struct) //skip static length member data ); @@ -786,12 +786,12 @@ ENCODE(OP_GuildMemberList) { emu->name_length + //skip name contents emu->count //skip string terminators ); - + structs::GuildMemberEntry_Struct *e = (structs::GuildMemberEntry_Struct *) buffer; - + uint32 r; for(r = 0; r < emu->count; r++, emu_e++) { - + //the order we set things here must match the struct //nice helper macro @@ -807,7 +807,7 @@ ENCODE(OP_GuildMemberList) { } #define PutFieldN(field) \ e->field = htonl(emu_e->field) - + SlideStructString( name, emu_name ); PutFieldN(level); PutFieldN(banker); @@ -821,15 +821,15 @@ ENCODE(OP_GuildMemberList) { SlideStructString( public_note, emu_note ); e->zoneinstance = 0; e->zone_id = htons(emu_e->zone_id); - - + + #undef SlideStructString #undef PutFieldN - + e++; } } - + delete[] __emu_buffer; @@ -840,9 +840,9 @@ ENCODE(OP_ReadBook) { EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; - + BookText_Struct *emu_BookText_Struct = (BookText_Struct *)__emu_buffer; in->size = sizeof(structs::BookText_Struct) + strlen(emu_BookText_Struct->booktext); @@ -915,7 +915,7 @@ ENCODE(OP_VetRewardsAvaliable) old_data += sizeof(InternalVeteranReward); data += sizeof(structs::VeteranReward); } - + dest->FastQueuePacket(&outapp_create); delete inapp; } @@ -1027,7 +1027,7 @@ ENCODE(OP_DzMemberList) ss.write((const char*)&null_term, sizeof(char)); ss.write((const char*)&emu->entries[i].status, sizeof(char)); } - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -1084,7 +1084,7 @@ ENCODE(OP_DzLeaderStatus) ss.write((const char*)&client_id, sizeof(uint32)); ss.write((const char*)&client_id, sizeof(uint32));//1 ss.write((const char*)&client_id, sizeof(uint32)); - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -1182,7 +1182,7 @@ DECODE(OP_InspectRequest) { DECODE(OP_InspectAnswer) { DECODE_LENGTH_EXACT(structs::InspectResponse_Struct); SETUP_DIRECT_DECODE(InspectResponse_Struct, structs::InspectResponse_Struct); - + IN(TargetID); IN(playerid); @@ -1194,7 +1194,7 @@ DECODE(OP_InspectAnswer) { // move arrow item up to last element in server array strn0cpy(emu->itemnames[21], "", sizeof(emu->itemnames[21])); strn0cpy(emu->itemnames[22], eq->itemnames[21], sizeof(emu->itemnames[22])); - + int k; for (k = 0; k <= 20; k++) { IN(itemicons[k]); @@ -1221,13 +1221,13 @@ ENCODE(OP_LFGuild) dest->FastQueuePacket(&in, ack_req); return; } - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_LFGuild, sizeof(structs::LFGuild_PlayerToggle_Struct)); memcpy(outapp->pBuffer, in->pBuffer, sizeof(structs::LFGuild_PlayerToggle_Struct)); dest->FastQueuePacket(&outapp, ack_req); - + delete in; } @@ -1264,14 +1264,14 @@ DECODE(OP_ItemLinkClick) { DECODE_LENGTH_EXACT(structs::ItemViewRequest_Struct); SETUP_DIRECT_DECODE(ItemViewRequest_Struct, structs::ItemViewRequest_Struct); MEMSET_IN(ItemViewRequest_Struct); - + IN(item_id); int r; for (r = 0; r < 5; r++) { IN(augments[r]); } IN(link_hash); - + FINISH_DIRECT_DECODE(); } @@ -1322,7 +1322,7 @@ DECODE(OP_WhoAllRequest) { IN(lvlhigh); IN(gmlookup); emu->type = 3; - + FINISH_DIRECT_DECODE(); } @@ -1401,7 +1401,7 @@ char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 d } } - + *length=MakeAnyLenString(&serialization, "%.*s%s" // For leading quotes (and protection) if a subitem; "%s" // Instance data diff --git a/common/patches/Titanium.h b/common/patches/Titanium.h index c2ed6136e..337556938 100644 --- a/common/patches/Titanium.h +++ b/common/patches/Titanium.h @@ -6,30 +6,30 @@ class EQStreamIdentifier; namespace Titanium { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + //magic macro to declare our opcode processors #include "SSDeclare.h" #include "Titanium_ops.h" }; - + }; diff --git a/common/patches/Titanium_structs.h b/common/patches/Titanium_structs.h index d1aef83df..cdd7fccf8 100644 --- a/common/patches/Titanium_structs.h +++ b/common/patches/Titanium_structs.h @@ -63,7 +63,7 @@ struct DuelResponse_Struct }; /* Cofruben: - Adventure stuff,not a net one,just one for our use + Adventure stuff,not a net one,just one for our use */ static const uint32 ADVENTURE_COLLECT = 0; static const uint32 ADVENTURE_MASSKILL = 1; @@ -158,10 +158,10 @@ struct CharacterSelect_Struct { ** */ -/* -** Generic Spawn Struct -** Length: 383 Octets -** Used in: +/* +** Generic Spawn Struct +** Length: 383 Octets +** Used in: ** spawnZoneStruct ** dbSpawnStruct ** petStruct @@ -214,14 +214,14 @@ struct Spawn_Struct { /*0147*/ uint8 unknown0147[4]; /*0151*/ uint8 level; // Spawn Level /*0152*/ uint8 unknown0259[4]; // ***Placeholder -/*0156*/ uint8 beard; // Beard style +/*0156*/ uint8 beard; // Beard style /*0157*/ char suffix[32]; // Player's suffix (of Veeshan, etc.) /*0189*/ uint32 petOwnerId; // If this is a pet, the spawn id of owner /*0193*/ uint8 guildrank; // 0=normal, 1=officer, 2=leader /*0194*/ uint8 unknown0194[3]; -/*0197*/ union +/*0197*/ union { - struct + struct { /*0197*/ uint32 equip_helmet; // Equipment: Helmet Visual /*0201*/ uint32 equip_chest; // Equipment: Chest Visual @@ -255,7 +255,7 @@ struct Spawn_Struct { /*0334*/ uint8 gender; // Gender (0=male, 1=female) /*0335*/ uint8 bodytype; // Bodytype /*0336*/ uint8 unknown0336[3]; -union +union { /*0339*/ uint8 equip_chest2; // Second place in packet for chest texture (usually 0xFF in live packets) // Not sure why there are 2 of them, but it effects chest texture! @@ -264,9 +264,9 @@ union }; /*0340*/ uint32 spawnId; // Spawn Id /*0344*/ uint8 unknown0344[4]; -/*0348*/ union +/*0348*/ union { - struct + struct { /*0348*/ Color_Struct color_helmet; // Color of helmet item /*0352*/ Color_Struct color_chest; // Color of chest item @@ -350,9 +350,9 @@ struct NewZone_Struct { ** Length: 12 Bytes ** */ -struct MemorizeSpell_Struct { -uint32 slot; // Spot in the spell book/memorized slot -uint32 spell_id; // Spell id (200 or c8 is minor healing, etc) +struct MemorizeSpell_Struct { +uint32 slot; // Spot in the spell book/memorized slot +uint32 spell_id; // Spell id (200 or c8 is minor healing, etc) uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming uint32 unknown12; }; @@ -386,20 +386,20 @@ struct DeleteSpell_Struct }; struct ManaChange_Struct -{ +{ uint32 new_mana; // New Mana AMount uint32 stamina; uint32 spell_id; uint32 unknown12; }; -struct SwapSpell_Struct -{ - uint32 from_slot; - uint32 to_slot; +struct SwapSpell_Struct +{ + uint32 from_slot; + uint32 to_slot; -}; +}; struct BeginCast_Struct { @@ -571,7 +571,7 @@ struct CharCreate_Struct struct AA_Array { uint32 AA; - uint32 value; + uint32 value; }; @@ -611,7 +611,7 @@ struct Bandolier_Struct { struct PotionBelt_Struct { BandolierItem_Struct items[MAX_PLAYER_BANDOLIER_ITEMS]; }; - + static const uint32 MAX_GROUP_LEADERSHIP_AA_ARRAY = 16; static const uint32 MAX_RAID_LEADERSHIP_AA_ARRAY = 16; static const uint32 MAX_LEADERSHIP_AA_ARRAY = (MAX_GROUP_LEADERSHIP_AA_ARRAY+MAX_RAID_LEADERSHIP_AA_ARRAY); @@ -625,18 +625,18 @@ struct RaidLeadershipAA_Struct { uint32 ranks[MAX_RAID_LEADERSHIP_AA_ARRAY]; }; - /** -* A bind point. -* Size: 20 Octets -*/ -struct BindStruct { - /*000*/ uint32 zoneId; - /*004*/ float x; - /*008*/ float y; - /*012*/ float z; - /*016*/ float heading; - /*020*/ -}; + /** +* A bind point. +* Size: 20 Octets +*/ +struct BindStruct { + /*000*/ uint32 zoneId; + /*004*/ float x; + /*008*/ float y; + /*012*/ float z; + /*016*/ float heading; + /*020*/ +}; /* @@ -698,8 +698,8 @@ sed -e 's/_t//g' -e 's/MAX_AA/MAX_PP_AA_ARRAY/g' \ -e 's/thirst/thirst_level/g' \ -e 's/guildstatus/guildrank/g' \ -e 's/airRemaining/air_remaining/g' \ - - + + */ struct PlayerProfile_Struct @@ -741,7 +741,7 @@ struct PlayerProfile_Struct /*02264*/ uint8 face; // Player face /*02265*/ uint8 unknown02264[47]; /*02312*/ uint32 spell_book[MAX_PP_SPELLBOOK]; // List of the Spells in spellbook -/*03912*/ uint8 unknown4184[448]; // all 0xff after last spell +/*03912*/ uint8 unknown4184[448]; // all 0xff after last spell /*04360*/ uint32 mem_spells[MAX_PP_MEMSPELL]; // List of spells memorized /*04396*/ uint8 unknown04396[32]; /*04428*/ uint32 platinum; // Platinum Pieces on player @@ -752,7 +752,7 @@ struct PlayerProfile_Struct /*04448*/ uint32 gold_cursor; // Gold Pieces on cursor /*04452*/ uint32 silver_cursor; // Silver Pieces on cursor /*04456*/ uint32 copper_cursor; // Copper Pieces on cursor -/*04460*/ uint32 skills[MAX_PP_SKILL]; // List of skills +/*04460*/ uint32 skills[MAX_PP_SKILL]; // List of skills /*04760*/ uint8 unknown04760[236]; /*04996*/ uint32 toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) /*05000*/ uint32 thirst_level; // Drink (ticks till next drink) @@ -778,7 +778,7 @@ struct PlayerProfile_Struct /*13044*/ uint32 lastlogin; // character last save time /*13048*/ uint32 timePlayedMin; // time character played /*13052*/ uint8 pvp; // 1=pvp, 0=not pvp -/*13053*/ uint8 anon; // 2=roleplay, 1=anon, 0=not anon +/*13053*/ uint8 anon; // 2=roleplay, 1=anon, 0=not anon /*13054*/ uint8 gm; // 0=no, 1=yes (guessing!) /*13055*/ uint8 guildrank; // 0=member, 1=officer, 2=guildleader /*13056*/ uint32 guildbanker; @@ -791,7 +791,7 @@ struct PlayerProfile_Struct /*13116*/ float x; // Players x position /*13120*/ float y; // Players y position /*13124*/ float z; // Players z position -/*13128*/ float heading; // Players heading +/*13128*/ float heading; // Players heading /*13132*/ uint8 unknown13132[4]; // ***Placeholder /*13136*/ uint32 platinum_bank; // Platinum Pieces in Bank /*13140*/ uint32 gold_bank; // Gold Pieces in Bank @@ -805,7 +805,7 @@ struct PlayerProfile_Struct /*13260*/ uint8 unknown13260[16]; /*13276*/ uint16 zone_id; // see zones.h /*13278*/ uint16 zoneInstance; // Instance id -/*13280*/ char groupMembers[MAX_GROUP_MEMBERS][64];// all the members in group, including self +/*13280*/ char groupMembers[MAX_GROUP_MEMBERS][64];// all the members in group, including self /*13664*/ char groupLeader[64]; // Leader of the group ? /*13728*/ uint8 unknown13728[656]; /*14384*/ uint32 entityid; @@ -826,7 +826,7 @@ struct PlayerProfile_Struct /*14572*/ uint32 tribute_active; // 0 = off, 1=on /*14576*/ Tribute_Struct tributes[MAX_PLAYER_TRIBUTES]; // Current tribute loadout /*14616*/ uint32 unknown14616; -/*14620*/ double group_leadership_exp; +/*14620*/ double group_leadership_exp; /*14628*/ double raid_leadership_exp; /*14640*/ uint32 group_leadership_points; // Unspent group lead AA points /*14644*/ uint32 raid_leadership_points; // Unspent raid lead AA points @@ -858,7 +858,7 @@ struct PlayerProfile_Struct /*19580*/ uint32 showhelm; // 0=no, 1=yes /*19584*/ uint8 unknown19584[4]; // ***Placeholder (10/27/2005) /*19588*/ uint32 unknown19588; // *** Placeholder -/*19584*/ +/*19584*/ }; @@ -969,7 +969,7 @@ struct BindWound_Struct /* ** Type: Zone Change Request (before hand) -** Length: 88 bytes +** Length: 88 bytes ** OpCode: a320 */ @@ -992,7 +992,7 @@ struct RequestClientZoneChange_Struct { /*08*/ float x; /*12*/ float z; /*16*/ float heading; -/*20*/ uint32 type; //unknown... values +/*20*/ uint32 type; //unknown... values }; struct Animation_Struct { @@ -1272,13 +1272,13 @@ struct TradeMoneyUpdate_Struct{ ** Surname struct ** Size: 100 bytes */ -struct Surname_Struct -{ +struct Surname_Struct +{ /*0000*/ char name[64]; /*0064*/ uint32 unknown0064; /*0068*/ char lastname[32]; /*0100*/ -}; +}; struct GuildsListEntry_Struct { char name[64]; @@ -1534,7 +1534,7 @@ struct Merchant_Click_Struct { /*000*/ uint32 npcid; // Merchant NPC's entity id /*004*/ uint32 playerid; /*008*/ uint32 command; //1=open, 0=cancel/close -/*012*/ float rate; //cost multiplier, dosent work anymore +/*012*/ float rate; //cost multiplier, dosent work anymore }; /* Unknowns: @@ -1635,7 +1635,7 @@ struct Illusion_Struct { /*068*/ uint16 race; /*070*/ char unknown070[2]; /*072*/ uint8 gender; -/*073*/ uint8 texture; +/*073*/ uint8 texture; /*074*/ uint8 helmtexture; /*075*/ uint8 unknown075; /*076*/ uint32 face; @@ -1686,14 +1686,14 @@ struct GroupCancel_Struct { uint8 toggle; }; -struct GroupUpdate_Struct { +struct GroupUpdate_Struct { /*0000*/ uint32 action; /*0004*/ char yourname[64]; /*0068*/ char membername[5][64]; /*0388*/ char leadersname[64]; }; -struct GroupUpdate2_Struct { +struct GroupUpdate2_Struct { /*0000*/ uint32 action; /*0004*/ char yourname[64]; /*0068*/ char membername[5][64]; @@ -1702,7 +1702,7 @@ struct GroupUpdate2_Struct { /*0580*/ uint8 unknown[188]; /*0768*/ }; -struct GroupJoin_Struct { +struct GroupJoin_Struct { /*0000*/ uint32 action; /*0004*/ char yourname[64]; /*0068*/ char membername[64]; @@ -1716,10 +1716,10 @@ struct FaceChange_Struct { /*003*/ uint8 eyecolor2; /*004*/ uint8 hairstyle; /*005*/ uint8 beard; // vesuvias -/*006*/ uint8 face; +/*006*/ uint8 face; //vesuvias: //there are only 10 faces for barbs changing woad just -//increase the face value by ten so if there were 8 woad +//increase the face value by ten so if there were 8 woad //designs then there would be 80 barb faces }; @@ -1801,11 +1801,11 @@ struct Who_All_Struct { // 76 length total /*140*/ }; -struct Stun_Struct { // 4 bytes total +struct Stun_Struct { // 4 bytes total uint32 duration; // Duration of stun }; -struct AugmentItem_Struct { +struct AugmentItem_Struct { /*00*/ int16 container_slot; /*02*/ char unknown02[2]; /*04*/ int32 augment_slot; @@ -1819,11 +1819,11 @@ struct Emote_Struct { /*1028*/ }; -// Inspect -struct Inspect_Struct { - uint32 TargetID; - uint32 PlayerID; -}; +// Inspect +struct Inspect_Struct { + uint32 TargetID; + uint32 PlayerID; +}; //OP_InspectAnswer struct InspectResponse_Struct{//Cofruben:need to send two of this for the inspect response. /*000*/ uint32 TargetID; @@ -2005,7 +2005,7 @@ struct CloseContainer_Struct { /* ** Generic Door Struct ** Length: 52 Octets -** Used in: +** Used in: ** cDoorSpawnsStruct(f721) ** */ @@ -2616,7 +2616,7 @@ struct Split_Struct ** Last Updated: Oct-15-2003 ** */ -struct NewCombine_Struct { +struct NewCombine_Struct { /*00*/ int16 container_slot; /*02*/ char unknown02[2]; /*04*/ @@ -2882,21 +2882,21 @@ struct UpdateLeadershipAA_Struct { /*12*/ }; -/** -* Leadership AA update -* Length: 32 Octets -* OpCode: LeadExpUpdate -*/ -struct leadExpUpdateStruct { - /*0000*/ uint32 unknown0000; // All zeroes? - /*0004*/ uint32 group_leadership_exp; // Group leadership exp value - /*0008*/ uint32 group_leadership_points; // Unspent group points - /*0012*/ uint32 unknown0012; // Type? - /*0016*/ uint32 unknown0016; // All zeroes? - /*0020*/ uint32 raid_leadership_exp; // Raid leadership exp value - /*0024*/ uint32 raid_leadership_points; // Unspent raid points - /*0028*/ uint32 unknown0028; -}; +/** +* Leadership AA update +* Length: 32 Octets +* OpCode: LeadExpUpdate +*/ +struct leadExpUpdateStruct { + /*0000*/ uint32 unknown0000; // All zeroes? + /*0004*/ uint32 group_leadership_exp; // Group leadership exp value + /*0008*/ uint32 group_leadership_points; // Unspent group points + /*0012*/ uint32 unknown0012; // Type? + /*0016*/ uint32 unknown0016; // All zeroes? + /*0020*/ uint32 raid_leadership_exp; // Raid leadership exp value + /*0024*/ uint32 raid_leadership_points; // Unspent raid points + /*0028*/ uint32 unknown0028; +}; @@ -2939,7 +2939,7 @@ struct RaidDetails_Struct { /*000*/ uint32 action; //=6,20 /*004*/ char leader_name[64]; /*068*/ uint32 unknown68[4]; -/*084*/ LeadershipAA_Struct abilities; //ranks in backwards byte order +/*084*/ LeadershipAA_Struct abilities; //ranks in backwards byte order /*128*/ uint8 unknown128[142]; /*354*/ uint32 leader_id; }; @@ -3100,7 +3100,7 @@ struct AA_Action { }; struct AA_Skills { //this should be removed and changed to AA_Array -/*00*/ uint32 aa_skill; +/*00*/ uint32 aa_skill; /*04*/ uint32 aa_value; }; @@ -3131,13 +3131,13 @@ struct AATable_Struct { struct Weather_Struct { uint32 val1; //generall 0x000000FF uint32 type; //0x31=rain, 0x02=snow(i think), 0 = normal - uint32 mode; + uint32 mode; }; struct ZoneInUnknown_Struct { uint32 val1; uint32 val2; - uint32 val3; + uint32 val3; }; struct MobHealth_Struct { diff --git a/common/patches/Underfoot.cpp b/common/patches/Underfoot.cpp index 44c65cc8b..409324e27 100644 --- a/common/patches/Underfoot.cpp +++ b/common/patches/Underfoot.cpp @@ -23,7 +23,7 @@ static OpcodeManager *opcodes = nullptr; static Strategy struct_strategy; char* SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth); - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == nullptr) { @@ -39,37 +39,37 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; string pname; - + //register our world signature. pname = string(name) + "_world"; signature.ignore_eq_opcode = 0; signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - + //register our zone signature. pname = string(name) + "_zone"; signature.ignore_eq_opcode = opcodes->EmuToEQ(OP_AckPacket); signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy); - - - + + + _log(NET__IDENTIFY, "Registered patch %s", name); } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != nullptr) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -99,7 +99,7 @@ std::string Strategy::Describe() const { r += name; return(r); } - + const EQClientVersion Strategy::ClientVersion() const { return EQClientUnderfoot; @@ -116,7 +116,7 @@ static inline uint32 TitaniumToUnderfootSlot(uint32 TitaniumSlot) { { UnderfootSlot = TitaniumSlot + 1; } - else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor + else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor { UnderfootSlot = TitaniumSlot + 11; } @@ -135,20 +135,20 @@ static inline uint32 TitaniumToUnderfootSlot(uint32 TitaniumSlot) { else { UnderfootSlot = TitaniumSlot; - } - + } + return UnderfootSlot; } // Converts Underfoot Slot IDs to Titanium Slot IDs for use in Decodes static inline uint32 UnderfootToTitaniumSlot(uint32 UnderfootSlot) { uint32 TitaniumSlot = 0; - + if(UnderfootSlot >= 22 && UnderfootSlot <= 54) // Cursor/Ammo/Power Source and Normal Inventory Slots { TitaniumSlot = UnderfootSlot - 1; } - else if(UnderfootSlot >= 262 && UnderfootSlot <= 351) // Bag Slots for Normal Inventory and Cursor + else if(UnderfootSlot >= 262 && UnderfootSlot <= 351) // Bag Slots for Normal Inventory and Cursor { TitaniumSlot = UnderfootSlot - 11; } @@ -187,7 +187,7 @@ ENCODE(OP_OpenNewTasksWindow) { EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; __emu_AvailableTaskHeader = (AvailableTaskHeader_Struct*)__emu_buffer; @@ -223,7 +223,7 @@ ENCODE(OP_OpenNewTasksWindow) { __eq_AvailableTaskData1->TaskID = __emu_AvailableTaskData1->TaskID; // This next unknown seems to affect the colour of the task title. 0x3f80000 is what I have seen // in Underfoot packets. Changing it to 0x3f000000 makes the title red. - __eq_AvailableTaskData1->unknown1 = 0x3f800000; + __eq_AvailableTaskData1->unknown1 = 0x3f800000; __eq_AvailableTaskData1->TimeLimit = __emu_AvailableTaskData1->TimeLimit; __eq_AvailableTaskData1->unknown2 = __emu_AvailableTaskData1->unknown2; @@ -282,7 +282,7 @@ ENCODE(OP_OpenNewTasksWindow) { } delete[] __emu_buffer; - + dest->FastQueuePacket(&in, ack_req); } @@ -290,8 +290,8 @@ ENCODE(OP_OpenNewTasksWindow) { ENCODE(OP_SendCharInfo) { ENCODE_LENGTH_EXACT(CharacterSelect_Struct); SETUP_VAR_ENCODE(CharacterSelect_Struct); - - + + //EQApplicationPacket *packet = *p; //const CharacterSelect_Struct *emu = (CharacterSelect_Struct *) packet->pBuffer; @@ -310,10 +310,10 @@ ENCODE(OP_SendCharInfo) { + namelen; ALLOC_VAR_ENCODE(structs::CharacterSelect_Struct, total_length); - + //unsigned char *eq_buffer = new unsigned char[total_length]; //structs::CharacterSelect_Struct *eq_head = (structs::CharacterSelect_Struct *) eq_buffer; - + eq->char_count = char_count; eq->total_chars = 10; @@ -360,9 +360,9 @@ ENCODE(OP_SendCharInfo) { } bufptr += sizeof(structs::CharacterSelectEntry_Struct); } - + FINISH_ENCODE(); - + } ENCODE(OP_ZoneServerInfo) { @@ -393,10 +393,10 @@ ENCODE(OP_SendZonepoints) { ENCODE(OP_SendAATable) { ENCODE_LENGTH_ATLEAST(SendAA_Struct); - + SETUP_VAR_ENCODE(SendAA_Struct); ALLOC_VAR_ENCODE(structs::SendAA_Struct, sizeof(structs::SendAA_Struct) + emu->total_abilities*sizeof(structs::AA_Ability)); - + // Check clientver field to verify this AA should be sent for SoF // clientver 1 is for all clients and 6 is for Underfoot if (emu->clientver <= 6 ) @@ -473,13 +473,13 @@ ENCODE(OP_RespondAA) { ENCODE(OP_PlayerProfile) { SETUP_DIRECT_ENCODE(PlayerProfile_Struct, structs::PlayerProfile_Struct); - + uint32 r; - + eq->available_slots=0xffffffff; memset(eq->unknown06284, 0xff, sizeof(eq->unknown06284)); memset(eq->unknown07284, 0xff, sizeof(eq->unknown07284)); - + // OUT(checksum); OUT(gender); OUT(race); @@ -554,7 +554,7 @@ ENCODE(OP_PlayerProfile) { OUT(thirst_level); OUT(hunger_level); //PS this needs to be figured out more; but it was 'good enough' - for(r = 0; r < structs::BUFF_COUNT; r++) + for(r = 0; r < structs::BUFF_COUNT; r++) { if(emu->buffs[r].spellid != 0xFFFF && emu->buffs[r].spellid != 0) { @@ -584,7 +584,7 @@ ENCODE(OP_PlayerProfile) { OUT(aapoints_spent); OUT(aapoints); // OUT(unknown06160[4]); - //NOTE: new client supports 20 bandoliers, our internal rep + //NOTE: new client supports 20 bandoliers, our internal rep //only supports 4.. for(r = 0; r < 4; r++) { OUT_str(bandoliers[r].name); @@ -707,10 +707,10 @@ const uint8 bytes[] = { }; memcpy(eq->unknown18020, bytes, sizeof(bytes)); - + //set the checksum... CRC32::SetEQChecksum(__packet->pBuffer, sizeof(structs::PlayerProfile_Struct)-4); - + FINISH_ENCODE(); } @@ -748,7 +748,7 @@ ENCODE(OP_NewZone) { OUT(SuspendBuffs); eq->FogDensity = emu->fog_density; - + /*fill in some unknowns with observed values, hopefully it will help */ eq->unknown800 = -1; eq->unknown844 = 600; @@ -895,7 +895,7 @@ ENCODE(OP_Barter) delete[] __emu_buffer; dest->FastQueuePacket(&in, ack_req); - + } ENCODE(OP_BazaarSearch) @@ -958,11 +958,11 @@ ENCODE(OP_ZoneSpawns) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Spawn_Struct *emu = (Spawn_Struct *) __emu_buffer; - + //determine and verify length int entrycount = in->size / sizeof(Spawn_Struct); if(entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) { @@ -971,7 +971,7 @@ ENCODE(OP_ZoneSpawns) { return; } - + //_log(NET__STRUCTS, "Spawn name is [%s]", emu->name); emu = (Spawn_Struct *) __emu_buffer; @@ -980,7 +980,7 @@ ENCODE(OP_ZoneSpawns) { char *Buffer = (char *) in->pBuffer; - + int r; int k; for(r = 0; r < entrycount; r++, emu++) { @@ -1153,7 +1153,7 @@ ENCODE(OP_ZoneSpawns) { { VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); } - + VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->curHp); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->haircolor); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->beardcolor); @@ -1211,7 +1211,7 @@ ENCODE(OP_ZoneSpawns) { Position->deltaZ = emu->deltaZ; Buffer += sizeof(structs::Spawn_Struct_Position); - + if((emu->NPC == 0) || (emu->race <=12) || (emu->race == 128) || (emu ->race == 130) || (emu->race == 330) || (emu->race == 522)) { for(k = 0; k < 9; ++k) @@ -1265,7 +1265,7 @@ ENCODE(OP_ZoneSpawns) { dest->FastQueuePacket(&outapp, ack_req); } - + delete in; } @@ -1273,7 +1273,7 @@ ENCODE(OP_MercenaryDataResponse) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; MercenaryMerchantList_Struct *emu = (MercenaryMerchantList_Struct *) __emu_buffer; @@ -1336,7 +1336,7 @@ ENCODE(OP_MercenaryDataUpdate) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; MercenaryDataUpdate_Struct *emu = (MercenaryDataUpdate_Struct *) __emu_buffer; @@ -1412,7 +1412,7 @@ ENCODE(OP_ItemPacket) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + unsigned char *__emu_buffer = in->pBuffer; ItemPacket_Struct *old_item_pkt=(ItemPacket_Struct *)__emu_buffer; InternalSerializedItem_Struct *int_struct=(InternalSerializedItem_Struct *)(old_item_pkt->SerializedItem); @@ -1454,7 +1454,7 @@ ENCODE(OP_CharInventory) { return; } - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; @@ -1462,7 +1462,7 @@ ENCODE(OP_CharInventory) { if(ItemCount == 0 || (in->size % sizeof(InternalSerializedItem_Struct)) != 0) { - _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", + _log(NET__STRUCTS, "Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(InternalSerializedItem_Struct)); delete in; @@ -1475,7 +1475,7 @@ ENCODE(OP_CharInventory) { in->pBuffer = new uchar[4]; *(uint32 *)in->pBuffer = ItemCount; - + in->size = 4; for(int r = 0; r < ItemCount; r++, eq++) { @@ -1519,39 +1519,39 @@ ENCODE(OP_GuildMemberList) { //consume the packet EQApplicationPacket *in = *p; *p = nullptr; - + //store away the emu struct unsigned char *__emu_buffer = in->pBuffer; Internal_GuildMembers_Struct *emu = (Internal_GuildMembers_Struct *) in->pBuffer; - - - + + + //make a new EQ buffer. uint32 pnl = strlen(emu->player_name); - uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + + uint32 length = sizeof(structs::GuildMembers_Struct) + pnl + emu->count*sizeof(structs::GuildMemberEntry_Struct) + emu->name_length + emu->note_length; in->pBuffer = new uint8[length]; in->size = length; //no memset since we fill every byte. - + uint8 *buffer; buffer = in->pBuffer; - + //easier way to setup GuildMembers_Struct //set prefix name strcpy((char *)buffer, emu->player_name); buffer += pnl; *buffer = '\0'; buffer++; - + //add member count. *((uint32 *) buffer) = htonl( emu->count ); buffer += sizeof(uint32); - + if(emu->count > 0) { Internal_GuildMemberEntry_Struct *emu_e = emu->member; - const char *emu_name = (const char *) (__emu_buffer + + const char *emu_name = (const char *) (__emu_buffer + sizeof(Internal_GuildMembers_Struct) + //skip header emu->count * sizeof(Internal_GuildMemberEntry_Struct) //skip static length member data ); @@ -1559,12 +1559,12 @@ ENCODE(OP_GuildMemberList) { emu->name_length + //skip name contents emu->count //skip string terminators ); - + structs::GuildMemberEntry_Struct *e = (structs::GuildMemberEntry_Struct *) buffer; - + uint32 r; for(r = 0; r < emu->count; r++, emu_e++) { - + //the order we set things here must match the struct //nice helper macro @@ -1580,7 +1580,7 @@ ENCODE(OP_GuildMemberList) { } #define PutFieldN(field) \ e->field = htonl(emu_e->field) - + SlideStructString( name, emu_name ); PutFieldN(level); PutFieldN(banker); @@ -1594,15 +1594,15 @@ ENCODE(OP_GuildMemberList) { SlideStructString( public_note, emu_note ); e->zoneinstance = 0; e->zone_id = htons(emu_e->zone_id); - - + + #undef SlideStructString #undef PutFieldN - + e++; } } - + delete[] __emu_buffer; @@ -1655,7 +1655,7 @@ ENCODE(OP_GroundSpawn) in->size = strlen(emu->object_name) + 58; in->pBuffer = new unsigned char[in->size]; - + char *OutBuffer = (char *)in->pBuffer; VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->drop_id); @@ -1668,7 +1668,7 @@ ENCODE(OP_GroundSpawn) // This next field is actually a float. There is a groundspawn in freeportwest (sack of money sitting on some barrels) which requires this // field to be set to (float)255.0 to appear at all, and also the size field below to be 5, to be the correct size. I think SoD has the same // issue. - VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, 0); + VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, 0); VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, 0); // Unknown, observed 0 VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, 0); // This appears to be the size field. VARSTRUCT_ENCODE_TYPE(float, OutBuffer, emu->y); @@ -1680,7 +1680,7 @@ ENCODE(OP_GroundSpawn) VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, 0); // Unknown, observed 0x00 delete[] __emu_buffer; - + dest->FastQueuePacket(&in, ack_req); } @@ -1774,7 +1774,7 @@ ENCODE(OP_LogServer) { ENCODE_LENGTH_EXACT(LogServer_Struct); SETUP_DIRECT_ENCODE(LogServer_Struct, structs::LogServer_Struct); strcpy(eq->worldshortname, emu->worldshortname); - + OUT(enablevoicemacros); OUT(enablemail); OUT(enable_pvp); @@ -1795,7 +1795,7 @@ ENCODE(OP_LogServer) { eq->unknown263[23] = 0x80; eq->unknown263[24] = 0x3f; eq->unknown263[33] = 1; - + FINISH_ENCODE(); } @@ -2037,7 +2037,7 @@ ENCODE(OP_Stun) { FINISH_ENCODE(); } -ENCODE(OP_ZonePlayerToBind) +ENCODE(OP_ZonePlayerToBind) { ENCODE_LENGTH_ATLEAST(ZonePlayerToBind_Struct); ZonePlayerToBind_Struct *zps = (ZonePlayerToBind_Struct*)(*p)->pBuffer; @@ -2090,7 +2090,7 @@ ENCODE(OP_AdventureMerchantSell) { FINISH_ENCODE(); } -ENCODE(OP_RaidUpdate) +ENCODE(OP_RaidUpdate) { EQApplicationPacket *inapp = *p; *p = nullptr; @@ -2103,7 +2103,7 @@ ENCODE(OP_RaidUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct)); structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer; - + add_member->raidGen.action = in_add_member->raidGen.action; add_member->raidGen.parameter = in_add_member->raidGen.parameter; strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64); @@ -2180,7 +2180,7 @@ ENCODE(OP_VetRewardsAvaliable) old_data += sizeof(InternalVeteranReward); data += sizeof(structs::VeteranReward); } - + dest->FastQueuePacket(&outapp_create); delete inapp; } @@ -2288,7 +2288,7 @@ ENCODE(OP_GroupUpdate) EQApplicationPacket *in = *p; GroupJoin_Struct *gjs = (GroupJoin_Struct*)in->pBuffer; - + //_log(NET__ERROR, "Received outgoing OP_GroupUpdate with action code %i", gjs->action); if((gjs->action == groupActLeave) || (gjs->action == groupActDisband)) { @@ -2334,10 +2334,10 @@ ENCODE(OP_GroupUpdate) { // Group Update2 //_log(NET__ERROR, "Struct is GroupUpdate2"); - + unsigned char *__emu_buffer = in->pBuffer; GroupUpdate2_Struct *gu2 = (GroupUpdate2_Struct*) __emu_buffer; - + //_log(NET__ERROR, "Yourname is %s", gu2->yourname); int MemberCount = 1; @@ -2359,7 +2359,7 @@ ENCODE(OP_GroupUpdate) EQApplicationPacket *outapp = new EQApplicationPacket(OP_GroupUpdateB, PacketLength); char *Buffer = (char *)outapp->pBuffer; - + // Header VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // Think this should be SpawnID, but it doesn't seem to matter VARSTRUCT_ENCODE_TYPE(uint32, Buffer, MemberCount); @@ -2367,7 +2367,7 @@ ENCODE(OP_GroupUpdate) // Leader // - + VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); VARSTRUCT_ENCODE_STRING(Buffer, gu2->yourname); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); @@ -2409,7 +2409,7 @@ ENCODE(OP_GroupUpdate) GLAAus->NPCMarkerID = gu2->NPCMarkerID; memcpy(&GLAAus->LeaderAAs, &gu2->leader_aas, sizeof(GLAAus->LeaderAAs)); - + dest->FastQueuePacket(&outapp); delete in; @@ -2447,7 +2447,7 @@ ENCODE(OP_ChannelMessage) in->size = strlen(emu->sender) + 1 + strlen(emu->targetname) + 1 + strlen(emu->message) + 1 + 36; in->pBuffer = new unsigned char[in->size]; - + char *OutBuffer = (char *)in->pBuffer; VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sender); @@ -2495,7 +2495,7 @@ ENCODE(OP_GuildsList) } InBuffer += 64; } - + PacketSize++; // Appears to be an extra 0x00 at the very end. in->size = PacketSize; @@ -2582,7 +2582,7 @@ ENCODE(OP_DzMemberList) ss.write((const char*)&null_term, sizeof(char)); ss.write((const char*)&emu->entries[i].status, sizeof(char)); } - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -2639,7 +2639,7 @@ ENCODE(OP_DzLeaderStatus) ss.write((const char*)&client_id, sizeof(uint32)); ss.write((const char*)&client_id, sizeof(uint32));//1 ss.write((const char*)&client_id, sizeof(uint32)); - + __packet->size = ss.str().length(); __packet->pBuffer = new unsigned char[__packet->size]; memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size); @@ -2753,7 +2753,7 @@ ENCODE(OP_SpawnAppearance) dest->FastQueuePacket(&in, ack_req); return; } - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_ChangeSize, sizeof(ChangeSize_Struct)); ChangeSize_Struct *css = (ChangeSize_Struct *)outapp->pBuffer; @@ -2764,7 +2764,7 @@ ENCODE(OP_SpawnAppearance) css->Unknown12 = 1.0f; dest->FastQueuePacket(&outapp, ack_req); - + delete in; } @@ -2778,7 +2778,7 @@ ENCODE(OP_DisciplineUpdate) FINISH_ENCODE(); } -ENCODE(OP_AltCurrencySell) +ENCODE(OP_AltCurrencySell) { ENCODE_LENGTH_EXACT(AltCurrencySellItem_Struct); SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); @@ -2801,7 +2801,7 @@ ENCODE(OP_AltCurrency) if(opcode == 8) { AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer; - EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(structs::AltCurrencyPopulate_Struct) + EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(structs::AltCurrencyPopulate_Struct) + sizeof(structs::AltCurrencyPopulateEntry_Struct) * populate->count); structs::AltCurrencyPopulate_Struct *out_populate = (structs::AltCurrencyPopulate_Struct*)outapp->pBuffer; @@ -2966,7 +2966,7 @@ DECODE(OP_ItemLinkClick) { DECODE_LENGTH_EXACT(structs::ItemViewRequest_Struct); SETUP_DIRECT_DECODE(ItemViewRequest_Struct, structs::ItemViewRequest_Struct); MEMSET_IN(ItemViewRequest_Struct); - + IN(item_id); int r; for (r = 0; r < 5; r++) { @@ -2974,7 +2974,7 @@ DECODE(OP_ItemLinkClick) { } IN(link_hash); IN(icon); - + FINISH_DIRECT_DECODE(); } @@ -3017,7 +3017,7 @@ DECODE(OP_ShopPlayerBuy) } DECODE(OP_ClientUpdate) { - // for some odd reason, there is an extra byte on the end of this on occasion.. + // for some odd reason, there is an extra byte on the end of this on occasion.. DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct); SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct); IN(spawn_id); @@ -3048,7 +3048,7 @@ DECODE(OP_CharacterCreate) { emu->start_zone = RuleI(World, TutorialZoneID); else emu->start_zone = eq->start_zone; - + IN(haircolor); IN(deity); IN(STR); @@ -3080,7 +3080,7 @@ DECODE(OP_WhoAllRequest) { IN(gmlookup); IN(guildid); IN(type); - + FINISH_DIRECT_DECODE(); } @@ -3682,7 +3682,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint Underfoot::structs::ItemTertiaryBodyStruct itbs; memset(&itbs, 0, sizeof(Underfoot::structs::ItemTertiaryBodyStruct)); - + itbs.loregroup = item->LoreGroup; itbs.artifact = item->ArtifactFlag; itbs.summonedflag = item->SummonedFlag; @@ -3880,7 +3880,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint uint32 SubLengths[10]; for(int x = 0; x < 10; ++x) { - + SubSerializations[x] = nullptr; const ItemInst* subitem = ((const ItemInst*)inst)->GetItem(x); @@ -3926,7 +3926,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint return item_serial; } -DECODE(OP_AltCurrencySellSelection) +DECODE(OP_AltCurrencySellSelection) { DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); @@ -3935,7 +3935,7 @@ DECODE(OP_AltCurrencySellSelection) FINISH_DIRECT_DECODE(); } -DECODE(OP_AltCurrencySell) +DECODE(OP_AltCurrencySell) { DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); diff --git a/common/patches/Underfoot.h b/common/patches/Underfoot.h index 1f1c8312f..fb66a3488 100644 --- a/common/patches/Underfoot.h +++ b/common/patches/Underfoot.h @@ -6,30 +6,30 @@ class EQStreamIdentifier; namespace Underfoot { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; - + //magic macro to declare our opcode processors #include "SSDeclare.h" #include "Underfoot_ops.h" }; - + }; diff --git a/common/patches/Underfoot_structs.h b/common/patches/Underfoot_structs.h index 61cd189c7..daa4a0533 100644 --- a/common/patches/Underfoot_structs.h +++ b/common/patches/Underfoot_structs.h @@ -331,7 +331,7 @@ struct Spawn_Struct /*0000*/ //char suffix[0]; // only read if(hasTitleOrSuffix & 8) char unknown20[8]; uint8 IsMercenary; // If NPC == 1 and this == 1, then the NPC name is Orange. -/*0000*/ char unknown21[28]; +/*0000*/ char unknown21[28]; }; @@ -561,7 +561,7 @@ struct SpellBuffFade_Struct_Underfoot { /*012*/ uint32 spellid; /*016*/ uint32 duration; /*020*/ uint32 unknown016; -/*024*/ uint32 playerId; // Global player ID? +/*024*/ uint32 playerId; // Global player ID? /*028*/ uint32 unknown020; /*032*/ uint8 unknown0028[48]; /*080*/ uint32 slotid; @@ -645,7 +645,7 @@ struct CharCreate_Struct { /*0000*/ uint32 class_; /*0004*/ uint32 haircolor; -/*0008*/ uint32 beard; +/*0008*/ uint32 beard; /*0012*/ uint32 beardcolor; /*0016*/ uint32 gender; /*0020*/ uint32 race; @@ -871,7 +871,7 @@ struct PlayerProfile_Struct /*04176*/ uint32 INT; // Intelligence - 3c 00 00 00 - 60 /*04180*/ uint32 AGI; // Agility - 5f 00 00 00 - 95 /*04184*/ uint32 WIS; // Wisdom - 46 00 00 00 - 70 -/*04188*/ uint8 unknown04188[28]; // +/*04188*/ uint8 unknown04188[28]; // /*04216*/ uint8 face; // Player face - Actually uint32? /*04217*/ uint8 unknown04217[147]; // was [175] /*04364*/ uint32 spell_book[MAX_PP_SPELLBOOK]; // List of the Spells in spellbook 720 = 90 pages [2880] was [1920] @@ -906,7 +906,7 @@ struct PlayerProfile_Struct /*18008*/ uint8 unknown18008[8]; /*18016*/ uint32 available_slots; /*18020*/ uint8 unknown18020[80]; // -//END SUB-STRUCT used for shrouding. +//END SUB-STRUCT used for shrouding. /*18100*/ char name[64]; // Name of player /*18164*/ char last_name[32]; // Last name of player /*18196*/ uint8 unknown18196[8]; //#### Not In Titanium #### new to SoF[12] @@ -1000,7 +1000,7 @@ struct PlayerProfile_Struct /*25584*/ uint32 level3; // SoF looks at the level here to determine how many leadership AA you can bank. /*25588*/ uint32 showhelm; // 0=no, 1=yes /*25592*/ uint32 RestTimer; -/*25596*/ uint8 unknown25596[1036]; // ***Placeholder (2/13/2007) was[1028]or[940]or[1380] - END of Struct +/*25596*/ uint8 unknown25596[1036]; // ***Placeholder (2/13/2007) was[1028]or[940]or[1380] - END of Struct /*26632*/ }; @@ -1247,7 +1247,7 @@ struct CombatDamage_Struct /* 19 */ uint8 unknown19[9]; // was [9] /* 28 */ }; - + /* ** Consider Struct @@ -1260,7 +1260,7 @@ struct Consider_Struct{ /*012*/ uint32 level; // Level /*016*/ uint8 pvpcon; // Pvp con flag 0/1 /*017*/ uint8 unknown017[3]; // -/*020*/ +/*020*/ }; /* @@ -1383,14 +1383,14 @@ struct PlayerPositionUpdateClient_Struct /*0012*/ float y_pos; // y coord (1st loc value) /*0016*/ signed delta_heading:10; // change in heading unsigned padding0036:10; // animation - unsigned padding0016:12; // ***Placeholder + unsigned padding0016:12; // ***Placeholder /*0020*/ float delta_x; // Change in x /*0024*/ float delta_y; // Change in y /*0028*/ float z_pos; // z coord (3rd loc value) /*0032*/ float delta_z; // Change in z -/*0036*/ unsigned animation:10; // ***Placeholder +/*0036*/ unsigned animation:10; // ***Placeholder unsigned heading:12; // Directional heading - unsigned padding0037:10; // ***Placeholder + unsigned padding0037:10; // ***Placeholder /*0040*/ }; @@ -1937,7 +1937,7 @@ struct AdventureLeaderboard_Struct /*008*/ uint32 success; /*012*/ uint32 failure; /*016*/ uint32 our_rank; -/*020*/ +/*020*/ }; /*struct Item_Shop_Struct { @@ -1962,15 +1962,15 @@ struct Illusion_Struct { //size: 256 /*079*/ uint8 unknown079; // /*080*/ uint32 face; // /*084*/ uint8 hairstyle; // Some Races don't change Hair Style Properly in SoF -/*085*/ uint8 haircolor; // -/*086*/ uint8 beard; // -/*087*/ uint8 beardcolor; // -/*088*/ float size; // +/*085*/ uint8 haircolor; // +/*086*/ uint8 beard; // +/*087*/ uint8 beardcolor; // +/*088*/ float size; // /*092*/ uint8 unknown092[148]; /*240*/ uint32 unknown240; // Removes armor? -/*244*/ uint32 drakkin_heritage; // -/*248*/ uint32 drakkin_tattoo; // -/*252*/ uint32 drakkin_details; // +/*244*/ uint32 drakkin_heritage; // +/*248*/ uint32 drakkin_tattoo; // +/*252*/ uint32 drakkin_details; // /*256*/ }; @@ -2330,7 +2330,7 @@ struct BookRequest_Struct { /*0000*/ uint32 window; // where to display the text (0xFFFFFFFF means new window). /*0004*/ uint32 invslot; // The inventory slot the book is in. Not used, but echoed in the response packet. /*0008*/ uint32 type; // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others -/*0012*/ uint32 unknown0012; +/*0012*/ uint32 unknown0012; /*0016*/ uint16 unknown0016; /*0018*/ char txtfile[8194]; }; @@ -2431,7 +2431,7 @@ struct Door_Struct /*0054*/ uint8 unknown0054[4]; // 00 00 00 00 /*0060*/ uint8 doorId; // door's id # /*0061*/ uint8 opentype; -/*0062*/ uint8 state_at_spawn; +/*0062*/ uint8 state_at_spawn; /*0063*/ uint8 invert_state; // if this is 1, the door is normally open /*0064*/ uint32 door_param; // normally ff ff ff ff (-1) /*0068*/ uint32 unknown0068; // 00 00 00 00 @@ -2735,7 +2735,7 @@ struct Tracking_Struct_New { struct Track_Struct_New { uint16 entityid; // Entity ID uint16 unknown002; // 00 00 - uint32 unknown004; // + uint32 unknown004; // uint8 level; // level of mob uint8 unknown009; // 01 maybe type of mob? player/npc? char name[1]; // name of mob @@ -3942,7 +3942,7 @@ struct ItemBodyStruct uint32 icon; uint8 unknown1; uint8 unknown2; - uint32 BenefitFlag; + uint32 BenefitFlag; uint8 tradeskills; int8 CR; int8 DR; @@ -4045,9 +4045,9 @@ struct ItemTertiaryBodyStruct uint8 no_transfer; uint16 expendablearrow; - uint32 unknown8; - uint32 unknown9; - uint32 unknown10; + uint32 unknown8; + uint32 unknown9; + uint32 unknown10; uint32 unknown11; uint8 unknown12; uint8 unknown13; @@ -4148,7 +4148,7 @@ struct ItemQuaternaryBodyStruct int32 clairvoyance; uint8 unknown18; //Power Source Capacity or evolve filename? uint32 evolve_string; // Some String, but being evolution related is just a guess - uint8 unknown19; + uint8 unknown19; uint32 unknown20; // Bard Stuff? uint32 unknown21; uint32 unknown22; @@ -4295,7 +4295,7 @@ struct MercenaryListEntry_Struct { /*0041*/ uint32 MercUnk02; // Unknown (normally see 1, but sometimes 2 or 0) /*0045*/ uint32 StanceCount; // Iterations of MercenaryStance_Struct - Normally 2 to 4 seen /*0049*/ int32 MercUnk03; // Unknown (always 0 at merchant) - Seen on active merc: 93 a4 03 77, b8 ed 2f 26, 88 d5 8b c3, and 93 a4 ad 77 -/*0053*/ uint8 MercUnk04; // Seen 1 +/*0053*/ uint8 MercUnk04; // Seen 1 /*0054*/ MercenaryStance_Struct Stances[1]; // Count Varies, but hard set to 2 for now - From dbstr_us.txt - 1^24^Passive^0, 2^24^Balanced^0, etc (1 to 9 as of April 2012) }; @@ -4342,7 +4342,7 @@ struct MercenaryData_Struct { // [OPCode: 0x6537] On Live as of April 2 2012 [Server->Client] // Should be named OP_MercenaryDataResponse, but the current opcode using that name should be renamed first // Size varies if mercenary is hired or if browsing Mercenary Merchant -// This may also be the response for Client->Server 0x0327 (size 0) packet On Live as of April 2 2012 +// This may also be the response for Client->Server 0x0327 (size 0) packet On Live as of April 2 2012 struct MercenaryDataUpdate_Struct { /*0000*/ int32 MercStatus; // Seen 0 with merc and -1 with no merc hired /*0004*/ uint32 MercCount; // Seen 1 with 1 merc hired and 0 with no merc hired diff --git a/common/patches/template.cpp b/common/patches/template.cpp index 017cfb6d3..219e30f71 100644 --- a/common/patches/template.cpp +++ b/common/patches/template.cpp @@ -12,7 +12,7 @@ namespace TEMPLATE { static const char *name = "CHANGEME"; static OpcodeManager *opcodes = NULL; static Strategy struct_strategy; - + void Register(EQStreamIdentifier &into) { //create our opcode manager if we havent already if(opcodes == NULL) { @@ -27,16 +27,16 @@ void Register(EQStreamIdentifier &into) { return; } } - + //ok, now we have what we need to register. - + EQStream::Signature signature; - + //register our world signature. signature.first_length = sizeof(structs::LoginInfo_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_SendLoginInfo); into.RegisterPatch(signature, name, &opcodes, &struct_strategy); - + //register our zone signature. signature.first_length = sizeof(structs::ClientZoneEntry_Struct); signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry); @@ -44,11 +44,11 @@ void Register(EQStreamIdentifier &into) { } void Reload() { - + //we have a big problem to solve here when we switch back to shared memory //opcode managers because we need to change the manager pointer, which means //we need to go to every stream and replace it's manager. - + if(opcodes != NULL) { //TODO: get this file name from the config file string opfile = "patch_"; @@ -85,17 +85,17 @@ std::string Strategy::Describe() const { /*ENCODE(OP_PlayerProfile) { SETUP_DIRECT(PlayerProfile_Struct, structs::PlayerProfile_Struct); - - - + + + FINISH_DIRECT(); } ENCODE(OP_NewZone) { SETUP_DIRECT(PlayerProfile_Struct, structs::PlayerProfile_Struct); - - - + + + FINISH_DIRECT(); }*/ diff --git a/common/patches/template.h b/common/patches/template.h index 9e570cc56..16f869fc1 100644 --- a/common/patches/template.h +++ b/common/patches/template.h @@ -6,30 +6,30 @@ class EQStreamIdentifier; namespace TEMPLATE { - + //these are the only public member of this namespace. extern void Register(EQStreamIdentifier &into); extern void Reload(); - - - - //you should not directly access anything below.. + + + + //you should not directly access anything below.. //I just dont feel like making a seperate header for it. - + class Strategy : public StructStrategy { public: Strategy(); - + protected: - + virtual std::string Describe() const; virtual const EQClientVersion ClientVersion() const; //magic macro to declare our opcodes #include "SSDeclare.h" #include "TEMPLATE_ops.h" - + }; - + }; diff --git a/common/perl_EQDB.cpp b/common/perl_EQDB.cpp index 35417b4a7..086a27c73 100644 --- a/common/perl_EQDB.cpp +++ b/common/perl_EQDB.cpp @@ -33,7 +33,7 @@ typedef const char Const_char; #include "EQDB.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -231,7 +231,7 @@ XS(boot_EQDB) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/common/perl_EQDBRes.cpp b/common/perl_EQDBRes.cpp index b1753e070..835bea2c8 100644 --- a/common/perl_EQDBRes.cpp +++ b/common/perl_EQDBRes.cpp @@ -193,12 +193,12 @@ XS(XS_EQDBRes_fetch_row_hash) RETVAL = THIS->fetch_row_hash(); ST(0) = sv_newmortal(); if (RETVAL.begin()!=RETVAL.end()) - { + { //NOTE: we are leaking the original ST(0) right now HV *hv = newHV(); sv_2mortal((SV*)hv); ST(0) = newRV((SV*)hv); - + map::const_iterator cur, end; cur = RETVAL.begin(); end = RETVAL.end(); @@ -270,7 +270,7 @@ XS(boot_EQDBRes) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/common/profiler.h b/common/profiler.h index 425fb9f2b..10ae404d2 100644 --- a/common/profiler.h +++ b/common/profiler.h @@ -35,15 +35,15 @@ public: inline virtual ~GeneralProfiler() { safe_delete_array(timers); } - + inline double getTotalDuration(unsigned int id) { return(idreset(); } - + RDTSC_Collector *timers; unsigned int count; }; diff --git a/common/ptimer.h b/common/ptimer.h index 919f0cfd4..1220daa92 100644 --- a/common/ptimer.h +++ b/common/ptimer.h @@ -41,7 +41,7 @@ enum { //values for pTimerType pTimerDisciplineReuseEnd = 24, pTimerCombatAbility = 25, pTimerBeggingPickPocket = 26, - + pTimerLayHands = 87, //these IDs are used by client too pTimerHarmTouch = 89, //so dont change them @@ -54,7 +54,7 @@ enum { //values for pTimerType pTimerAAEnd = 2999, pTimerAAEffectStart = 3001, //AA effect timers pTimerAAEffectEnd = 4999, - + pTimerSpellStart = 5000 //Do not put any timer IDs above this one //if needed, increase its starting ID }; @@ -66,13 +66,13 @@ typedef uint16 pTimerType; class PersistentTimer { public: static PersistentTimer *LoadTimer(Database *db, uint32 char_id, pTimerType type); - + PersistentTimer(uint32 char_id, pTimerType type, uint32 duration); PersistentTimer(uint32 char_id, pTimerType type, uint32 start_time, uint32 duration, bool enable); - + bool Expired(Database *db, bool iReset = true); void Start(uint32 set_timer_time=0); - + void SetTimer(uint32 set_timer_time=0); uint32 GetRemainingTime(); inline void Enable() { enabled = true; } @@ -89,11 +89,11 @@ public: protected: uint32 get_current_time(); - + uint32 start_time; uint32 timer_time; bool enabled; - + uint32 _char_id; pTimerType _type; }; @@ -102,13 +102,13 @@ protected: class PTimerList { public: PTimerList(uint32 char_id = 0); - + ~PTimerList(); - + bool Load(Database *db); bool Store(Database *db); bool Clear(Database *db); - + void Start(pTimerType type, uint32 duration); bool Expired(Database *db, pTimerType type, bool reset = true); void Clear(Database *db, pTimerType type); @@ -117,24 +117,24 @@ public: void Disable(pTimerType type); uint32 GetRemainingTime(pTimerType type); PersistentTimer *Get(pTimerType type); - + inline void SetCharID(uint32 char_id) { _char_id = char_id; } - + void ToVector(vector< pair > &out); - + //Clear a timer for a char not logged in //this is not defined on a char which is logged in! static bool ClearOffline(Database *db, uint32 char_id, pTimerType type); - + typedef map::iterator iterator; iterator begin() { return(_list.begin()); } iterator end() { return(_list.end()); } - - + + void AddTimer(pTimerType type, uint32 start_time, uint32 duration, bool enable); protected: uint32 _char_id; - + map _list; }; diff --git a/common/queues.h b/common/queues.h index 66125e650..c6779385a 100644 --- a/common/queues.h +++ b/common/queues.h @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, diff --git a/common/rdtsc.cpp b/common/rdtsc.cpp index 085387efc..15826d49a 100644 --- a/common/rdtsc.cpp +++ b/common/rdtsc.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -91,35 +91,35 @@ int64 RDTSC_Timer::rdtsc() { void RDTSC_Timer::init() { #ifdef USE_RDTSC int64 before, after, sum; - + int r; sum = 0; // run an average to increase accuracy of clock rate for(r = 0; r < CALIBRATE_LOOPS; r++) { before = rdtsc(); - + //sleep a know duration to figure out clock rate #ifdef _WINDOWS Sleep(SLEEP_TIME); #else usleep(SLEEP_TIME * 1000); //ms * 1000 #endif - + after = rdtsc(); - + sum += after - before; } - + //ticks per sleep / ms per sleep _ticsperms = (sum / CALIBRATE_LOOPS) / SLEEP_TIME; - + #else //if using gettimeofday, this is fixed at 1000 _ticsperms = 1000; #endif // printf("Tics per milisecond: %llu \n", _ticsperms); - - _inited = true; //only want to do this once + + _inited = true; //only want to do this once } //start the timer @@ -145,7 +145,7 @@ RDTSC_Collector::RDTSC_Collector() : RDTSC_Timer() { RDTSC_Collector::RDTSC_Collector(bool start_it) : RDTSC_Timer(start_it) { reset(); } - + void RDTSC_Collector::stop() { RDTSC_Timer::stop(); _sum += RDTSC_Timer::getTicks(); @@ -160,7 +160,7 @@ double RDTSC_Collector::getTotalDuration() { double RDTSC_Collector::getAverage() { return(((double)(getTotalTicks())) / double(_ticsperms * _count)); } - + void RDTSC_Collector::reset() { _sum = 0; _count = 0; diff --git a/common/rdtsc.h b/common/rdtsc.h index b1babfd2b..d73fbaec8 100644 --- a/common/rdtsc.h +++ b/common/rdtsc.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -26,8 +26,8 @@ This class implementes the highest possibly prescision timer which is avaliable on the current archetecture. - - On intel, this uses the rdtsc instruction to get the actual + + On intel, this uses the rdtsc instruction to get the actual clock cycle count, and elsewhere it falls back to gettimeofday All calculations are carried out in 64 bit integers. @@ -39,18 +39,18 @@ class RDTSC_Timer { public: RDTSC_Timer(); RDTSC_Timer(bool start_it); - + void start(); //start the timer virtual void stop(); //stop the timer double getDuration(); //returns the number of miliseconds elapsed - + //access functions int64 getTicks() { return(_end - _start); } static int64 ticksPerMS() { return(_ticsperms); } - + protected: static int64 rdtsc(); - + int64 _start; int64 _end; @@ -67,17 +67,17 @@ class RDTSC_Collector : public RDTSC_Timer { public: RDTSC_Collector(); RDTSC_Collector(bool start_it); - + void reset(); - + void stop(); //stop the timer - + double getTotalDuration(); //returns the number of miliseconds elapsed double getAverage(); - + int64 getTotalTicks() { return(_sum); } int64 getCount() { return(_count); } - + protected: int64 _sum; int64 _count; diff --git a/common/rulesys.h b/common/rulesys.h index 060a44e82..266b75570 100644 --- a/common/rulesys.h +++ b/common/rulesys.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -54,14 +54,14 @@ public: #include "ruletypes.h" _IntRuleCount } IntType; - + typedef enum { #define RULE_REAL(cat, rule, default_value) \ Real__##rule, #include "ruletypes.h" _RealRuleCount } RealType; - + typedef enum { #define RULE_BOOL(cat, rule, default_value) \ Bool__##rule, @@ -85,9 +85,9 @@ public: static const RealType InvalidReal = _RealRuleCount; static const BoolType InvalidBool = _BoolRuleCount; static const CategoryType InvalidCategory = _CatCount; - + static const uint32 _RulesCount = _IntRuleCount+_RealRuleCount+_BoolRuleCount; - + //fetch routines, you should generally use the Rule* macros instead of this int32 GetIntRule (IntType t) const; float GetRealRule(RealType t) const; @@ -109,11 +109,11 @@ public: static int GetRulesetID(Database *db, const char *rulesetname); static std::string GetRulesetName(Database *db, int id); static bool ListRulesets(Database *db, std::map &into); - + void ResetRules(); bool LoadRules(Database *db, const char *ruleset = nullptr); void SaveRules(Database *db, const char *ruleset = nullptr); - + private: RuleManager(); RuleManager(const RuleManager&); @@ -134,7 +134,7 @@ private: RealRule, BoolRule } RuleType; - + static bool _FindRule(const char *rule_name, RuleType &type_into, uint16 &index_into); static const char *_GetRuleName(RuleType type, uint16 index); static int _FindOrCreateRuleset(Database *db, const char *ruleset); @@ -148,7 +148,7 @@ private: uint16 rule_index; //index into its 'type' array } RuleInfo; static const RuleInfo s_RuleInfo[]; - + }; #endif /*RULESYS_H_*/ diff --git a/common/ruletypes.h b/common/ruletypes.h index e5156c474..204763b2b 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -40,11 +40,11 @@ RULE_REAL( Character, AAExpMultiplier, 0.5 ) RULE_REAL( Character, GroupExpMultiplier, 0.5 ) RULE_REAL( Character, RaidExpMultiplier, 0.2 ) RULE_BOOL( Character, UseXPConScaling, true ) -RULE_INT ( Character, LightBlueModifier, 40 ) +RULE_INT ( Character, LightBlueModifier, 40 ) RULE_INT ( Character, BlueModifier, 90 ) RULE_INT ( Character, WhiteModifier, 100 ) RULE_INT ( Character, YellowModifier, 125 ) -RULE_INT ( Character, RedModifier, 150 ) +RULE_INT ( Character, RedModifier, 150 ) RULE_INT ( Character, AutosaveIntervalS, 300 ) //0=disabled RULE_INT ( Character, HPRegenMultiplier, 100) RULE_INT ( Character, ManaRegenMultiplier, 100) @@ -227,7 +227,7 @@ RULE_INT ( Pathing, RouteUpdateFrequencyLong, 5000) // How often a new route wi // When a path has a path node route and it's target changes position, if it has RouteUpdateFrequencyNodeCount or less nodes to go on it's // current path, it will recalculate it's path based on the RouteUpdateFrequencyShort timer, otherwise it will use the // RouteUpdateFrequencyLong timer. -RULE_INT ( Pathing, RouteUpdateFrequencyNodeCount, 5) +RULE_INT ( Pathing, RouteUpdateFrequencyNodeCount, 5) RULE_REAL ( Pathing, MinDistanceForLOSCheckShort, 40000) // (NoRoot). While following a path, only check for LOS to target within this distance. RULE_REAL ( Pathing, MinDistanceForLOSCheckLong, 1000000) // (NoRoot). Min distance when initially attempting to acquire the target. RULE_INT ( Pathing, MinNodesLeftForLOSCheck, 4) // Only check for LOS when we are down to this many path nodes left to run. @@ -321,7 +321,7 @@ RULE_REAL ( Combat, HitFalloffMajor, 50.0) //hit will fall off sharply if we're RULE_REAL ( Combat, HitBonusPerLevel, 1.2) //You gain this % of hit for every level you are above your target RULE_REAL ( Combat, WeaponSkillFalloff, 0.33) //For every weapon skill point that's not maxed you lose this % of hit RULE_REAL ( Combat, ArcheryHitPenalty, 0.25) //Archery has a hit penalty to try to help balance it with the plethora of long term +hit modifiers for it -RULE_REAL ( Combat, AgiHitFactor, 0.01) +RULE_REAL ( Combat, AgiHitFactor, 0.01) RULE_INT ( Combat, MinRangedAttackDist, 25) //Minimum Distance to use Ranged Attacks RULE_BOOL ( Combat, ArcheryBonusRequiresStationary, true) //does the 2x archery bonus chance require a stationary npc RULE_REAL ( Combat, ArcheryBaseDamageBonus, 1) // % Modifier to Base Archery Damage (.5 = 50% base damage, 1 = 100%, 2 = 200%) diff --git a/common/seperator.h b/common/seperator.h index 5957528cb..3031813b6 100644 --- a/common/seperator.h +++ b/common/seperator.h @@ -33,10 +33,10 @@ public: int i; argnum = 0; int len = static_cast(strlen(message_in)); - + if(arglen > len) arglen = len+1; - + //msg = strdup(message); msg = new char[len+1]; strcpy(msg, message_in); diff --git a/common/serverinfo.cpp b/common/serverinfo.cpp index 410da4c26..6a4840f45 100644 --- a/common/serverinfo.cpp +++ b/common/serverinfo.cpp @@ -33,21 +33,21 @@ int GetOS() { OSVERSIONINFO Ver_os; Ver_os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - + if(!(GetVersionEx(&Ver_os))) return 1; - + Ver_build = Ver_os.dwBuildNumber & 0xFFFF; Ver_min = Ver_os.dwMinorVersion; Ver_maj = Ver_os.dwMajorVersion; Ver_pid = Ver_os.dwPlatformId; - + if ((Ver_pid == 1) && (Ver_maj == 4)) { if ((Ver_min < 10) && (Ver_build == 950)) { strcpy(Ver_name, "Microsoft Windows 95"); } - else if ((Ver_min < 10) && + else if ((Ver_min < 10) && ((Ver_build > 950) && (Ver_build <= 1080))) { strcpy(Ver_name, "Microsoft Windows 95 SP1"); @@ -60,7 +60,7 @@ int GetOS() { { strcpy(Ver_name, "Microsoft Windows 98"); } - else if ((Ver_min == 10) && + else if ((Ver_min == 10) && ((Ver_build > 1998) && (Ver_build < 2183))) { strcpy(Ver_name, "Microsoft Windows 98, Service Pack 1"); @@ -99,21 +99,21 @@ int GetOS() { } return 0; -} +} #else #include #include #include - + char* GetOS(char* os_string) { utsname info; if(uname(&info)==0) { snprintf(os_string, 99, "%s %s %s %s %s", info.sysname, info.nodename, info.release, info.version, info.machine); } else { - strncpy(os_string, "Error determining OS & version!", 25); + strncpy(os_string, "Error determining OS & version!", 25); } return os_string; diff --git a/common/servertalk.h b/common/servertalk.h index 26450d872..b78dfada9 100644 --- a/common/servertalk.h +++ b/common/servertalk.h @@ -105,12 +105,12 @@ #define ServerOP_GroupCancelInvite 0x0112 #define ServerOP_InstanceUpdateTime 0x014F -#define ServerOP_AdventureRequest 0x0150 +#define ServerOP_AdventureRequest 0x0150 #define ServerOP_AdventureRequestAccept 0x0151 #define ServerOP_AdventureRequestDeny 0x0152 -#define ServerOP_AdventureRequestCreate 0x0153 -#define ServerOP_AdventureData 0x0154 -#define ServerOP_AdventureDataClear 0x0155 +#define ServerOP_AdventureRequestCreate 0x0153 +#define ServerOP_AdventureData 0x0154 +#define ServerOP_AdventureDataClear 0x0155 #define ServerOP_AdventureCreateDeny 0x0156 #define ServerOP_AdventureDataRequest 0x0157 #define ServerOP_AdventureClickDoor 0x0158 @@ -267,7 +267,7 @@ public: uint8 ReadUInt8() { uint8 value = *(uint8 *)(pBuffer + _rpos); _rpos += sizeof(uint8); return value; } uint32 ReadUInt32() { uint32 value = *(uint32 *)(pBuffer + _rpos); _rpos += sizeof(uint32); return value; } void ReadString(char *str) { uint32 len = static_cast(strlen((char *)(pBuffer + _rpos))) + 1; memcpy(str, pBuffer + _rpos, len); _rpos += len; } - + uint32 GetWritePosition() { return _wpos; } uint32 GetReadPosition() { return _rpos; } void SetWritePosition(uint32 Newwpos) { _wpos = Newwpos; } @@ -584,7 +584,7 @@ struct ServerWhoAll_Struct { }; struct ServerFriendsWho_Struct { - uint32 FromID; + uint32 FromID; char FromName[64]; char FriendsString[1]; }; @@ -838,7 +838,7 @@ struct ServerRaidGeneralAction_Struct { struct ServerRaidGroupAction_Struct { //add / remove depends on opcode. char membername[64]; //member who's adding / leaving uint32 gid; //group id to send to. - uint32 rid; //raid id to send to. + uint32 rid; //raid id to send to. }; struct ServerRaidMessage_Struct { diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 6fc251374..a5107215f 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -27,8 +27,8 @@ SharedDatabase::SharedDatabase() } SharedDatabase::SharedDatabase(const char* host, const char* user, const char* passwd, const char* database, uint32 port) -: Database(host, user, passwd, database, port), skill_caps_mmf(nullptr), items_mmf(nullptr), items_hash(nullptr), - faction_mmf(nullptr), faction_hash(nullptr), loot_table_mmf(nullptr), loot_drop_mmf(nullptr), loot_table_hash(nullptr), +: Database(host, user, passwd, database, port), skill_caps_mmf(nullptr), items_mmf(nullptr), items_hash(nullptr), + faction_mmf(nullptr), faction_hash(nullptr), loot_table_mmf(nullptr), loot_drop_mmf(nullptr), loot_table_hash(nullptr), loot_drop_hash(nullptr) { } @@ -49,16 +49,16 @@ bool SharedDatabase::SetHideMe(uint32 account_id, uint8 hideme) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET hideme = %i where id = %i", hideme, account_id), errbuf)) { cerr << "Error in SetGMSpeed query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + safe_delete_array(query); return true; - + } uint8 SharedDatabase::GetGMSpeed(uint32 account_id) @@ -85,14 +85,14 @@ uint8 SharedDatabase::GetGMSpeed(uint32 account_id) } else { - + cerr << "Error in GetGMSpeed query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + return 0; - + } @@ -100,16 +100,16 @@ bool SharedDatabase::SetGMSpeed(uint32 account_id, uint8 gmspeed) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET gmspeed = %i where id = %i", gmspeed, account_id), errbuf)) { cerr << "Error in SetGMSpeed query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + safe_delete_array(query); return true; - + } uint32 SharedDatabase::GetTotalTimeEntitledOnAccount(uint32 AccountID) { @@ -170,7 +170,7 @@ bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const Ite MYSQL_RES *result; MYSQL_ROW row; // Delete cursor items - if (!RunQuery(query, MakeAnyLenString(&query, + if (!RunQuery(query, MakeAnyLenString(&query, "SELECT itemid,charges FROM sharedbank " "WHERE acctid=%d AND slotid=%d", account_id, slot_id), errbuf, &result)) { @@ -180,19 +180,19 @@ bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const Ite return(true); } safe_delete_array(query); - + row = mysql_fetch_row(result); bool found = false; if(row) { uint32 id = atoi(row[0]); uint16 charges = atoi(row[1]); - + uint16 expect_charges = 0; if(inst->GetCharges() >= 0) expect_charges = inst->GetCharges(); else expect_charges = 0x7FFF; - + if(id == inst->GetItem()->ID && charges == expect_charges) found = true; } @@ -210,23 +210,23 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s //never save tribute slots: if(slot_id >= 400 && slot_id <= 404) return(true); - + if (inst && inst->IsType(ItemClassCommon)) { for(int i=0;i<5;i++) { ItemInst *auginst=inst->GetItem(i); augslot[i]=(auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; } } - + if (slot_id>=2500 && slot_id<=2600) { // Shared bank inventory if (!inst) { // Delete item uint32 account_id = GetAccountIDByChar(char_id); uint32 len_query = MakeAnyLenString(&query, "DELETE FROM sharedbank WHERE acctid=%i AND slotid=%i", account_id, slot_id); - + ret = RunQuery(query, len_query, errbuf); - + // Delete bag slots, if need be if (ret && Inventory::SupportsContainers(slot_id)) { safe_delete_array(query); @@ -234,7 +234,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM sharedbank WHERE acctid=%i AND slotid>=%i AND slotid<%i", account_id, base_slot_id, (base_slot_id+10)), errbuf); } - + // @merth: need to delete augments here } else { @@ -246,7 +246,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s else charges = 0x7FFF; - uint32 len_query = MakeAnyLenString(&query, + uint32 len_query = MakeAnyLenString(&query, "REPLACE INTO sharedbank " " (acctid,slotid,itemid,charges,custom_data," " augslot1,augslot2,augslot3,augslot4,augslot5)" @@ -256,7 +256,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s inst->GetCustomDataString().c_str(), (unsigned long)augslot[0],(unsigned long)augslot[1],(unsigned long)augslot[2],(unsigned long)augslot[3],(unsigned long)augslot[4]); - + ret = RunQuery(query, len_query, errbuf); } } @@ -265,7 +265,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s // Delete item ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND slotid=%i", char_id, slot_id), errbuf); - + // Delete bag slots, if need be if (ret && Inventory::SupportsContainers(slot_id)) { safe_delete_array(query); @@ -273,7 +273,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND slotid>=%i AND slotid<%i", char_id, base_slot_id, (base_slot_id+10)), errbuf); } - + // @merth: need to delete augments here } else { @@ -283,24 +283,24 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s else charges = 0x7FFF; // Update/Insert item - uint32 len_query = MakeAnyLenString(&query, + uint32 len_query = MakeAnyLenString(&query, "REPLACE INTO inventory " " (charid,slotid,itemid,charges,instnodrop,custom_data,color," " augslot1,augslot2,augslot3,augslot4,augslot5)" " VALUES(%lu,%lu,%lu,%lu,%lu,'%s',%lu," " %lu,%lu,%lu,%lu,%lu)", - (unsigned long)char_id, (unsigned long)slot_id, (unsigned long)inst->GetItem()->ID, (unsigned long)charges, + (unsigned long)char_id, (unsigned long)slot_id, (unsigned long)inst->GetItem()->ID, (unsigned long)charges, (unsigned long)(inst->IsInstNoDrop() ? 1:0),inst->GetCustomDataString().c_str(),(unsigned long)inst->GetColor(), (unsigned long)augslot[0],(unsigned long)augslot[1],(unsigned long)augslot[2],(unsigned long)augslot[3],(unsigned long)augslot[4] ); - + ret = RunQuery(query, len_query, errbuf); } } - + if (!ret) LogFile->write(EQEMuLog::Error, "SaveInventory query '%s': %s", query, errbuf); safe_delete_array(query); - + // Save bag contents, if slot supports bag contents if (inst && inst->IsType(ItemClassContainer) && Inventory::SupportsContainers(slot_id)) { for (uint8 idx=0; idx<10; idx++) { @@ -308,9 +308,9 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s SaveInventory(char_id, baginst, Inventory::CalcSlotId(slot_id, idx)); } } - + // @merth: need to save augments here - + return ret; } @@ -338,12 +338,12 @@ int32 SharedDatabase::GetSharedPlatinum(uint32 account_id) } else { - + cerr << "Error in GetSharedPlatinum query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + return 0; } @@ -357,7 +357,7 @@ bool SharedDatabase::SetSharedPlatinum(uint32 account_id, int32 amount_to_add) safe_delete_array(query); return false; } - + safe_delete_array(query); return true; } @@ -369,7 +369,7 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv, MYSQL_RES *result; MYSQL_ROW row; const Item_Struct* myitem; - + RunQuery ( query, @@ -394,7 +394,7 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv, myitem = GetItem(itemid); if(!myitem) continue; - ItemInst* myinst = CreateBaseItem(myitem, charges); + ItemInst* myinst = CreateBaseItem(myitem, charges); if(slot < 0) slot = inv->FindFreeSlot(0,0); inv->PutItem(slot, *myinst); @@ -415,7 +415,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { MYSQL_RES *result; MYSQL_ROW row; bool ret = false; - + if (is_charid) { len_query = MakeAnyLenString(&query, "SELECT sb.slotid,sb.itemid,sb.charges,sb.augslot1,sb.augslot2,sb.augslot3,sb.augslot4,sb.augslot5,sb.custom_data from sharedbank sb " @@ -426,7 +426,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { len_query = MakeAnyLenString(&query, "SELECT slotid,itemid,charges,augslot1,augslot2,augslot3,augslot4,augslot5,custom_data from sharedbank WHERE acctid=%i", id); } - + if (RunQuery(query, len_query, errbuf, &result)) { while ((row = mysql_fetch_row(result))) { int16 slot_id = (int16)atoi(row[0]); @@ -439,10 +439,10 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { aug[3] = (uint32)atoi(row[6]); aug[4] = (uint32)atoi(row[7]); const Item_Struct* item = GetItem(item_id); - + if (item) { int16 put_slot_id = SLOT_INVALID; - + ItemInst* inst = CreateBaseItem(item, charges); if (item->ItemClass == ItemClassCommon) { for(int i=0;i<5;i++) { @@ -476,10 +476,10 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { } } } - + put_slot_id = inv->PutItem(slot_id, *inst); safe_delete(inst); - + // Save ptr to item in inventory if (put_slot_id == SLOT_INVALID) { LogFile->write(EQEMuLog::Error, @@ -496,14 +496,14 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { ((is_charid==true) ? "charid" : "acctid"), id, item_id, slot_id); } } - + mysql_free_result(result); ret = true; } else { LogFile->write(EQEMuLog::Error, "Database::GetSharedBank(uint32 account_id): %s", errbuf); } - + safe_delete_array(query); return ret; } @@ -517,12 +517,12 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { MYSQL_RES* result; MYSQL_ROW row; bool ret = false; - + // Retrieve character inventory if (RunQuery(query, MakeAnyLenString(&query, "SELECT slotid,itemid,charges,color,augslot1,augslot2,augslot3,augslot4,augslot5," "instnodrop,custom_data FROM inventory WHERE charid=%i ORDER BY slotid", char_id), errbuf, &result)) { - while ((row = mysql_fetch_row(result))) { + while ((row = mysql_fetch_row(result))) { int16 slot_id = atoi(row[0]); uint32 item_id = atoi(row[1]); uint16 charges = atoi(row[2]); @@ -536,12 +536,12 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { bool instnodrop = (row[9] && (uint16)atoi(row[9])) ? true : false; const Item_Struct* item = GetItem(item_id); - + if (item) { int16 put_slot_id = SLOT_INVALID; - + ItemInst* inst = CreateBaseItem(item, charges); - + if(row[10]) { std::string data_str(row[10]); std::string id; @@ -587,10 +587,10 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { if (slot_id>=8000 && slot_id <= 8999) put_slot_id = inv->PushCursor(*inst); - else + else put_slot_id = inv->PutItem(slot_id, *inst); safe_delete(inst); - + // Save ptr to item in inventory if (put_slot_id == SLOT_INVALID) { LogFile->write(EQEMuLog::Error, @@ -605,7 +605,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { } } mysql_free_result(result); - + // Retrieve shared inventory ret = GetSharedBank(char_id, inv, true); } @@ -613,7 +613,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { LogFile->write(EQEMuLog::Error, "GetInventory query '%s' %s", query, errbuf); LogFile->write(EQEMuLog::Error, "If you got an error related to the 'instnodrop' field, run the following SQL Queries:\nalter table inventory add instnodrop tinyint(1) unsigned default 0 not null;\n"); } - + safe_delete_array(query); return ret; } @@ -626,10 +626,10 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) MYSQL_RES* result; MYSQL_ROW row; bool ret = false; - + // Retrieve character inventory if (RunQuery(query, MakeAnyLenString(&query, "SELECT slotid,itemid,charges,color,augslot1,augslot2,augslot3,augslot4,augslot5," - "instnodrop,custom_data FROM inventory INNER JOIN character_ ch ON ch.id=charid WHERE ch.name='%s' AND ch.account_id=%i ORDER BY slotid", + "instnodrop,custom_data FROM inventory INNER JOIN character_ ch ON ch.id=charid WHERE ch.name='%s' AND ch.account_id=%i ORDER BY slotid", name, account_id), errbuf, &result)) { while ((row = mysql_fetch_row(result))) { @@ -649,7 +649,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) if(!item) continue; - ItemInst* inst = CreateBaseItem(item, charges); + ItemInst* inst = CreateBaseItem(item, charges); inst->SetInstNoDrop(instnodrop); if(row[10]) { @@ -657,7 +657,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) std::string id; std::string value; bool use_id = true; - + for(int i = 0; i < data_str.length(); ++i) { if(data_str[i] == '^') { if(!use_id) { @@ -691,10 +691,10 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) } if (slot_id>=8000 && slot_id <= 8999) put_slot_id = inv->PushCursor(*inst); - else + else put_slot_id = inv->PutItem(slot_id, *inst); safe_delete(inst); - + // Save ptr to item in inventory if (put_slot_id == SLOT_INVALID) { LogFile->write(EQEMuLog::Error, @@ -703,7 +703,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) } } mysql_free_result(result); - + // Retrieve shared inventory ret = GetSharedBank(account_id, inv, false); } @@ -711,7 +711,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) LogFile->write(EQEMuLog::Error, "GetInventory query '%s' %s", query, errbuf); LogFile->write(EQEMuLog::Error, "If you got an error related to the 'instnodrop' field, run the following SQL Queries:\nalter table inventory add instnodrop tinyint(1) unsigned default 0 not null;\n"); } - + safe_delete_array(query); return ret; } @@ -723,7 +723,7 @@ void SharedDatabase::GetItemsCount(int32 &item_count, uint32 &max_id) { MYSQL_ROW row; item_count = -1; max_id = 0; - + char query[] = "SELECT MAX(id), count(*) FROM items"; if (RunQuery(query, static_cast(strlen(query)), errbuf, &result)) { row = mysql_fetch_row(result); @@ -810,9 +810,9 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ " from items order by id"; Item_Struct item; if(RunQuery(query, sizeof(query), errbuf, &result)) { - while((row = mysql_fetch_row(result))) { + while((row = mysql_fetch_row(result))) { memset(&item, 0, sizeof(Item_Struct)); - + item.ItemClass = (uint8)atoi(row[ItemField::itemclass]); strcpy(item.Name,row[ItemField::name]); strcpy(item.Lore,row[ItemField::lore]); @@ -1010,7 +1010,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ break; } } - + mysql_free_result(result); } else { @@ -1173,7 +1173,7 @@ bool SharedDatabase::LoadNPCFactionLists() { if(faction_hash) { return true; } - + try { EQEmu::IPCMutex mutex("faction"); mutex.Lock(); @@ -1212,16 +1212,16 @@ bool SharedDatabase::GetPlayerProfile(uint32 account_id, char* name, PlayerProfi MYSQL_RES* result; MYSQL_ROW row; bool ret = false; - + unsigned long* lengths; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT profile,zonename,x,y,z,extprofile,instanceid FROM character_ WHERE account_id=%i AND name='%s'", account_id, name), errbuf, &result)) { - if (mysql_num_rows(result) == 1) { + if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); lengths = mysql_fetch_lengths(result); if (lengths[0] == sizeof(PlayerProfile_Struct)) { memcpy(pp, row[0], sizeof(PlayerProfile_Struct)); - + if (current_zone) strcpy(current_zone, row[1]); pp->zone_id = GetZoneID(row[1]); @@ -1234,12 +1234,12 @@ bool SharedDatabase::GetPlayerProfile(uint32 account_id, char* name, PlayerProfi if(current_instance) *current_instance = pp->zoneInstance; - + if(ext) { //SetExtendedProfile handles any conversion SetExtendedProfile(ext, row[5], lengths[5]); } - + // Retrieve character inventory ret = GetInventory(account_id, name, inv); } @@ -1248,13 +1248,13 @@ bool SharedDatabase::GetPlayerProfile(uint32 account_id, char* name, PlayerProfi lengths[0], sizeof(PlayerProfile_Struct)); } } - + mysql_free_result(result); } else { LogFile->write(EQEMuLog::Error, "GetPlayerProfile query '%s' %s", query, errbuf); } - + safe_delete_array(query); return ret; } @@ -1265,15 +1265,15 @@ bool SharedDatabase::SetPlayerProfile(uint32 account_id, uint32 charid, PlayerPr char* query = 0; uint32 affected_rows = 0; bool ret = false; - + if (RunQuery(query, SetPlayerProfile_MQ(&query, account_id, charid, pp, inv, ext, current_zone, current_instance, MaxXTargets), errbuf, 0, &affected_rows)) { ret = (affected_rows != 0); } - + if (!ret) { LogFile->write(EQEMuLog::Error, "SetPlayerProfile query '%s' %s", query, errbuf); } - + safe_delete_array(query); return ret; } @@ -1290,13 +1290,13 @@ uint32 SharedDatabase::SetPlayerProfile_MQ(char** query, uint32 account_id, uint if(strlen(pp->name) == 0) // Sanity check in case pp never loaded return false; - + end += sprintf(end, "UPDATE character_ SET timelaston=unix_timestamp(now()),name=\'%s\', zonename=\'%s\', zoneid=%u, instanceid=%u, x = %f, y = %f, z = %f, profile=\'", pp->name, GetZoneName(current_zone), current_zone, current_instance, pp->x, pp->y, pp->z); end += DoEscapeString(end, (char*)pp, sizeof(PlayerProfile_Struct)); end += sprintf(end,"\', extprofile=\'"); end += DoEscapeString(end, (char*)ext, sizeof(ExtendedProfile_Struct)); end += sprintf(end,"\',class=%d,level=%d,xtargets=%u WHERE id=%u", pp->class_, pp->level, MaxXTargets, charid); - + return (uint32) (end - (*query)); } @@ -1333,14 +1333,14 @@ ItemInst* SharedDatabase::CreateItem(const Item_Struct* item, int16 charges, uin inst->PutAugment(this, 3, aug4); inst->PutAugment(this, 4, aug5); } - + return inst; } ItemInst* SharedDatabase::CreateBaseItem(const Item_Struct* item, int16 charges) { ItemInst* inst = nullptr; if (item) { - // if maxcharges is -1 that means it is an unlimited use item. + // if maxcharges is -1 that means it is an unlimited use item. // set it to 1 charge so that it is usable on creation if (charges == 0 && item->MaxCharges == -1) charges = 1; @@ -1349,8 +1349,8 @@ ItemInst* SharedDatabase::CreateBaseItem(const Item_Struct* item, int16 charges) inst = new EvoItemInst(item, charges); ((EvoItemInst*)inst)->Initialize(this); } - else - inst = new ItemInst(item, charges); + else + inst = new ItemInst(item, charges); } return inst; } @@ -1363,8 +1363,8 @@ int32 SharedDatabase::DeleteStalePlayerCorpses() { if(RuleB(Zone, EnableShadowrest)) { if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried = 1 WHERE IsBurried=0 and " - "(UNIX_TIMESTAMP() - UNIX_TIMESTAMP(timeofdeath)) > %d and not timeofdeath=0", - (RuleI(Character, CorpseDecayTimeMS) / 1000)), errbuf, 0, &affected_rows)) + "(UNIX_TIMESTAMP() - UNIX_TIMESTAMP(timeofdeath)) > %d and not timeofdeath=0", + (RuleI(Character, CorpseDecayTimeMS) / 1000)), errbuf, 0, &affected_rows)) { safe_delete_array(query); return -1; @@ -1373,8 +1373,8 @@ int32 SharedDatabase::DeleteStalePlayerCorpses() { else { if (!RunQuery(query, MakeAnyLenString(&query, "Delete from player_corpses where (UNIX_TIMESTAMP() - " - "UNIX_TIMESTAMP(timeofdeath)) > %d and not timeofdeath=0", (RuleI(Character, CorpseDecayTimeMS) / 1000)), - errbuf, 0, &affected_rows)) + "UNIX_TIMESTAMP(timeofdeath)) > %d and not timeofdeath=0", (RuleI(Character, CorpseDecayTimeMS) / 1000)), + errbuf, 0, &affected_rows)) { safe_delete_array(query); return -1; @@ -1396,7 +1396,7 @@ int32 SharedDatabase::DeleteStalePlayerBackups() { return -1; } safe_delete_array(query); - + return affected_rows; } @@ -1420,7 +1420,7 @@ bool SharedDatabase::GetCommandSettings(map &commands) { safe_delete_array(query); return false; } - + return false; } @@ -1460,11 +1460,11 @@ void SharedDatabase::LoadSkillCaps(void *data) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - if(RunQuery(query, MakeAnyLenString(&query, - "SELECT skillID, class, level, cap FROM skill_caps ORDER BY skillID, class, level"), + if(RunQuery(query, MakeAnyLenString(&query, + "SELECT skillID, class, level, cap FROM skill_caps ORDER BY skillID, class, level"), errbuf, &result)) { safe_delete_array(query); - + while((row = mysql_fetch_row(result))) { uint8 skillID = atoi(row[0]); uint8 class_ = atoi(row[1]) - 1; @@ -1531,7 +1531,7 @@ uint8 SharedDatabase::GetTrainLevel(uint8 Class_, SkillType Skill, uint8 Level) if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { return 0; } - + uint8 ret = 0; if(Level > static_cast(SkillMaxLevel)) { uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count); @@ -1554,7 +1554,7 @@ uint8 SharedDatabase::GetTrainLevel(uint8 Class_, SkillType Skill, uint8 Level) } } } - + if(ret > GetSkillCap(Class_, Skill, Level)) ret = static_cast(GetSkillCap(Class_, Skill, Level)); @@ -1601,7 +1601,7 @@ int SharedDatabase::GetMaxSpellID() { MYSQL_RES *result; MYSQL_ROW row; int32 ret = 0; - if(RunQuery(query, MakeAnyLenString(&query, "SELECT MAX(id) FROM spells_new"), + if(RunQuery(query, MakeAnyLenString(&query, "SELECT MAX(id) FROM spells_new"), errbuf, &result)) { safe_delete_array(query); row = mysql_fetch_row(result); @@ -1622,11 +1622,11 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { MYSQL_RES *result; MYSQL_ROW row; - if(RunQuery(query, MakeAnyLenString(&query, - "SELECT * FROM spells_new ORDER BY id ASC"), + if(RunQuery(query, MakeAnyLenString(&query, + "SELECT * FROM spells_new ORDER BY id ASC"), errbuf, &result)) { safe_delete_array(query); - + int tempid = 0; int counter = 0; while (row = mysql_fetch_row(result)) { @@ -1657,7 +1657,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { sp[tempid].buffduration=atoi(row[17]); sp[tempid].AEDuration=atoi(row[18]); sp[tempid].mana=atoi(row[19]); - + int y=0; for(y=0; y< EFFECT_COUNT;y++) sp[tempid].base[y]=atoi(row[20+y]); // effect_base_value @@ -1665,26 +1665,26 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { sp[tempid].base2[y]=atoi(row[32+y]); // effect_limit_value for(y=0; y< EFFECT_COUNT;y++) sp[tempid].max[y]=atoi(row[44+y]); - + for(y=0; y< 4;y++) sp[tempid].components[y]=atoi(row[58+y]); - + for(y=0; y< 4;y++) sp[tempid].component_counts[y]=atoi(row[62+y]); - + for(y=0; y< 4;y++) sp[tempid].NoexpendReagent[y]=atoi(row[66+y]); - + for(y=0; y< EFFECT_COUNT;y++) sp[tempid].formula[y]=atoi(row[70+y]); - + sp[tempid].goodEffect=atoi(row[83]); sp[tempid].Activated=atoi(row[84]); sp[tempid].resisttype=atoi(row[85]); - + for(y=0; y< EFFECT_COUNT;y++) sp[tempid].effectid[y]=atoi(row[86+y]); - + sp[tempid].targettype = (SpellTargetType) atoi(row[98]); sp[tempid].basediff=atoi(row[99]); int tmp_skill = atoi(row[100]);; @@ -1695,10 +1695,10 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { sp[tempid].zonetype=atoi(row[101]); sp[tempid].EnvironmentType=atoi(row[102]); sp[tempid].TimeOfDay=atoi(row[103]); - + for(y=0; y < PLAYER_CLASS_COUNT;y++) sp[tempid].classes[y]=atoi(row[104+y]); - + sp[tempid].CastingAnim=atoi(row[120]); sp[tempid].SpellAffectIndex=atoi(row[123]); sp[tempid].disallow_sit=atoi(row[124]); @@ -1713,7 +1713,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { sp[tempid].short_buff_box = atoi(row[154]); sp[tempid].descnum = atoi(row[155]); sp[tempid].effectdescnum = atoi(row[157]); - + sp[tempid].bonushate=atoi(row[162]); sp[tempid].EndurCost=atoi(row[166]); @@ -1810,10 +1810,10 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) { uint32 id = static_cast(atoul(row[0])); if(id != current_id) { if(current_id != 0) { - hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + + hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * lt->NumEntries))); } - + memset(loot_table, 0, sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128)); current_entry = 0; current_id = id; @@ -1821,7 +1821,7 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) { lt->maxcash = static_cast(atoul(row[2])); lt->avgcoin = static_cast(atoul(row[3])); } - + if(current_entry > 128) { continue; } @@ -1829,18 +1829,18 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) { if(!row[4]) { continue; } - + lt->Entries[current_entry].lootdrop_id = static_cast(atoul(row[4])); lt->Entries[current_entry].multiplier = static_cast(atoi(row[5])); lt->Entries[current_entry].droplimit = static_cast(atoi(row[6])); lt->Entries[current_entry].mindrop = static_cast(atoi(row[7])); lt->Entries[current_entry].probability = static_cast(atof(row[8])); - + ++(lt->NumEntries); ++current_entry; } if(current_id != 0) { - hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + + hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * lt->NumEntries))); } @@ -1869,7 +1869,7 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) { uint32 id = static_cast(atoul(row[0])); if(id != current_id) { if(current_id != 0) { - hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + + hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * ld->NumEntries))); } @@ -1894,7 +1894,7 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) { ++current_entry; } if(current_id != 0) { - hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + + hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * ld->NumEntries))); } @@ -1913,11 +1913,11 @@ bool SharedDatabase::LoadLoot() { mutex.Lock(); loot_table_mmf = new EQEmu::MemoryMappedFile("shared/loot_table"); loot_table_hash = new EQEmu::FixedMemoryVariableHashSet( - reinterpret_cast(loot_table_mmf->Get()), + reinterpret_cast(loot_table_mmf->Get()), loot_table_mmf->Size()); loot_drop_mmf = new EQEmu::MemoryMappedFile("shared/loot_drop"); loot_drop_hash = new EQEmu::FixedMemoryVariableHashSet( - reinterpret_cast(loot_drop_mmf->Get()), + reinterpret_cast(loot_drop_mmf->Get()), loot_drop_mmf->Size()); mutex.Unlock(); } catch(std::exception &ex) { @@ -1983,11 +1983,11 @@ void SharedDatabase::SetPlayerInspectMessage(char* playername, const InspectMess char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET inspectmessage='%s' WHERE name='%s'", message->text, playername), errbuf)) { cerr << "Error in SetPlayerInspectMessage query '" << query << "' " << errbuf << endl; } - + safe_delete_array(query); } @@ -2018,10 +2018,10 @@ void SharedDatabase::SetBotInspectMessage(uint32 botid, const InspectMessage_Str char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE bots SET BotInspectMessage='%s' WHERE BotID=%i", message->text, botid), errbuf)) { cerr << "Error in SetBotInspectMessage query '" << query << "' " << errbuf << endl; } - + safe_delete_array(query); } diff --git a/common/shareddb.h b/common/shareddb.h index d739bef19..fe20bdee1 100644 --- a/common/shareddb.h +++ b/common/shareddb.h @@ -63,17 +63,17 @@ public: bool GetInventory(uint32 char_id, Inventory* inv); bool GetInventory(uint32 account_id, char* name, Inventory* inv); bool SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin); - - + + string GetBook(const char *txtfile); - + /* * Item Methods */ ItemInst* CreateItem(uint32 item_id, int16 charges=0, uint32 aug1=0, uint32 aug2=0, uint32 aug3=0, uint32 aug4=0, uint32 aug5=0); ItemInst* CreateItem(const Item_Struct* item, int16 charges=0, uint32 aug1=0, uint32 aug2=0, uint32 aug3=0, uint32 aug4=0, uint32 aug5=0); ItemInst* CreateBaseItem(const Item_Struct* item, int16 charges=0); - + /* * Shared Memory crap */ @@ -85,7 +85,7 @@ public: const Item_Struct* IterateItems(uint32* id); const Item_Struct* GetItem(uint32 id); const EvolveInfo* GetEvolveInfo(uint32 loregroup); - + //faction lists void GetFactionListInfo(uint32 &list_count, uint32 &max_lists); const NPCFactionList* GetNPCFactionEntry(uint32 id); @@ -111,7 +111,7 @@ public: void LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpellID); protected: - + EQEmu::MemoryMappedFile *items_mmf; EQEmu::FixedMemoryHashSet *items_hash; EQEmu::MemoryMappedFile *faction_mmf; diff --git a/common/spdat.cpp b/common/spdat.cpp index 319e94f14..4e0a6c1c6 100644 --- a/common/spdat.cpp +++ b/common/spdat.cpp @@ -20,7 +20,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) /* solar: General outline of spell casting process - + 1. a) Client clicks a spell bar gem, ability, or item. client_process.cpp gets the op and calls CastSpell() with all the relevant info including @@ -215,7 +215,7 @@ bool IsBeneficialSpell(uint16 spell_id) if(tt != ST_Self && tt != ST_Pet){ if(IsEffectInSpell(spell_id, SE_CancelMagic)) return false; - } + } if(tt == ST_Target || tt == ST_AETarget || tt == ST_Animal || tt == ST_Undead || tt == ST_Pet) { uint16 sai = spells[spell_id].SpellAffectIndex; if(spells[spell_id].resisttype == RESIST_MAGIC){ @@ -347,7 +347,7 @@ bool IsPureNukeSpell(uint16 spell_id) return ( - effect_count == 1 && IsEffectInSpell(spell_id, SE_CurrentHP) && + effect_count == 1 && IsEffectInSpell(spell_id, SE_CurrentHP) && spells[spell_id].buffduration == 0 && IsDamageSpell(spell_id) ); } @@ -364,15 +364,15 @@ bool IsPBAENukeSpell(uint16 spell_id) bool IsAERainNukeSpell(uint16 spell_id) { - return IsValidSpell(spell_id) && IsPureNukeSpell(spell_id) + return IsValidSpell(spell_id) && IsPureNukeSpell(spell_id) && spells[spell_id].aoerange > 0 && spells[spell_id].AEDuration > 1000; } bool IsPartialCapableSpell(uint16 spell_id) { - if(IsPureNukeSpell(spell_id) || - IsFearSpell(spell_id) || - IsEffectInSpell(spell_id, SE_Root) || + if(IsPureNukeSpell(spell_id) || + IsFearSpell(spell_id) || + IsEffectInSpell(spell_id, SE_Root) || IsEffectInSpell(spell_id, SE_Charm)) { return true; @@ -401,7 +401,7 @@ bool IsGroupSpell(uint16 spell_id) IsValidSpell(spell_id) && ( spells[spell_id].targettype == ST_AEBard || - spells[spell_id].targettype == ST_Group || + spells[spell_id].targettype == ST_Group || spells[spell_id].targettype == ST_GroupTeleport ) ); @@ -439,7 +439,7 @@ bool IsEffectInSpell(uint16 spellid, int effect) return false; for(j = 0; j < EFFECT_COUNT; j++) - if(spells[spellid].effectid[j] == effect) + if(spells[spellid].effectid[j] == effect) return true; return false; @@ -460,7 +460,7 @@ bool IsBlankSpellEffect(uint16 spellid, int effect_index) ( effect == SE_Blank || // blank marker ( // spacer - effect == SE_CHA && + effect == SE_CHA && base == 0 && formula == 100 ) @@ -493,7 +493,7 @@ int GetMinLevel(uint16 spell_id) { if(spell.classes[r] < min) min = spell.classes[r]; } - + //if we can't cast the spell return 0 //just so it wont screw up calculations used in other areas of the code if(min == 255) @@ -536,7 +536,7 @@ int GetSpellEffectIndex(uint16 spell_id, int effect) int CanUseSpell(uint16 spellid, int classa, int level) { int level_to_use; - + if(!IsValidSpell(spellid) || classa >= PLAYER_CLASS_COUNT) return 0; @@ -557,7 +557,7 @@ int CanUseSpell(uint16 spellid, int classa, int level) bool BeneficialSpell(uint16 spell_id) { - if (spell_id <= 0 || spell_id >= SPDAT_RECORDS + if (spell_id <= 0 || spell_id >= SPDAT_RECORDS /*|| spells[spell_id].stacking == 27*/ ) { return true; @@ -668,9 +668,9 @@ bool IsDisciplineBuff(uint16 spell_id) if(!IsValidSpell(spell_id)) return false; - if(spells[spell_id].mana == 0 + if(spells[spell_id].mana == 0 && spells[spell_id].short_buff_box == 0 - && (spells[spell_id].EndurCost || spells[spell_id].EndurUpkeep) + && (spells[spell_id].EndurCost || spells[spell_id].EndurUpkeep) && spells[spell_id].targettype == ST_Self) { return true; @@ -836,7 +836,7 @@ int GetSpellEffectDescNum(uint16 spell_id) } } -DmgShieldType GetDamageShieldType(uint16 spell_id) +DmgShieldType GetDamageShieldType(uint16 spell_id) { // If we have a DamageShieldType for this spell from the damageshieldtypes table, return that, @@ -844,8 +844,8 @@ DmgShieldType GetDamageShieldType(uint16 spell_id) // if( (spell_id > 0) && (spell_id < SPDAT_RECORDS) ){ - _log(SPELLS__EFFECT_VALUES, "DamageShieldType for spell %i (%s) is %X\n", spell_id, - spells[spell_id].name, spells[spell_id].DamageShieldType); + _log(SPELLS__EFFECT_VALUES, "DamageShieldType for spell %i (%s) is %X\n", spell_id, + spells[spell_id].name, spells[spell_id].DamageShieldType); if(spells[spell_id].DamageShieldType) return (DmgShieldType) spells[spell_id].DamageShieldType; @@ -865,10 +865,10 @@ DmgShieldType GetDamageShieldType(uint16 spell_id) return DS_THORNS; } -bool IsLDoNObjectSpell(uint16 spell_id) +bool IsLDoNObjectSpell(uint16 spell_id) { - if(IsEffectInSpell(spell_id, SE_AppraiseLDonChest) || - IsEffectInSpell(spell_id, SE_DisarmLDoNTrap) || + if(IsEffectInSpell(spell_id, SE_AppraiseLDonChest) || + IsEffectInSpell(spell_id, SE_DisarmLDoNTrap) || IsEffectInSpell(spell_id, SE_UnlockLDoNChest)) { return true; @@ -898,7 +898,7 @@ bool IsHealOverTimeSpell(uint16 spell_id) { } bool IsCompleteHealSpell(uint16 spell_id) { - + if(spell_id == 13 || IsEffectInSpell(spell_id, SE_CompleteHeal) || IsPercentalHealSpell(spell_id) && !IsGroupSpell(spell_id)) return true; else @@ -960,7 +960,7 @@ bool IsGroupHealOverTimeSpell(uint16 spell_id) { bool IsDebuffSpell(uint16 spell_id) { - if(IsBeneficialSpell(spell_id) || IsEffectHitpointsSpell(spell_id) || IsStunSpell(spell_id) || IsMezSpell(spell_id) + if(IsBeneficialSpell(spell_id) || IsEffectHitpointsSpell(spell_id) || IsStunSpell(spell_id) || IsMezSpell(spell_id) || IsCharmSpell(spell_id) || IsSlowSpell(spell_id) || IsEffectInSpell(spell_id, SE_Root) || IsEffectInSpell(spell_id, SE_CancelMagic) || IsEffectInSpell(spell_id, SE_MovementSpeed) || IsFearSpell(spell_id) || IsEffectInSpell(spell_id, SE_Calm)) return false; @@ -980,14 +980,14 @@ bool IsResistDebuffSpell(uint16 spell_id) { bool IsSelfConversionSpell(uint16 spell_id) { - if(GetSpellTargetType(spell_id) == ST_Self && IsEffectInSpell(spell_id, SE_CurrentMana) && IsEffectInSpell(spell_id, SE_CurrentHP) + if(GetSpellTargetType(spell_id) == ST_Self && IsEffectInSpell(spell_id, SE_CurrentMana) && IsEffectInSpell(spell_id, SE_CurrentHP) && spells[spell_id].base[GetSpellEffectIndex(spell_id, SE_CurrentMana)] > 0 && spells[spell_id].base[GetSpellEffectIndex(spell_id, SE_CurrentHP)] < 0) return true; else return false; } -uint32 GetMorphTrigger(uint32 spell_id) +uint32 GetMorphTrigger(uint32 spell_id) { for(int i = 0; i < EFFECT_COUNT; ++i) { diff --git a/common/spdat.h b/common/spdat.h index a936f9975..43efe3182 100644 --- a/common/spdat.h +++ b/common/spdat.h @@ -80,7 +80,7 @@ enum RESISTTYPE RESIST_CHROMATIC = 6, RESIST_PRISMATIC = 7, RESIST_PHYSICAL = 8, // see Muscle Shock, Back Swing - RESIST_CORRUPTION = 9 + RESIST_CORRUPTION = 9 }; //Target Type IDs @@ -250,17 +250,17 @@ typedef enum { #define SE_CallPet 103 // implemented - Summon Companion #define SE_Translocate 104 // implemented #define SE_AntiGate 105 // implemented - Translocational Anchor -#define SE_SummonBSTPet 106 // implemented +#define SE_SummonBSTPet 106 // implemented //#define SE_Unknown107 107 // not used -#define SE_Familiar 108 // implemented +#define SE_Familiar 108 // implemented #define SE_SummonItemIntoBag 109 // implemented - summons stuff into container //#define SE_Unknown110 110 // not used -#define SE_ResistAll 111 // implemented -#define SE_CastingLevel 112 // implemented -#define SE_SummonHorse 113 // implemented +#define SE_ResistAll 111 // implemented +#define SE_CastingLevel 112 // implemented +#define SE_SummonHorse 113 // implemented #define SE_ChangeAggro 114 // implemented - Hate modifing buffs(ie horrifying visage) #define SE_Hunger 115 // implemented - Song of Sustenance -#define SE_CurseCounter 116 // implemented +#define SE_CurseCounter 116 // implemented #define SE_MagicWeapon 117 // implemented - makes weapon magical #define SE_SingingSkill 118 // *implemented - needs AA conversion #define SE_AttackSpeed3 119 // implemented @@ -288,7 +288,7 @@ typedef enum { #define SE_LimitInstant 141 // implemented #define SE_LimitMinLevel 142 // implemented #define SE_LimitCastTime 143 // implemented -//#define SE_Unknown144 144 // not used +//#define SE_Unknown144 144 // not used #define SE_Teleport2 145 // implemented - Banishment of the Pantheon //#define SE_Unknown146 146 // not used (Lightning Rod) Electrical Resist? (exp. VoA) #define SE_PercentalHeal 147 // implemented @@ -383,7 +383,7 @@ typedef enum { //#define SE_Unknown236 236 // not used #define SE_GivePetGroupTarget 237 // implemented[AA] - (Pet Affinity) #define SE_IllusionPersistence 238 // *not implemented - lends persistence to your illusionary disguises, causing them to last until you die or the illusion is forcibly removed. -#define SE_FeignedCastOnChance 239 // *not implemented as bonus - ability gives you an increasing chance for your feigned deaths to not be revealed by spells cast upon you. +#define SE_FeignedCastOnChance 239 // *not implemented as bonus - ability gives you an increasing chance for your feigned deaths to not be revealed by spells cast upon you. //#define SE_Unknown240 240 // not used [Likely related to above - you become immune to feign breaking on a resisted spell and have a good chance of feigning through a spell that successfully lands upon you.] #define SE_ImprovedReclaimEnergy 241 // not implemented as bonus - increase the amount of mana returned to you when reclaiming your pet. #define SE_ChanceWipeHateList 242 // *not implemented - increases the chance to wipe hate with memory blurr @@ -433,7 +433,7 @@ typedef enum { #define SE_SpellDamage 286 // implemented - adds direct spell damage #define SE_SpellDurationIncByTic 287 // implemented #define SE_SpecialAttackKBProc 288 // implemented[AA] - Chance to to do a knockback from special attacks [AA Dragon Punch]. -#define SE_ImprovedSpellEffect 289 // implemented +#define SE_ImprovedSpellEffect 289 // implemented #define SE_IncreaseRunSpeedCap 290 // implemented[AA] - increases run speed over the hard cap #define SE_Purify 291 // implemented - Removes determental effects #define SE_StrikeThrough2 292 // implemented[AA] - increasing chance of bypassing an opponent's special defenses, such as dodge, block, parry, and riposte. @@ -451,7 +451,7 @@ typedef enum { #define SE_OffhandRiposteFail 304 // not implemented as bonus - enemy cannot riposte offhand attacks #define SE_MitigateDamageShield 305 // implemented - off hand attacks only (Shielding Resistance) #define SE_ArmyOfTheDead 306 // *not implemented NecroAA - This ability calls up to five shades of nearby corpses back to life to serve the necromancer. The soulless abominations will mindlessly fight the target until called back to the afterlife some time later. The first rank summons up to three shades that serve for 60 seconds, and each additional rank adds one more possible shade and increases their duration by 15 seconds -#define SE_Appraisal 307 // *not implemented Rogue AA - This ability allows you to estimate the selling price of an item you are holding on your cursor. +#define SE_Appraisal 307 // *not implemented Rogue AA - This ability allows you to estimate the selling price of an item you are holding on your cursor. #define SE_SuspendMinion 308 // not implemented as bonus #define SE_YetAnotherGate 309 // implemented #define SE_ReduceReuseTimer 310 // implemented @@ -494,23 +494,23 @@ typedef enum { #define SE_ExtraArcheryAttack 347 // not implemented - chance at an additional archery attack (consumes arrow) #define SE_LimitManaCost 348 // implemented #define SE_ShieldEquipHateMod 349 // *not implemented[AA] ie. used to increase melee hate when wearing a shield w/ Shield Specialist AA. -#define SE_ManaBurn 350 // implemented - Drains mana for damage/heal at a defined ratio up to a defined maximum amount of mana. +#define SE_ManaBurn 350 // implemented - Drains mana for damage/heal at a defined ratio up to a defined maximum amount of mana. #define SE_PersistentEffect 351 // *not implemented. creates a trap/totem that casts a spell (spell id + base1?) when anything comes near it. can probably make a beacon for this #define SE_Unknown352 352 // *not implemented - looks to be some type of invulnerability? Test ITC (8755) #define SE_AdditionalAura 353 // *not implemented - allows use of more than 1 aura, aa effect #define SE_Unknown354 354 // *not implemented - looks to be some type of invulnerability? Test DAT (8757) #define SE_Unknown355 355 // *not implemented - looks to be some type of invulnerability? Test LT (8758) //#define SE_Unknown356 356 // not used -//#define SE_Unknown357 357 // *not implemented - (Stunted Growth) Something to do with negate effects? Focus? Chance? -#define SE_CurrentManaOnce 358 // implemented +//#define SE_Unknown357 357 // *not implemented - (Stunted Growth) Something to do with negate effects? Focus? Chance? +#define SE_CurrentManaOnce 358 // implemented #define SE_Invulnerabilty 359 // *not implemented - Invulnerability (Brell's Blessing) #define SE_SpellOnKill 360 // implemented - a buff that has a base1 % to cast spell base2 when you kill a "challenging foe" base3 min level -#define SE_SpellOnDeath 361 // implemented - casts spell on death of buffed +#define SE_SpellOnDeath 361 // implemented - casts spell on death of buffed #define SE_PotionBeltSlots 362 // *not implemented[AA] 'Quick Draw' expands the potion belt by one additional available item slot per rank. #define SE_BandolierSlots 363 // *not implemented[AA] 'Battle Ready' expands the bandolier by one additional save slot per rank. #define SE_TripleAttackChance 364 // implemented #define SE_SpellOnKill2 365 // implemented - chance to trigger a spell on kill when the kill is caused by a specific spell with this effect in it (10470 Venin) -#define SE_ShieldEquipDmgMod 366 // *not implemented - [AA Shield Specialist] - damage bonus to weapon if shield equiped. +#define SE_ShieldEquipDmgMod 366 // *not implemented - [AA Shield Specialist] - damage bonus to weapon if shield equiped. #define SE_SetBodyType 367 // implemented - set body type of base1 so it can be affected by spells that are limited to that type (Plant, Animal, Undead, etc) #define SE_FactionMod 368 // *not implemented - increases faction with base1 (faction id, live won't match up w/ ours) by base2 #define SE_CorruptionCounter 369 // implemented @@ -518,7 +518,7 @@ typedef enum { #define SE_AttackSpeed4 371 // implemented - stackable slow effect 'Inhibit Melee' #define SE_ForageSkill 372 // *not implemented[AA] Will increase the skill cap for those that have the Forage skill and grant the skill and raise the cap to those that do not. #define SE_CastOnWearoff 373 // implemented -#define SE_ApplyEffect 374 // implemented +#define SE_ApplyEffect 374 // implemented #define SE_DotCritDmgIncrease 375 // implemented - Increase damage of DoT critical amount //#define SE_Unknown376 376 // *not implemented - used in 2 spells #define SE_BossSpellTrigger 377 // implemented - spell is cast on fade @@ -572,14 +572,14 @@ typedef enum { #define SE_Display 425 // *not implemented - Illusion: Flying Dragon(21626) #define SE_IncreaseExtTargetWindow 426 // *not implmented[AA] - increases the capacity of your extended target window #define SE_SkillProc 427 // implemented - chance to proc when using a skill(ie taunt) -#define SE_LimitToSkill 428 // implemented - limits what skills will effect a skill proc +#define SE_LimitToSkill 428 // implemented - limits what skills will effect a skill proc #define SE_SkillProc2 429 // implemented - chance to proc when using a skill (most have hit limits) //#define SE_Unknown430 430 // *not implemented - Fear of the Dark(27641) //#define SE_Unknown431 431 // *not implemented - Fear of the Dark(27641) //#define SE_Unknown432 432 // not used //#define SE_Uknonwn433 433 // not used #define SE_CriticalHealChance2 434 // implemented - increase critical heal chance -#define SE_CriticalHealOverTime2 435 // implemented - increase critical heal over time chance +#define SE_CriticalHealOverTime2 435 // implemented - increase critical heal over time chance //#define SE_Unknown432 436 // not used #define SE_Anchor 437 // *not implemented - Teleport Guild Hall Anchor(33099) //#define SE_Unknown438 438 // not used @@ -609,7 +609,7 @@ struct SPDat_Spell_Struct /* 003 */ char teleport_zone[64]; // Teleport zone, pet name summoned, or item summoned /* 004 */ char you_cast[64]; // Message when you cast /* 005 */ char other_casts[64]; // Message when other casts -/* 006 */ char cast_on_you[64]; // Message when spell is cast on you +/* 006 */ char cast_on_you[64]; // Message when spell is cast on you /* 007 */ char cast_on_other[64]; // Message when spell is cast on someone else /* 008 */ char spell_fades[64]; // Spell fades /* 009 */ float range; @@ -636,13 +636,13 @@ struct SPDat_Spell_Struct /* 070 */ uint16 formula[EFFECT_COUNT]; // Spell's value formula /* 082 */ //int LightType; // probaly another effecttype flag /* 083 */ int8 goodEffect; //0=detrimental, 1=Beneficial, 2=Beneficial, Group Only -/* 084 */ int Activated; // probaly another effecttype flag +/* 084 */ int Activated; // probaly another effecttype flag /* 085 */ int resisttype; /* 086 */ int effectid[EFFECT_COUNT]; // Spell's effects /* 098 */ SpellTargetType targettype; // Spell's Target /* 099 */ int basediff; // base difficulty fizzle adjustment /* 100 */ SkillType skill; -/* 101 */ int8 zonetype; // 01=Outdoors, 02=dungeons, ff=Any +/* 101 */ int8 zonetype; // 01=Outdoors, 02=dungeons, ff=Any /* 102 */ int8 EnvironmentType; /* 103 */ int8 TimeOfDay; /* 104 */ uint8 classes[PLAYER_CLASS_COUNT]; // Classes, and their min levels @@ -659,32 +659,32 @@ struct SPDat_Spell_Struct /* 144 */ //int16 new_icon // Spell icon used by the client in uifiles/default/spells??.tga, both for spell gems & buff window. Looks to depreciate icon & memicon /* 145 */ //int16 spellanim; // Doesn't look like it's the same as #doanim, so not sure what this is /* 146 */ int8 uninterruptable; // Looks like anything != 0 is uninterruptable. Values are mostly -1, 0, & 1 (Fetid Breath = 90?) -/* 147 */ int16 ResistDiff; +/* 147 */ int16 ResistDiff; /* 148 */ //int dot_stacking_exempt; /* 149 */ //int deletable; /* 150 */ uint16 RecourseLink; /* 151 */ // 151: -1, 0, or 1 // 152 & 153: all set to 0 -/* 154 */ int8 short_buff_box; // != 0, goes to short buff box. +/* 154 */ int8 short_buff_box; // != 0, goes to short buff box. /* 155 */ int descnum; // eqstr of description of spell /* 156 */ //int typedescnum; // eqstr of type description /* 157 */ int effectdescnum; // eqstr of effect description -/* 158 */ +/* 158 */ /* 162 */ int bonushate; -/* 163 */ +/* 163 */ /* 166 */ int EndurCost; /* 167 */ int8 EndurTimerIndex; /* 168 */ //int IsDisciplineBuff; //Will goto the combat window when cast -/* 169 */ +/* 169 */ /* 173 */ int HateAdded; /* 174 */ int EndurUpkeep; -/* 175 */ +/* 175 */ /* 176 */ int numhits; /* 177 */ int pvpresistbase; /* 178 */ int pvpresistcalc; /* 179 */ int pvpresistcap; /* 180 */ int spell_category; -/* 181 */ +/* 181 */ /* 185 */ int8 can_mgb; // 0=no, -1 or 1 = yes /* 186 */ int dispel_flag; /* 189 */ int MinResist; @@ -702,7 +702,7 @@ struct SPDat_Spell_Struct uint8 DamageShieldType; // This field does not exist in spells_us.txt }; -extern const SPDat_Spell_Struct* spells; +extern const SPDat_Spell_Struct* spells; extern int32 SPDAT_RECORDS; bool IsTargetableAESpell(uint16 spell_id); diff --git a/common/timeoutmgr.cpp b/common/timeoutmgr.cpp index aeebf7706..99120f029 100644 --- a/common/timeoutmgr.cpp +++ b/common/timeoutmgr.cpp @@ -54,7 +54,7 @@ void TimeoutManager::CheckTimeouts() { void TimeoutManager::AddMember(Timeoutable *who) { if(who == nullptr) return; - + DeleteMember(who); //just in case... prolly not needed. members.push_back(who); #ifdef TIMEOUT_DEBUG diff --git a/common/timeoutmgr.h b/common/timeoutmgr.h index ac968f5b3..50d9369f8 100644 --- a/common/timeoutmgr.h +++ b/common/timeoutmgr.h @@ -38,7 +38,7 @@ public: //this frequency should generally be a multiple of TIMEOUT_GRANULARITY Timeoutable(uint32 check_frequency); virtual ~Timeoutable(); - + virtual void CheckTimeout() = 0; private: @@ -50,15 +50,15 @@ class TimeoutManager { friend class Timeoutable; public: TimeoutManager(); - + void CheckTimeouts(); - + protected: - + //methods called by Timeoutable objects: void AddMember(Timeoutable *who); void DeleteMember(Timeoutable *who); - + vector members; }; diff --git a/common/timer.cpp b/common/timer.cpp index c75f44b51..616581bdd 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -76,9 +76,9 @@ int gettimeofday (timeval *tp, ...) bool Timer::Check(bool iReset) { _CP(Timer_Check); - if (this==0) { - cerr << "Null timer during ->Check()!?\n"; - return true; + if (this==0) { + cerr << "Null timer during ->Check()!?\n"; + return true; } // if (!current_time || !start_time || !timer_time) {cerr << "Timer::Check on a timer that does not have a vital member defined."; // return true;} @@ -92,7 +92,7 @@ bool Timer::Check(bool iReset) } return true; } - + return false; } @@ -106,11 +106,11 @@ void Timer::Enable() { } /* This function set the timer and restart it */ -void Timer::Start(uint32 set_timer_time, bool ChangeResetTimer) { +void Timer::Start(uint32 set_timer_time, bool ChangeResetTimer) { start_time = current_time; enabled = true; if (set_timer_time != 0) - { + { timer_time = set_timer_time; if (ChangeResetTimer) set_at_trigger = set_timer_time; @@ -158,7 +158,7 @@ void Timer::Trigger() } const uint32 Timer::GetCurrentTime() -{ +{ return current_time; } @@ -172,7 +172,7 @@ const uint32 Timer::GetTimeSeconds() { const uint32 Timer::SetCurrentTime() { - struct timeval read_time; + struct timeval read_time; uint32 this_time; gettimeofday(&read_time,0); @@ -186,7 +186,7 @@ const uint32 Timer::SetCurrentTime() { current_time += this_time - last_time; } - + last_time = this_time; // cerr << "Current time:" << current_time << endl; diff --git a/common/types.h b/common/types.h index 21f530467..258ee992c 100644 --- a/common/types.h +++ b/common/types.h @@ -74,7 +74,7 @@ typedef const char Const_char; //for perl XS #define strncasecmp _strnicmp #define strcasecmp _stricmp typedef void ThreadReturnType; - #define THREAD_RETURN(x) _endthread(); return; + #define THREAD_RETURN(x) _endthread(); return; #else typedef void* ThreadReturnType; #define THREAD_RETURN(x) return(x); diff --git a/common/useperl.h b/common/useperl.h index b20863c42..8087e4204 100644 --- a/common/useperl.h +++ b/common/useperl.h @@ -3,7 +3,7 @@ //headers from the Perl distribution -#include +#include #define WIN32IO_IS_STDIO #ifndef WIN32 @@ -43,7 +43,7 @@ extern "C" { //the perl headers dont do this for us... #endif #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif diff --git a/common/worldconn.cpp b/common/worldconn.cpp index ef3922bf7..633d9d0e4 100644 --- a/common/worldconn.cpp +++ b/common/worldconn.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -52,7 +52,7 @@ bool WorldConnection::SendPacket(ServerPacket* pack) { void WorldConnection::OnConnected() { const EQEmuConfig *Config=EQEmuConfig::get(); _log(NET__WORLD, "Connected to World: %s:%d", Config->WorldIP.c_str(), Config->WorldTCPPort); - + ServerPacket* pack = new ServerPacket(ServerOP_ZAAuth, 16); MD5::Generate((const uchar*) m_password.c_str(), m_password.length(), pack->pBuffer); SendPacket(pack); @@ -61,7 +61,7 @@ void WorldConnection::OnConnected() { void WorldConnection::Process() { _CP(WorldConnection_Process); - + //persistent connection.... if (!Connected()) { pConnected = tcpc.Connected(); @@ -71,14 +71,14 @@ void WorldConnection::Process() { else return; } - + } void WorldConnection::AsyncConnect() { const EQEmuConfig *Config=EQEmuConfig::get(); tcpc.AsyncConnect(Config->WorldIP.c_str(), Config->WorldTCPPort); } - + bool WorldConnection::Connect() { const EQEmuConfig *Config=EQEmuConfig::get(); char errbuf[TCPConnection_ErrorBufferSize]; diff --git a/common/worldconn.h b/common/worldconn.h index 3821d3c9a..c4fa4ad17 100644 --- a/common/worldconn.h +++ b/common/worldconn.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -34,20 +34,20 @@ public: virtual void Process(); bool SendPacket(ServerPacket* pack); - + uint32 GetIP() const { return tcpc.GetrIP(); } uint16 GetPort() const { return tcpc.GetrPort(); } bool Connected() const { return (pConnected && tcpc.Connected()); } - + void SetPassword(const char *password) { m_password = password; } bool Connect(); void AsyncConnect(); void Disconnect(); inline bool TryReconnect() const { return pTryReconnect; } - + protected: virtual void OnConnected(); - + std::string m_password; EmuTCPConnection tcpc; bool pTryReconnect; diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt index 14257fef9..663f2e674 100644 --- a/eqlaunch/CMakeLists.txt +++ b/eqlaunch/CMakeLists.txt @@ -16,7 +16,7 @@ ADD_EXECUTABLE(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers}) TARGET_LINK_LIBRARIES(eqlaunch Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY}) IF(MSVC) - + SET_TARGET_PROPERTIES(eqlaunch PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") TARGET_LINK_LIBRARIES(eqlaunch "Ws2_32.lib") ENDIF(MSVC) diff --git a/eqlaunch/ZoneLaunch.cpp b/eqlaunch/ZoneLaunch.cpp index 6b038d8bf..3e7efba77 100644 --- a/eqlaunch/ZoneLaunch.cpp +++ b/eqlaunch/ZoneLaunch.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -33,7 +33,7 @@ void ZoneLaunch::InitStartTimer() { s_startTimer.Trigger(); } -ZoneLaunch::ZoneLaunch(WorldServer *world, const char *launcher_name, +ZoneLaunch::ZoneLaunch(WorldServer *world, const char *launcher_name, const char *zone_name, const EQEmuConfig *config) : m_state(StateStartPending), m_world(world), @@ -68,7 +68,7 @@ void ZoneLaunch::Start() { spec->args.push_back(m_launcherName); spec->handler = this; spec->logFile = m_config->LogPrefix + m_zone + m_config->LogSuffix; - + //spec is consumed, even on failure m_ref = ProcLauncher::get()->Launch(spec); if(m_ref == ProcLauncher::ProcError) { @@ -76,14 +76,14 @@ void ZoneLaunch::Start() { m_timer.Start(m_config->RestartWait); return; } - + m_startCount++; m_state = StateStarted; s_running++; m_killFails = 0; - + SendStatus(); - + _log(LAUNCHER__STATUS, "Zone %s has been started.", m_zone.c_str()); } @@ -158,15 +158,15 @@ bool ZoneLaunch::Process() { //we have to wait on the shared timer now.. break; } - + //ok, both timers say we can start. //disable our internal timer, will get started again if it is needed. m_timer.Disable(); - + //actually start up the program _log(LAUNCHER__STATUS, "Starting zone %s", m_zone.c_str()); Start(); - + //now update the shared timer to reflect the proper start interval. if(s_running == 1) { //we are the first zone started. wait that interval. @@ -177,7 +177,7 @@ bool ZoneLaunch::Process() { _log(LAUNCHER__STATUS, "Waiting %d milliseconds before booting the next zone.", m_config->ZoneBootInterval); s_startTimer.Start(m_config->ZoneBootInterval); } - + } //else, timer still ticking, keep waiting break; case StateStarted: @@ -218,7 +218,7 @@ bool ZoneLaunch::Process() { //called when the process actually dies off... void ZoneLaunch::OnTerminate(const ProcLauncher::ProcRef &ref, const ProcLauncher::Spec *spec) { s_running--; - + switch(m_state) { case StateStartPending: _log(LAUNCHER__STATUS, "Zone %s has gone down before we started it..?? Restart timer started.", m_zone.c_str()); @@ -246,7 +246,7 @@ void ZoneLaunch::OnTerminate(const ProcLauncher::ProcRef &ref, const ProcLaunche _log(LAUNCHER__STATUS, "Notified of zone %s terminating when we thought it was stopped.", m_zone.c_str()); break; } - + SendStatus(); } diff --git a/eqlaunch/ZoneLaunch.h b/eqlaunch/ZoneLaunch.h index 9c68e7e5f..0f684af0e 100644 --- a/eqlaunch/ZoneLaunch.h +++ b/eqlaunch/ZoneLaunch.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -30,27 +30,27 @@ public: ZoneLaunch(WorldServer *world, const char *launcher_name, const char *zone_name, const EQEmuConfig *config); virtual ~ZoneLaunch(); - + void Stop(bool graceful = true); void Restart(); - + bool Process(); - + void SendStatus() const; - + const char *GetZone() const { return(m_zone.c_str()); } uint32 GetStartCount() const { return(m_startCount); } - + //should only be called during process init to setup the start timer. static void InitStartTimer(); - + protected: bool IsRunning() const { return(m_state == StateStarted || m_state == StateStopPending || m_state == StateRestartPending); } - + void Start(); - + void OnTerminate(const ProcLauncher::ProcRef &ref, const ProcLauncher::Spec *spec); - + enum { StateStartPending, StateStarted, @@ -58,18 +58,18 @@ protected: StateStopPending, StateStopped } m_state; - + WorldServer *const m_world; const std::string m_zone; const char *const m_launcherName; const EQEmuConfig *const m_config; - + Timer m_timer; ProcLauncher::ProcRef m_ref; uint32 m_startCount; - + uint32 m_killFails; - + private: static int s_running; static Timer s_startTimer; diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp index 06ccd718b..4c7950025 100644 --- a/eqlaunch/eqlaunch.cpp +++ b/eqlaunch/eqlaunch.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -48,14 +48,14 @@ int main(int argc, char *argv[]) { _log(LAUNCHER__ERROR, "You must specfify a launcher name as the first argument to this program."); return(1); } - + _log(LAUNCHER__INIT, "Loading server configuration.."); if (!EQEmuConfig::LoadConfig()) { _log(LAUNCHER__ERROR, "Loading server configuration failed."); return(1); } const EQEmuConfig *Config = EQEmuConfig::get(); - + /* * Setup nice signal handlers */ @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) { _log(LAUNCHER__ERROR, "Could not set signal handler"); return 1; } - + /* * Add '.' to LD_LIBRARY_PATH */ @@ -86,38 +86,38 @@ int main(int argc, char *argv[]) { putenv(v); } #endif - + map zones; WorldServer world(zones, launcher_name.c_str(), Config); if (!world.Connect()) { _log(LAUNCHER__ERROR, "worldserver.Connect() FAILED! Will retry."); } - + map::iterator zone, zend; set to_remove; - + Timer InterserverTimer(INTERSERVER_TIMER); // does auto-reconnect - + _log(LAUNCHER__INIT, "Starting main loop..."); - + // zones["test"] = new ZoneLaunch(&world, "./zone", "dynamic_1"); - + ProcLauncher *launch = ProcLauncher::get(); RunLoops = true; while(RunLoops) { //Advance the timer to our current point in time Timer::SetCurrentTime(); - + /* * Process the world connection */ world.Process(); - + /* * Let the process manager look for dead children */ launch->Process(); - + /* * Give all zones a chance to process. */ @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) { if(!zone->second->Process()) to_remove.insert(zone->first); } - + /* * Kill off any zones which have stopped */ @@ -142,13 +142,13 @@ int main(int argc, char *argv[]) { delete zone->second; zones.erase(rem); } - - + + if (InterserverTimer.Check()) { if (world.TryReconnect() && (!world.Connected())) world.AsyncConnect(); } - + /* * Take a nice nap until next cycle */ @@ -157,7 +157,7 @@ int main(int argc, char *argv[]) { else Sleep(2000); } - + //try to be semi-nice about this... without waiting too long zone = zones.begin(); zend = zones.end(); @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) { for(; zone != zend; zone++) { delete zone->second; } - + return(0); } diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp index 1f314bd8f..672525dbd 100644 --- a/eqlaunch/worldserver.cpp +++ b/eqlaunch/worldserver.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -35,7 +35,7 @@ WorldServer::~WorldServer() { void WorldServer::OnConnected() { WorldConnection::OnConnected(); - + ServerPacket* pack = new ServerPacket(ServerOP_LauncherConnectInfo, sizeof(LauncherConnectInfo)); LauncherConnectInfo* sci = (LauncherConnectInfo*) pack->pBuffer; strn0cpy(sci->name, m_name, sizeof(sci->name)); @@ -43,7 +43,7 @@ void WorldServer::OnConnected() { // strcpy(sci->address, net.GetZoneAddress()); SendPacket(pack); safe_delete(pack); - + //send status for all zones... std::map::iterator cur, end; cur = m_zones.begin(); @@ -54,9 +54,9 @@ void WorldServer::OnConnected() { } void WorldServer::Process() { - + WorldConnection::Process(); - + if (!Connected()) return; @@ -83,8 +83,8 @@ void WorldServer::Process() { break; } const LauncherZoneRequest *lzr = (const LauncherZoneRequest *) pack->pBuffer; - - + + switch(ZoneRequestCommands(lzr->command)) { case ZR_Start: { if(m_zones.find(lzr->short_name) != m_zones.end()) { @@ -123,7 +123,7 @@ void WorldServer::Process() { //ignore this, world is still being dumb break; } - + default: { _log(LAUNCHER__NET, "Unknown opcode 0x%x from World of len %d", pack->opcode, pack->size); break; @@ -138,11 +138,11 @@ void WorldServer::Process() { void WorldServer::SendStatus(const char *short_name, uint32 start_count, bool running) { ServerPacket* pack = new ServerPacket(ServerOP_LauncherZoneStatus, sizeof(LauncherZoneStatus)); LauncherZoneStatus* it =(LauncherZoneStatus*) pack->pBuffer; - + strn0cpy(it->short_name, short_name, 32); it->start_count = start_count; it->running = running?1:0; - + SendPacket(pack); safe_delete(pack); } diff --git a/eqlaunch/worldserver.h b/eqlaunch/worldserver.h index b6d6314ad..113dc1ae4 100644 --- a/eqlaunch/worldserver.h +++ b/eqlaunch/worldserver.h @@ -32,12 +32,12 @@ public: virtual ~WorldServer(); virtual void Process(); - + void SendStatus(const char *short_name, uint32 start_count, bool running); - + private: virtual void OnConnected(); - + const char *const m_name; const EQEmuConfig *const m_config; std::map &m_zones; diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt index 5ded6a0c7..96599d4b3 100644 --- a/loginserver/CMakeLists.txt +++ b/loginserver/CMakeLists.txt @@ -43,7 +43,7 @@ ADD_EXECUTABLE(loginserver ${eqlogin_sources} ${eqlogin_headers}) TARGET_LINK_LIBRARIES(loginserver Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE}) IF(MSVC) - + SET_TARGET_PROPERTIES(loginserver PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") TARGET_LINK_LIBRARIES(loginserver "Ws2_32.lib") ENDIF(MSVC) diff --git a/loginserver/Client.cpp b/loginserver/Client.cpp index a487849e1..0ae477ff0 100644 --- a/loginserver/Client.cpp +++ b/loginserver/Client.cpp @@ -197,7 +197,7 @@ void Client::Handle_Login(const char* data, unsigned int size) #ifdef WIN32 e_buffer = server.eq_crypto->DecryptUsernamePassword(data, size, server.options.GetEncryptionMode()); - + int buffer_len = strlen(e_buffer); e_hash.assign(e_buffer, buffer_len); e_user.assign((e_buffer + buffer_len + 1), strlen(e_buffer + buffer_len + 1)); @@ -353,7 +353,7 @@ void Client::Handle_Play(const char* data) void Client::SendServerListPacket() { EQApplicationPacket *outapp = server.SM->CreateServerListPacket(this); - + if(server.options.IsDumpOutPacketsOn()) { DumpPacket(outapp); @@ -380,12 +380,12 @@ void Client::GenerateKey() int count = 0; while(count < 10) { - static const char key_selection[] = + static const char key_selection[] = { - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', - 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', '0', '1', '2', '3', '4', '5', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; diff --git a/loginserver/Client.h b/loginserver/Client.h index 7ca7cf9a2..b670e88c0 100644 --- a/loginserver/Client.h +++ b/loginserver/Client.h @@ -49,7 +49,7 @@ enum LoginMode }; /** - * Client class, controls a single client and it's + * Client class, controls a single client and it's * connection to the login server. */ class Client diff --git a/loginserver/ClientManager.cpp b/loginserver/ClientManager.cpp index 73791ef6b..c6ad7093f 100644 --- a/loginserver/ClientManager.cpp +++ b/loginserver/ClientManager.cpp @@ -30,7 +30,7 @@ ClientManager::ClientManager() titanium_ops = new RegularOpcodeManager; if(!titanium_ops->LoadOpcodes(server.config->GetVariable("Titanium", "opcodes").c_str())) { - server_log->Log(log_error, "ClientManager fatal error: couldn't load opcodes for Titanium file %s.", + server_log->Log(log_error, "ClientManager fatal error: couldn't load opcodes for Titanium file %s.", server.config->GetVariable("Titanium", "opcodes").c_str()); run_server = false; } @@ -50,7 +50,7 @@ ClientManager::ClientManager() sod_ops = new RegularOpcodeManager; if(!sod_ops->LoadOpcodes(server.config->GetVariable("SoD", "opcodes").c_str())) { - server_log->Log(log_error, "ClientManager fatal error: couldn't load opcodes for SoD file %s.", + server_log->Log(log_error, "ClientManager fatal error: couldn't load opcodes for SoD file %s.", server.config->GetVariable("SoD", "opcodes").c_str()); run_server = false; } diff --git a/loginserver/Config.cpp b/loginserver/Config.cpp index ecf544464..487a88588 100644 --- a/loginserver/Config.cpp +++ b/loginserver/Config.cpp @@ -146,7 +146,7 @@ void Config::Tokenize(FILE *input, list &tokens) { char c = fgetc(input); string lexeme; - + while(c != EOF) { if(isspace(c)) diff --git a/loginserver/Config.h b/loginserver/Config.h index 37ce9902a..c9b2b1bca 100644 --- a/loginserver/Config.h +++ b/loginserver/Config.h @@ -40,7 +40,7 @@ public: * Parses the selected file for variables, will clear current variables if selected. */ virtual void Parse(const char *file_name); - + /** * Gets a variable if it exists. */ @@ -52,7 +52,7 @@ protected: private: /** * Breaks our input up into tokens for Parse(). - * This is private because it's not intended to be overloaded by a derived class which + * This is private because it's not intended to be overloaded by a derived class which * may get it's input from other places than a C file pointer. (a http get request for example). * The programmer of a derived class would be expected to make their own Tokenize function for their own Parse(). */ diff --git a/loginserver/Database.h b/loginserver/Database.h index 08bc3b70d..71917518b 100644 --- a/loginserver/Database.h +++ b/loginserver/Database.h @@ -51,7 +51,7 @@ public: * Needed for world login procedure. * Returns true if the record was found, false otherwise. */ - virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, + virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password) { return false; } /** diff --git a/loginserver/DatabaseMySQL.cpp b/loginserver/DatabaseMySQL.cpp index df1577f3d..9294cb059 100644 --- a/loginserver/DatabaseMySQL.cpp +++ b/loginserver/DatabaseMySQL.cpp @@ -40,7 +40,7 @@ DatabaseMySQL::DatabaseMySQL(string user, string pass, string host, string port, { my_bool r = 1; mysql_options(db, MYSQL_OPT_RECONNECT, &r); - if(!mysql_real_connect(db, host.c_str(), user.c_str(), pass.c_str(), name.c_str(), atoi(port.c_str()), nullptr, 0)) + if(!mysql_real_connect(db, host.c_str(), user.c_str(), pass.c_str(), name.c_str(), atoi(port.c_str()), nullptr, 0)) { mysql_close(db); server_log->Log(log_database, "Failed to connect to MySQL database."); @@ -73,7 +73,7 @@ bool DatabaseMySQL::GetLoginDataFromAccountName(string name, string &password, u query << "SELECT LoginServerID, AccountPassword FROM " << server.options.GetAccountTable() << " WHERE AccountName = '"; query << name; query << "'"; - + if(mysql_query(db, query.str().c_str()) != 0) { server_log->Log(log_database, "Mysql query failed: %s", query.str().c_str()); @@ -97,7 +97,7 @@ bool DatabaseMySQL::GetLoginDataFromAccountName(string name, string &password, u return false; } -bool DatabaseMySQL::GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, +bool DatabaseMySQL::GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password) { if(!db) @@ -118,7 +118,7 @@ bool DatabaseMySQL::GetWorldRegistration(string long_name, string short_name, un query << " WHERE WSR.ServerShortName = '"; query << escaped_short_name; query << "'"; - + if(mysql_query(db, query.str().c_str()) != 0) { server_log->Log(log_database, "Mysql query failed: %s", query.str().c_str()); @@ -155,7 +155,7 @@ bool DatabaseMySQL::GetWorldRegistration(string long_name, string short_name, un { if((row = mysql_fetch_row(res)) != nullptr) { - account = row[0]; + account = row[0]; password = row[1]; mysql_free_result(res); return true; diff --git a/loginserver/DatabaseMySQL.h b/loginserver/DatabaseMySQL.h index 87aa2c45b..9a1cea425 100644 --- a/loginserver/DatabaseMySQL.h +++ b/loginserver/DatabaseMySQL.h @@ -66,7 +66,7 @@ public: * Needed for world login procedure. * Returns true if the record was found, false otherwise. */ - virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, + virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password); /** diff --git a/loginserver/DatabasePostgreSQL.cpp b/loginserver/DatabasePostgreSQL.cpp index fd23ff347..f6a3c5ac4 100644 --- a/loginserver/DatabasePostgreSQL.cpp +++ b/loginserver/DatabasePostgreSQL.cpp @@ -61,7 +61,7 @@ bool DatabasePostgreSQL::GetLoginDataFromAccountName(string name, string &passwo } /** - * PostgreSQL doesn't have automatic reconnection option like mysql + * PostgreSQL doesn't have automatic reconnection option like mysql * but it's easy to check and reconnect */ if(PQstatus(db) != CONNECTION_OK) @@ -100,7 +100,7 @@ bool DatabasePostgreSQL::GetLoginDataFromAccountName(string name, string &passwo return false; } -bool DatabasePostgreSQL::GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, +bool DatabasePostgreSQL::GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password) { if(!db) @@ -109,7 +109,7 @@ bool DatabasePostgreSQL::GetWorldRegistration(string long_name, string short_nam } /** - * PostgreSQL doesn't have automatic reconnection option like mysql + * PostgreSQL doesn't have automatic reconnection option like mysql * but it's easy to check and reconnect */ if(PQstatus(db) != CONNECTION_OK) @@ -147,7 +147,7 @@ bool DatabasePostgreSQL::GetWorldRegistration(string long_name, string short_nam trusted = atoi(PQgetvalue(res, 0, 2)); list_id = atoi(PQgetvalue(res, 0, 3)); list_desc = PQgetvalue(res, 0, 4); - account = PQgetvalue(res, 0, 5); + account = PQgetvalue(res, 0, 5); password = PQgetvalue(res, 0, 6); PQclear(res); @@ -166,7 +166,7 @@ void DatabasePostgreSQL::UpdateLSAccountData(unsigned int id, string ip_address) } /** - * PostgreSQL doesn't have automatic reconnection option like mysql + * PostgreSQL doesn't have automatic reconnection option like mysql * but it's easy to check and reconnect */ if(PQstatus(db) != CONNECTION_OK) @@ -201,7 +201,7 @@ void DatabasePostgreSQL::UpdateWorldRegistration(unsigned int id, string long_na } /** - * PostgreSQL doesn't have automatic reconnection option like mysql + * PostgreSQL doesn't have automatic reconnection option like mysql * but it's easy to check and reconnect */ if(PQstatus(db) != CONNECTION_OK) diff --git a/loginserver/DatabasePostgreSQL.h b/loginserver/DatabasePostgreSQL.h index 28922f403..ef7ad30ed 100644 --- a/loginserver/DatabasePostgreSQL.h +++ b/loginserver/DatabasePostgreSQL.h @@ -66,7 +66,7 @@ public: * Needed for world login procedure. * Returns true if the record was found, false otherwise. */ - virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, + virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password); /** diff --git a/loginserver/Encryption.cpp b/loginserver/Encryption.cpp index 0a7986fc0..66498965d 100644 --- a/loginserver/Encryption.cpp +++ b/loginserver/Encryption.cpp @@ -96,15 +96,15 @@ bool Encryption::Load(const char *name) h_dll = LoadLibrary(name); #endif - if(h_dll == NULL) + if(h_dll == NULL) { return false; } - else - { - SetLastError(0); + else + { + SetLastError(0); } - + return true; } diff --git a/loginserver/ErrorLog.cpp b/loginserver/ErrorLog.cpp index 9ec6db87a..ecc5a7ba6 100644 --- a/loginserver/ErrorLog.cpp +++ b/loginserver/ErrorLog.cpp @@ -68,30 +68,30 @@ void ErrorLog::Log(eqLogType type, const char *message, ...) m_time = localtime(&m_clock); log_mutex->lock(); - printf("[%s] [%02d.%02d.%02d - %02d:%02d:%02d] %s\n", - eqLogTypes[type], - m_time->tm_mon+1, - m_time->tm_mday, - m_time->tm_year%100, - m_time->tm_hour, - m_time->tm_min, - m_time->tm_sec, + printf("[%s] [%02d.%02d.%02d - %02d:%02d:%02d] %s\n", + eqLogTypes[type], + m_time->tm_mon+1, + m_time->tm_mday, + m_time->tm_year%100, + m_time->tm_hour, + m_time->tm_min, + m_time->tm_sec, buffer); if(error_log) { - fprintf(error_log, "[%s] [%02d.%02d.%02d - %02d:%02d:%02d] %s\n", - eqLogTypes[type], - m_time->tm_mon+1, - m_time->tm_mday, - m_time->tm_year%100, - m_time->tm_hour, - m_time->tm_min, - m_time->tm_sec, + fprintf(error_log, "[%s] [%02d.%02d.%02d - %02d:%02d:%02d] %s\n", + eqLogTypes[type], + m_time->tm_mon+1, + m_time->tm_mday, + m_time->tm_year%100, + m_time->tm_hour, + m_time->tm_min, + m_time->tm_sec, buffer); fflush(error_log); } - + log_mutex->unlock(); delete[] buffer; } @@ -110,26 +110,26 @@ void ErrorLog::LogPacket(eqLogType type, const char *data, size_t size) m_time = localtime(&m_clock); log_mutex->lock(); - printf("[%s] [%02d.%02d.%02d - %02d:%02d:%02d] dumping packet of size %u:\n", - eqLogTypes[type], - m_time->tm_mon+1, - m_time->tm_mday, - m_time->tm_year%100, - m_time->tm_hour, - m_time->tm_min, - m_time->tm_sec, + printf("[%s] [%02d.%02d.%02d - %02d:%02d:%02d] dumping packet of size %u:\n", + eqLogTypes[type], + m_time->tm_mon+1, + m_time->tm_mday, + m_time->tm_year%100, + m_time->tm_hour, + m_time->tm_min, + m_time->tm_sec, (unsigned int)size); if(error_log) { - fprintf(error_log, "[%s] [%02d.%02d.%02d - %02d:%02d:%02d] dumping packet of size %u\n", - eqLogTypes[type], - m_time->tm_mon+1, - m_time->tm_mday, - m_time->tm_year%100, - m_time->tm_hour, - m_time->tm_min, - m_time->tm_sec, + fprintf(error_log, "[%s] [%02d.%02d.%02d - %02d:%02d:%02d] dumping packet of size %u\n", + eqLogTypes[type], + m_time->tm_mon+1, + m_time->tm_mday, + m_time->tm_year%100, + m_time->tm_hour, + m_time->tm_min, + m_time->tm_sec, (unsigned int)size); } @@ -162,7 +162,7 @@ void ErrorLog::LogPacket(eqLogType type, const char *data, size_t size) fprintf(error_log, "- "); } } - + printf("%02X ", (unsigned int)data[i]); if(error_log) { diff --git a/loginserver/LoginServer.h b/loginserver/LoginServer.h index a3fc7301f..f64cd5fae 100644 --- a/loginserver/LoginServer.h +++ b/loginserver/LoginServer.h @@ -29,7 +29,7 @@ #include "ClientManager.h" /** - * Login server struct, contains every variable for the server that needs to exist + * Login server struct, contains every variable for the server that needs to exist * outside the scope of main(). */ struct LoginServer diff --git a/loginserver/LoginStructures.h b/loginserver/LoginStructures.h index cee9a7665..01c6ab9d5 100644 --- a/loginserver/LoginStructures.h +++ b/loginserver/LoginStructures.h @@ -86,7 +86,7 @@ struct ServerListHeader_Struct { uint32 NumberOfServers; }; -struct PlayEverquestRequest_Struct +struct PlayEverquestRequest_Struct { uint16 Sequence; uint32 Unknown1; diff --git a/loginserver/Main.cpp b/loginserver/Main.cpp index 5714456d5..cc4ed579d 100644 --- a/loginserver/Main.cpp +++ b/loginserver/Main.cpp @@ -58,7 +58,7 @@ int main() server.config = new Config(); server_log->Log(log_debug, "Config System Init."); server.config->Parse("login.ini"); - + //Parse unregistered allowed option. if(server.config->GetVariable("options", "unregistered_allowed").compare("FALSE") == 0) { @@ -143,10 +143,10 @@ int main() #ifdef EQEMU_MYSQL_ENABLED server_log->Log(log_debug, "MySQL Database Init."); server.db = (Database*)new DatabaseMySQL( - server.config->GetVariable("database", "user"), - server.config->GetVariable("database", "password"), - server.config->GetVariable("database", "host"), - server.config->GetVariable("database", "port"), + server.config->GetVariable("database", "user"), + server.config->GetVariable("database", "password"), + server.config->GetVariable("database", "host"), + server.config->GetVariable("database", "port"), server.config->GetVariable("database", "db")); #endif } @@ -155,10 +155,10 @@ int main() #ifdef EQEMU_POSTGRESQL_ENABLED server_log->Log(log_debug, "PostgreSQL Database Init."); server.db = (Database*)new DatabasePostgreSQL( - server.config->GetVariable("database", "user"), - server.config->GetVariable("database", "password"), - server.config->GetVariable("database", "host"), - server.config->GetVariable("database", "port"), + server.config->GetVariable("database", "user"), + server.config->GetVariable("database", "password"), + server.config->GetVariable("database", "host"), + server.config->GetVariable("database", "port"), server.config->GetVariable("database", "db")); #endif } diff --git a/loginserver/Options.h b/loginserver/Options.h index 4f04457e3..74d1904b3 100644 --- a/loginserver/Options.h +++ b/loginserver/Options.h @@ -19,7 +19,7 @@ #define EQEMU_OPTIONS_H /** - * Collects options on one object, because having a bunch of global variables floating around is + * Collects options on one object, because having a bunch of global variables floating around is * really ugly and just a little dangerous. */ class Options @@ -28,13 +28,13 @@ public: /** * Constructor, sets the default options. */ - Options() : - allow_unregistered(true), - trace(false), - dump_in_packets(false), - dump_out_packets(false), - encryption_mode(5), - local_network("127.0.0.1"), + Options() : + allow_unregistered(true), + trace(false), + dump_in_packets(false), + dump_out_packets(false), + encryption_mode(5), + local_network("127.0.0.1"), reject_duplicate_servers(false) { } /** diff --git a/loginserver/ServerManager.cpp b/loginserver/ServerManager.cpp index c40cfd462..58aa6fd87 100644 --- a/loginserver/ServerManager.cpp +++ b/loginserver/ServerManager.cpp @@ -25,7 +25,7 @@ extern ErrorLog *server_log; extern LoginServer server; extern bool run_server; -ServerManager::ServerManager() +ServerManager::ServerManager() { char error_buffer[TCPConnection_ErrorBufferSize]; @@ -60,7 +60,7 @@ void ServerManager::Process() in_addr tmp; tmp.s_addr = tcp_c->GetrIP(); server_log->Log(log_network, "New world server connection from %s:%d", inet_ntoa(tmp), tcp_c->GetrPort()); - + WorldServer *cur = GetServerByAddress(tcp_c->GetrIP()); if(cur) { @@ -178,7 +178,7 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c) sl->Unknown4 = 0x00000000; sl->NumberOfServers = server_count; - unsigned char *data_ptr = outapp->pBuffer; + unsigned char *data_ptr = outapp->pBuffer; data_ptr += sizeof(ServerListHeader_Struct); iter = world_servers.begin(); @@ -280,7 +280,7 @@ void ServerManager::SendUserToWorldRequest(unsigned int server_id, unsigned int utwr->lsaccountid = client_account_id; (*iter)->GetConnection()->SendPacket(outapp); found = true; - + if(server.options.IsDumpInPacketsOn()) { DumpPacket(outapp); diff --git a/loginserver/WorldServer.cpp b/loginserver/WorldServer.cpp index b641161d7..8763480a3 100644 --- a/loginserver/WorldServer.cpp +++ b/loginserver/WorldServer.cpp @@ -141,11 +141,11 @@ bool WorldServer::Process() } UsertoWorldResponse_Struct *utwr = (UsertoWorldResponse_Struct*)app->pBuffer; - server_log->Log(log_client, "Trying to find client with user id of %u.", utwr->lsaccountid); + server_log->Log(log_client, "Trying to find client with user id of %u.", utwr->lsaccountid); Client *c = server.CM->GetClient(utwr->lsaccountid); if(c) { - server_log->Log(log_client, "Found client with user id of %u and account name of %s.", utwr->lsaccountid, c->GetAccountName().c_str()); + server_log->Log(log_client, "Found client with user id of %u and account name of %s.", utwr->lsaccountid, c->GetAccountName().c_str()); EQApplicationPacket *outapp = new EQApplicationPacket(OP_PlayEverquestResponse, sizeof(PlayEverquestResponse_Struct)); PlayEverquestResponse_Struct *per = (PlayEverquestResponse_Struct*)outapp->pBuffer; per->Sequence = c->GetPlaySequence(); @@ -180,7 +180,7 @@ bool WorldServer::Process() if(server.options.IsTraceOn()) { - server_log->Log(log_network_trace, "Sending play response with following data, allowed %u, sequence %u, server number %u, message %u", + server_log->Log(log_network_trace, "Sending play response with following data, allowed %u, sequence %u, server number %u, message %u", per->Allowed, per->Sequence, per->ServerNumber, per->Message); server_log->LogPacket(log_network_trace, (const char*)outapp->pBuffer, outapp->size); } @@ -371,7 +371,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) { if(s_acct_name.size() == 0 || s_acct_pass.size() == 0) { - server_log->Log(log_world, "Server %s(%s) successfully logged into account that had no user/password requirement.", + server_log->Log(log_world, "Server %s(%s) successfully logged into account that had no user/password requirement.", long_name.c_str(), short_name.c_str()); authorized = true; SetRuntimeID(s_id); @@ -380,7 +380,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) } else if(s_acct_name.compare(account_name) == 0 && s_acct_pass.compare(account_password) == 0) { - server_log->Log(log_world, "Server %s(%s) successfully logged in.", + server_log->Log(log_world, "Server %s(%s) successfully logged in.", long_name.c_str(), short_name.c_str()); authorized = true; SetRuntimeID(s_id); @@ -403,14 +403,14 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) } else { - server_log->Log(log_world, "Server %s(%s) attempted to log in but database couldn't find an entry and only registered servers are allowed.", + server_log->Log(log_world, "Server %s(%s) attempted to log in but database couldn't find an entry and only registered servers are allowed.", long_name.c_str(), short_name.c_str()); return; } } else { - server_log->Log(log_world, "Server %s(%s) did not attempt to log in but only registered servers are allowed.", + server_log->Log(log_world, "Server %s(%s) did not attempt to log in but only registered servers are allowed.", long_name.c_str(), short_name.c_str()); return; } @@ -430,7 +430,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) { if(s_acct_name.compare(account_name) == 0 && s_acct_pass.compare(account_password) == 0) { - server_log->Log(log_world, "Server %s(%s) successfully logged in.", + server_log->Log(log_world, "Server %s(%s) successfully logged in.", long_name.c_str(), short_name.c_str()); authorized = true; SetRuntimeID(s_id); @@ -461,7 +461,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) } else { - server_log->Log(log_world, "Server %s(%s) did not attempt to log in but unregistered servers are allowed.", + server_log->Log(log_world, "Server %s(%s) did not attempt to log in but unregistered servers are allowed.", long_name.c_str(), short_name.c_str()); authorized = true; SetRuntimeID(s_id); @@ -471,7 +471,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) } else { - server_log->Log(log_world, "Server %s(%s) attempted to log in but database couldn't find an entry but unregistered servers are allowed.", + server_log->Log(log_world, "Server %s(%s) attempted to log in but database couldn't find an entry but unregistered servers are allowed.", long_name.c_str(), short_name.c_str()); if(server.db->CreateWorldRegistration(long_name, short_name, s_id)) { @@ -485,7 +485,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) in_addr in; in.s_addr = connection->GetrIP(); server.db->UpdateWorldRegistration(GetRuntimeID(), long_name, string(inet_ntoa(in))); - + if(authorized) { server.CM->UpdateServerList(); @@ -503,7 +503,7 @@ void WorldServer::SendClientAuth(unsigned int ip, string account, string key, un { ServerPacket *outapp = new ServerPacket(ServerOP_LSClientAuth, sizeof(ServerLSClientAuth)); ServerLSClientAuth* slsca = (ServerLSClientAuth*)outapp->pBuffer; - + slsca->lsaccount_id = account_id; strncpy(slsca->name, account.c_str(), account.size() > 30 ? 30 : account.size()); strncpy(slsca->key, key.c_str(), 10); diff --git a/loginserver/WorldServer.h b/loginserver/WorldServer.h index f5195f8e1..8b3133965 100644 --- a/loginserver/WorldServer.h +++ b/loginserver/WorldServer.h @@ -59,7 +59,7 @@ public: * Accesses connection, it is intentional that this is not const (trust me). */ EmuTCPConnection *GetConnection() { return connection; } - + /** * Sets the connection to c. */ @@ -69,7 +69,7 @@ public: * Gets the runtime id of this server. */ unsigned int GetRuntimeID() const { return runtime_id; } - + /** * Sets the runtime id of this server. */ diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt index 4e319ddad..6af899854 100644 --- a/queryserv/CMakeLists.txt +++ b/queryserv/CMakeLists.txt @@ -22,7 +22,7 @@ ADD_DEFINITIONS(-DQSERV) TARGET_LINK_LIBRARIES(queryserv Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY}) IF(MSVC) - + SET_TARGET_PROPERTIES(queryserv PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") TARGET_LINK_LIBRARIES(queryserv "Ws2_32.lib") ENDIF(MSVC) diff --git a/queryserv/database.h b/queryserv/database.h index f38d5db98..b788e7c20 100644 --- a/queryserv/database.h +++ b/queryserv/database.h @@ -44,7 +44,7 @@ public: Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port); bool Connect(const char* host, const char* user, const char* passwd, const char* database,uint32 port); ~Database(); - + bool GetVariable(const char* varname, char* varvalue, uint16 varvalue_len); void AddSpeech(const char* from, const char* to, const char* message, uint16 minstatus, uint32 guilddbid, uint8 type); void LogPlayerTrade(QSPlayerLogTrade_Struct* QS, uint32 Items); @@ -57,7 +57,7 @@ protected: void HandleMysqlError(uint32 errnum); private: void DBInitVars(); - + }; #endif diff --git a/queryserv/lfguild.cpp b/queryserv/lfguild.cpp index af44817a9..c884d45f6 100644 --- a/queryserv/lfguild.cpp +++ b/queryserv/lfguild.cpp @@ -103,7 +103,7 @@ void LFGuildManager::HandlePacket(ServerPacket *pack) pack->ReadString(Comments); uint32 Toggle = pack->ReadUInt32(); uint32 TimeZone = pack->ReadUInt32(); - + TogglePlayer(FromZoneID, FromInstanceID, From, Class, Level, AAPoints, Comments, Toggle, TimeZone); break; @@ -116,7 +116,7 @@ void LFGuildManager::HandlePacket(ServerPacket *pack) case QSG_LFGuild_UpdateGuildInfo: { char GuildName[33], Comments[257]; - + pack->ReadString(GuildName); pack->ReadString(Comments); @@ -154,8 +154,8 @@ void LFGuildManager::HandlePacket(ServerPacket *pack) default: break; } - - + + } void LFGuildManager::SendPlayerMatches(uint32 FromZoneID, uint32 FromInstanceID, char *From, uint32 FromLevel, uint32 ToLevel, uint32 MinAA, uint32 TimeZone, uint32 Classes) @@ -289,7 +289,7 @@ void LFGuildManager::TogglePlayer(uint32 FromZoneID, uint32 FromInstanceID, char worldserver->SendPacket(pack); safe_delete(pack); - + } void LFGuildManager::ToggleGuild(uint32 FromZoneID, uint32 FromInstanceID, char *From, char* GuildName, char *Comments, uint32 FromLevel, uint32 ToLevel, uint32 Classes, uint32 AACount, uint32 Toggle, uint32 TimeZone) @@ -336,7 +336,7 @@ void LFGuildManager::ToggleGuild(uint32 FromZoneID, uint32 FromInstanceID, char pack->WriteUInt32(TimeZone); pack->WriteUInt32(Now); pack->WriteUInt32(Toggle); - + worldserver->SendPacket(pack); safe_delete(pack); } @@ -396,7 +396,7 @@ void LFGuildManager::SendPlayerStatus(uint32 FromZoneID, uint32 FromInstanceID, pack->WriteUInt32((*it).TimeZone); pack->WriteUInt32((*it).TimePosted); pack->WriteUInt32(1); - + worldserver->SendPacket(pack); safe_delete(pack); break; diff --git a/queryserv/queryservconfig.h b/queryserv/queryservconfig.h index 61830e3da..a403d379f 100644 --- a/queryserv/queryservconfig.h +++ b/queryserv/queryservconfig.h @@ -36,7 +36,7 @@ public: // Produce a const singleton static const queryservconfig *get() { - if (_chat_config == nullptr) + if (_chat_config == nullptr) LoadConfig(); return(_chat_config); } diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp index 3efd1bbbb..fae1be01f 100644 --- a/queryserv/worldserver.cpp +++ b/queryserv/worldserver.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -58,7 +58,7 @@ void WorldServer::OnConnected() void WorldServer::Process() { WorldConnection::Process(); - + if (!Connected()) return; @@ -146,13 +146,13 @@ void WorldServer::Process() // The 'Type' field is a 'sub-opcode'. A value of 0 is used for the LFGuild packets. The next feature to be added // to queryserv would use 1, etc. // - // Obviously, any fields in the packet following the 'Type' will be unique to the particular type of packet. The + // Obviously, any fields in the packet following the 'Type' will be unique to the particular type of packet. The // 'Generic' in the name of this ServerOP code relates to the four header fields. char From[64]; pack->SetReadPosition(8); pack->ReadString(From); uint32 Type = pack->ReadUInt32(); - + switch(Type) { case QSG_LFGuild: @@ -164,7 +164,7 @@ void WorldServer::Process() default: _log(QUERYSERV__ERROR, "Received unhandled ServerOP_QueryServGeneric", Type); break; - } + } break; } diff --git a/queryserv/worldserver.h b/queryserv/worldserver.h index e579b467d..c42ca5ceb 100644 --- a/queryserv/worldserver.h +++ b/queryserv/worldserver.h @@ -27,7 +27,7 @@ public: WorldServer(); virtual ~WorldServer(); virtual void Process(); - + private: virtual void OnConnected(); }; diff --git a/shared_memory/items.cpp b/shared_memory/items.cpp index 054434293..f6ed659d2 100644 --- a/shared_memory/items.cpp +++ b/shared_memory/items.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -27,19 +27,19 @@ void LoadItems(SharedDatabase *database) { EQEmu::IPCMutex mutex("items"); mutex.Lock(); - + int32 items = -1; uint32 max_item = 0; database->GetItemsCount(items, max_item); if(items == -1) { EQ_EXCEPT("Shared Memory", "Unable to get any items from the database."); } - + uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(items, max_item)); EQEmu::MemoryMappedFile mmf("shared/items", size); mmf.ZeroFile(); - + void *ptr = mmf.Get(); - database->LoadItems(ptr, size, items, max_item); + database->LoadItems(ptr, size, items, max_item); mutex.Unlock(); } diff --git a/shared_memory/items.h b/shared_memory/items.h index 6ef0f7f2a..c292563ec 100644 --- a/shared_memory/items.h +++ b/shared_memory/items.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/shared_memory/loot.cpp b/shared_memory/loot.cpp index 385ad04ab..ed9bc4577 100644 --- a/shared_memory/loot.cpp +++ b/shared_memory/loot.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -28,7 +28,7 @@ void LoadLoot(SharedDatabase *database) { EQEmu::IPCMutex mutex("loot"); mutex.Lock(); - + uint32 loot_table_count, loot_table_max, loot_table_entries_count; uint32 loot_drop_count, loot_drop_max, loot_drop_entries_count; database->GetLootTableInfo(loot_table_count, loot_table_max, loot_table_entries_count); @@ -49,10 +49,10 @@ void LoadLoot(SharedDatabase *database) { mmf_loot_table.ZeroFile(); mmf_loot_drop.ZeroFile(); - EQEmu::FixedMemoryVariableHashSet loot_table_hash(reinterpret_cast(mmf_loot_table.Get()), + EQEmu::FixedMemoryVariableHashSet loot_table_hash(reinterpret_cast(mmf_loot_table.Get()), loot_table_size, loot_table_max); - EQEmu::FixedMemoryVariableHashSet loot_drop_hash(reinterpret_cast(mmf_loot_drop.Get()), + EQEmu::FixedMemoryVariableHashSet loot_drop_hash(reinterpret_cast(mmf_loot_drop.Get()), loot_drop_size, loot_drop_max); database->LoadLootTables(mmf_loot_table.Get(), loot_table_max); diff --git a/shared_memory/loot.h b/shared_memory/loot.h index 3967add0d..89f470c09 100644 --- a/shared_memory/loot.h +++ b/shared_memory/loot.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index f13413d63..7e717434e 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -39,7 +39,7 @@ int main(int argc, char **argv) { LogFile->write(EQEMuLog::Error, "Unable to load configuration file."); return 0; } - + const EQEmuConfig *config = EQEmuConfig::get(); if(!load_log_settings(config->LogSettingsFile.c_str())) { LogFile->write(EQEMuLog::Error, "Warning: unable to read %s.", config->LogSettingsFile.c_str()); @@ -47,7 +47,7 @@ int main(int argc, char **argv) { SharedDatabase database; LogFile->write(EQEMuLog::Status, "Connecting to database..."); - if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(), + if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(), config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) { LogFile->write(EQEMuLog::Error, "Unable to connect to the database, cannot continue without a " "database connection"); @@ -93,7 +93,7 @@ int main(int argc, char **argv) { load_loot = true; } break; - + case 's': if(strcasecmp("skill_caps", argv[i]) == 0) { load_skill_caps = true; @@ -124,7 +124,7 @@ int main(int argc, char **argv) { return 0; } } - + if(load_all || load_loot) { LogFile->write(EQEMuLog::Status, "Loading loot..."); try { diff --git a/shared_memory/npc_faction.cpp b/shared_memory/npc_faction.cpp index 6fd18ed70..5fc2d6845 100644 --- a/shared_memory/npc_faction.cpp +++ b/shared_memory/npc_faction.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -27,19 +27,19 @@ void LoadFactions(SharedDatabase *database) { EQEmu::IPCMutex mutex("faction"); mutex.Lock(); - + uint32 lists = 0; uint32 max_list = 0; database->GetFactionListInfo(lists, max_list); if(lists == 0) { EQ_EXCEPT("Shared Memory", "Unable to get any factions from the database."); } - + uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(lists, max_list)); EQEmu::MemoryMappedFile mmf("shared/faction", size); mmf.ZeroFile(); - + void *ptr = mmf.Get(); - database->LoadNPCFactionLists(ptr, size, lists, max_list); + database->LoadNPCFactionLists(ptr, size, lists, max_list); mutex.Unlock(); } diff --git a/shared_memory/npc_faction.h b/shared_memory/npc_faction.h index 4ff97a91d..57313bb8e 100644 --- a/shared_memory/npc_faction.h +++ b/shared_memory/npc_faction.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/shared_memory/skill_caps.cpp b/shared_memory/skill_caps.cpp index 2c588a6ea..8cfae69fc 100644 --- a/shared_memory/skill_caps.cpp +++ b/shared_memory/skill_caps.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -28,15 +28,15 @@ void LoadSkillCaps(SharedDatabase *database) { EQEmu::IPCMutex mutex("skill_caps"); mutex.Lock(); - + uint32 class_count = PLAYER_CLASS_COUNT; uint32 skill_count = HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); EQEmu::MemoryMappedFile mmf("shared/skill_caps", size); mmf.ZeroFile(); - + void *ptr = mmf.Get(); - database->LoadSkillCaps(ptr); + database->LoadSkillCaps(ptr); mutex.Unlock(); } \ No newline at end of file diff --git a/shared_memory/skill_caps.h b/shared_memory/skill_caps.h index 044f83534..75c18bffa 100644 --- a/shared_memory/skill_caps.h +++ b/shared_memory/skill_caps.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/shared_memory/spells.cpp b/shared_memory/spells.cpp index cd5f8a0c2..635d57c29 100644 --- a/shared_memory/spells.cpp +++ b/shared_memory/spells.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/shared_memory/spells.h b/shared_memory/spells.h index 03ef75282..7959382a4 100644 --- a/shared_memory/spells.h +++ b/shared_memory/spells.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/tests/cppunit/collectoroutput.cpp b/tests/cppunit/collectoroutput.cpp index 1e2ffc204..260062504 100644 --- a/tests/cppunit/collectoroutput.cpp +++ b/tests/cppunit/collectoroutput.cpp @@ -28,7 +28,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "cpptest-collectoroutput.h" @@ -46,21 +46,21 @@ namespace Test { _tests.reserve(tests); } - + /// Constructs a collector object. /// CollectorOutput::CollectorOutput() : Output(), _total_errors(0) {} - + void CollectorOutput::finished(int tests, const Time& time) { _total_tests = tests; _total_time = time; } - + void CollectorOutput::suite_start(int tests, const string& name) { @@ -70,7 +70,7 @@ namespace Test _cur_suite = &_suites.back(); } } - + void CollectorOutput::suite_end(int tests, const string&, const Time& time) { @@ -80,14 +80,14 @@ namespace Test _total_errors += _cur_suite->_errors; } } - + void CollectorOutput::test_start(const string& name) { _cur_suite->_tests.push_back(TestInfo(name)); _cur_test = &_cur_suite->_tests.back(); } - + void CollectorOutput::test_end(const string&, bool ok, const Time& time) { @@ -95,12 +95,12 @@ namespace Test ++_cur_suite->_errors; _cur_test->_time = time; } - + void CollectorOutput::assertment(const Source& s) { _cur_test->_sources.push_back(s); } - + } // namespace Test diff --git a/tests/cppunit/compileroutput.cpp b/tests/cppunit/compileroutput.cpp index 23eec3986..ef17146f4 100644 --- a/tests/cppunit/compileroutput.cpp +++ b/tests/cppunit/compileroutput.cpp @@ -50,12 +50,12 @@ namespace Test throw Test::CompilerOutput::InvalidFormat(format); pos += mod.size(); return true; - } + } return false; } - + } // anonymous namespace - + /// Constructs a compiler output handler. /// /// \param format Pre-defined compiler output format. @@ -72,10 +72,10 @@ namespace Test "%file:%line: %text", // GCC "%file(%line) : %text" // MSVC }; - + _format = table[format]; } - + /// Constructs a compiler output handler. /// /// \param format %Output format to use. @@ -89,7 +89,7 @@ namespace Test _stream(stream) { int expr(0), file(0), line(0); - + for (string::size_type pos = 0; (pos = _format.find_first_of('%', pos)) != string::npos; ) { @@ -100,34 +100,34 @@ namespace Test else throw InvalidFormat(format); } - + if (!expr && !file && !line) throw InvalidFormat(format); } - + void CompilerOutput::assertment(const Source& s) { string fmt(_format); string::size_type pos; - + fmt.reserve(fmt.size() + 128); - + if ((pos = fmt.find("%file")) != string::npos) fmt.replace(pos, 5, s.file()); - + if ((pos = fmt.find("%text")) != string::npos) fmt.replace(pos, 5, s.message()); - + if ((pos = fmt.find("%line")) != string::npos) { ostringstream ss; ss << s.line(); fmt.replace(pos, 5, ss.str()); } - + _stream << fmt << endl; } - + } // namespace Test diff --git a/tests/cppunit/cpptest-assert.h b/tests/cppunit/cpptest-assert.h index bf90dd842..0e0ceaafe 100644 --- a/tests/cppunit/cpptest-assert.h +++ b/tests/cppunit/cpptest-assert.h @@ -231,7 +231,7 @@ /// \param a First expression to test. /// \param b Second expression to test. /// \param delta Constant. -/// \param msg User message. +/// \param msg User message. /// /// \see TEST_ASSERT_DELTA(a, b, delta) /// @@ -245,7 +245,7 @@ if (!continue_after_failure()) return; \ } \ } - + /// Verify an expression and expects an exception in return. /// An assertment is issued if the exception is not thrown. /// @@ -343,7 +343,7 @@ if (!continue_after_failure()) return; \ } \ } - + /// Verify an expression and expects no exception in return. /// An assertment is issued if any exception is thrown. /// diff --git a/tests/cppunit/cpptest-collectoroutput.h b/tests/cppunit/cpptest-collectoroutput.h index cd9b65e95..c565f04cb 100644 --- a/tests/cppunit/cpptest-collectoroutput.h +++ b/tests/cppunit/cpptest-collectoroutput.h @@ -55,52 +55,52 @@ namespace Test virtual void test_end(const std::string& name, bool ok, const Time& time); virtual void assertment(const Source& s); - + protected: struct OutputSuiteInfo; struct OutputTestInfo; struct OutputErrorTestInfo; - + typedef std::list Sources; - + struct TestInfo { std::string _name; Time _time; - + bool _success : 1; Sources _sources; - + explicit TestInfo(const std::string name); }; - + typedef std::vector Tests; - + struct SuiteInfo { std::string _name; int _errors; Tests _tests; Time _time; - + SuiteInfo(const std::string& name, int tests); }; - + typedef std::list Suites; - + Suites _suites; int _total_errors; int _total_tests; Time _total_time; - + CollectorOutput(); - + private: SuiteInfo* _cur_suite; TestInfo* _cur_test; }; - + } // namespace Test - + #endif // #ifndef CPPTEST_COLLECTOROUTPUT_H diff --git a/tests/cppunit/cpptest-compileroutput.h b/tests/cppunit/cpptest-compileroutput.h index 35a6feb28..2f6cb0926 100644 --- a/tests/cppunit/cpptest-compileroutput.h +++ b/tests/cppunit/cpptest-compileroutput.h @@ -64,14 +64,14 @@ namespace Test InvalidFormat(const std::string& what) : std::logic_error(what) {} }; - + /// Pre-defined compiler output formats. /// enum Format { /// Generic compiler format, which equals: /// %%file:%%line: %%text - /// + /// Generic, /// @@ -79,34 +79,34 @@ namespace Test /// Error cpptest %%file %%line: %%text. /// BCC, - - /// GNU Compiler Collection + + /// GNU Compiler Collection /// (GCC) format, which equals: /// %%file:%%line: %%text /// GCC, - /// Microsoft Visual C++ + /// Microsoft Visual C++ /// (MSVC) format, which equals: /// %%file(%%line) : %%text /// MSVC }; - + explicit CompilerOutput(Format format = Generic, std::ostream& stream = std::cout); - + explicit CompilerOutput(const std::string& format, std::ostream& stream = std::cout); - + virtual void assertment(const Source& s); - + private: std::string _format; std::ostream& _stream; }; } // namespace Test - + #endif // #ifndef CPPTEST_COMPILEROUTPUT_H diff --git a/tests/cppunit/cpptest-htmloutput.h b/tests/cppunit/cpptest-htmloutput.h index 464683f47..1cdf096f0 100644 --- a/tests/cppunit/cpptest-htmloutput.h +++ b/tests/cppunit/cpptest-htmloutput.h @@ -44,9 +44,9 @@ namespace Test class HtmlOutput : public CollectorOutput { public: - void generate(std::ostream& os, bool incl_ok_tests = true, + void generate(std::ostream& os, bool incl_ok_tests = true, const std::string& name = ""); - + private: struct SuiteRow; struct TestRow; @@ -57,8 +57,8 @@ namespace Test friend struct TestSuiteRow; }; - -} // namespace Test - -#endif // #ifndef CPPTEST_HTMLOUTPUT_H + +} // namespace Test + +#endif // #ifndef CPPTEST_HTMLOUTPUT_H diff --git a/tests/cppunit/cpptest-output.h b/tests/cppunit/cpptest-output.h index cfadaecb1..898231bdf 100644 --- a/tests/cppunit/cpptest-output.h +++ b/tests/cppunit/cpptest-output.h @@ -41,7 +41,7 @@ namespace Test { class Source; class Time; - + /// \brief %Test suite output handler. /// /// Abstract base class for all suite output handlers. Derive from this @@ -58,7 +58,7 @@ namespace Test /// Empty destructor. /// virtual ~Output() {} - + /// Called when testing is started. /// /// \param tests Total number of tests in all suites. @@ -67,7 +67,7 @@ namespace Test { CPPTEST_UNUSED(tests); } - + /// Called when testing is finished. /// /// \param tests Total number of tests in all suites. @@ -89,7 +89,7 @@ namespace Test CPPTEST_UNUSED(tests); CPPTEST_UNUSED(name); } - + /// Called when a suite is finished. /// /// \param tests Number of tests in this suite. @@ -103,7 +103,7 @@ namespace Test CPPTEST_UNUSED(name); CPPTEST_UNUSED(time); } - + /// Called when a tests is executed. /// /// \param name Name of the test function. @@ -112,7 +112,7 @@ namespace Test { CPPTEST_UNUSED(name); } - + /// Called when a test if finished, regardless if an assertment was /// issued. /// @@ -127,7 +127,7 @@ namespace Test CPPTEST_UNUSED(ok); CPPTEST_UNUSED(time); } - + /// Called when an assertment is issued. /// /// \param s Assert point information. @@ -141,12 +141,12 @@ namespace Test /// Empty constructor. /// Output() {} - + private: Output(const Output&); Output& operator=(const Output&); }; - + } // namespace Test - + #endif // #ifndef CPPTEST_OUTPUT_H diff --git a/tests/cppunit/cpptest-source.h b/tests/cppunit/cpptest-source.h index 47140ca71..c2eb57f32 100644 --- a/tests/cppunit/cpptest-source.h +++ b/tests/cppunit/cpptest-source.h @@ -34,7 +34,7 @@ namespace Test { class Suite; - + /// \brief Assertment source information. /// /// Contains information about an assertment point. @@ -42,17 +42,17 @@ namespace Test class Source { friend class Suite; - + public: Source(); Source(const char* file, unsigned int line, const char* msg); - + const std::string& file() const; unsigned int line() const; const std::string& message() const; const std::string& suite() const; const std::string& test() const; - + private: unsigned int _line; std::string _file; @@ -60,7 +60,7 @@ namespace Test std::string _suite; std::string _test; }; - + } // namespace Test #endif // #ifndef CPPTEST_SOURCE_H diff --git a/tests/cppunit/cpptest-suite.h b/tests/cppunit/cpptest-suite.h index b42a19fa1..eb6908b7b 100644 --- a/tests/cppunit/cpptest-suite.h +++ b/tests/cppunit/cpptest-suite.h @@ -39,7 +39,7 @@ namespace Test { class Output; - + /// \brief Unit testing suite. /// /// Base class for all suites. Derive from this class to create own @@ -51,52 +51,52 @@ namespace Test /// class Suite { - public: + public: Suite(); virtual ~Suite(); - + void add(Suite* suite); - + bool run(Output& output, bool cont_after_fail = true); - + protected: /// Pointer to a test function. /// typedef void (Suite::*Func)(); - + bool continue_after_failure() const { return _continue; } - + virtual void setup() {} virtual void tear_down() {} - + void register_test(Func func, const std::string& name); void assertment(Source s); - + private: struct DoRun; struct ExecTests; struct SubSuiteTests; struct SuiteTime; struct SubSuiteTime; - + friend struct DoRun; friend struct ExecTests; friend struct SubSuiteTests; friend struct SubSuiteTime; - + struct Data { Func _func; std::string _name; Time _time; - + Data(Func func, const std::string& name) : _func(func), _name(name) {} }; - + typedef std::list Tests; typedef std::list Suites; - + std::string _name; // Suite name const std::string* _cur_test; // Current test func name Suites _suites; // External test suites @@ -105,11 +105,11 @@ namespace Test bool _result : 1; // Test result bool _success : 1; // Set if no test failed bool _continue : 1; // Continue func after failures - + void do_run(Output* os, bool cont_after_fail); int total_tests() const; Time total_time(bool recursive) const; - + // Disable // Suite(const Suite&); @@ -133,7 +133,7 @@ namespace Test /// #define TEST_ADD(func)\ register_test(static_cast(&func), #func); - + } // namespace Test #endif // #ifndef CPPTEST_SUITE_H diff --git a/tests/cppunit/cpptest-textoutput.h b/tests/cppunit/cpptest-textoutput.h index 45ed9f2fc..91b0d7c64 100644 --- a/tests/cppunit/cpptest-textoutput.h +++ b/tests/cppunit/cpptest-textoutput.h @@ -53,15 +53,15 @@ namespace Test /// Terse output mode, which only shows the number of correct tests. /// Terse, - + /// Verbose output mode, which also shows extended assert /// information for each test that failed. /// - Verbose + Verbose }; - + TextOutput(Mode mode, std::ostream& stream = std::cout); - + virtual void finished(int tests, const Time& time); virtual void suite_start(int tests, const std::string& name); virtual void suite_end(int tests, const std::string& name, @@ -69,10 +69,10 @@ namespace Test virtual void test_end(const std::string& name, bool ok, const Time& time); virtual void assertment(const Source& s); - + private: typedef std::list ErrorList; - + Mode _mode; std::ostream& _stream; ErrorList _suite_error_list; @@ -84,5 +84,5 @@ namespace Test }; } // namespace Test - + #endif // #ifndef CPPTEST_TEXTOUTPUT_H diff --git a/tests/cppunit/cpptest-time.h b/tests/cppunit/cpptest-time.h index ee1f282c9..bc7f5b78b 100644 --- a/tests/cppunit/cpptest-time.h +++ b/tests/cppunit/cpptest-time.h @@ -45,22 +45,22 @@ namespace Test public: Time(); Time(unsigned int sec, unsigned int usec); - + unsigned int seconds() const; unsigned int microseconds() const; - + static Time current(); - + friend Time operator+(const Time& t1, const Time& t2); friend Time operator-(const Time& t1, const Time& t2); - + friend std::ostream& operator<<(std::ostream& os, const Time& t); - + private: unsigned int _sec; unsigned int _usec; }; - + } // namespace Test #endif // #ifndef CPPTEST_TIME_H diff --git a/tests/cppunit/htmloutput.cpp b/tests/cppunit/htmloutput.cpp index bdf6fd6a4..8870a33fd 100644 --- a/tests/cppunit/htmloutput.cpp +++ b/tests/cppunit/htmloutput.cpp @@ -31,7 +31,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "cpptest-htmloutput.h" #include "utils.h" @@ -52,7 +52,7 @@ namespace Test idx += replace.size(); } } - + string escape(string value) { @@ -63,7 +63,7 @@ namespace Test strreplace(value, '\'', "'"); return value; } - + void header(ostream& os, string name) { @@ -149,7 +149,7 @@ namespace Test "
\n" "\n"; } - + void footer(ostream& os) { @@ -162,15 +162,15 @@ namespace Test "

\n" "\n\n"; } - + void back_ref(ostream& os, const string& ref, bool prepend_newline = true) { - + os << "

Back to " << escape(ref) << "\n

\n"; } - + void sub_title(ostream& os, const string& title, int size) { @@ -186,43 +186,43 @@ namespace Test h << "h" << size; os << "<" << h.str() << ">" << escape(title) << "\n"; } - + enum ClassTableType { TableClass_Summary, TableClass_Suites, TableClass_Suite, TableClass_Result }; - + void table_header(ostream& os, ClassTableType type, const string &summary = "") { static const char* class_tabletypes[] = { "summary", "suites", "suite", "result" }; - + os << "\n"; } - + void table_footer(ostream& os) { os << "
\n"; } - + void table_tr_header(ostream& os) { os << " \n"; } - + void table_tr_footer(ostream& os) { os << " \n"; } - + enum ClassType { Title, Success, Error }; - + void table_entry(ostream& os, ClassType type, const string& s, int width = 0, const string& link = "") { static const char* class_types[] = { "title", "success", "error" }; - + os << " " << escape(s) << ""; else os << " class=\"tablecell_" << class_types[type] << "\">" << escape(s); - os << "\n"; + os << "\n"; } - + } // anonymous namespace - + // Test suite table // struct HtmlOutput::SuiteRow @@ -259,7 +259,7 @@ namespace Test table_tr_footer(_os); } }; - + // Individual tests tables, tests // struct HtmlOutput::TestRow @@ -276,7 +276,7 @@ namespace Test ti._sources.front().suite() + "_" + ti._name; ClassType type(ti._success ? Success : Error); ostringstream ss; - + table_tr_header(_os); table_entry(_os, type, ti._name, 0, link); ss.str(""), ss << ti._sources.size(); @@ -288,19 +288,19 @@ namespace Test } } }; - + // Individual tests tables, header // struct HtmlOutput::TestSuiteRow { bool _incl_ok_tests; ostream& _os; - TestSuiteRow(ostream& os, bool incl_ok_tests) + TestSuiteRow(ostream& os, bool incl_ok_tests) : _incl_ok_tests(incl_ok_tests), _os(os) {} void operator()(const SuiteInfo& si) { ostringstream ss; - + sub_title(_os, "Suite: " + si._name, 3, si._name); table_header(_os, TableClass_Suite, "Details for suite " + si._name); table_tr_header(_os); @@ -309,13 +309,13 @@ namespace Test table_entry(_os, Title, "Success", 10); table_entry(_os, Title, "Time (s)", 10); table_tr_footer(_os); - for_each(si._tests.begin(), si._tests.end(), + for_each(si._tests.begin(), si._tests.end(), TestRow(_os, _incl_ok_tests)); table_footer(_os); back_ref(_os, "top"); } }; - + // Individual tests result tables // struct HtmlOutput::TestResult @@ -325,9 +325,9 @@ namespace Test void operator()(const Source& s) { const int TitleSize = 15; - + ostringstream ss; - + table_header(_os, TableClass_Result, "Test Failure"); table_tr_header(_os); table_entry(_os, Title, "Test", TitleSize); @@ -345,7 +345,7 @@ namespace Test table_footer(_os); } }; - + // All tests result tables // struct HtmlOutput::TestResultAll @@ -357,14 +357,14 @@ namespace Test if (!ti._success) { const string& suite = ti._sources.front().suite(); - + sub_title(_os, suite + "::" + ti._name, 3, suite + "_" + ti._name); for_each(ti._sources.begin(), ti._sources.end(), TestResult(_os)); back_ref(_os, suite, false); } } }; - + // Individual tests result tables, iterator // struct HtmlOutput::SuiteTestResult @@ -376,12 +376,12 @@ namespace Test for_each(si._tests.begin(), si._tests.end(), TestResultAll(_os)); } }; - + /// Generates the HTML table. This function should only be called after /// run(), when all tests have been executed. /// /// \param os Output stream. - /// \param incl_ok_tests Set if successful tests should be shown; + /// \param incl_ok_tests Set if successful tests should be shown; /// false otherwise. /// \param name Name of generated report. /// @@ -390,9 +390,9 @@ namespace Test { ClassType type(_total_errors > 0 ? Error : Success); ostringstream ss; - + header(os, name); - + // Table: Summary // sub_title(os, "Summary", 2); @@ -415,7 +415,7 @@ namespace Test table_tr_footer(os); table_footer(os); os << "
\n\n"; - + // Table: Test suites // sub_title(os, "Test suites", 2); @@ -430,12 +430,12 @@ namespace Test for_each(_suites.begin(), _suites.end(), SuiteRow(os)); table_footer(os); os << "
\n\n"; - + // Individual tests tables // for_each(_suites.begin(), _suites.end(), TestSuiteRow(os, incl_ok_tests)); os << "
\n\n"; - + // Individual tests result tables // if(_total_errors != 0) @@ -443,11 +443,11 @@ namespace Test sub_title(os, "Test results", 2); for_each(_suites.begin(), _suites.end(), SuiteTestResult(os)); os << "
\n\n"; - } + } // EOF // footer(os); } - + } // namespace Test diff --git a/tests/cppunit/missing.cpp b/tests/cppunit/missing.cpp index 046dff7b0..6dd38d5f7 100644 --- a/tests/cppunit/missing.cpp +++ b/tests/cppunit/missing.cpp @@ -28,7 +28,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "missing.h" @@ -40,7 +40,7 @@ #include #else #include -#endif +#endif #include #include @@ -53,7 +53,7 @@ namespace Test gettimeofday(timeval* tv, void*) { assert(tv); - + #ifdef HAVE_GETTICKCOUNT long now = GetTickCount(); tv->tv_sec = now / 1000; @@ -62,10 +62,10 @@ namespace Test tv->tv_sec = time(0); tv->tv_usec = 0; #endif // #ifdef HAVE_GETTICKCOUNT - + return 0; } - + #endif // #ifndef HAVE_GETTIMEOFDAY #ifndef HAVE_ROUND @@ -74,7 +74,7 @@ namespace Test { return d > 0.0 ? floor(d + 0.5) : ceil(d - 0.5); } -#endif +#endif } // namespace Test diff --git a/tests/cppunit/missing.h b/tests/cppunit/missing.h index 78af19401..016ffb39c 100644 --- a/tests/cppunit/missing.h +++ b/tests/cppunit/missing.h @@ -31,7 +31,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif namespace Test { @@ -42,15 +42,15 @@ namespace Test long tv_sec; long tv_usec; }; - + extern int gettimeofday(timeval* tv, void*); - + #endif // #ifndef HAVE_GETTIMEOFDAY - + #ifndef HAVE_ROUND extern double round(double d); -#endif - +#endif + } // namespace Test #endif // #ifndef CPPTEST_MISSING_H diff --git a/tests/cppunit/source.cpp b/tests/cppunit/source.cpp index b1cebda53..cc4a3609e 100644 --- a/tests/cppunit/source.cpp +++ b/tests/cppunit/source.cpp @@ -36,7 +36,7 @@ namespace Test Source::Source() : _line(0) {} - + /// Constructs a source object. /// /// \param file Name of the file containing the failing function. @@ -48,15 +48,15 @@ namespace Test _file(file ? file : ""), _msg(msg ? msg : "") {} - + /// \return Name of the file containing the failing function. /// const string& - Source::file() const + Source::file() const { return _file; } - + /// \return Line where the function starts. /// unsigned int @@ -64,7 +64,7 @@ namespace Test { return _line; } - + /// \return Descriptive message. /// const string& @@ -72,7 +72,7 @@ namespace Test { return _msg; } - + /// \return Name of the suite, which the test belongs to. /// const string& diff --git a/tests/cppunit/suite.cpp b/tests/cppunit/suite.cpp index f531e6c8f..7f344d06c 100644 --- a/tests/cppunit/suite.cpp +++ b/tests/cppunit/suite.cpp @@ -34,7 +34,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "cpptest-output.h" #include "cpptest-source.h" @@ -55,9 +55,9 @@ namespace Test while (first != last) delete *first++; } - + } // anonymous namespace - + /// Constructs an empty test suite. /// Suite::Suite() @@ -65,14 +65,14 @@ namespace Test _output(0), _success(true) {} - + /// Destroys this suite object. /// Suite::~Suite() { destroy_range(_suites.begin(), _suites.end()); } - + /// Starts the testing. All tests in this suite and embedded suites will /// be executed. /// @@ -90,7 +90,7 @@ namespace Test output.finished(ntests, total_time(true)); return _success; } - + /// \fn void Suite::setup() /// /// Setups a test fixture. This function is called before each test, @@ -100,7 +100,7 @@ namespace Test /// specialized behavior. /// /// \see tear_down() - + /// \fn void Suite::tear_down() /// /// Tears down a test fixture. This function is called after each test, @@ -110,7 +110,7 @@ namespace Test /// specialized behavior. /// /// \see setup() - + /// Adds a suite to this suite. Tests in added suites will be executed /// when run() of the top-level suite is called. /// @@ -121,7 +121,7 @@ namespace Test { _suites.push_back(suite); } - + /// Registers a test function. /// /// \b Note: Do not call this function directly, use the TEST_ADD(func) @@ -136,11 +136,11 @@ namespace Test { string::size_type pos = name.find_first_of(':'); assert(!name.empty() && name[pos + 1] == ':' && name[pos + 2] != '\0'); - + _name.assign(name, 0, pos); _tests.push_back(Data(func, name.substr(pos + 2))); } - + /// Issues an assertment to the output handler. /// /// Do not call this function directly, use one of the available assertment @@ -156,21 +156,21 @@ namespace Test _output->assertment(s); _result = _success = false; } - + // Functor to execute tests for the given suite. // struct Suite::ExecTests { Suite& _suite; - + ExecTests(Suite& s) : _suite(s) {} - + void operator()(Data& data) { _suite._cur_test = &data._name; _suite._result = true; // assume success, assert will set to false _suite._output->test_start(data._name); - + _suite.setup(); Time start(Time::current()); // FIXME Also feedback exception to user @@ -182,7 +182,7 @@ namespace Test } Time end(Time::current()); _suite.tear_down(); - + data._time = end - start; _suite._output->test_end(data._name, _suite._result, data._time); } @@ -194,7 +194,7 @@ namespace Test { bool _continue; Output* _output; - + DoRun(Output* output, bool cont) : _continue(cont), _output(output) {} void operator()(Suite* suite) { suite->do_run(_output, _continue); } }; @@ -206,7 +206,7 @@ namespace Test { _continue = cont_after_fail; _output = os; - + _output->suite_start(_tests.size(), _name); for_each(_tests.begin(), _tests.end(), ExecTests(*this)); _output->suite_end(_tests.size(), _name, total_time(false)); @@ -235,7 +235,7 @@ namespace Test return value + s->total_tests(); } }; - + // Counts all tests in this and all its embedded suites. // int @@ -244,7 +244,7 @@ namespace Test return accumulate(_suites.begin(), _suites.end(), _tests.size(), SubSuiteTests()); } - + // Functor to accumulate execution time for tests. // struct Suite::SuiteTime @@ -254,7 +254,7 @@ namespace Test return time + data._time; } }; - + // Functor to accumulate execution time for suites. // struct Suite::SubSuiteTime @@ -264,7 +264,7 @@ namespace Test return time + s->total_time(true); } }; - + // Counts time accumulated execution time for all tests in this and all // its embedded suites. // @@ -273,9 +273,9 @@ namespace Test { Time time = accumulate(_tests.begin(), _tests.end(), Time(), SuiteTime()); - + return !recursive ? time : accumulate(_suites.begin(), _suites.end(), time, SubSuiteTime()); } - + } // namespace Test diff --git a/tests/cppunit/textoutput.cpp b/tests/cppunit/textoutput.cpp index 792a89439..bb0846927 100644 --- a/tests/cppunit/textoutput.cpp +++ b/tests/cppunit/textoutput.cpp @@ -30,7 +30,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "cpptest-textoutput.h" #include "cpptest-time.h" @@ -55,12 +55,12 @@ namespace Test << "\tFile: " << s.file() << endl << "\tLine: " << s.line() << endl << "\tMessage: " << s.message() << endl << endl; - + } }; - + } // anonymous namespace - + /// Constructs a text output handler. /// /// \param mode Output mode. @@ -71,7 +71,7 @@ namespace Test _stream(stream), _total_errors(0) {} - + void TextOutput::finished(int tests, const Time& time) { @@ -79,7 +79,7 @@ namespace Test << correct(tests, _total_errors) << "% correct" << " in " << time << " seconds" << endl; } - + void TextOutput::suite_start(int tests, const string& name) { @@ -89,13 +89,13 @@ namespace Test _suite_tests = _suite_errors = 0; _suite_total_tests = tests; _suite_error_list.clear(); - + _stream << _suite_name << ": " << "0/" << _suite_total_tests << "\r" << flush; } } - + void TextOutput::suite_end(int tests, const string& name, const Time& time) { @@ -104,15 +104,15 @@ namespace Test _stream << name << ": " << tests << "/" << tests << ", " << correct(tests, _suite_errors) << "% correct" << " in " << time << " seconds" << endl; - + if (_mode == Verbose && _suite_errors) for_each(_suite_error_list.begin(), _suite_error_list.end(), ShowSource(_stream)); - + _total_errors += _suite_errors; } } - + void TextOutput::test_end(const string&, bool ok, const Time&) { @@ -122,11 +122,11 @@ namespace Test if (!ok) ++_suite_errors; } - + void TextOutput::assertment(const Source& s) { _suite_error_list.push_back(s); } - + } // namespace Test diff --git a/tests/cppunit/time.cpp b/tests/cppunit/time.cpp index 4b7a988f5..7ba55a36b 100644 --- a/tests/cppunit/time.cpp +++ b/tests/cppunit/time.cpp @@ -28,7 +28,7 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "missing.h" #include "cpptest-time.h" @@ -48,16 +48,16 @@ namespace Test namespace { const unsigned int UsecPerSec = 1000000; - + } // anonymous namespace - + /// Constructs a time object with zeroed time. /// Time::Time() : _sec(0), _usec(0) {} - + /// Constructs a time object. /// /// \param sec Seconds. @@ -67,7 +67,7 @@ namespace Test : _sec(sec), _usec(usec) {} - + /// \return Seconds. /// unsigned int @@ -75,7 +75,7 @@ namespace Test { return _sec; } - + /// \return Micro-seconds. /// unsigned int @@ -83,7 +83,7 @@ namespace Test { return _usec; } - + /// \return The current time. /// Time @@ -93,7 +93,7 @@ namespace Test gettimeofday(&tv, 0); return Time(tv.tv_sec, tv.tv_usec); } - + /// \relates Time /// /// Computes the time elapsed between two time values. @@ -108,10 +108,10 @@ namespace Test { if (t2._sec > t1._sec || (t2._sec == t1._sec && t2._usec > t1._usec)) return Time(); - + unsigned int sec = t1._sec - t2._sec; unsigned int usec; - + if (t2._usec > t1._usec) { --sec; @@ -119,10 +119,10 @@ namespace Test } else usec = t1._usec - t2._usec; - + return Time(sec, usec); } - + /// \relates Time /// /// Adds two time values. @@ -137,7 +137,7 @@ namespace Test { unsigned int sec = t1._sec + t2._sec; unsigned int usec = t1._usec + t2._usec; - + if (usec > UsecPerSec) { ++sec; @@ -145,7 +145,7 @@ namespace Test } return Time(sec, usec); } - + /// \relates Time /// /// Outputs a time to an output stream. @@ -171,6 +171,6 @@ namespace Test return os; } - + } // namespace Test diff --git a/tests/cppunit/utils.cpp b/tests/cppunit/utils.cpp index ebf850239..f7e545592 100644 --- a/tests/cppunit/utils.cpp +++ b/tests/cppunit/utils.cpp @@ -29,13 +29,13 @@ # include "winconfig.h" #else # include "config.h" -#endif +#endif #include "missing.h" #include "utils.h" namespace Test -{ +{ // Computes the procentage of correct tests. // int diff --git a/tests/cppunit/utils.h b/tests/cppunit/utils.h index 967e0afaf..c3a48e420 100644 --- a/tests/cppunit/utils.h +++ b/tests/cppunit/utils.h @@ -30,7 +30,7 @@ namespace Test { extern int correct(int tests, int errors); - + } // namespace Test #endif // #ifndef CPPTEST_UTILS_H diff --git a/tests/cppunit/winconfig.h b/tests/cppunit/winconfig.h index 6b2858a62..9546ebf5a 100644 --- a/tests/cppunit/winconfig.h +++ b/tests/cppunit/winconfig.h @@ -36,7 +36,7 @@ #if _MSC_VER == 1200 // MS Visual C++ 6.0 #pragma warning (disable: 4786) #endif - + #if _MSC_VER > 1300 // MS Visual C++ .NET 2002 and above #pragma warning (disable: 4267) #endif diff --git a/tests/fixed_memory_test.h b/tests/fixed_memory_test.h index d0463a849..89d6dad46 100644 --- a/tests/fixed_memory_test.h +++ b/tests/fixed_memory_test.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -26,7 +26,7 @@ class FixedMemoryHashTest : public Test::Suite { typedef void(FixedMemoryHashTest::*TestFunction)(void); public: - FixedMemoryHashTest() { + FixedMemoryHashTest() { size_ = EQEmu::FixedMemoryHashSet::estimated_size(72000, 190000); data_ = new uint8[size_]; memset(data_, 0, size_); @@ -43,10 +43,10 @@ public: TEST_ADD(FixedMemoryHashTest::InsertEndTest); TEST_ADD(FixedMemoryHashTest::RetrieveEndTest); } - ~FixedMemoryHashTest() { + ~FixedMemoryHashTest() { delete[] data_; } - + private: void InitTest() { EQEmu::FixedMemoryHashSet hash(data_, size_, 72000, 190000); @@ -71,7 +71,7 @@ public: strcpy(item.Name, "Iron Sword"); item.ID = 1001; hash.insert(1001, item); - + TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.size() == 1); TEST_ASSERT(hash.max_size() == 72000); @@ -84,7 +84,7 @@ public: TEST_ASSERT(hash.size() == 1); TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - + Item_Struct item = hash[1001]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1001); @@ -97,7 +97,7 @@ public: strcpy(item.Name, "Steel Sword"); item.ID = 1001; hash.insert(1001, item); - + TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.size() == 1); TEST_ASSERT(hash.max_size() == 72000); @@ -110,7 +110,7 @@ public: TEST_ASSERT(hash.size() == 1); TEST_ASSERT((hash.max_size() == 72000)); TEST_ASSERT(!hash.empty()); - + Item_Struct item = hash[1001]; TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); TEST_ASSERT(item.ID == 1001); @@ -138,7 +138,7 @@ public: TEST_ASSERT(hash.size() == 2); TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - + Item_Struct item = hash[1000]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1000); @@ -172,7 +172,7 @@ public: TEST_ASSERT(hash.size() == 3); TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - + Item_Struct item = hash[1000]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1000); @@ -212,7 +212,7 @@ public: TEST_ASSERT(hash.size() == 4); TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - + Item_Struct item = hash[1000]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1000); diff --git a/tests/fixed_memory_variable_test.h b/tests/fixed_memory_variable_test.h index cd77d29b0..fcc04ad7f 100644 --- a/tests/fixed_memory_variable_test.h +++ b/tests/fixed_memory_variable_test.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -29,7 +29,7 @@ struct test_struct { class FixedMemoryVariableHashTest : public Test::Suite { typedef void(FixedMemoryVariableHashTest::*TestFunction)(void); public: - FixedMemoryVariableHashTest() { + FixedMemoryVariableHashTest() { size_ = 1024 + 12 + 2008; data_ = new uint8[size_]; memset(data_, 0, size_); @@ -42,10 +42,10 @@ public: TEST_ADD(FixedMemoryVariableHashTest::InsertAgainFailTest); TEST_ADD(FixedMemoryVariableHashTest::RetrieveAgainFailTest); } - ~FixedMemoryVariableHashTest() { + ~FixedMemoryVariableHashTest() { delete[] data_; } - + private: void InitTest() { EQEmu::FixedMemoryVariableHashSet hash(data_, size_, 501); @@ -65,16 +65,16 @@ public: memset(&test, 0, sizeof(test)); strcpy(test.name, "Bill D."); - hash.insert(0, reinterpret_cast(&test), sizeof(test)); + hash.insert(0, reinterpret_cast(&test), sizeof(test)); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(!hash.exists(501)); } - + void RetrieveTest() { EQEmu::FixedMemoryVariableHashSet hash(data_, size_); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(!hash.exists(501)); - + test_struct test = hash[0]; TEST_ASSERT(strcmp(test.name, "Bill D.") == 0); } @@ -85,7 +85,7 @@ public: memset(&test, 0, sizeof(test)); strcpy(test.name, "Jimmy P."); - hash.insert(501, reinterpret_cast(&test), sizeof(test)); + hash.insert(501, reinterpret_cast(&test), sizeof(test)); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(501)); } @@ -94,7 +94,7 @@ public: EQEmu::FixedMemoryVariableHashSet hash(data_, size_); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(501)); - + test_struct test = hash[501]; TEST_ASSERT(strcmp(test.name, "Jimmy P.") == 0); } @@ -119,7 +119,7 @@ public: TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(501)); TEST_ASSERT(!hash.exists(500)); - + try { test_struct test = hash[500]; TEST_ASSERT(false); diff --git a/tests/ipc_mutex_test.h b/tests/ipc_mutex_test.h index 1ecd1d11f..799fa83e4 100644 --- a/tests/ipc_mutex_test.h +++ b/tests/ipc_mutex_test.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -25,16 +25,16 @@ class IPCMutexTest : public Test::Suite { typedef void(IPCMutexTest::*TestFunction)(void); public: - IPCMutexTest() { + IPCMutexTest() { TEST_ADD(IPCMutexTest::LockMutexTest); TEST_ADD(IPCMutexTest::UnlockMutexTest); TEST_ADD(IPCMutexTest::DoubleLockMutexTest); TEST_ADD(IPCMutexTest::DoubleUnlockMutexTest); } - ~IPCMutexTest() { + ~IPCMutexTest() { } - + private: void LockMutexTest() { EQEmu::IPCMutex mutex("TestMutex1"); diff --git a/tests/main.cpp b/tests/main.cpp index b43cf2081..f3cf0e20a 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/tests/memory_mapped_file_test.h b/tests/memory_mapped_file_test.h index cccf73162..3f77353eb 100644 --- a/tests/memory_mapped_file_test.h +++ b/tests/memory_mapped_file_test.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -25,33 +25,33 @@ class MemoryMappedFileTest : public Test::Suite { typedef void(MemoryMappedFileTest::*TestFunction)(void); public: - MemoryMappedFileTest() { + MemoryMappedFileTest() { TEST_ADD(MemoryMappedFileTest::LoadAndZeroMMF) TEST_ADD(MemoryMappedFileTest::LoadExistingMMF) } - ~MemoryMappedFileTest() { + ~MemoryMappedFileTest() { } - private: + private: void LoadAndZeroMMF() { EQEmu::MemoryMappedFile mmf("testfile.txt", 512); mmf.ZeroFile(); TEST_ASSERT(mmf.Size() == 512); - + unsigned char *data = reinterpret_cast(mmf.Get()); TEST_ASSERT(data != nullptr); - + *reinterpret_cast(data) = 562; } - + void LoadExistingMMF() { EQEmu::MemoryMappedFile mmf("testfile.txt"); TEST_ASSERT(mmf.Size() == 512); - + unsigned char *data = reinterpret_cast(mmf.Get()); TEST_ASSERT(data != nullptr); - + uint32 val = *reinterpret_cast(data); TEST_ASSERT(val == 562); } diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt index 1218541a3..4493d8461 100644 --- a/ucs/CMakeLists.txt +++ b/ucs/CMakeLists.txt @@ -24,7 +24,7 @@ ADD_DEFINITIONS(-DUCS) TARGET_LINK_LIBRARIES(ucs Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY}) IF(MSVC) - + SET_TARGET_PROPERTIES(ucs PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") TARGET_LINK_LIBRARIES(ucs "Ws2_32.lib") ENDIF(MSVC) diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp index 6167c7e05..c3f3ad6f0 100644 --- a/ucs/chatchannel.cpp +++ b/ucs/chatchannel.cpp @@ -28,7 +28,7 @@ extern Database database; extern uint32 ChatMessagesSent; -ChatChannel::ChatChannel(string inName, string inOwner, string inPassword, bool inPermanent, int inMinimumStatus) : +ChatChannel::ChatChannel(string inName, string inOwner, string inPassword, bool inPermanent, int inMinimumStatus) : DeleteTimer(0) { Name = inName; @@ -43,7 +43,7 @@ ChatChannel::ChatChannel(string inName, string inOwner, string inPassword, bool Moderated = false; - _log(UCS__TRACE, "New ChatChannel created: Name: [%s], Owner: [%s], Password: [%s], MinStatus: %i", + _log(UCS__TRACE, "New ChatChannel created: Name: [%s], Owner: [%s], Password: [%s], MinStatus: %i", Name.c_str(), Owner.c_str(), Password.c_str(), MinimumStatus); } @@ -301,7 +301,7 @@ bool ChatChannel::RemoveClient(Client *c) { return false; _log(UCS__TRACE, "Starting delete timer for empty password protected channel %s", Name.c_str()); - + DeleteTimer.Start(RuleI(Channels, DeleteTimer) * 60000); } @@ -455,7 +455,7 @@ ChatChannel *ChatChannelList::AddClientToChannel(string ChannelName, Client *c) if(!c) return nullptr; if((ChannelName.length() > 0) && (isdigit(ChannelName[0]))) { - + c->GeneralChannelMessage("The channel name can not begin with a number."); return nullptr; @@ -465,7 +465,7 @@ ChatChannel *ChatChannelList::AddClientToChannel(string ChannelName, Client *c) string::size_type Colon = ChannelName.find_first_of(":"); - if(Colon == string::npos) + if(Colon == string::npos) NormalisedName = CapitaliseName(ChannelName); else { NormalisedName = CapitaliseName(ChannelName.substr(0, Colon)); diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index 9a857c3cd..49374a7a9 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -83,8 +83,8 @@ vector ParseRecipients(string RecipientString) { // This method parses the Recipient List in the mailto command, which can look like this example: // - // "Baalinor , - // -Friends , + // "Baalinor , + // -Friends , // Guild , SOE.EQ.BTG2.luccerathe, SOE.EQ.BTG2.codsas // // First, it splits it up at commas, so it looks like this: @@ -180,7 +180,7 @@ vector ParseRecipients(string RecipientString) { break; } - RecipientList.push_back(Secret + Recips.substr(CurrentPos, + RecipientList.push_back(Secret + Recips.substr(CurrentPos, Space - CurrentPos)); CurrentPos = Space + 1; } @@ -191,9 +191,9 @@ vector ParseRecipients(string RecipientString) { } } - + (*Iterator) = Secret + (*Iterator); - + Iterator++; } @@ -212,7 +212,7 @@ vector ParseRecipients(string RecipientString) { if(LastPeriod != string::npos) { (*Iterator) = (*Iterator).substr(LastPeriod + 1); - + for(unsigned int i = 0; i < (*Iterator).length(); i++) { if(i == 0) @@ -240,7 +240,7 @@ vector ParseRecipients(string RecipientString) { static void ProcessMailTo(Client *c, string MailMessage) { _log(UCS__TRACE, "MAILTO: From %s, %s", c->MailBoxName().c_str(), MailMessage.c_str()); - + vector Recipients; string::size_type FirstQuote = MailMessage.find_first_of("\"", 0); @@ -335,7 +335,7 @@ static void ProcessMailTo(Client *c, string MailMessage) { Success = false; } } - + if(Success) { // Success EQApplicationPacket *outapp = new EQApplicationPacket(OP_MailDeliveryStatus, 10); @@ -494,7 +494,7 @@ Clientlist::Clientlist(int ChatPort) { Client::Client(EQStream *eqs) { - ClientStream = eqs; + ClientStream = eqs; CurrentMailBox = 0; @@ -571,7 +571,7 @@ void Clientlist::CheckForStaleConnections(Client *c) { _log(UCS__CLIENT, "Client connection from %s:%d closed.", inet_ntoa(in), ntohs((*Iterator)->ClientStream->GetRemotePort())); - + safe_delete((*Iterator)); Iterator = ClientChatConnections.erase(Iterator); @@ -611,7 +611,7 @@ void Clientlist::Process() { _log(UCS__CLIENT, "Client connection from %s:%d closed.", inet_ntoa(in), ntohs((*Iterator)->ClientStream->GetRemotePort())); - + safe_delete((*Iterator)); Iterator = ClientChatConnections.erase(Iterator); @@ -698,7 +698,7 @@ void Clientlist::Process() { case OP_Mail: { string CommandString = (const char*)app->pBuffer; - + ProcessOPMailCommand((*Iterator), CommandString); break; @@ -762,7 +762,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, string CommandString) string::size_type Space = CommandString.find_first_of(" "); - if(Space != string::npos) { + if(Space != string::npos) { Command = CommandString.substr(0, Space); @@ -793,7 +793,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, string CommandString) case CommandListAll: ChannelList->SendAllChannels(c); break; - + case CommandList: c->ProcessChannelList(Parameters); break; @@ -875,7 +875,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, string CommandString) } case CommandSetMailForwarding: break; - + case CommandBuddy: RemoveApostrophes(Parameters); ProcessCommandBuddy(c, Parameters); @@ -924,7 +924,7 @@ void Client::SendMailBoxes() { int PacketLength = 10; string s; - + for(int i = 0; i < Count; i++) { s += GetMailPrefix() + Characters[i].Name; @@ -1028,7 +1028,7 @@ void Client::JoinChannels(string ChannelNameList) { if(NumberOfChannels == MAX_JOINED_CHANNELS) { GeneralChannelMessage("You have joined the maximum number of channels. /leave one before trying to join another."); - + break; } @@ -1238,7 +1238,7 @@ void Client::ProcessChannelList(string Input) { ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName); - if(RequiredChannel) + if(RequiredChannel) RequiredChannel->SendChannelMembers(this); else GeneralChannelMessage("Channel " + Input + " not found."); @@ -1289,7 +1289,7 @@ void Client::SendChannelList() { safe_delete(outapp); } -void Client::SendChannelMessage(string Message) +void Client::SendChannelMessage(string Message) { string::size_type MessageStart = Message.find_first_of(" "); @@ -1348,11 +1348,11 @@ void Client::SendChannelMessage(string Message) } } int AllowedMessages = RuleI(Chat, MinimumMessagesPerInterval) + GetKarma(); - AllowedMessages = AllowedMessages > RuleI(Chat, MaximumMessagesPerInterval) ? RuleI(Chat, MaximumMessagesPerInterval) : AllowedMessages; - + AllowedMessages = AllowedMessages > RuleI(Chat, MaximumMessagesPerInterval) ? RuleI(Chat, MaximumMessagesPerInterval) : AllowedMessages; + if(RuleI(Chat, MinStatusToBypassAntiSpam) <= Status) AllowedMessages = 10000; - + AttemptedMessages++; if(AttemptedMessages > AllowedMessages) { @@ -1363,7 +1363,7 @@ void Client::SendChannelMessage(string Message) if(GlobalChatLimiterTimer) { char TimeLeft[256]; - sprintf(TimeLeft, "You are currently rate limited, you cannot send more messages for %i seconds.", + sprintf(TimeLeft, "You are currently rate limited, you cannot send more messages for %i seconds.", (GlobalChatLimiterTimer->GetRemainingTime() / 1000)); GeneralChannelMessage(TimeLeft); } @@ -1446,7 +1446,7 @@ void Client::SendChannelMessageByNumber(string Message) { } } - _log(UCS__TRACE, "%s tells %s, [%s]", GetName().c_str(), RequiredChannel->GetName().c_str(), + _log(UCS__TRACE, "%s tells %s, [%s]", GetName().c_str(), RequiredChannel->GetName().c_str(), Message.substr(MessageStart + 1).c_str()); if(RuleB(Chat, EnableAntiSpam)) @@ -1463,7 +1463,7 @@ void Client::SendChannelMessageByNumber(string Message) { } } int AllowedMessages = RuleI(Chat, MinimumMessagesPerInterval) + GetKarma(); - AllowedMessages = AllowedMessages > RuleI(Chat, MaximumMessagesPerInterval) ? RuleI(Chat, MaximumMessagesPerInterval) : AllowedMessages; + AllowedMessages = AllowedMessages > RuleI(Chat, MaximumMessagesPerInterval) ? RuleI(Chat, MaximumMessagesPerInterval) : AllowedMessages; if(RuleI(Chat, MinStatusToBypassAntiSpam) <= Status) AllowedMessages = 10000; @@ -1477,7 +1477,7 @@ void Client::SendChannelMessageByNumber(string Message) { if(GlobalChatLimiterTimer) { char TimeLeft[256]; - sprintf(TimeLeft, "You are currently rate limited, you cannot send more messages for %i seconds.", + sprintf(TimeLeft, "You are currently rate limited, you cannot send more messages for %i seconds.", (GlobalChatLimiterTimer->GetRemainingTime() / 1000)); GeneralChannelMessage(TimeLeft); } @@ -1544,7 +1544,7 @@ void Client::ToggleAnnounce(string State) string Message = "Announcing now "; - if(Announce) + if(Announce) Message += "on"; else Message += "off"; @@ -1746,7 +1746,7 @@ void Client::SetChannelOwner(string CommandString) { void Client::OPList(string CommandString) { string::size_type ChannelStart = CommandString.find_first_not_of(" "); - + if(ChannelStart == string::npos) { string Message = "Incorrect syntax: /chat oplist "; GeneralChannelMessage(Message); @@ -1969,7 +1969,7 @@ void Client::ChannelGrantModerator(string CommandString) { } else { RequiredChannel->AddModerator(Moderator); - + if(RequiredClient) RequiredClient->GeneralChannelMessage(GetName() + " has made you a moderator of channel " + ChannelName); @@ -2056,7 +2056,7 @@ void Client::ChannelGrantVoice(string CommandString) { } else { RequiredChannel->AddVoice(Voicee); - + if(RequiredClient) RequiredClient->GeneralChannelMessage(GetName() + " has given you voice in channel " + ChannelName); @@ -2256,7 +2256,7 @@ Client *Clientlist::IsCharacterOnline(string CharacterName) { // If the mail is destined for the primary mailbox for this character, or the one they have selected // - if((MailBoxNumber == 0) || (MailBoxNumber == (*Iterator)->GetMailBoxNumber())) + if((MailBoxNumber == 0) || (MailBoxNumber == (*Iterator)->GetMailBoxNumber())) return (*Iterator); } @@ -2280,7 +2280,7 @@ void Client::SendNotification(int MailBoxNumber, string Subject, string From, in char sMessageID[100]; char Sequence[100]; - + sprintf(TimeStamp, "%i", (int)time(nullptr)); sprintf(sMessageID, "%i", MessageID); @@ -2296,8 +2296,8 @@ void Client::SendNotification(int MailBoxNumber, string Subject, string From, in VARSTRUCT_ENCODE_INTSTRING(PacketBuffer, MailBoxNumber); VARSTRUCT_ENCODE_STRING(PacketBuffer, sMessageID); VARSTRUCT_ENCODE_STRING(PacketBuffer, TimeStamp); - VARSTRUCT_ENCODE_STRING(PacketBuffer, "1"); - VARSTRUCT_ENCODE_STRING(PacketBuffer, From.c_str()); + VARSTRUCT_ENCODE_STRING(PacketBuffer, "1"); + VARSTRUCT_ENCODE_STRING(PacketBuffer, From.c_str()); VARSTRUCT_ENCODE_STRING(PacketBuffer, Subject.c_str()); _pkt(UCS__PACKETS, outapp); @@ -2314,13 +2314,13 @@ void Client::ChangeMailBox(int NewMailBox) { SetMailBox(NewMailBox); _log(UCS__TRACE, "New mailbox is %s", MailBoxName().c_str()); - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_MailboxChange, 2); char *buf = (char *)outapp->pBuffer; VARSTRUCT_ENCODE_INTSTRING(buf, NewMailBox); - + _pkt(UCS__PACKETS, outapp); QueuePacket(outapp); diff --git a/ucs/clientlist.h b/ucs/clientlist.h index f118e939c..91264a395 100644 --- a/ucs/clientlist.h +++ b/ucs/clientlist.h @@ -33,7 +33,7 @@ #define MAX_JOINED_CHANNELS 10 enum { CommandJoin = 0, CommandLeaveAll, CommandLeave, CommandListAll, CommandList, CommandSet, CommandAnnounce, CommandSetOwner, - CommandOPList, CommandInvite, CommandGrant, CommandModerate, CommandVoice, CommandKick, + CommandOPList, CommandInvite, CommandGrant, CommandModerate, CommandVoice, CommandKick, CommandPassword, CommandToggleInvites, CommandAFK, CommandUptime, CommandGetHeaders, CommandGetBody, CommandMailTo, CommandSetMessageStatus, CommandSelectMailBox, CommandSetMailForwarding, CommandBuddy, CommandIgnorePlayer, @@ -46,7 +46,7 @@ struct CommandEntry { typedef enum { ConnectionTypeUnknown, ConnectionTypeCombined, ConnectionTypeMail, ConnectionTypeChat } ConnectionType; -static const CommandEntry Commands[] = { +static const CommandEntry Commands[] = { { "join", CommandJoin }, { "leaveall", CommandLeaveAll }, { "leave", CommandLeave }, diff --git a/ucs/database.cpp b/ucs/database.cpp index e03339b0b..eb60b0c5c 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -161,7 +161,7 @@ int Database::FindAccount(const char *CharacterName, Client *c) { } safe_delete_array(query); - if (mysql_num_rows(result) != 1) + if (mysql_num_rows(result) != 1) { _log(UCS__ERROR, "Bad result from query"); mysql_free_result(result); @@ -183,7 +183,7 @@ int Database::FindAccount(const char *CharacterName, Client *c) { } safe_delete_array(query); - for(unsigned int i = 0; i < mysql_num_rows(result); i++) + for(unsigned int i = 0; i < mysql_num_rows(result); i++) { row = mysql_fetch_row(result); c->AddCharacter(atoi(row[0]), row[1], atoi(row[2])); @@ -214,7 +214,7 @@ bool Database::VerifyMailKey(string CharacterName, int IPAddress, string MailKey row = mysql_fetch_row(result); // The key is the client's IP address (expressed as 8 hex digits) and an 8 hex digit random string generated - // by world. + // by world. // char CombinedKey[17]; @@ -222,7 +222,7 @@ bool Database::VerifyMailKey(string CharacterName, int IPAddress, string MailKey sprintf(CombinedKey, "%08X%s", IPAddress, MailKey.c_str()); else sprintf(CombinedKey, "%s", MailKey.c_str()); - + _log(UCS__TRACE, "DB key is [%s], Client key is [%s]", row[0], CombinedKey); bool Valid = !strcmp(row[0], CombinedKey); @@ -407,7 +407,7 @@ void Database::SendHeaders(Client *c) { my_ulonglong NumRows = mysql_num_rows(result); int HeaderCountPacketLength = 0; - + sprintf(Buf, "%i", c->GetMailBoxNumber()); HeaderCountPacketLength += (strlen(Buf) + 1); @@ -552,7 +552,7 @@ bool Database::SendMail(string Recipient, string From, string Subject, string Bo //printf("Database::SendMail(%s, %s, %s)\n", Recipient.c_str(), From.c_str(), Subject.c_str()); string::size_type LastPeriod = Recipient.find_last_of("."); - + if(LastPeriod == string::npos) CharacterName = Recipient; else @@ -560,7 +560,7 @@ bool Database::SendMail(string Recipient, string From, string Subject, string Bo CharacterName[0] = toupper(CharacterName[0]); - for(unsigned int i = 1; i < CharacterName.length(); i++) + for(unsigned int i = 1; i < CharacterName.length(); i++) CharacterName[i] = tolower(CharacterName[i]); CharacterID = FindCharacter(CharacterName.c_str()); @@ -585,7 +585,7 @@ bool Database::SendMail(string Recipient, string From, string Subject, string Bo int Now = time(nullptr); // time returns a 64 bit int on Windows at least, which vsnprintf doesn't like. - if(!RunQuery(query, MakeAnyLenString(&query, MailQuery, CharacterID, Now, From.c_str(), EscSubject, EscBody, + if(!RunQuery(query, MakeAnyLenString(&query, MailQuery, CharacterID, Now, From.c_str(), EscSubject, EscBody, RecipientsString.c_str(), 1), errbuf, 0, 0, &LastMsgID)) { _log(UCS__ERROR, "SendMail: Query %s failed with error %s", query, errbuf); @@ -610,7 +610,7 @@ bool Database::SendMail(string Recipient, string From, string Subject, string Bo c->SendNotification(c->GetMailBoxNumber(CharacterName), Subject, FQN, LastMsgID); } - + MailMessagesSent++; return true; @@ -660,7 +660,7 @@ void Database::ExpireMail() { // Expire Trash if(RuleI(Mail, ExpireTrash) >= 0) { - if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=4 and `timestamp` < %i", + if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=4 and `timestamp` < %i", time(nullptr) - RuleI(Mail, ExpireTrash)), errbuf, 0, &AffectedRows)) { _log(UCS__INIT, "Expired %i trash messages.", AffectedRows); } @@ -671,7 +671,7 @@ void Database::ExpireMail() { } // Expire Read if(RuleI(Mail, ExpireRead) >= 0) { - if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=3 and `timestamp` < %i", + if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=3 and `timestamp` < %i", time(nullptr) - RuleI(Mail, ExpireRead)), errbuf, 0, &AffectedRows)) { _log(UCS__INIT, "Expired %i read messages.", AffectedRows); } @@ -682,7 +682,7 @@ void Database::ExpireMail() { } // Expire Unread if(RuleI(Mail, ExpireUnread) >= 0) { - if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=1 and `timestamp` < %i", + if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=1 and `timestamp` < %i", time(nullptr) - RuleI(Mail, ExpireUnread)), errbuf, 0, &AffectedRows)) { _log(UCS__INIT, "Expired %i unread messages.", AffectedRows); } @@ -707,7 +707,7 @@ void Database::AddFriendOrIgnore(int CharID, int Type, string Name) { _log(UCS__TRACE, "Wrote Friend/Ignore entry for charid %i, type %i, name %s to database.", CharID, Type, Name.c_str()); - + safe_delete_array(query); } @@ -724,7 +724,7 @@ void Database::RemoveFriendOrIgnore(int CharID, int Type, string Name) { _log(UCS__TRACE, "Removed Friend/Ignore entry for charid %i, type %i, name %s from database.", CharID, Type, Name.c_str()); - + safe_delete_array(query); } diff --git a/ucs/database.h b/ucs/database.h index ad047e928..440c9fc36 100644 --- a/ucs/database.h +++ b/ucs/database.h @@ -61,13 +61,13 @@ public: void AddFriendOrIgnore(int CharID, int Type, string Name); void RemoveFriendOrIgnore(int CharID, int Type, string Name); void GetFriendsAndIgnore(int CharID, vector &Friends, vector &Ignorees); - + protected: void HandleMysqlError(uint32 errnum); private: void DBInitVars(); - + }; #endif diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index b94a4e6ed..aeb1b2491 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -134,7 +134,7 @@ int main() { CL = new Clientlist(Config->ChatPort); ChannelList = new ChatChannelList(); - + database.LoadChatChannels(); if (signal(SIGINT, CatchSignal) == SIG_ERR) { diff --git a/ucs/ucsconfig.h b/ucs/ucsconfig.h index 84fdf332d..02f1db128 100644 --- a/ucs/ucsconfig.h +++ b/ucs/ucsconfig.h @@ -36,7 +36,7 @@ public: // Produce a const singleton static const ucsconfig *get() { - if (_chat_config == nullptr) + if (_chat_config == nullptr) LoadConfig(); return(_chat_config); } diff --git a/ucs/worldserver.cpp b/ucs/worldserver.cpp index a8c5d7c7b..754808b6c 100644 --- a/ucs/worldserver.cpp +++ b/ucs/worldserver.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -59,7 +59,7 @@ void WorldServer::OnConnected() void WorldServer::Process() { WorldConnection::Process(); - + if (!Connected()) return; @@ -118,10 +118,10 @@ void WorldServer::Process() case ServerOP_UCSMailMessage: { ServerMailMessageHeader_Struct *mail = (ServerMailMessageHeader_Struct*)pack->pBuffer; - database.SendMail(string("SOE.EQ.") + Config->ShortName + string(".") + string(mail->to), - string(mail->from), - mail->subject, - mail->message, + database.SendMail(string("SOE.EQ.") + Config->ShortName + string(".") + string(mail->to), + string(mail->from), + mail->subject, + mail->message, string()); break; } diff --git a/ucs/worldserver.h b/ucs/worldserver.h index e579b467d..c42ca5ceb 100644 --- a/ucs/worldserver.h +++ b/ucs/worldserver.h @@ -27,7 +27,7 @@ public: WorldServer(); virtual ~WorldServer(); virtual void Process(); - + private: virtual void OnConnected(); }; diff --git a/utils/EQExtractor2/EQExtractor2/ChangeLog.txt b/utils/EQExtractor2/EQExtractor2/ChangeLog.txt index 2181b9279..8fbdcc089 100644 --- a/utils/EQExtractor2/EQExtractor2/ChangeLog.txt +++ b/utils/EQExtractor2/EQExtractor2/ChangeLog.txt @@ -142,7 +142,7 @@ Derision: Redesigned the UI. Use the menu bar, or the following shortcuts: Ctrl-V View Packets Ctrl-A Dump AA Ctrl-D Show Debug Window (hidden by default. Change in Options). - Ctrl-O Set Options (these settings persist across sessions). + Ctrl-O Set Options (these settings persist across sessions). Derision: Added the ability to disable removal of redundant waypoints. Derision: Added an option to only generate SQL for spawns whose name contains a given string. @@ -153,7 +153,7 @@ Derision: Fixed crash when Debug log was closed rather than just hidden. Derision: Replaced HexDump method with a considerably faster version. ==07/14/2010== -Derision: Renamed PatchTestJune242010Decoder to PatchJuly132010Decoder. +Derision: Renamed PatchTestJune242010Decoder to PatchJuly132010Decoder. Derision: Updated patch_May12-2010.conf with current EQEmu patch_Live.conf. Updated version number to 2.0.5 ==06/26/2010== diff --git a/utils/EQExtractor2/EQExtractor2/EQApplicationLayer.cs b/utils/EQExtractor2/EQExtractor2/EQApplicationLayer.cs index 58537e9be..5a7d9f0db 100644 --- a/utils/EQExtractor2/EQExtractor2/EQApplicationLayer.cs +++ b/utils/EQExtractor2/EQExtractor2/EQApplicationLayer.cs @@ -60,9 +60,9 @@ namespace EQApplicationLayer // Put our supported patch version decoders into the list. PatchList = new List(); - + PatchList.Add(new PatchMay122010Decoder()); - + PatchList.Add(new PatchJuly132010Decoder()); PatchList.Add(new PatchTestSep012010Decoder()); @@ -92,7 +92,7 @@ namespace EQApplicationLayer PatchList.Add(new PatchJuly132012Decoder()); PatchList.Add(new PatchAugust152012Decoder()); - + PatchList.Add(new PatchDecember102012Decoder()); PatchList.Add(new PatchJanuary162013Decoder()); @@ -106,10 +106,10 @@ namespace EQApplicationLayer PatchList.Add(new PatchMarch132013Decoder()); PatchList.Add(new PatchApril152013Decoder()); - + PatchList.Add(new PatchSoD()); - } + } // This is called from the main form to tell us where the application was launched from (where to look for the .conf files) // and also gives us the LogHandler method so we can send debug messages to the main form. @@ -143,7 +143,7 @@ namespace EQApplicationLayer } public string GetDecoderVersion() - { + { // We don't need to check if PatchDecoder is null, because it is always initialised to an instance of the base // PatchSpecficDecoder class return PatchDecoder.GetVersion(); @@ -156,7 +156,7 @@ namespace EQApplicationLayer } public bool DumpPackets(string FileName, bool ShowTimeStamps) - { + { return PatchDecoder.DumpPackets(FileName, ShowTimeStamps); } @@ -187,7 +187,7 @@ namespace EQApplicationLayer else if (TempStatus > Status) Status = TempStatus; } - return Status; + return Status; } // This is called by the main form when all the packets have been processed. It prompts us to pass the packets down @@ -214,7 +214,7 @@ namespace EQApplicationLayer { return PatchDecoder.GetCaptureStartTime(); } - + public string GetZoneName() { return PatchDecoder.GetZoneName(); @@ -255,13 +255,13 @@ namespace EQApplicationLayer SQLOut("DELETE from doors where zone = '" + ZoneName + "' and doorid >= @BaseDoorID and doorid <= @BaseDoorID + " + UpperBound + " and version = " + SpawnVersion + ";"); foreach(Door d in DoorList) - { + { if ((d.OpenType == 57) || (d.OpenType == 58)) - { + { ZonePoint? zp = GetZonePointNumber(d.DoorParam); - + if (zp != null) - { + { d.DestZone = ZoneNumberToName(zp.Value.TargetZoneID); d.DestX = zp.Value.TargetX; d.DestY = zp.Value.TargetY; @@ -276,7 +276,7 @@ namespace EQApplicationLayer SQLOut(DoorQuery); } - } + } public void GenerateSpawnSQL(bool GenerateSpawns, bool GenerateGrids, bool GenerateMerchants, string ZoneName, UInt32 ZoneID, UInt32 SpawnVersion, @@ -325,18 +325,18 @@ namespace EQApplicationLayer NPCSpawnList NPCSL = new NPCSpawnList(); foreach(ZoneEntryStruct Spawn in ZoneSpawns) - { + { if (NPCType.IsMount(Spawn.SpawnName)) continue; if (!IncludeInvisibleMen && (Spawn.Race == 127)) continue; - + Spawn.Findable = (FindableEntities.IndexOf(Spawn.SpawnID) >= 0); - + if (Spawn.IsNPC != 1) continue; - + if (Spawn.PetOwnerID > 0) continue; @@ -346,9 +346,9 @@ namespace EQApplicationLayer bool ColoursInUse = false; for (int ColourSlot = 0; ColourSlot < 9; ++ColourSlot) - { + { if (((Spawn.SlotColour[ColourSlot] & 0x00ffffff) != 0) && UseNPCTypesTint) - ColoursInUse = true; + ColoursInUse = true; } if (Spawn.IsMercenary > 0) @@ -358,7 +358,7 @@ namespace EQApplicationLayer Spawn.BodyType, Spawn.HairColor, Spawn.BeardColor, Spawn.EyeColor1, Spawn.EyeColor2, Spawn.HairStyle, Spawn.Beard, Spawn.DrakkinHeritage, Spawn.DrakkinTattoo, Spawn.DrakkinDetails, Spawn.Deity, Spawn.Class, Spawn.EquipChest2, Spawn.Helm, Spawn.LastName); - + if (ExistingDBID == 0) { @@ -368,7 +368,7 @@ namespace EQApplicationLayer Spawn.Helm, Spawn.LastName, Spawn.Findable, Spawn.MeleeTexture1, Spawn.MeleeTexture2, Spawn.ArmorTintRed, Spawn.ArmorTintGreen, Spawn.ArmorTintBlue, Spawn.SlotColour); NPCTL.AddNPCType(NewNPCType); - + ExistingDBID = NPCTypeDBID++; UInt32 ArmorTintID = 0; @@ -435,17 +435,17 @@ namespace EQApplicationLayer string Spawn2EntryQuery = "INSERT INTO spawn2(`id`, `spawngroupID`, `zone`, `version`, `x`, `y`, `z`, `heading`, `respawntime`, `variance`, `pathgrid`, `_condition`, `cond_value`, `enabled`) VALUES("; Spawn2EntryQuery += "@StartingSpawn2ID + " + Spawn2ID + ", @StartingSpawnGroupID + " + SpawnGroupID + ", '" + ZoneName + "', " + SpawnVersion + ", " + Spawn.XPos + ", " + Spawn.YPos + ", " + Spawn.ZPos + ", "; Spawn2EntryQuery += Spawn.Heading + ", 640, 0, 0, 0, 1, 1);"; - + SpawnGroupID++; SpawnEntryID++; Spawn2ID++; - + if (GenerateSpawns) { SQLOut(SpawnGroupQuery); SQLOut(SpawnEntryQuery); SQLOut(Spawn2EntryQuery); - } + } } if (UpdateExistingNPCTypes) @@ -472,7 +472,7 @@ namespace EQApplicationLayer for (int ColourSlot = 0; ColourSlot < 9; ++ColourSlot) { if (((n.SlotColour[ColourSlot] & 0x00ffffff) != 0) && UseNPCTypesTint) - ColoursInUse = true; + ColoursInUse = true; } if (ColoursInUse) @@ -505,11 +505,11 @@ namespace EQApplicationLayer } if (GenerateGrids) - { + { List AllMovementUpdates = PatchDecoder.GetAllMovementUpdates(); - - foreach (PositionUpdate Update in AllMovementUpdates) - NPCSL.AddWaypoint(Update.SpawnID, Update.p, Update.HighRes); + + foreach (PositionUpdate Update in AllMovementUpdates) + NPCSL.AddWaypoint(Update.SpawnID, Update.p, Update.HighRes); SQLOut("--"); SQLOut("-- Grids"); @@ -520,24 +520,24 @@ namespace EQApplicationLayer foreach (NPCSpawn ns in NPCSL._NPCSpawnList) { if (ns.Waypoints.Count > 1) - { + { bool AllWaypointsTheSame = true; for (int WPNumber = 0; WPNumber < ns.Waypoints.Count; ++WPNumber) - { + { if (WPNumber == 0) continue; if ((ns.Waypoints[WPNumber].x != ns.Waypoints[WPNumber - 1].x) || (ns.Waypoints[WPNumber].y != ns.Waypoints[WPNumber - 1].y) || (ns.Waypoints[WPNumber].z != ns.Waypoints[WPNumber - 1].z)) { - AllWaypointsTheSame = false; + AllWaypointsTheSame = false; } } if (AllWaypointsTheSame) continue; - + int WaypointsInserted = 0; int WPNum = 1; @@ -551,10 +551,10 @@ namespace EQApplicationLayer for (int WPNumber = FirstUsableWaypoint; WPNumber < ns.Waypoints.Count; ++WPNumber) { - Position p = ns.Waypoints[WPNumber]; + Position p = ns.Waypoints[WPNumber]; if (CoalesceWaypoints) - { + { if ((WPNumber > FirstUsableWaypoint) && (WPNumber < (ns.Waypoints.Count - 2))) { Position np = ns.Waypoints[WPNumber + 1]; @@ -579,14 +579,14 @@ namespace EQApplicationLayer } } - // If this is the last waypoint, and we haven't inserted any of the previous ones, then don't bother + // If this is the last waypoint, and we haven't inserted any of the previous ones, then don't bother // with this one either. if ((WPNumber == (ns.Waypoints.Count - 1)) && (WaypointsInserted == 0)) continue; SQLOut("INSERT into grid_entries (`gridid`, `zoneid`, `number`, `x`, `y`, `z`, `heading`, `pause`) VALUES(@StartingGridID + " + GridDBID + ", " + ZoneID + ", " + (WPNum++) + ", " + p.x + ", " + p.y + ", " + p.z + ", " + p.heading + ", " + Pause + ");"); - ++WaypointsInserted; + ++WaypointsInserted; } if (WaypointsInserted > 1) { @@ -598,7 +598,7 @@ namespace EQApplicationLayer SQLOut("UPDATE spawn2 set x = " + ns.Waypoints[1].x + ", y = " + ns.Waypoints[1].y + ", z = " + ns.Waypoints[1].z + ", heading = " + ns.Waypoints[1].heading + " WHERE id = @StartingSpawn2ID + " + ns.Spawn2DBID + ";"); ++GridDBID; - } + } } } } @@ -627,7 +627,7 @@ namespace EQApplicationLayer continue; UInt32 MerchantNPCTypeID = npc.NPCTypeID; - + SQLOut("--"); SQLOut("-- " + npc.Name); SQLOut("-- "); @@ -639,7 +639,7 @@ namespace EQApplicationLayer string Insert = ""; if (mi.Quantity >= 0) - { + { if (!StartOfPlayerSoldItems) { StartOfPlayerSoldItems = true; @@ -662,7 +662,7 @@ namespace EQApplicationLayer SQLOut("UPDATE npc_types SET merchant_id = @StartingMerchantID + " + MerchantDBID + " WHERE id = @StartingNPCTypeID + " + MerchantNPCTypeID + ";"); ++MerchantDBID; - } + } } public void GenerateZonePointSQL(string ZoneName, SQLDestination SQLOut) @@ -671,13 +671,13 @@ namespace EQApplicationLayer { string Insert = String.Format("REPLACE into zone_points(`zone`, `number`, `y`, `x`, `z`, `heading`, `target_y`, `target_x`, `target_z`, `target_heading`, `zoneinst`, `target_zone_id`, `buffer`) VALUES('{0}', {1}, 0, 0, 0, 0, {2}, {3}, {4}, {5}, {6}, {7}, 0);", ZoneName, zp.Number, zp.y, zp.x, zp.z, zp.Heading, zp.Instance, zp.ZoneID); - SQLOut(Insert); + SQLOut(Insert); } } public void GenerateZonePointList() { - ZonePointList = PatchDecoder.GetZonePointList(); + ZonePointList = PatchDecoder.GetZonePointList(); } public ZonePoint? GetZonePointNumber(Int32 Number) @@ -697,7 +697,7 @@ namespace EQApplicationLayer { UInt16 ZoneID = PatchDecoder.GetZoneNumber(); - NewZoneStruct NewZone = PatchDecoder.GetZoneData(); + NewZoneStruct NewZone = PatchDecoder.GetZoneData(); SQLOut("--"); SQLOut("-- Zone Config"); @@ -725,7 +725,7 @@ namespace EQApplicationLayer public bool DumpAAs(string FileName) { return PatchDecoder.DumpAAs(FileName); - } + } public void GenerateObjectSQL(bool DoGroundSpawns, bool DoObjects, UInt32 SpawnVersion, SQLDestination SQLOut) { @@ -794,7 +794,7 @@ namespace EQApplicationLayer case "IT10802_ACTORDEF": return 16; case "IT10803_ACTORDEF": - return 15; + return 15; case "IT10865_ACTORDEF": return 15; case "IT128_ACTORDEF": diff --git a/utils/EQExtractor2/EQExtractor2/EQExtractor2.csproj b/utils/EQExtractor2/EQExtractor2/EQExtractor2.csproj index 542700b6c..7746d68c5 100644 --- a/utils/EQExtractor2/EQExtractor2/EQExtractor2.csproj +++ b/utils/EQExtractor2/EQExtractor2/EQExtractor2.csproj @@ -215,7 +215,7 @@ - diff --git a/utils/EQExtractor2/EQExtractor2/EQPacket.cs b/utils/EQExtractor2/EQExtractor2/EQPacket.cs index 775d42de9..a5c921efc 100644 --- a/utils/EQExtractor2/EQExtractor2/EQPacket.cs +++ b/utils/EQExtractor2/EQExtractor2/EQPacket.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// // This is the netcode for turning SOE protocol packets into EQ Application Packets // using System; @@ -45,20 +45,20 @@ namespace EQPacket public DateTime PacketTime; public bool Locked = false; } - + public class PacketManager { bool DEBUG = false; bool DUMPPACKETS = false; - + private void Debug(string Message) { if (DebugLogger != null) - DebugLogger(Message); + DebugLogger(Message); } public bool ErrorsInStream = false; - + const UInt32 OP_SessionRequest = 0x0001; const UInt32 OP_SessionResponse = 0x0002; const UInt32 OP_Combined = 0x0003; @@ -74,7 +74,7 @@ namespace EQPacket private int[] FragmentedPacketSize = {0, 0}; private int[] FragmentedBytesCollected = {0, 0}; private byte[][] Fragments = new byte [2][]; - + private System.Net.IPAddress ServerIP; private ushort ServerPort = 0; @@ -136,7 +136,7 @@ namespace EQPacket PacketList.Add(Packet); } - + private struct CacheEntry { public int Seq; @@ -152,7 +152,7 @@ namespace EQPacket Payload = inPayload; PacketTime = inPacketTime; SubPacket = inSubPacket; - } + } } private List Cache = new List(); @@ -212,7 +212,7 @@ namespace EQPacket int CacheElement; CacheElement = FindCacheEntry(GetExpectedSeq(PacketDirection.ServerToClient), PacketDirection.ServerToClient); - + while ( CacheElement >= 0) { if (DEBUG) @@ -267,8 +267,8 @@ namespace EQPacket ++ExpectedClientSEQ; else if (Direction == PacketDirection.ServerToClient) ++ExpectedServerSEQ; - } - + } + public void ProcessPacket(System.Net.IPAddress srcIp, System.Net.IPAddress dstIp, ushort srcPort, ushort dstPort, byte[] Payload, DateTime PacketTime, bool SubPacket, bool Cached) { byte Flags = 0x00; @@ -313,7 +313,7 @@ namespace EQPacket ServerIP = dstIp; ServerPort = dstPort; - + Log("-- Locked onto EQ Stream. Client IP " + srcIp + ":" + srcPort + " Server IP " + dstIp + ":" + dstPort); ExpectedClientSEQ = 0; @@ -321,7 +321,7 @@ namespace EQPacket ExpectedServerSEQ = 0; CryptoFlag = 0; - + break; } @@ -395,7 +395,7 @@ namespace EQPacket { if (DEBUG) Debug("0xa5"); - + Uncompressed = new byte[Payload.Length - 5]; Array.Copy(Payload, 3, Uncompressed, 0, Payload.Length - 5); @@ -436,12 +436,12 @@ namespace EQPacket AdvanceSeq(Direction); } } - + break; } else AdvanceSeq(Direction); - + bool Multi = ((Uncompressed[2] == 0x00) && (Uncompressed[3] == 0x19)); @@ -473,11 +473,11 @@ namespace EQPacket ++BufferPosition; OpCodeBytes = 3; } - + AppOpCode += (Uncompressed[BufferPosition++] * 256); - + ProcessAppPacket(srcIp, dstIp, srcPort, dstPort, AppOpCode, Size - OpCodeBytes, Uncompressed, BufferPosition, Direction, PacketTime); - + BufferPosition = BufferPosition + (Size - OpCodeBytes); } } @@ -494,7 +494,7 @@ namespace EQPacket OpCodeBytes = 3; } - AppOpCode += (Uncompressed[BufferPosition++] * 256); + AppOpCode += (Uncompressed[BufferPosition++] * 256); ProcessAppPacket(srcIp, dstIp, srcPort, dstPort, AppOpCode, Uncompressed.Length - (2 + OpCodeBytes), Uncompressed, BufferPosition, Direction, PacketTime); } @@ -539,7 +539,7 @@ namespace EQPacket { Debug("Uncompressed data."); Debug(Utils.HexDump(Uncompressed)); - } + } if (FragmentSeq[(int)Direction] == -1) { @@ -552,7 +552,7 @@ namespace EQPacket Debug("FragmentSeq is " + FragmentSeq[(int)Direction] + " Expecting " + GetExpectedSeq(Direction)); if (FragmentSeq[(int)Direction] != GetExpectedSeq(Direction)) - { + { if (FragmentSeq[(int)Direction] > GetExpectedSeq(Direction)) { if((FragmentSeq[(int)Direction] - GetExpectedSeq(Direction)) < 1000) @@ -569,7 +569,7 @@ namespace EQPacket } } FragmentSeq[(int)Direction] = -1; - + break; } else @@ -636,7 +636,7 @@ namespace EQPacket FragmentSeq[(int)Direction] = -1; } - } + } break; } else @@ -700,7 +700,7 @@ namespace EQPacket AppOpCode += (Fragments[(int)Direction][BufferPosition++] * 256); ProcessAppPacket(srcIp, dstIp, srcPort, dstPort, AppOpCode, Size - OpCodeBytes, Fragments[(int)Direction], BufferPosition, Direction, PacketTime); - + BufferPosition = BufferPosition + (Size - OpCodeBytes); } } @@ -721,7 +721,7 @@ namespace EQPacket byte[] NewPacket = new byte[Fragments[(int)Direction].Length - OpCodeBytes]; Array.Copy(Fragments[(int)Direction], BufferPosition, NewPacket, 0, Fragments[(int)Direction].Length - OpCodeBytes); - + ProcessAppPacket(srcIp, dstIp, srcPort, dstPort, AppOpCode, NewPacket.Length, NewPacket, 0, Direction, PacketTime); } if (DEBUG) @@ -730,7 +730,7 @@ namespace EQPacket FragmentSeq[(int)Direction] = -1; } } - + break; } case OP_OutOfOrderAck: @@ -750,7 +750,7 @@ namespace EQPacket Seq = Payload[3] * 256 + Payload[4]; else Seq = Payload[2] * 256 + Payload[3]; - + string DirectionString; if(Direction == PacketDirection.ClientToServer) @@ -763,7 +763,7 @@ namespace EQPacket Debug("OP_Ack, Seq " + Seq + " " + DirectionString); Debug(Utils.HexDump(Payload)); } - + break; } default: @@ -776,7 +776,7 @@ namespace EQPacket Debug(Utils.HexDump(Payload)); Debug("-------------------"); } - + int AppOpCode; byte[] NewPacket; @@ -791,7 +791,7 @@ namespace EQPacket else { // This packet has a flag byte between the first and second bytes of the opcode, and also a CRC - + Flags = Payload[1]; if (Flags == 0x5a) @@ -837,7 +837,7 @@ namespace EQPacket } if (!Cached && !CacheEmpty()) - ProcessCache(); + ProcessCache(); } public void ProcessAppPacket(System.Net.IPAddress srcIp, System.Net.IPAddress dstIp, ushort srcPort, ushort dstPort, int InOpCode, int BufferSize, byte[] Source, int Offset, PacketDirection Direction, DateTime PacketTime) @@ -854,7 +854,7 @@ namespace EQPacket PermaLocked = true; } Identified = (TempStatus == IdentificationStatus.Yes); - } + } AddPacket(app); } @@ -885,7 +885,7 @@ namespace EQPacket UncompressedSize = Payload.Length - (Offset - 1); } - + zs.Close(); zs.Dispose(); @@ -897,6 +897,6 @@ namespace EQPacket Array.Resize(ref Uncompressed, UncompressedSize); return Uncompressed; - } + } } } diff --git a/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.Designer.cs b/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.Designer.cs index 6805e5df2..092ea0375 100644 --- a/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.Designer.cs +++ b/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.Designer.cs @@ -77,9 +77,9 @@ this.groupBox2.SuspendLayout(); this.MiscOptions.SuspendLayout(); this.SuspendLayout(); - // + // // groupBox1 - // + // this.groupBox1.Controls.Add(this.MerchantTextBox); this.groupBox1.Controls.Add(this.MerchantLabel); this.groupBox1.Controls.Add(this.GroundSpawnTextBox); @@ -108,9 +108,9 @@ this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Insert IDs"; - // + // // MerchantTextBox - // + // this.MerchantTextBox.Enabled = false; this.MerchantTextBox.HidePromptOnLeave = true; this.MerchantTextBox.Location = new System.Drawing.Point(107, 302); @@ -119,18 +119,18 @@ this.MerchantTextBox.PromptChar = ' '; this.MerchantTextBox.Size = new System.Drawing.Size(61, 20); this.MerchantTextBox.TabIndex = 34; - // + // // MerchantLabel - // + // this.MerchantLabel.AutoSize = true; this.MerchantLabel.Location = new System.Drawing.Point(14, 306); this.MerchantLabel.Name = "MerchantLabel"; this.MerchantLabel.Size = new System.Drawing.Size(76, 13); this.MerchantLabel.TabIndex = 33; this.MerchantLabel.Text = "Merchant Lists"; - // + // // GroundSpawnTextBox - // + // this.GroundSpawnTextBox.Enabled = false; this.GroundSpawnTextBox.HidePromptOnLeave = true; this.GroundSpawnTextBox.Location = new System.Drawing.Point(107, 274); @@ -139,18 +139,18 @@ this.GroundSpawnTextBox.PromptChar = ' '; this.GroundSpawnTextBox.Size = new System.Drawing.Size(61, 20); this.GroundSpawnTextBox.TabIndex = 32; - // + // // GroundSpawnLabel - // + // this.GroundSpawnLabel.AutoSize = true; this.GroundSpawnLabel.Location = new System.Drawing.Point(7, 278); this.GroundSpawnLabel.Name = "GroundSpawnLabel"; this.GroundSpawnLabel.Size = new System.Drawing.Size(83, 13); this.GroundSpawnLabel.TabIndex = 31; this.GroundSpawnLabel.Text = "Ground Spawns"; - // + // // ObjectTextBox - // + // this.ObjectTextBox.Enabled = false; this.ObjectTextBox.HidePromptOnLeave = true; this.ObjectTextBox.Location = new System.Drawing.Point(107, 246); @@ -159,18 +159,18 @@ this.ObjectTextBox.PromptChar = ' '; this.ObjectTextBox.Size = new System.Drawing.Size(61, 20); this.ObjectTextBox.TabIndex = 30; - // + // // label1 - // + // this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(47, 250); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(43, 13); this.label1.TabIndex = 29; this.label1.Text = "Objects"; - // + // // GridTextBox - // + // this.GridTextBox.Enabled = false; this.GridTextBox.HidePromptOnLeave = true; this.GridTextBox.Location = new System.Drawing.Point(107, 218); @@ -179,18 +179,18 @@ this.GridTextBox.PromptChar = ' '; this.GridTextBox.Size = new System.Drawing.Size(61, 20); this.GridTextBox.TabIndex = 28; - // + // // GridLabel - // + // this.GridLabel.AutoSize = true; this.GridLabel.Location = new System.Drawing.Point(59, 222); this.GridLabel.Name = "GridLabel"; this.GridLabel.Size = new System.Drawing.Size(31, 13); this.GridLabel.TabIndex = 27; this.GridLabel.Text = "Grids"; - // + // // Spawn2TextBox - // + // this.Spawn2TextBox.Enabled = false; this.Spawn2TextBox.HidePromptOnLeave = true; this.Spawn2TextBox.Location = new System.Drawing.Point(107, 190); @@ -199,18 +199,18 @@ this.Spawn2TextBox.PromptChar = ' '; this.Spawn2TextBox.Size = new System.Drawing.Size(61, 20); this.Spawn2TextBox.TabIndex = 26; - // + // // Spawn2Label - // + // this.Spawn2Label.AutoSize = true; this.Spawn2Label.Location = new System.Drawing.Point(44, 194); this.Spawn2Label.Name = "Spawn2Label"; this.Spawn2Label.Size = new System.Drawing.Size(46, 13); this.Spawn2Label.TabIndex = 25; this.Spawn2Label.Text = "Spawn2"; - // + // // SpawnEntryTextBox - // + // this.SpawnEntryTextBox.Enabled = false; this.SpawnEntryTextBox.HidePromptOnLeave = true; this.SpawnEntryTextBox.Location = new System.Drawing.Point(107, 162); @@ -219,18 +219,18 @@ this.SpawnEntryTextBox.PromptChar = ' '; this.SpawnEntryTextBox.Size = new System.Drawing.Size(61, 20); this.SpawnEntryTextBox.TabIndex = 24; - // + // // SpawnEntryLabel - // + // this.SpawnEntryLabel.AutoSize = true; this.SpawnEntryLabel.Location = new System.Drawing.Point(26, 166); this.SpawnEntryLabel.Name = "SpawnEntryLabel"; this.SpawnEntryLabel.Size = new System.Drawing.Size(64, 13); this.SpawnEntryLabel.TabIndex = 23; this.SpawnEntryLabel.Text = "SpawnEntry"; - // + // // SpawnGroupTextBox - // + // this.SpawnGroupTextBox.Enabled = false; this.SpawnGroupTextBox.HidePromptOnLeave = true; this.SpawnGroupTextBox.Location = new System.Drawing.Point(107, 134); @@ -239,18 +239,18 @@ this.SpawnGroupTextBox.PromptChar = ' '; this.SpawnGroupTextBox.Size = new System.Drawing.Size(61, 20); this.SpawnGroupTextBox.TabIndex = 22; - // + // // SpawnGroupLabel - // + // this.SpawnGroupLabel.AutoSize = true; this.SpawnGroupLabel.Location = new System.Drawing.Point(21, 138); this.SpawnGroupLabel.Name = "SpawnGroupLabel"; this.SpawnGroupLabel.Size = new System.Drawing.Size(69, 13); this.SpawnGroupLabel.TabIndex = 21; this.SpawnGroupLabel.Text = "SpawnGroup"; - // + // // NPCTypesTextBox - // + // this.NPCTypesTextBox.Enabled = false; this.NPCTypesTextBox.HidePromptOnLeave = true; this.NPCTypesTextBox.Location = new System.Drawing.Point(107, 106); @@ -259,18 +259,18 @@ this.NPCTypesTextBox.PromptChar = ' '; this.NPCTypesTextBox.Size = new System.Drawing.Size(61, 20); this.NPCTypesTextBox.TabIndex = 20; - // + // // label3 - // + // this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(32, 110); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(58, 13); this.label3.TabIndex = 19; this.label3.Text = "NPCTypes"; - // + // // DoorsTextBox - // + // this.DoorsTextBox.Enabled = false; this.DoorsTextBox.HidePromptOnLeave = true; this.DoorsTextBox.Location = new System.Drawing.Point(107, 78); @@ -279,18 +279,18 @@ this.DoorsTextBox.PromptChar = ' '; this.DoorsTextBox.Size = new System.Drawing.Size(61, 20); this.DoorsTextBox.TabIndex = 18; - // + // // DoorsLabel - // + // this.DoorsLabel.AutoSize = true; this.DoorsLabel.Location = new System.Drawing.Point(55, 82); this.DoorsLabel.Name = "DoorsLabel"; this.DoorsLabel.Size = new System.Drawing.Size(35, 13); this.DoorsLabel.TabIndex = 17; this.DoorsLabel.Text = "Doors"; - // + // // VersionSelector - // + // this.VersionSelector.Enabled = false; this.VersionSelector.Location = new System.Drawing.Point(107, 50); this.VersionSelector.Maximum = new decimal(new int[] { @@ -303,27 +303,27 @@ this.VersionSelector.TabIndex = 16; this.VersionSelector.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.VersionSelector.ValueChanged += new System.EventHandler(this.VersionSelector_ValueChanged); - // + // // VersionLabel - // + // this.VersionLabel.AutoSize = true; this.VersionLabel.Location = new System.Drawing.Point(48, 54); this.VersionLabel.Name = "VersionLabel"; this.VersionLabel.Size = new System.Drawing.Size(42, 13); this.VersionLabel.TabIndex = 15; this.VersionLabel.Text = "Version"; - // + // // label4 - // + // this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(44, 26); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(46, 13); this.label4.TabIndex = 14; this.label4.Text = "ZoneID:"; - // + // // ZoneIDTextBox - // + // this.ZoneIDTextBox.Enabled = false; this.ZoneIDTextBox.HidePromptOnLeave = true; this.ZoneIDTextBox.Location = new System.Drawing.Point(107, 22); @@ -333,9 +333,9 @@ this.ZoneIDTextBox.Size = new System.Drawing.Size(100, 20); this.ZoneIDTextBox.TabIndex = 13; this.ZoneIDTextBox.Validated += new System.EventHandler(this.ZoneIDTextBox_Validated); - // + // // groupBox2 - // + // this.groupBox2.Controls.Add(this.InvisibleMenCheckBox); this.groupBox2.Controls.Add(this.NPCTypesTintCheckBox); this.groupBox2.Controls.Add(this.UpdateExistingNPCTypesCheckbox); @@ -353,9 +353,9 @@ this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "Include"; - // + // // NPCTypesTintCheckBox - // + // this.NPCTypesTintCheckBox.AutoSize = true; this.NPCTypesTintCheckBox.Location = new System.Drawing.Point(24, 233); this.NPCTypesTintCheckBox.Name = "NPCTypesTintCheckBox"; @@ -365,9 +365,9 @@ this.toolTip1.SetToolTip(this.NPCTypesTintCheckBox, "Uses the npc_types_tint table instead of the tint columns in the npc_types table." + ""); this.NPCTypesTintCheckBox.UseVisualStyleBackColor = true; - // + // // UpdateExistingNPCTypesCheckbox - // + // this.UpdateExistingNPCTypesCheckbox.AutoSize = true; this.UpdateExistingNPCTypesCheckbox.Location = new System.Drawing.Point(24, 210); this.UpdateExistingNPCTypesCheckbox.Name = "UpdateExistingNPCTypesCheckbox"; @@ -376,9 +376,9 @@ this.UpdateExistingNPCTypesCheckbox.Text = "Update existing NPC types"; this.UpdateExistingNPCTypesCheckbox.UseVisualStyleBackColor = true; this.UpdateExistingNPCTypesCheckbox.CheckedChanged += new System.EventHandler(this.UpdateExistingNPCTypesCheckbox_CheckedChanged); - // + // // ZonePointCheckBox - // + // this.ZonePointCheckBox.AutoSize = true; this.ZonePointCheckBox.Checked = true; this.ZonePointCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -388,9 +388,9 @@ this.ZonePointCheckBox.TabIndex = 40; this.ZonePointCheckBox.Text = "Zone Points"; this.ZonePointCheckBox.UseVisualStyleBackColor = true; - // + // // ZoneCheckBox - // + // this.ZoneCheckBox.AutoSize = true; this.ZoneCheckBox.Checked = true; this.ZoneCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -400,9 +400,9 @@ this.ZoneCheckBox.TabIndex = 39; this.ZoneCheckBox.Text = "Zone Config"; this.ZoneCheckBox.UseVisualStyleBackColor = true; - // + // // MerchantCheckBox - // + // this.MerchantCheckBox.AutoSize = true; this.MerchantCheckBox.Checked = true; this.MerchantCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -412,9 +412,9 @@ this.MerchantCheckBox.TabIndex = 38; this.MerchantCheckBox.Text = "Merchant Lists"; this.MerchantCheckBox.UseVisualStyleBackColor = true; - // + // // GroundSpawnCheckBox - // + // this.GroundSpawnCheckBox.AutoSize = true; this.GroundSpawnCheckBox.Checked = true; this.GroundSpawnCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -424,9 +424,9 @@ this.GroundSpawnCheckBox.TabIndex = 9; this.GroundSpawnCheckBox.Text = "Ground Spawns"; this.GroundSpawnCheckBox.UseVisualStyleBackColor = true; - // + // // ObjectCheckBox - // + // this.ObjectCheckBox.AutoSize = true; this.ObjectCheckBox.Checked = true; this.ObjectCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -436,9 +436,9 @@ this.ObjectCheckBox.TabIndex = 8; this.ObjectCheckBox.Text = "Objects"; this.ObjectCheckBox.UseVisualStyleBackColor = true; - // + // // GridCheckBox - // + // this.GridCheckBox.AutoSize = true; this.GridCheckBox.Checked = true; this.GridCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -448,9 +448,9 @@ this.GridCheckBox.TabIndex = 7; this.GridCheckBox.Text = "Grids"; this.GridCheckBox.UseVisualStyleBackColor = true; - // + // // SpawnCheckBox - // + // this.SpawnCheckBox.AutoSize = true; this.SpawnCheckBox.Checked = true; this.SpawnCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -461,9 +461,9 @@ this.SpawnCheckBox.Text = "Spawns"; this.SpawnCheckBox.UseVisualStyleBackColor = true; this.SpawnCheckBox.CheckedChanged += new System.EventHandler(this.SpawnCheckBox_CheckedChanged); - // + // // DoorCheckBox - // + // this.DoorCheckBox.AutoSize = true; this.DoorCheckBox.Checked = true; this.DoorCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; @@ -473,14 +473,14 @@ this.DoorCheckBox.TabIndex = 4; this.DoorCheckBox.Text = "Doors"; this.DoorCheckBox.UseVisualStyleBackColor = true; - // + // // SQLFileDialog - // + // this.SQLFileDialog.Filter = "SQL Files (*.sql)|*.sql|Text Files (*.txt)|*.txt|All files (*.*)|*.*"; this.SQLFileDialog.Title = "Generate SQL and Save As"; - // + // // GenerateSQLButton - // + // this.GenerateSQLButton.Location = new System.Drawing.Point(126, 474); this.GenerateSQLButton.Name = "GenerateSQLButton"; this.GenerateSQLButton.Size = new System.Drawing.Size(100, 27); @@ -488,9 +488,9 @@ this.GenerateSQLButton.Text = "Generate SQL"; this.GenerateSQLButton.UseVisualStyleBackColor = true; this.GenerateSQLButton.Click += new System.EventHandler(this.GenerateSQLButton_Click); - // + // // SQLCancelButton - // + // this.SQLCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.SQLCancelButton.Location = new System.Drawing.Point(305, 474); this.SQLCancelButton.Name = "SQLCancelButton"; @@ -499,9 +499,9 @@ this.SQLCancelButton.Text = "Cancel"; this.SQLCancelButton.UseVisualStyleBackColor = true; this.SQLCancelButton.Click += new System.EventHandler(this.SQLCancelButton_Click); - // + // // MiscOptions - // + // this.MiscOptions.Controls.Add(this.SpawnNameFilter); this.MiscOptions.Controls.Add(this.label2); this.MiscOptions.Controls.Add(this.CoalesceWaypoints); @@ -511,25 +511,25 @@ this.MiscOptions.TabIndex = 2; this.MiscOptions.TabStop = false; this.MiscOptions.Text = "Misc. Options"; - // + // // SpawnNameFilter - // + // this.SpawnNameFilter.Location = new System.Drawing.Point(229, 46); this.SpawnNameFilter.Name = "SpawnNameFilter"; this.SpawnNameFilter.Size = new System.Drawing.Size(209, 20); this.SpawnNameFilter.TabIndex = 5; - // + // // label2 - // + // this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(14, 49); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(209, 13); this.label2.TabIndex = 4; this.label2.Text = "Only include spawns that contain the string"; - // + // // CoalesceWaypoints - // + // this.CoalesceWaypoints.AutoSize = true; this.CoalesceWaypoints.Checked = true; this.CoalesceWaypoints.CheckState = System.Windows.Forms.CheckState.Checked; @@ -540,9 +540,9 @@ this.CoalesceWaypoints.Text = "Automatically coalesce waypoints"; this.toolTip1.SetToolTip(this.CoalesceWaypoints, "Remove redundant waypoints from generated SQL"); this.CoalesceWaypoints.UseVisualStyleBackColor = true; - // + // // InvisibleMenCheckBox - // + // this.InvisibleMenCheckBox.AutoSize = true; this.InvisibleMenCheckBox.Location = new System.Drawing.Point(24, 256); this.InvisibleMenCheckBox.Name = "InvisibleMenCheckBox"; @@ -551,9 +551,9 @@ this.InvisibleMenCheckBox.Text = "Include Invisible Men"; this.toolTip1.SetToolTip(this.InvisibleMenCheckBox, "Includes Race 127 NPCs"); this.InvisibleMenCheckBox.UseVisualStyleBackColor = true; - // + // // GenerateSQLForm - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.SQLCancelButton; diff --git a/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.cs b/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.cs index d937b495f..b282bf9a7 100644 --- a/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.cs +++ b/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.cs @@ -96,8 +96,8 @@ namespace EQExtractor2 this.DialogResult = DialogResult.Cancel; } - + } - + } diff --git a/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.resx b/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.resx index 183eb2750..5781a59db 100644 --- a/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.resx +++ b/utils/EQExtractor2/EQExtractor2/GenerateSQLForm.resx @@ -1,17 +1,17 @@  - diff --git a/utils/EQExtractor2/EQExtractor2/InternalTypes.cs b/utils/EQExtractor2/EQExtractor2/InternalTypes.cs index 645aaea00..faa588627 100644 --- a/utils/EQExtractor2/EQExtractor2/InternalTypes.cs +++ b/utils/EQExtractor2/EQExtractor2/InternalTypes.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// using System; using System.Collections.Generic; @@ -21,7 +21,7 @@ namespace EQExtractor2.InternalTypes public UInt32 DropID; public string Name; public UInt16 ZoneID; - public UInt16 InstanceID; + public UInt16 InstanceID; public float Heading; public float y; public float x; @@ -64,7 +64,7 @@ namespace EQExtractor2.InternalTypes public UInt16 ZoneID; public UInt16 InstanceID; public byte FallDamage; - public float FogDensity; + public float FogDensity; } public class ZoneEntryStruct @@ -76,16 +76,16 @@ namespace EQExtractor2.InternalTypes } public string SpawnName; - public UInt32 SpawnID; + public UInt32 SpawnID; public bool Findable; public Byte Level; - public Byte IsNPC; + public Byte IsNPC; public uint Showname; public uint TargetableWithHotkey; - public uint Targetable; + public uint Targetable; public uint ShowHelm; public uint Gender; - public byte OtherData; + public byte OtherData; public string DestructableString1; public string DestructableString2; public string DestructableString3; @@ -120,21 +120,21 @@ namespace EQExtractor2.InternalTypes public UInt32 DrakkinTattoo; public UInt32 DrakkinDetails; public UInt32 Deity; - public byte Class; - public byte EquipChest2; + public byte Class; + public byte EquipChest2; public byte Helm; public string LastName; public UInt32 PetOwnerID; public float YPos; - public float Heading; - public float XPos; - public float ZPos; + public float Heading; + public float XPos; + public float ZPos; public UInt32[] SlotColour; public byte ArmorTintRed; public byte ArmorTintGreen; - public byte ArmorTintBlue; + public byte ArmorTintBlue; public UInt32 MeleeTexture1; - public UInt32 MeleeTexture2; + public UInt32 MeleeTexture2; public UInt32[] Equipment; public string Title; public string Suffix; @@ -383,7 +383,7 @@ namespace EQExtractor2.InternalTypes public UInt16 Instance; public float x; public float y; - public float z; + public float z; public float TargetX; public float TargetY; public float TargetZ; @@ -575,7 +575,7 @@ namespace EQExtractor2.InternalTypes public Position p; - public bool HighRes; + public bool HighRes; } public class ExplorerSpawnRecord @@ -632,7 +632,7 @@ namespace EQExtractor2.InternalTypes public float DestY; public float DestZ; public float DestHeading; - + } class MerchantManager { diff --git a/utils/EQExtractor2/EQExtractor2/LogForm.Designer.cs b/utils/EQExtractor2/EQExtractor2/LogForm.Designer.cs index b1531ee72..be5c03559 100644 --- a/utils/EQExtractor2/EQExtractor2/LogForm.Designer.cs +++ b/utils/EQExtractor2/EQExtractor2/LogForm.Designer.cs @@ -30,9 +30,9 @@ { this.ConsoleWindow = new System.Windows.Forms.ListBox(); this.SuspendLayout(); - // + // // ConsoleWindow - // + // this.ConsoleWindow.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); @@ -44,9 +44,9 @@ this.ConsoleWindow.Name = "ConsoleWindow"; this.ConsoleWindow.Size = new System.Drawing.Size(938, 326); this.ConsoleWindow.TabIndex = 35; - // + // // LogForm - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(962, 355); diff --git a/utils/EQExtractor2/EQExtractor2/LogForm.cs b/utils/EQExtractor2/EQExtractor2/LogForm.cs index c836aa1af..9a0cde667 100644 --- a/utils/EQExtractor2/EQExtractor2/LogForm.cs +++ b/utils/EQExtractor2/EQExtractor2/LogForm.cs @@ -21,6 +21,6 @@ namespace EQExtractor2 e.Cancel = true; this.Hide(); } - + } } diff --git a/utils/EQExtractor2/EQExtractor2/LogForm.resx b/utils/EQExtractor2/EQExtractor2/LogForm.resx index 1af7de150..8b2ff64a1 100644 --- a/utils/EQExtractor2/EQExtractor2/LogForm.resx +++ b/utils/EQExtractor2/EQExtractor2/LogForm.resx @@ -1,17 +1,17 @@  - diff --git a/utils/EQExtractor2/EQExtractor2/OpcodeManager.cs b/utils/EQExtractor2/EQExtractor2/OpcodeManager.cs index 21b980190..a862a3119 100644 --- a/utils/EQExtractor2/EQExtractor2/OpcodeManager.cs +++ b/utils/EQExtractor2/EQExtractor2/OpcodeManager.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// using System; using System.IO; @@ -124,8 +124,8 @@ namespace EQExtractor2.OpCodes public void ResetCounts() { - foreach (OpCode oc in OpCodeList) - oc.Count = 0; + foreach (OpCode oc in OpCodeList) + oc.Count = 0; } public void RegisterExplorer(string Name, ExplorerMethod Explorer) @@ -137,7 +137,7 @@ namespace EQExtractor2.OpCodes oc.Explorer = Explorer; return; } - } + } } public void UnRegisterExplorer(string Name) diff --git a/utils/EQExtractor2/EQExtractor2/PacketDotNet.dll b/utils/EQExtractor2/EQExtractor2/PacketDotNet.dll index 560b03feeb7c309222b903e2534961cd9f0154d9..4f1a6c42fc3d0e5be377ad60c60675879b50b32d 100644 GIT binary patch delta 18 acmZoT!utO(>jv(Y$sg+^HmkJUxeEYS2nl`w delta 20 ccmex=n6=>u>jv%?M$X9}>m)WSx7@i40AYg(hX4Qo diff --git a/utils/EQExtractor2/EQExtractor2/PatchApril15-2013.cs b/utils/EQExtractor2/EQExtractor2/PatchApril15-2013.cs index 9ae389832..153a3304f 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchApril15-2013.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchApril15-2013.cs @@ -14,8 +14,8 @@ namespace EQExtractor2.Patches public PatchApril152013Decoder() { Version = "EQ Client Build Date April 15 2013."; - - PatchConfFileName = "patch_April15-2013.conf"; + + PatchConfFileName = "patch_April15-2013.conf"; SupportsSQLGeneration = true; } @@ -204,7 +204,7 @@ namespace EQExtractor2.Patches UInt32 Position4 = Buffer.ReadUInt32(); UInt32 Position5 = Buffer.ReadUInt32(); - + NewSpawn.YPos = Utils.EQ19ToFloat((Int32)((Position1 >> 12) & 0x7FFFF)); NewSpawn.ZPos = Utils.EQ19ToFloat((Int32)(Position2) & 0x7FFFF); diff --git a/utils/EQExtractor2/EQExtractor2/PatchAug04-2011.cs b/utils/EQExtractor2/EQExtractor2/PatchAug04-2011.cs index df72a7ed1..d291093fa 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchAug04-2011.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchAug04-2011.cs @@ -13,7 +13,7 @@ namespace EQExtractor2.Patches public PatchAug042011Decoder() { Version = "EQ Client Build Date August 04 2011."; - + ExpectedPPLength = 28496; PPZoneIDOffset = 21164; diff --git a/utils/EQExtractor2/EQExtractor2/PatchAugust15-2012.cs b/utils/EQExtractor2/EQExtractor2/PatchAugust15-2012.cs index 9351f0663..d05902add 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchAugust15-2012.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchAugust15-2012.cs @@ -17,7 +17,7 @@ namespace EQExtractor2.Patches ExpectedPPLength = 33904; PPZoneIDOffset = 26572; - + PatchConfFileName = "patch_August15-2012.conf"; } @@ -28,10 +28,10 @@ namespace EQExtractor2.Patches Item NewItem = new Item(); Buffer.SetPosition(30); - NewItem.MerchantSlot = Buffer.ReadByte(); - NewItem.Price = Buffer.ReadUInt32(); + NewItem.MerchantSlot = Buffer.ReadByte(); + NewItem.Price = Buffer.ReadUInt32(); Buffer.SkipBytes(5); - NewItem.Quantity = Buffer.ReadInt32(); + NewItem.Quantity = Buffer.ReadInt32(); Buffer.SetPosition(109); // 109 NewItem.Name = Buffer.ReadString(true); diff --git a/utils/EQExtractor2/EQExtractor2/PatchDec7-2010.cs b/utils/EQExtractor2/EQExtractor2/PatchDec7-2010.cs index 97b109900..416e3abef 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchDec7-2010.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchDec7-2010.cs @@ -15,7 +15,7 @@ namespace EQExtractor2.Patches Version = "EQ Client Build Date December 7 2010."; PatchConfFileName = "patch_Dec7-2010.conf"; - + } override public IdentificationStatus Identify(int OpCode, int Size, PacketDirection Direction) { @@ -31,7 +31,7 @@ namespace EQExtractor2.Patches public override void RegisterExplorers() { - //OpManager.RegisterExplorer("OP_ClientUpdate", ExploreClientUpdate); + //OpManager.RegisterExplorer("OP_ClientUpdate", ExploreClientUpdate); } public void ExploreClientUpdate(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) @@ -42,7 +42,7 @@ namespace EQExtractor2.Patches float y = Buffer.ReadSingle(); Buffer.SkipBytes(12); float z = Buffer.ReadSingle(); - + Buffer.SkipBytes(4); UInt32 Temp = Buffer.ReadUInt32(); Temp = Temp & 0x3FFFFF; diff --git a/utils/EQExtractor2/EQExtractor2/PatchDecember10-2012.cs b/utils/EQExtractor2/EQExtractor2/PatchDecember10-2012.cs index 4b9c29479..f6b43f709 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchDecember10-2012.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchDecember10-2012.cs @@ -18,7 +18,7 @@ namespace EQExtractor2.Patches ExpectedPPLength = -1; PPZoneIDOffset = -1; - + PatchConfFileName = "patch_Dec10-2012.conf"; PacketsToMatch = new PacketToMatch[] { @@ -31,7 +31,7 @@ namespace EQExtractor2.Patches } override public IdentificationStatus Identify(int OpCode, int Size, PacketDirection Direction) - { + { if ((OpCode == OpManager.OpCodeNameToNumber(PacketsToMatch[WaitingForPacket].OPCodeName)) && (Direction == PacketsToMatch[WaitingForPacket].Direction)) { @@ -42,7 +42,7 @@ namespace EQExtractor2.Patches return IdentificationStatus.Yes; WaitingForPacket++; - + return IdentificationStatus.Tentative; } @@ -119,8 +119,8 @@ namespace EQExtractor2.Patches ByteStream Buffer = new ByteStream(PlayerProfilePacket[0]); - Buffer.SkipBytes(24); - + Buffer.SkipBytes(24); + UInt32 BindCount = Buffer.ReadUInt32(); for (int i = 0; i < BindCount; ++i) @@ -129,7 +129,7 @@ namespace EQExtractor2.Patches } Buffer.SkipBytes(8); // Deity, intoxication - UInt32 SpellRefreshCount = Buffer.ReadUInt32(); + UInt32 SpellRefreshCount = Buffer.ReadUInt32(); for (int i = 0; i < SpellRefreshCount; ++i) { @@ -137,20 +137,20 @@ namespace EQExtractor2.Patches } UInt32 EquipmentCount = Buffer.ReadUInt32(); - + for (int i = 0; i < EquipmentCount; ++i) { Buffer.SkipBytes(20); } - UInt32 SomethingCount = Buffer.ReadUInt32(); + UInt32 SomethingCount = Buffer.ReadUInt32(); for (int i = 0; i < SomethingCount; ++i) { Buffer.SkipBytes(20); } - SomethingCount = Buffer.ReadUInt32(); + SomethingCount = Buffer.ReadUInt32(); for (int i = 0; i < SomethingCount; ++i) { @@ -158,7 +158,7 @@ namespace EQExtractor2.Patches } SomethingCount = Buffer.ReadUInt32(); - + for (int i = 0; i < SomethingCount; ++i) { Buffer.SkipBytes(4); @@ -169,25 +169,25 @@ namespace EQExtractor2.Patches UInt32 Points = Buffer.ReadUInt32(); UInt32 Mana = Buffer.ReadUInt32(); UInt32 CurHP = Buffer.ReadUInt32(); - + Buffer.SkipBytes(28); Buffer.SkipBytes(28); UInt32 AACount = Buffer.ReadUInt32(); - + for (int i = 0; i < AACount; ++i) { Buffer.SkipBytes(12); } SomethingCount = Buffer.ReadUInt32(); - + for (int i = 0; i < SomethingCount; ++i) { Buffer.SkipBytes(4); } SomethingCount = Buffer.ReadUInt32(); - + for (int i = 0; i < SomethingCount; ++i) { Buffer.SkipBytes(4); @@ -305,7 +305,7 @@ namespace EQExtractor2.Patches UInt16 ZoneID = Buffer.ReadUInt16(); return ZoneID; - + } override public List GetSpawns() @@ -335,7 +335,7 @@ namespace EQExtractor2.Patches UInt32 Bitfield = Buffer.ReadUInt32(); NewSpawn.Gender = (Bitfield & 3); - + Byte OtherData = Buffer.ReadByte(); Buffer.SkipBytes(8); // Skip 8 unknown bytes @@ -367,7 +367,7 @@ namespace EQExtractor2.Patches NewSpawn.BodyType = Buffer.ReadUInt32(); else NewSpawn.BodyType = 0; - + for (int j = 1; j < NewSpawn.PropCount; ++j) Buffer.SkipBytes(4); @@ -399,9 +399,9 @@ namespace EQExtractor2.Patches NewSpawn.WalkSpeed = Buffer.ReadSingle(); NewSpawn.RunSpeed = Buffer.ReadSingle(); - + NewSpawn.Race = Buffer.ReadUInt32(); - + Buffer.SkipBytes(1); // Skip Holding NewSpawn.Deity = Buffer.ReadUInt32(); @@ -411,9 +411,9 @@ namespace EQExtractor2.Patches NewSpawn.Class = Buffer.ReadByte(); Buffer.SkipBytes(4); // Skip PVP, Standstate, Light, Flymode - + NewSpawn.LastName = Buffer.ReadString(true); - + Buffer.SkipBytes(6); NewSpawn.PetOwnerID = Buffer.ReadUInt32(); @@ -421,7 +421,7 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(25); NewSpawn.MeleeTexture1 = 0; - NewSpawn.MeleeTexture2 = 0; + NewSpawn.MeleeTexture2 = 0; if ( (NewSpawn.IsNPC == 0) || NPCType.IsPlayableRace(NewSpawn.Race)) { @@ -501,7 +501,7 @@ namespace EQExtractor2.Patches NewSpawn.Heading = Utils.EQ19ToFloat((Int32)(Position5) & 0x7FFFF); - + if ((OtherData & 16) > 0) @@ -626,7 +626,7 @@ namespace EQExtractor2.Patches DecodeItemPacket(OutputStream, Buffer, Direction); } - + } @@ -669,7 +669,7 @@ namespace EQExtractor2.Patches String Desc = Buffer.ReadString(false); - + OutputStream.WriteLine("Duration: {0}, Unk4: {1:X}, StartTime: {2:X}", Duration, Unk4, StartTime); OutputStream.WriteLine("Desc: {0}", Desc); @@ -765,7 +765,7 @@ namespace EQExtractor2.Patches } OutputStream.WriteLine(""); //OutputStream.WriteLine("Offset is now: {0}", Buffer.GetPosition()); - + } } @@ -803,7 +803,7 @@ namespace EQExtractor2.Patches //float DeltaHeading = Utils.EQ19ToFloat((int)(Word & 0x3FF)); } - + } @@ -843,11 +843,11 @@ namespace EQExtractor2.Patches OutputStream.WriteLine(""); UInt32 BindCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: BindCount = {1}", Buffer.GetPosition() - 4, BindCount); - + for (int i = 0; i < BindCount; ++i) { OutputStream.WriteLine("{0, -5}: Bind: {1} Zone: {2} XYZ: {3},{4},{5} Heading: {6}", - Buffer.GetPosition(), i, Buffer.ReadUInt32(), Buffer.ReadSingle(), Buffer.ReadSingle(),Buffer.ReadSingle(),Buffer.ReadSingle()); + Buffer.GetPosition(), i, Buffer.ReadUInt32(), Buffer.ReadSingle(), Buffer.ReadSingle(),Buffer.ReadSingle(),Buffer.ReadSingle()); } OutputStream.WriteLine(""); @@ -858,10 +858,10 @@ namespace EQExtractor2.Patches //Buffer.SkipBytes(8); // Deity, intoxication UInt32 UnknownCount = Buffer.ReadUInt32(); - + OutputStream.WriteLine("{0, -5}: Unknown Count = {1}", Buffer.GetPosition() - 4, UnknownCount); - + for (int i = 0; i < UnknownCount; ++i) { @@ -872,7 +872,7 @@ namespace EQExtractor2.Patches UInt32 EquipmentCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: EquipmentCount = {1}", Buffer.GetPosition() - 4, EquipmentCount); - + for (int i = 0; i < EquipmentCount; ++i) { OutputStream.Write("{0, -5}: Equip: {1} Values: ", Buffer.GetPosition(), i); @@ -901,7 +901,7 @@ namespace EQExtractor2.Patches UInt32 TintCount = Buffer.ReadUInt32(); - OutputStream.WriteLine("{0, -5}: TintCount = {1}", Buffer.GetPosition() - 4, TintCount); + OutputStream.WriteLine("{0, -5}: TintCount = {1}", Buffer.GetPosition() - 4, TintCount); for (int i = 0; i < TintCount; ++i) { @@ -976,8 +976,8 @@ namespace EQExtractor2.Patches UInt32 AACount = Buffer.ReadUInt32(); - OutputStream.WriteLine("{0, -5}: AA Count = {1}", Buffer.GetPosition() - 4, AACount); - + OutputStream.WriteLine("{0, -5}: AA Count = {1}", Buffer.GetPosition() - 4, AACount); + for (int i = 0; i < AACount; ++i) { @@ -988,25 +988,25 @@ namespace EQExtractor2.Patches UInt32 SkillCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Skill Count = {1}", Buffer.GetPosition() - 4, SkillCount); - + for (int i = 0; i < SkillCount; ++i) { Buffer.SkipBytes(4); } - + UInt32 SomethingCount = Buffer.ReadUInt32(); - OutputStream.WriteLine("{0, -5}: Something Count = {1}", Buffer.GetPosition() - 4, SomethingCount); - + OutputStream.WriteLine("{0, -5}: Something Count = {1}", Buffer.GetPosition() - 4, SomethingCount); + for (int i = 0; i < SomethingCount; ++i) { Buffer.SkipBytes(4); } - + UInt32 DisciplineCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Discipline Count = {1}", Buffer.GetPosition() - 4, DisciplineCount); - + for (int i = 0; i < DisciplineCount; ++i) { Buffer.SkipBytes(4); @@ -1014,12 +1014,12 @@ namespace EQExtractor2.Patches UInt32 TimeStampCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: TimeStamp Count = {1}", Buffer.GetPosition() - 4, TimeStampCount); - + for (int i = 0; i < TimeStampCount; ++i) { Buffer.SkipBytes(4); } - + UInt32 RecastCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Recast Count = {1}", Buffer.GetPosition() - 4, RecastCount); @@ -1037,11 +1037,11 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); } - + UInt32 SpellBookSlots = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: SpellBookSlot Count = {1}", Buffer.GetPosition() - 4, SpellBookSlots); - + for (int i = 0; i < SpellBookSlots; ++i) { Buffer.SkipBytes(4); @@ -1050,7 +1050,7 @@ namespace EQExtractor2.Patches UInt32 SpellMemSlots = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Spell Mem Count = {1}", Buffer.GetPosition() - 4, SpellMemSlots); - + for (int i = 0; i < SpellMemSlots; ++i) { Buffer.SkipBytes(4); @@ -1059,18 +1059,18 @@ namespace EQExtractor2.Patches SomethingCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Unknown Count = {1}", Buffer.GetPosition() - 4, SomethingCount); - + for (int i = 0; i < SomethingCount; ++i) { Buffer.SkipBytes(4); } OutputStream.WriteLine("{0, -5}: Unknown = {1}", Buffer.GetPosition(), Buffer.ReadByte()); - + UInt32 BuffCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Buff Count = {1}", Buffer.GetPosition() - 4, BuffCount); - + for (int i = 0; i < BuffCount; ++i) { Buffer.ReadByte(); @@ -1104,7 +1104,7 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("{0, -5}: Unknown = {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Thirst? = {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Hunger? = {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); - + //Buffer.SkipBytes(20); OutputStream.WriteLine("{0, -5}: AA Spent = {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); @@ -1118,14 +1118,14 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("{0, -5}: AA Spent Special = {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: AA Unspent = {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown", Buffer.GetPosition(), Buffer.ReadUInt16()); - + //Buffer.SkipBytes(30); UInt32 BandolierCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Bandolier Count = {1}", Buffer.GetPosition() - 4, BandolierCount); - + for (int i = 0; i < BandolierCount; ++i) { Buffer.ReadString(false); @@ -1146,11 +1146,11 @@ namespace EQExtractor2.Patches UInt32 PotionCount = Buffer.ReadUInt32(); OutputStream.WriteLine("{0, -5}: Potion Count = {1}", Buffer.GetPosition() - 4, PotionCount); - + for (int i = 0; i < PotionCount; ++i) { Buffer.ReadString(false); - Buffer.SkipBytes(8); + Buffer.SkipBytes(8); } OutputStream.WriteLine("{0, -5}: Unknown {1}", Buffer.GetPosition(), Buffer.ReadInt32()); @@ -1186,7 +1186,7 @@ namespace EQExtractor2.Patches int CurrentPosition = Buffer.GetPosition(); OutputStream.WriteLine("{0, -5}: Name: {1}", Buffer.GetPosition(), Buffer.ReadString(false)); - + Buffer.SetPosition(CurrentPosition + (int)NameLength); UInt32 LastNameLength = Buffer.ReadUInt32(); @@ -1209,10 +1209,10 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("{0, -5}: Language Count = {1}", Buffer.GetPosition() - 4, LanguageCount); for (int i = 0; i < LanguageCount; ++i) - { + { Buffer.SkipBytes(1); } - + OutputStream.WriteLine("{0, -5}: Zone ID {1}", Buffer.GetPosition(), Buffer.ReadUInt16()); OutputStream.WriteLine("{0, -5}: Zone Instance {1}", Buffer.GetPosition(), Buffer.ReadUInt16()); OutputStream.WriteLine("{0, -5}: Y,X,Z {1},{2},{3} Heading: {4}", @@ -1341,7 +1341,7 @@ namespace EQExtractor2.Patches for(int i = 0; i < Unknown6; ++i) OutputStream.WriteLine("{0, -5}: Unknown LDON? {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); - + OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); @@ -1358,7 +1358,7 @@ namespace EQExtractor2.Patches // Air remaining ? OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); - // Next 7 could be PVP stats, + // Next 7 could be PVP stats, OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); @@ -1426,16 +1426,16 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("{0, -5}: Showhelm? {1}", Buffer.GetPosition(), Buffer.ReadByte()); OutputStream.WriteLine("{0, -5}: RestTimer? {1}", Buffer.GetPosition(), Buffer.ReadUInt32()); - + OutputStream.WriteLine("Skipping 1028 bytes starting at offset {0}", Buffer.GetPosition()); Buffer.SkipBytes(1028); - + OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("Pointer is {0} bytes from end.", Buffer.Length() - Buffer.GetPosition()); - + } @@ -1490,12 +1490,12 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("Properties = {0}, Offset now {1}", Properties, Buffer.GetPosition()); UInt32 BodyType = 0; - + if(Properties > 0) BodyType = Buffer.ReadUInt32(); OutputStream.WriteLine("Bodytype = {0}", BodyType); - + if (Properties != 1) OutputStream.WriteLine("XXXX Properties is {0}", Properties); @@ -1552,7 +1552,7 @@ namespace EQExtractor2.Patches { UInt32 Equip3 = Buffer.ReadUInt32(); - UInt32 Equipx = Buffer.ReadUInt32(); + UInt32 Equipx = Buffer.ReadUInt32(); UInt32 Equip2 = Buffer.ReadUInt32(); @@ -1560,13 +1560,13 @@ namespace EQExtractor2.Patches UInt32 Equip0 = Buffer.ReadUInt32(); - OutputStream.WriteLine("Equip slot {0}: 0,1,2,x,3 is {1}, {2}, {3}, {4}, {5}", i, + OutputStream.WriteLine("Equip slot {0}: 0,1,2,x,3 is {1}, {2}, {3}, {4}, {5}", i, Equip0, Equip1, Equip2, Equipx, Equip3); } - - + + } else @@ -1635,7 +1635,7 @@ namespace EQExtractor2.Patches if (Buffer.Length() != Buffer.GetPosition()) OutputStream.WriteLine("PARSE ERROR"); - + diff --git a/utils/EQExtractor2/EQExtractor2/PatchFeb8-2011.cs b/utils/EQExtractor2/EQExtractor2/PatchFeb8-2011.cs index 02c1e4430..5b4054726 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchFeb8-2011.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchFeb8-2011.cs @@ -44,7 +44,7 @@ namespace EQExtractor2.Patches ByteStream Buffer = new ByteStream(PacketBuffer); Item NewItem = new Item(); - + Buffer.SetPosition(30); NewItem.MerchantSlot = Buffer.ReadByte(); // 13 NewItem.Price = Buffer.ReadUInt32(); // 14 diff --git a/utils/EQExtractor2/EQExtractor2/PatchFebruary11-2013.cs b/utils/EQExtractor2/EQExtractor2/PatchFebruary11-2013.cs index 2464e6f2d..9226e5b19 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchFebruary11-2013.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchFebruary11-2013.cs @@ -14,10 +14,10 @@ namespace EQExtractor2.Patches public PatchFebruary112013Decoder() { Version = "EQ Client Build Date February 11 2013."; - + PatchConfFileName = "patch_Feb11-2013.conf"; - PacketsToMatch = new PacketToMatch[] { + PacketsToMatch = new PacketToMatch[] { new PacketToMatch { OPCodeName = "OP_ZoneEntry", Direction = PacketDirection.ClientToServer, RequiredSize = 76, VersionMatched = false }, new PacketToMatch { OPCodeName = "OP_PlayerProfile", Direction = PacketDirection.ServerToClient, RequiredSize = -1, VersionMatched = true }, }; @@ -691,7 +691,7 @@ namespace EQExtractor2.Patches // Air remaining ? OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); - // Next 7 could be PVP stats, + // Next 7 could be PVP stats, OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); OutputStream.WriteLine("{0, -5}: Unknown {1:X}", Buffer.GetPosition(), Buffer.ReadUInt32()); diff --git a/utils/EQExtractor2/EQExtractor2/PatchGeneric.cs b/utils/EQExtractor2/EQExtractor2/PatchGeneric.cs index 5457c0ba2..c714041b5 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchGeneric.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchGeneric.cs @@ -36,7 +36,7 @@ namespace EQExtractor2.Patches { return Version; } - + virtual public bool UnsupportedVersion() { return ExpectedPPLength == 0; @@ -70,7 +70,7 @@ namespace EQExtractor2.Patches { return 0; } - + virtual public MerchantManager GetMerchantData(NPCSpawnList NPCSL) { return null; @@ -128,7 +128,7 @@ namespace EQExtractor2.Patches virtual public PositionUpdate Decode_OP_NPCMoveUpdate(byte[] UpdatePacket) { - PositionUpdate PosUpdate = new PositionUpdate(); + PositionUpdate PosUpdate = new PositionUpdate(); return PosUpdate; } @@ -165,12 +165,12 @@ namespace EQExtractor2.Patches { return ""; } - + virtual public bool DumpAAs(string FileName) { return false; } - + public void GivePackets(PacketManager pm) { Packets = pm; @@ -281,7 +281,7 @@ namespace EQExtractor2.Patches return ""; } - + protected PacketManager Packets; public OpCodeManager OpManager; diff --git a/utils/EQExtractor2/EQExtractor2/PatchJanuary16-2013.cs b/utils/EQExtractor2/EQExtractor2/PatchJanuary16-2013.cs index f43df3233..589ce30fd 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchJanuary16-2013.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchJanuary16-2013.cs @@ -14,8 +14,8 @@ namespace EQExtractor2.Patches public PatchJanuary162013Decoder() { Version = "EQ Client Build Date January 16 2013."; - - PatchConfFileName = "patch_Jan16-2013.conf"; + + PatchConfFileName = "patch_Jan16-2013.conf"; } override public List GetSpawns() @@ -240,7 +240,7 @@ namespace EQExtractor2.Patches { //OpManager.RegisterExplorer("OP_ZoneEntry", ExploreZoneEntry); //OpManager.RegisterExplorer("OP_NPCMoveUpdate", ExploreNPCMoveUpdate); - //OpManager.RegisterExplorer("OP_MobUpdate", ExploreMobUpdate); + //OpManager.RegisterExplorer("OP_MobUpdate", ExploreMobUpdate); } public void ExploreNPCMoveUpdate(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) diff --git a/utils/EQExtractor2/EQExtractor2/PatchJuly13-2010.cs b/utils/EQExtractor2/EQExtractor2/PatchJuly13-2010.cs index dcc8eafe6..acfefceb3 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchJuly13-2010.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchJuly13-2010.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// using System; using System.IO; using System.Collections.Generic; @@ -45,7 +45,7 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("Item: {0} at Slot: {1}", Name, Slot); } - + public void ExploreCastSpell(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) { @@ -138,6 +138,6 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("\r\nBuffer position at end is {0}", Buffer.GetPosition()); OutputStream.WriteLine(""); } - + } } diff --git a/utils/EQExtractor2/EQExtractor2/PatchJuly13-2012.cs b/utils/EQExtractor2/EQExtractor2/PatchJuly13-2012.cs index bd037eca7..67b6ec412 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchJuly13-2012.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchJuly13-2012.cs @@ -17,8 +17,8 @@ namespace EQExtractor2.Patches ExpectedPPLength = 33784; PPZoneIDOffset = 26452; - + PatchConfFileName = "patch_July13-2012.conf"; - } + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/PatchJune25-2012.cs b/utils/EQExtractor2/EQExtractor2/PatchJune25-2012.cs index 98f5b0e75..090fde73b 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchJune25-2012.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchJune25-2012.cs @@ -13,8 +13,8 @@ namespace EQExtractor2.Patches public PatchJune252012Decoder() { Version = "EQ Client Build Date June 25 2012."; - + PatchConfFileName = "patch_June25-2012.conf"; - } + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/PatchMar15-2012.cs b/utils/EQExtractor2/EQExtractor2/PatchMar15-2012.cs index 00c65a5b7..e98c2003e 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchMar15-2012.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchMar15-2012.cs @@ -22,7 +22,7 @@ namespace EQExtractor2.Patches } public override void RegisterExplorers() - { + { //OpManager.RegisterExplorer("OP_ZoneEntry", ExploreZoneEntry); } @@ -32,7 +32,7 @@ namespace EQExtractor2.Patches return; string SpawnName = Buffer.ReadString(true); - + UInt32 SpawnID = Buffer.ReadUInt32(); byte Level = Buffer.ReadByte(); @@ -102,7 +102,7 @@ namespace EQExtractor2.Patches Buffer.ReadByte(); - + } OutputStream.WriteLine("Size starts at offset {0}", Buffer.GetPosition()); @@ -372,7 +372,7 @@ namespace EQExtractor2.Patches NewSpawn.XPos = Utils.EQ19ToFloat((Int32)(Position4 >> 12) & 0x7FFFF); NewSpawn.ZPos = Utils.EQ19ToFloat((Int32)(Position5 & 0x7FFFF)); - + NewSpawn.MeleeTexture1 = 0; NewSpawn.MeleeTexture2 = 0; diff --git a/utils/EQExtractor2/EQExtractor2/PatchMarch13-2013.cs b/utils/EQExtractor2/EQExtractor2/PatchMarch13-2013.cs index a4bac3b81..d70572b2b 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchMarch13-2013.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchMarch13-2013.cs @@ -14,12 +14,12 @@ namespace EQExtractor2.Patches public PatchMarch132013Decoder() { Version = "EQ Client Build Date March 13 2013."; - - PatchConfFileName = "patch_Mar13-2013.conf"; + + PatchConfFileName = "patch_Mar13-2013.conf"; SupportsSQLGeneration = true; } - + override public List GetDoors() { List DoorList = new List(); diff --git a/utils/EQExtractor2/EQExtractor2/PatchMarch15-2011.cs b/utils/EQExtractor2/EQExtractor2/PatchMarch15-2011.cs index 2ec152125..c189749e9 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchMarch15-2011.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchMarch15-2011.cs @@ -18,7 +18,7 @@ namespace EQExtractor2.Patches ExpectedPPLength = 28536; - PPZoneIDOffset = 21204; - } + PPZoneIDOffset = 21204; + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/PatchMay12-2010.cs b/utils/EQExtractor2/EQExtractor2/PatchMay12-2010.cs index d31c6d172..20e4253a3 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchMay12-2010.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchMay12-2010.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// using System; using System.IO; @@ -26,14 +26,14 @@ namespace EQExtractor2.Patches public PatchMay122010Decoder() { Version = "EQ Client Build Date May 12 2010. (Valid up to and including Build Date June 8 2010)"; - + PatchConfFileName = "patch_May12-2010.conf"; - + ExpectedPPLength = 26632; - + PPZoneIDOffset = 19396; } - + override public bool Init(string ConfDirectory, ref string ErrorMessage) { OpManager = new OpCodeManager(); @@ -94,7 +94,7 @@ namespace EQExtractor2.Patches List PlayerProfilePacket = GetPacketsOfType("OP_PlayerProfile", PacketDirection.ServerToClient); if (PlayerProfilePacket.Count == 0) - { + { return 0; } else @@ -107,7 +107,7 @@ namespace EQExtractor2.Patches return BitConverter.ToUInt16(PlayerProfilePacket[0], PPZoneIDOffset); } - + override public List GetDoors() { List DoorList = new List(); @@ -159,7 +159,7 @@ namespace EQExtractor2.Patches DoorParam, DestZone, 0, 0, 0, 0); DoorList.Add(NewDoor); - + } return DoorList; } @@ -221,7 +221,7 @@ namespace EQExtractor2.Patches { ByteStream Buffer = new ByteStream(PacketBuffer); - Item NewItem = new Item(); + Item NewItem = new Item(); NewItem.StackSize = Buffer.ReadUInt32(); Buffer.SkipBytes(4); @@ -233,7 +233,7 @@ namespace EQExtractor2.Patches NewItem.Name = Buffer.ReadString(true); NewItem.Lore = Buffer.ReadString(true); NewItem.IDFile = Buffer.ReadString(true); - NewItem.ID = Buffer.ReadUInt32(); + NewItem.ID = Buffer.ReadUInt32(); return NewItem; } @@ -245,7 +245,7 @@ namespace EQExtractor2.Patches List ZonePointPackets = GetPacketsOfType("OP_SendZonepoints", PacketDirection.ServerToClient); if (ZonePointPackets.Count < 1) - { + { return ZonePointList; } @@ -257,7 +257,7 @@ namespace EQExtractor2.Patches if (Entries == 0) return ZonePointList; - + float x, y, z, Heading; UInt32 Number; @@ -284,14 +284,14 @@ namespace EQExtractor2.Patches ZoneID = Buffer.ReadUInt16(); Instance = Buffer.ReadUInt16(); - + Buffer.SkipBytes(4); // Skip the last UInt32 ZonePoint NewZonePoint = new ZonePoint(Number, ZoneID, Instance, x, y, z, x, y, z, Heading, ZoneID); - ZonePointList.Add(NewZonePoint); + ZonePointList.Add(NewZonePoint); } - + return ZonePointList; } @@ -300,7 +300,7 @@ namespace EQExtractor2.Patches NewZoneStruct NewZone = new NewZoneStruct(); List ZonePackets = GetPacketsOfType("OP_NewZone", PacketDirection.ServerToClient); - + if (ZonePackets.Count < 1) return NewZone; @@ -316,7 +316,7 @@ namespace EQExtractor2.Patches NewZone.LongName = Buffer.ReadFixedLengthString(278, true); - NewZone.Type = Buffer.ReadByte(); + NewZone.Type = Buffer.ReadByte(); NewZone.FogRed = Buffer.ReadBytes(4); @@ -325,7 +325,7 @@ namespace EQExtractor2.Patches NewZone.FogBlue = Buffer.ReadBytes(4); Buffer.SkipBytes(1); // Unknown - + for (int i = 0; i < 4; ++i) NewZone.FogMinClip[i] = Buffer.ReadSingle(); @@ -379,7 +379,7 @@ namespace EQExtractor2.Patches NewZone.FogDensity = Buffer.ReadSingle(); // Everything else after this point in the packet is unknown. - + return NewZone; } @@ -433,7 +433,7 @@ namespace EQExtractor2.Patches // Destructable Objects. Not handled yet // //SQLOut(String.Format("-- OBJECT FOUND SpawnID {0}", SpawnID.ToString("x"))); - + NewSpawn.DestructableString1 = Buffer.ReadString(false); NewSpawn.DestructableString2 = Buffer.ReadString(false); @@ -524,7 +524,7 @@ namespace EQExtractor2.Patches NewSpawn.EquipChest2 = Buffer.ReadByte(); bool UseWorn = (NewSpawn.EquipChest2 == 255); - + Buffer.SkipBytes(2); // 2 Unknown bytes; NewSpawn.Helm = Buffer.ReadByte(); @@ -554,7 +554,7 @@ namespace EQExtractor2.Patches NewSpawn.XPos = Utils.EQ19ToFloat((Int32)(Position4 >> 12) & 0x7FFFF); NewSpawn.ZPos = Utils.EQ19ToFloat((Int32)(Position5 & 0x7FFFF)); - + for (int ColourSlot = 0; ColourSlot < 9; ++ColourSlot) NewSpawn.SlotColour[ColourSlot] = Buffer.ReadUInt32(); @@ -636,9 +636,9 @@ namespace EQExtractor2.Patches List UpdatePackets = GetPacketsOfType("OP_NPCMoveUpdate", PacketDirection.ServerToClient); - foreach (byte[] UpdatePacket in UpdatePackets) + foreach (byte[] UpdatePacket in UpdatePackets) Updates.Add(Decode_OP_NPCMoveUpdate(UpdatePacket)); - + return Updates; } @@ -671,9 +671,9 @@ namespace EQExtractor2.Patches List UpdatePackets = GetPacketsOfType("OP_MobUpdate", PacketDirection.ServerToClient); - foreach (byte[] MobUpdatePacket in UpdatePackets) + foreach (byte[] MobUpdatePacket in UpdatePackets) Updates.Add(Decode_OP_MobUpdate(MobUpdatePacket)); - + return Updates; } @@ -754,7 +754,7 @@ namespace EQExtractor2.Patches List PacketList = Packets.PacketList; UInt32 OP_ClientUpdate = OpManager.OpCodeNameToNumber("OP_ClientUpdate"); - + foreach (EQApplicationPacket UpdatePacket in PacketList) { if ((UpdatePacket.OpCode != OP_ClientUpdate) || (UpdatePacket.Direction != PacketDirection.ClientToServer)) @@ -779,7 +779,7 @@ namespace EQExtractor2.Patches Updates.Add(PosUpdate); - } + } return Updates; } @@ -828,7 +828,7 @@ namespace EQExtractor2.Patches List FindableSpawnList = new List(); List FindablePackets = GetPacketsOfType("OP_SendFindableNPCs", PacketDirection.ServerToClient); - + if (FindablePackets.Count < 1) return FindableSpawnList; @@ -837,7 +837,7 @@ namespace EQExtractor2.Patches if (BitConverter.ToUInt32(Packet, 0) == 0) FindableSpawnList.Add(BitConverter.ToUInt32(Packet, 4)); } - + return FindableSpawnList; } @@ -864,7 +864,7 @@ namespace EQExtractor2.Patches //OpManager.RegisterExplorer("OP_HPUpdate", ExploreHPUpdate); //OpManager.RegisterExplorer("OP_Animation", ExploreAnimation); //OpManager.RegisterExplorer("OP_CharInventory", ExploreCharInventoryPacket); - + } public void ExploreZoneEntry(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) @@ -910,7 +910,7 @@ namespace EQExtractor2.Patches if ((OtherData & 1) > 0) { // Destructable Objects. - + DestructableString1 = Buffer.ReadString(false); DestructableString2 = Buffer.ReadString(false); @@ -956,9 +956,9 @@ namespace EQExtractor2.Patches DestructableUnk9, DestructableByte); } - Buffer.SkipBytes(17); + Buffer.SkipBytes(17); - byte PropCount = Buffer.ReadByte(); + byte PropCount = Buffer.ReadByte(); if (PropCount >= 1) { @@ -991,8 +991,8 @@ namespace EQExtractor2.Patches { UInt32 CurrentHP = Buffer.ReadUInt32(); Int32 MaxHP = Buffer.ReadInt32(); - UInt16 SpawnID = Buffer.ReadUInt16(); - + UInt16 SpawnID = Buffer.ReadUInt16(); + string SpawnName = FindExplorerSpawn(SpawnID); OutputStream.WriteLine("Spawn {0} {1} Current HP: {2} Max HP: {3}", SpawnID, SpawnName, CurrentHP, MaxHP); @@ -1001,7 +1001,7 @@ namespace EQExtractor2.Patches } public void ExploreAnimation(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) - { + { UInt16 SpawnID = Buffer.ReadUInt16(); byte Action = Buffer.ReadByte(); byte Value = Buffer.ReadByte(); @@ -1324,7 +1324,7 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); // clickunk7 Buffer.SkipBytes(30); // Proc Effect Struct Buffer.ReadString(true); // Proc Name - Buffer.SkipBytes(4); // unknown5 + Buffer.SkipBytes(4); // unknown5 Buffer.SkipBytes(30); // Worn Effect Struct Buffer.ReadString(true); // Worn Name Buffer.SkipBytes(4); // unknown6 @@ -1336,7 +1336,7 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); // unknown6 Buffer.SkipBytes(30); // Worn Effect Struct Buffer.ReadString(true); // Worn Name - Buffer.SkipBytes(4); // unknown6 + Buffer.SkipBytes(4); // unknown6 Buffer.SkipBytes(103); // Item Quaternary Body Struct - 4 (we want to read the SubLength field at the end) //UInt32 SubLengths = Buffer.ReadUInt32(); diff --git a/utils/EQExtractor2/EQExtractor2/PatchMay12-2011.cs b/utils/EQExtractor2/EQExtractor2/PatchMay12-2011.cs index 97f0ac2ac..852eabefc 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchMay12-2011.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchMay12-2011.cs @@ -18,7 +18,7 @@ namespace EQExtractor2.Patches ExpectedPPLength = 28536; - PPZoneIDOffset = 21204; + PPZoneIDOffset = 21204; } override public PositionUpdate Decode_OP_NPCMoveUpdate(byte[] UpdatePacket) @@ -42,7 +42,7 @@ namespace EQExtractor2.Patches PosUpdate.p.heading = (float)bs.readInt(12) / (float)(1 << 3); PosUpdate.HighRes = true; - + return PosUpdate; } @@ -245,20 +245,20 @@ namespace EQExtractor2.Patches //base.RegisterExplorers(); //OpManager.RegisterExplorer("OP_SpawnDoor", ExploreSpawnDoor); - + } public void ExploreSpawnDoor(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) - { + { uint DoorCount = Buffer.Length() / 96; OutputStream.WriteLine("Door Count: {0}", DoorCount); - + for (int d = 0; d < DoorCount; ++d) { string DoorName = Buffer.ReadFixedLengthString(32, false); - + float YPos = Buffer.ReadSingle(); float XPos = Buffer.ReadSingle(); @@ -288,9 +288,9 @@ namespace EQExtractor2.Patches // Skip past the trailing unknowns in the door struct, moving to the next door in the packet. - Buffer.SkipBytes(28); + Buffer.SkipBytes(28); } - + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/PatchMay24-2011.cs b/utils/EQExtractor2/EQExtractor2/PatchMay24-2011.cs index 280db1333..63049ecd9 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchMay24-2011.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchMay24-2011.cs @@ -13,10 +13,10 @@ namespace EQExtractor2.Patches public PatchMay242011Decoder() { Version = "EQ Client Build Date May 24 2011."; - + ExpectedPPLength = 28856; - PPZoneIDOffset = 21524; - } + PPZoneIDOffset = 21524; + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/PatchNov17-2011.cs b/utils/EQExtractor2/EQExtractor2/PatchNov17-2011.cs index 01218b638..c7e0df132 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchNov17-2011.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchNov17-2011.cs @@ -274,7 +274,7 @@ namespace EQExtractor2.Patches //OpManager.RegisterExplorer("OP_NPCMoveUpdate", ExploreNPCMoveUpdate); //OpManager.RegisterExplorer("OP_MobUpdate", ExploreMobUpdate); - + } public void ExploreNPCMoveUpdate(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) @@ -365,7 +365,7 @@ namespace EQExtractor2.Patches UInt32 Cost = Buffer.ReadUInt32(); UInt32 Seq = Buffer.ReadUInt32(); UInt32 CurrentLevel = Buffer.ReadUInt32(); - + UInt32 PreReqSkillCount = Buffer.ReadUInt32(); UInt32 [] PreReqSkills = new UInt32[PreReqSkillCount]; @@ -416,7 +416,7 @@ namespace EQExtractor2.Patches OutputFile.Write("{0} ", PreReqMinPoints[i]); OutputFile.WriteLine(""); - + OutputFile.WriteLine(" Type:\t\t" + Type); OutputFile.WriteLine(" SpellID:\t" + SpellID); OutputFile.WriteLine(" Unknown057:\t" + Unknown057); diff --git a/utils/EQExtractor2/EQExtractor2/PatchSoD.cs b/utils/EQExtractor2/EQExtractor2/PatchSoD.cs index 70c06c4f1..c1bdc2e1c 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchSoD.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchSoD.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// // // IMPORTANT NOTE: This decoder for SoD was developed purely as a cursory test of the multi-patch support and is not guaranteed // to be 100% correct. @@ -721,7 +721,7 @@ namespace EQExtractor2.Patches GroundSpawn.Name = Buffer.ReadFixedLengthString(16, false); - Buffer.SkipBytes(20); + Buffer.SkipBytes(20); GroundSpawn.ObjectType = Buffer.ReadUInt32(); @@ -760,11 +760,11 @@ namespace EQExtractor2.Patches public override void RegisterExplorers() { - OpManager.RegisterExplorer("OP_ZoneEntry", ExploreZoneEntry); + OpManager.RegisterExplorer("OP_ZoneEntry", ExploreZoneEntry); //OpManager.RegisterExplorer("OP_RespawnWindow", ExploreRespawnWindow); //OpManager.RegisterExplorer("OP_ZonePlayerToBind", ExploreZonePlayerToBind); //OpManager.RegisterExplorer("OP_RequestClientZoneChange", ExploreRequestClientZoneChange); - //OpManager.RegisterExplorer("OP_DeleteSpawn", ExploreDeleteSpawn); + //OpManager.RegisterExplorer("OP_DeleteSpawn", ExploreDeleteSpawn); OpManager.RegisterExplorer("OP_HPUpdate", ExploreHPUpdate); } diff --git a/utils/EQExtractor2/EQExtractor2/PatchTestSep1-2010.cs b/utils/EQExtractor2/EQExtractor2/PatchTestSep1-2010.cs index b2a7cd486..7eaf07b7d 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchTestSep1-2010.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchTestSep1-2010.cs @@ -1,7 +1,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// using System; using System.IO; using System.Collections.Generic; @@ -25,15 +25,15 @@ namespace EQExtractor2.Patches { if((OpCode == OpManager.OpCodeNameToNumber("OP_ZoneEntry")) && (Direction == PacketDirection.ClientToServer)) return IdentificationStatus.Yes; - + return IdentificationStatus.No; - } + } override public Item DecodeItemPacket(byte[] PacketBuffer) { ByteStream Buffer = new ByteStream(PacketBuffer); - Item NewItem = new Item(); + Item NewItem = new Item(); NewItem.StackSize = Buffer.ReadUInt32(); // 00 Buffer.SkipBytes(4); @@ -55,12 +55,12 @@ namespace EQExtractor2.Patches public override void RegisterExplorers() { base.RegisterExplorers(); - + //OpManager.RegisterExplorer("OP_CharInventory", ExploreCharInventoryPacket); //OpManager.RegisterExplorer("OP_ItemPacket", ExploreItemPacket); //OpManager.RegisterExplorer("OP_MercenaryPurchaseWindow", ExploreMercenaryPurchaseWindow); } - + public void ExploreCharInventoryPacket(StreamWriter OutputStream, ByteStream Buffer, PacketDirection Direction) { UInt32 ItemCount = Buffer.ReadUInt32(); @@ -69,7 +69,7 @@ namespace EQExtractor2.Patches for (int i = 0; i < ItemCount; ++i) { - ExploreSubItem(OutputStream, ref Buffer); + ExploreSubItem(OutputStream, ref Buffer); } OutputStream.WriteLine(""); @@ -85,7 +85,7 @@ namespace EQExtractor2.Patches } void ExploreSubItem(StreamWriter OutputStream, ref ByteStream Buffer) - { + { Buffer.SkipBytes(8); byte Area = Buffer.ReadByte(); @@ -118,14 +118,14 @@ namespace EQExtractor2.Patches break; case 8: AreaName = "Merchant"; - break; + break; } OutputStream.WriteLine("Area: {0} {1} Main Slot {2,2} Sub Slot {3,3} Name {4}", Area, AreaName.PadRight(20), MainSlot, SubSlot, Name); Buffer.ReadString(true); // Lore Buffer.ReadString(true); // IDFile - + //Buffer.SkipBytes(236); // Item Body Struct UInt32 ID = Buffer.ReadUInt32(); @@ -229,7 +229,7 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); // clickunk7 Buffer.SkipBytes(30); // Proc Effect Struct Buffer.ReadString(true); // Proc Name - Buffer.SkipBytes(4); // unknown5 + Buffer.SkipBytes(4); // unknown5 Buffer.SkipBytes(30); // Worn Effect Struct Buffer.ReadString(true); // Worn Name Buffer.SkipBytes(4); // unknown6 @@ -241,15 +241,15 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); // unknown6 Buffer.SkipBytes(30); // Worn Effect Struct Buffer.ReadString(true); // Worn Name - Buffer.SkipBytes(4); // unknown6 + Buffer.SkipBytes(4); // unknown6 Buffer.SkipBytes(103); // Item Quaternary Body Struct - 4 (we want to read the SubLength field at the end) UInt32 SubLengths = Buffer.ReadUInt32(); - + for (int i = 0; i < SubLengths; ++i) { Buffer.SkipBytes(4); - ExploreSubItem(OutputStream, ref Buffer); + ExploreSubItem(OutputStream, ref Buffer); } } @@ -291,7 +291,7 @@ namespace EQExtractor2.Patches OutputStream.WriteLine("VARSTRUCT_ENCODE_TYPE(uint32, Buffer, {0}); // Unknown", Unknown3); UInt32 Unknown4 = Buffer.ReadUInt32(); OutputStream.WriteLine("VARSTRUCT_ENCODE_TYPE(uint32, Buffer, {0}); // Unknown", Unknown4); - + byte Unknown5 = Buffer.ReadByte(); //OutputStream.WriteLine("VARSTRUCT_ENCODE_TYPE(uint8, Buffer, {0}); // Unknown", Unknown5); @@ -303,7 +303,7 @@ namespace EQExtractor2.Patches //OutputStream.WriteLine("VARSTRUCT_ENCODE_TYPE(uint32, Buffer, {0}); // Unknown", Unknown8); UInt32 StanceCount = Buffer.ReadUInt32(); - + OutputStream.WriteLine("VARSTRUCT_ENCODE_TYPE(uint32, Buffer, {0}); // Number of Stances for this Merc", StanceCount); UInt32 Unknown10 = Buffer.ReadUInt32(); @@ -311,8 +311,8 @@ namespace EQExtractor2.Patches byte Unknown11 = Buffer.ReadByte(); //OutputStream.WriteLine("VARSTRUCT_ENCODE_TYPE(uint8, Buffer, {0}); // Unknown", Unknown11); - - + + //OutputStream.WriteLine(" Offset: {5} Unknown1: {0} DBStrings: {1} {2} Purchase: {3} Upkeep: {4}\r\n", Unknown1, DBStringID1, DBStringID2, // PurchaseCost, UpkeepCost, Offset); //OutputStream.WriteLine(" Unknowns: {0} {1} {2} {3} {4} {5} {6} {7} {8}\r\n", @@ -336,6 +336,6 @@ namespace EQExtractor2.Patches OutputStream.WriteLine(""); } - + } } diff --git a/utils/EQExtractor2/EQExtractor2/PatchTestSep22-2010.cs b/utils/EQExtractor2/EQExtractor2/PatchTestSep22-2010.cs index 6c5230501..2f53e1363 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchTestSep22-2010.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchTestSep22-2010.cs @@ -314,7 +314,7 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); // clickunk7 Buffer.SkipBytes(30); // Proc Effect Struct Buffer.ReadString(true); // Proc Name - Buffer.SkipBytes(4); // unknown5 + Buffer.SkipBytes(4); // unknown5 Buffer.SkipBytes(30); // Worn Effect Struct Buffer.ReadString(true); // Worn Name Buffer.SkipBytes(4); // unknown6 @@ -326,15 +326,15 @@ namespace EQExtractor2.Patches Buffer.SkipBytes(4); // unknown6 Buffer.SkipBytes(30); // Worn Effect Struct Buffer.ReadString(true); // Worn Name - Buffer.SkipBytes(4); // unknown6 + Buffer.SkipBytes(4); // unknown6 Buffer.SkipBytes(103); // Item Quaternary Body Struct - 4 (we want to read the SubLength field at the end) - + Buffer.SkipBytes(57); // HoT OutputStream.WriteLine(" Reading sublengths from offset {0}", Buffer.GetPosition()); UInt32 SubLengths = Buffer.ReadUInt32(); - + for (int i = 0; i < SubLengths; ++i) { diff --git a/utils/EQExtractor2/EQExtractor2/PatchTestServerFebruary5-2013.cs b/utils/EQExtractor2/EQExtractor2/PatchTestServerFebruary5-2013.cs index c705bccd4..1298dd5e4 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchTestServerFebruary5-2013.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchTestServerFebruary5-2013.cs @@ -14,10 +14,10 @@ namespace EQExtractor2.Patches public PatchTestServerFebruary52013Decoder() { Version = "EQ Client Build Date Test Server February 5 2013."; - + PatchConfFileName = "patch_TestServer-Feb5-2013.conf"; SupportsSQLGeneration = false; - } + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/PatchTestServerJanuary16-2013.cs b/utils/EQExtractor2/EQExtractor2/PatchTestServerJanuary16-2013.cs index 41f6a3889..21be591cc 100644 --- a/utils/EQExtractor2/EQExtractor2/PatchTestServerJanuary16-2013.cs +++ b/utils/EQExtractor2/EQExtractor2/PatchTestServerJanuary16-2013.cs @@ -14,10 +14,10 @@ namespace EQExtractor2.Patches public PatchTestServerJanuary162013Decoder() { Version = "EQ Client Build Date Test Server January 16 2013."; - + PatchConfFileName = "patch_TestServer-Jan16-2013.conf"; SupportsSQLGeneration = false; - } + } } } \ No newline at end of file diff --git a/utils/EQExtractor2/EQExtractor2/Properties/AssemblyInfo.cs b/utils/EQExtractor2/EQExtractor2/Properties/AssemblyInfo.cs index 879069892..202a873e5 100644 --- a/utils/EQExtractor2/EQExtractor2/Properties/AssemblyInfo.cs +++ b/utils/EQExtractor2/EQExtractor2/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("EQExtractor2")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,11 +25,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] diff --git a/utils/EQExtractor2/EQExtractor2/Properties/Resources.Designer.cs b/utils/EQExtractor2/EQExtractor2/Properties/Resources.Designer.cs index e67b74c43..b78b32960 100644 --- a/utils/EQExtractor2/EQExtractor2/Properties/Resources.Designer.cs +++ b/utils/EQExtractor2/EQExtractor2/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace EQExtractor2.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace EQExtractor2.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace EQExtractor2.Properties { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. diff --git a/utils/EQExtractor2/EQExtractor2/Properties/Resources.resx b/utils/EQExtractor2/EQExtractor2/Properties/Resources.resx index af7dbebba..9c90483af 100644 --- a/utils/EQExtractor2/EQExtractor2/Properties/Resources.resx +++ b/utils/EQExtractor2/EQExtractor2/Properties/Resources.resx @@ -1,17 +1,17 @@  - diff --git a/utils/EQExtractor2/EQExtractor2/Properties/Settings.Designer.cs b/utils/EQExtractor2/EQExtractor2/Properties/Settings.Designer.cs index 27d78fb48..37d6d4781 100644 --- a/utils/EQExtractor2/EQExtractor2/Properties/Settings.Designer.cs +++ b/utils/EQExtractor2/EQExtractor2/Properties/Settings.Designer.cs @@ -9,20 +9,20 @@ //------------------------------------------------------------------------------ namespace EQExtractor2.Properties { - - + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("notepad.exe")] @@ -34,7 +34,7 @@ namespace EQExtractor2.Properties { this["TextFileViewer"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -46,7 +46,7 @@ namespace EQExtractor2.Properties { this["ShowDebugWindowOnStartup"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] diff --git a/utils/EQExtractor2/EQExtractor2/SharpPcap.dll b/utils/EQExtractor2/EQExtractor2/SharpPcap.dll index 38b783bf27c9a0e2bbf3cd766473dfed7055257e..e53fa0198ab85a66fd95aaf758de7bfaec66b3da 100644 GIT binary patch delta 14 WcmZoz!}NbO(}o#(n`i2!rvm^p^#+*$ delta 16 YcmeyrnyFz8(}o#(j0&4)=%uFv06x?Pxc~qF diff --git a/utils/EQExtractor2/EQExtractor2/UserOptions.Designer.cs b/utils/EQExtractor2/EQExtractor2/UserOptions.Designer.cs index 372cb8fcd..3d5581f79 100644 --- a/utils/EQExtractor2/EQExtractor2/UserOptions.Designer.cs +++ b/utils/EQExtractor2/EQExtractor2/UserOptions.Designer.cs @@ -39,27 +39,27 @@ this.EQPacketDebugFilename = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.SuspendLayout(); - // + // // label1 - // + // this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 9); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(107, 13); this.label1.TabIndex = 0; this.label1.Text = "Packet Dump Viewer"; - // + // // PacketDumpViewerProgram - // + // this.PacketDumpViewerProgram.Location = new System.Drawing.Point(125, 6); this.PacketDumpViewerProgram.Name = "PacketDumpViewerProgram"; this.PacketDumpViewerProgram.Size = new System.Drawing.Size(390, 20); this.PacketDumpViewerProgram.TabIndex = 1; this.toolTip1.SetToolTip(this.PacketDumpViewerProgram, "If not using notepad/wordpad include the full path, e.g. C:\\Program Files (x86)\\N" + "otepad++\\notepad++.exe"); - // + // // ShowDebugWindowOnStartup - // + // this.ShowDebugWindowOnStartup.AutoSize = true; this.ShowDebugWindowOnStartup.Location = new System.Drawing.Point(15, 61); this.ShowDebugWindowOnStartup.Name = "ShowDebugWindowOnStartup"; @@ -67,9 +67,9 @@ this.ShowDebugWindowOnStartup.TabIndex = 2; this.ShowDebugWindowOnStartup.Text = "Show Debug Window On Startup"; this.ShowDebugWindowOnStartup.UseVisualStyleBackColor = true; - // + // // ShowTimeStamps - // + // this.ShowTimeStamps.AutoSize = true; this.ShowTimeStamps.Location = new System.Drawing.Point(15, 84); this.ShowTimeStamps.Name = "ShowTimeStamps"; @@ -77,9 +77,9 @@ this.ShowTimeStamps.TabIndex = 3; this.ShowTimeStamps.Text = "Include Time Stamps In Packet Dump"; this.ShowTimeStamps.UseVisualStyleBackColor = true; - // + // // OptionsOKButton - // + // this.OptionsOKButton.Location = new System.Drawing.Point(125, 122); this.OptionsOKButton.Name = "OptionsOKButton"; this.OptionsOKButton.Size = new System.Drawing.Size(75, 23); @@ -87,9 +87,9 @@ this.OptionsOKButton.Text = "OK"; this.OptionsOKButton.UseVisualStyleBackColor = true; this.OptionsOKButton.Click += new System.EventHandler(this.OptionsOKButton_Click); - // + // // OptionsCancelButton - // + // this.OptionsCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.OptionsCancelButton.Location = new System.Drawing.Point(332, 122); this.OptionsCancelButton.Name = "OptionsCancelButton"; @@ -98,17 +98,17 @@ this.OptionsCancelButton.Text = "Cancel"; this.OptionsCancelButton.UseVisualStyleBackColor = true; this.OptionsCancelButton.Click += new System.EventHandler(this.OptionsCancelButton_Click); - // + // // EQPacketDebugFilename - // + // this.EQPacketDebugFilename.Location = new System.Drawing.Point(125, 32); this.EQPacketDebugFilename.Name = "EQPacketDebugFilename"; this.EQPacketDebugFilename.Size = new System.Drawing.Size(390, 20); this.EQPacketDebugFilename.TabIndex = 7; this.toolTip1.SetToolTip(this.EQPacketDebugFilename, "Output file for low level netcode debugging"); - // + // // label2 - // + // this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 35); this.label2.Name = "label2"; @@ -116,9 +116,9 @@ this.label2.TabIndex = 6; this.label2.Text = "Netcode Debug"; this.toolTip1.SetToolTip(this.label2, "Output file for low level netcode debugging"); - // + // // UserOptions - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.OptionsCancelButton; diff --git a/utils/EQExtractor2/EQExtractor2/UserOptions.resx b/utils/EQExtractor2/EQExtractor2/UserOptions.resx index df8339b68..dcfd08d0f 100644 --- a/utils/EQExtractor2/EQExtractor2/UserOptions.resx +++ b/utils/EQExtractor2/EQExtractor2/UserOptions.resx @@ -1,17 +1,17 @@  - diff --git a/utils/EQExtractor2/EQExtractor2/Utils.cs b/utils/EQExtractor2/EQExtractor2/Utils.cs index 3aeb28028..62a69ccc5 100644 --- a/utils/EQExtractor2/EQExtractor2/Utils.cs +++ b/utils/EQExtractor2/EQExtractor2/Utils.cs @@ -4,7 +4,7 @@ // // ShowEQ Distributed under GPL // http://www.sourceforge.net/projects/seq -// +// // Copyright 2004 Zaphod (dohpaz@users.sourceforge.net). // // ----------------------------------------------------------- @@ -13,7 +13,7 @@ // // Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net). Distributed under GPL version 2. // -// +// using System; @@ -21,7 +21,7 @@ using System.Text; namespace MyUtils { - public class ByteStream + public class ByteStream { public ByteStream(byte[] NewBuffer) { @@ -93,7 +93,7 @@ namespace MyUtils return Slice; } - + public void SkipBytes(int Count) { BufferPointer += Count; @@ -149,7 +149,7 @@ namespace MyUtils int BufferPointer; } - + class BitStream { public BitStream(byte[] Data, UInt32 Length) @@ -182,7 +182,7 @@ namespace MyUtils { // Lead partial is a byte. So just put it in the middle. leadPartialBitCount = 0; - } + } if (leadPartialBitCount > bitCount) { @@ -216,7 +216,7 @@ namespace MyUtils Out = (Out << 8) | m_data[currentByte]; currentByte++; } - + // And the end. if (tailPartialBitCount > 0) { @@ -292,7 +292,7 @@ namespace MyUtils { StringBuilder CleanName = new StringBuilder(); - foreach(char c in Name) + foreach(char c in Name) if(!Char.IsDigit(c)) CleanName.Append(c); @@ -300,15 +300,15 @@ namespace MyUtils } public static float EQ19ToFloat(Int32 EQ19Value) - { + { if ((EQ19Value & 0x40000) > 0) EQ19Value = -(0x7FFFF - EQ19Value + 1); return (float)EQ19Value / (float)(1 << 3); } - + } - + } diff --git a/utils/EQExtractor2/EQExtractor2/log4net.dll b/utils/EQExtractor2/EQExtractor2/log4net.dll index 1bac5d9a06373a3722dd84407608bc1982d8a3f7..b184be52eafb3723794eb99f63f508ceebe00ed1 100644 GIT binary patch delta 62 zcmZqp!1v=l--cD9n^%kW?A>f}*tm_mon+1, mTime->tm_mday, mTime->tm_year%100, mTime->tm_hour, mTime->tm_min, mTime->tm_sec, buffer); } @@ -65,7 +65,7 @@ void EQEmuErrorLog::Log(unsigned int mOutputType, const char *msg, ...) fprintf(mErrorLogSQL, "%s;\n\n", buffer); } } - + if(buffer) delete[] buffer; } \ No newline at end of file diff --git a/utils/TaskMaster/ErrorLog.h b/utils/TaskMaster/ErrorLog.h index 2d1ada0c4..615c7a44d 100644 --- a/utils/TaskMaster/ErrorLog.h +++ b/utils/TaskMaster/ErrorLog.h @@ -13,12 +13,12 @@ enum{ }; //log file output -#define LOG_FILE_NAME "debug.txt" +#define LOG_FILE_NAME "debug.txt" #define SQL_LOG_FILE_NAME "sql_log.sql" //max single log length //same as a client:message() max len -#define MAX_LOG_LEN 4096 +#define MAX_LOG_LEN 4096 //much simplified logging function, similar to the one used on the server (Tho much simpler) class EQEmuErrorLog { diff --git a/utils/TaskMaster/activities.cpp b/utils/TaskMaster/activities.cpp index fac68536b..4f2d211f4 100644 --- a/utils/TaskMaster/activities.cpp +++ b/utils/TaskMaster/activities.cpp @@ -5,7 +5,7 @@ #include "utility.h" #include "base.h" #include "ErrorLog.h" - + using namespace std; void MainFrame::ActivitiesListBoxSimpleSelect(wxCommandEvent& event) @@ -129,7 +129,7 @@ void MainFrame::NewActivity(wxCommandEvent& event) char * mActQuery = 0; MakeAnyLenString(&mActQuery, "INSERT INTO `activities` (`taskid`,`activityid`,`step`,`activitytype`,`text1`,`text2`,`text3`,`goalid`,`goalmethod`,`goalcount`,`delivertonpc`,`zoneid`,`optional`) VALUES (%u,%u,%u,%u,'%s','%s','%s',%u,%u,%u,%u,%u,%u)", newAct.id, newAct.activityId, newAct.step, newAct.activityType, newAct.text1, newAct.text2, newAct.text3, newAct.goalid, newAct.goalmethod, newAct.goalcount, newAct.deliverToNpc, newAct.zoneid, newAct.optional ); - + mErrorLog->Log(eqEmuLogSQL, "%s", mActQuery); if (mysql_query(mMysql, mActQuery)) { mErrorLog->Log(eqEmuLogBoth, "MySQL Error: %s", mysql_error(mMysql)); @@ -161,7 +161,7 @@ void MainFrame::DeleteActivity(wxCommandEvent& event) eqtask_activity_id *selAct = (eqtask_activity_id*)ActivitiesSelectionList->GetClientData(ActivitiesSelectionList->GetSelection()); unsigned int aid = selAct->activityid; - unsigned int tid = selAct->id; + unsigned int tid = selAct->id; if(selAct) { diff --git a/utils/TaskMaster/base.cpp b/utils/TaskMaster/base.cpp index af119a961..b9b118962 100644 --- a/utils/TaskMaster/base.cpp +++ b/utils/TaskMaster/base.cpp @@ -113,7 +113,7 @@ MainFrame::MainFrame(const wxString& title, BoxSizer1 = new wxBoxSizer(wxHORIZONTAL); mErrorLog->Log(eqEmuLogBoth, "Creating Item List Box."); - ItemSelectionList = new wxListBox(this, LIST_Click, wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, 0); + ItemSelectionList = new wxListBox(this, LIST_Click, wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, 0); mErrorLog->Log(eqEmuLogBoth, "Adding Item List Box to Sizer."); BoxSizer1->Add(ItemSelectionList, 0, wxALIGN_TOP|wxALL|wxEXPAND, 5); @@ -228,7 +228,7 @@ MainFrame::MainFrame(const wxString& title, mActText1 = new wxTextCtrl(MainPanel2, -1, wxT(""), wxPoint(185,0), wxSize(180,20), wxTE_DONTWRAP); mActText1->SetMaxLength(64); mActText1->Disable(); - + mActText2Label = new wxStaticText(MainPanel2, -1, "Text 2:", wxPoint(105,22), wxDefaultSize); mActText2 = new wxTextCtrl(MainPanel2, -1, wxT(""), wxPoint(185,20), wxSize(180,20), wxTE_DONTWRAP); mActText2->SetMaxLength(64); @@ -392,7 +392,7 @@ MainFrame::MainFrame(const wxString& title, mErrorLog->Log(eqEmuLogBoth, "Adding Notebook to Sizer."); BoxSizer1->Add(MainNotebookBack, 1, wxALIGN_TOP|wxEXPAND, 5); - + mErrorLog->Log(eqEmuLogBoth, "Setting Frame Sizer."); this->SetSizer(BoxSizer1); mErrorLog->Log(eqEmuLogBoth, "Calculating Frame Layout."); @@ -444,22 +444,22 @@ void MainFrame::Connect(wxCommandEvent& WXUNUSED(event)) mErrorLog->Log(eqEmuLogBoth, "Failed to load tasks, exiting."); Close(TRUE); return; - } + } if(!LoadGoals()){ mysql_close(mMysql); mErrorLog->Log(eqEmuLogBoth, "Failed to load goals, exiting."); Close(TRUE); return; - } + } if(!LoadActivities()){ mysql_close(mMysql); mErrorLog->Log(eqEmuLogBoth, "Failed to load activities, exiting."); Close(TRUE); return; - } - + } + if(!LoadItems()){ mysql_close(mMysql); mErrorLog->Log(eqEmuLogBoth, "Failed to load items, exiting."); @@ -510,7 +510,7 @@ void MainFrame::ListBoxDoubleClick(wxCommandEvent& event) Iter = taskList.begin(); Iter += openedIndex; eqtask mTask = *Iter; - + wxString mStr; mStr.Printf("%s", mTask.title); mTaskName->Clear(); diff --git a/utils/TaskMaster/base.h b/utils/TaskMaster/base.h index 58bb1100b..c6365088c 100644 --- a/utils/TaskMaster/base.h +++ b/utils/TaskMaster/base.h @@ -223,7 +223,7 @@ public: enum { - TEXT_Main = wxID_HIGHEST + 1, + TEXT_Main = wxID_HIGHEST + 1, MENU_Connect, MENU_Quit, MENU_NewTask, @@ -252,4 +252,4 @@ enum LIST_Click_Proximity, }; -#endif \ No newline at end of file +#endif \ No newline at end of file diff --git a/utils/TaskMaster/base_utility.cpp b/utils/TaskMaster/base_utility.cpp index 181419b0e..96dcf9e3a 100644 --- a/utils/TaskMaster/base_utility.cpp +++ b/utils/TaskMaster/base_utility.cpp @@ -12,7 +12,7 @@ using namespace std; bool MainFrame::GetDatabaseSettings(){ FILE *mFile = NULL; mFile = fopen("db.txt", "r"); - + //very little error checking //we don't make sure the values in the file are valid //or all there just that the file exists so: @@ -81,7 +81,7 @@ bool MainFrame::LoadItems(){ itemsLoaded++; } mErrorLog->Log(eqEmuLogBoth, "%u Successfully Loaded Items", itemsLoaded); - mysql_free_result(res); + mysql_free_result(res); } else{ mErrorLog->Log(eqEmuLogBoth, "Mysql connection did not exist for item load."); @@ -143,7 +143,7 @@ bool MainFrame::LoadZones() zonesLoaded++; } mErrorLog->Log(eqEmuLogBoth, "%u Successfully Loaded Zones", zonesLoaded); - mysql_free_result(res); + mysql_free_result(res); } else{ mErrorLog->Log(eqEmuLogBoth, "Mysql connection did not exist for zone load."); @@ -181,7 +181,7 @@ bool MainFrame::LoadTasks() wxString str; str.Printf("%d:%s", newT.id, newT.title); ItemSelectionList->Append(str); - + if(newT.id > highestIndex) highestIndex = newT.id; @@ -200,7 +200,7 @@ bool MainFrame::LoadTasks() tasksLoaded++; } mErrorLog->Log(eqEmuLogBoth, "%u Successfully Loaded Tasks", tasksLoaded); - mysql_free_result(res); + mysql_free_result(res); } else{ mErrorLog->Log(eqEmuLogBoth, "Mysql connection did not exist for task load."); @@ -232,7 +232,7 @@ bool MainFrame::LoadGoals() goalsLoaded++; } mErrorLog->Log(eqEmuLogBoth, "%u Successfully Loaded Goals", goalsLoaded); - mysql_free_result(res); + mysql_free_result(res); } else{ mErrorLog->Log(eqEmuLogBoth, "Mysql connection did not exist for goal load."); @@ -276,7 +276,7 @@ bool MainFrame::LoadActivities() activitiesLoaded++; } mErrorLog->Log(eqEmuLogBoth, "%u Successfully Loaded Activities", activitiesLoaded); - mysql_free_result(res); + mysql_free_result(res); } else{ mErrorLog->Log(eqEmuLogBoth, "Mysql connection did not exist for activity load."); @@ -315,7 +315,7 @@ bool MainFrame::LoadProximity() proximitiesLoaded++; } mErrorLog->Log(eqEmuLogBoth, "%u Successfully Loaded Proximities", proximitiesLoaded); - mysql_free_result(res); + mysql_free_result(res); } else{ mErrorLog->Log(eqEmuLogBoth, "Mysql connection did not exist for proximity load."); diff --git a/utils/TaskMaster/goals.cpp b/utils/TaskMaster/goals.cpp index 2f78d6529..64c35e419 100644 --- a/utils/TaskMaster/goals.cpp +++ b/utils/TaskMaster/goals.cpp @@ -67,7 +67,7 @@ void MainFrame::PopulateGoalValues(unsigned int goalid) if((*Iter).id == goalid){ int *i = new int; *i = (*Iter).value; - + wxString curStr; curStr.Clear(); curStr.Printf("%u", (*Iter).value); @@ -333,7 +333,7 @@ void MainFrame::ChangeGoalValue(wxCommandEvent& event) mErrorLog->Log(eqEmuLogBoth, "Modify goal value failed, goal values not active"); return; } - + if(GoalsValuesList->GetSelection() == wxNOT_FOUND) { mErrorLog->Log(eqEmuLogBoth, "Modify goal value failed, no selection found"); diff --git a/utils/TaskMaster/proximity.cpp b/utils/TaskMaster/proximity.cpp index f4491b1e2..0ed3820d9 100644 --- a/utils/TaskMaster/proximity.cpp +++ b/utils/TaskMaster/proximity.cpp @@ -32,7 +32,7 @@ void MainFrame::PopulateProximity() prox->exploreid = eqt.exploreid; prox->zoneid = eqt.zoneid; - + wxString zoneName; zoneName.Printf("Unknown Zone"); vector::iterator ZoneIter; @@ -115,7 +115,7 @@ void MainFrame::NewProximity(wxCommandEvent& event) mErrorLog->Log(eqEmuLogBoth, "New proximity failed, not connected to db"); return; } - + int newID = wxGetNumberFromUser("", "Explore ID:", "Explore ID", 0, 0, 9999999); int newZoneID = wxGetNumberFromUser("", "Zone ID:", "Zone ID", 0, 0, 9999999); @@ -280,7 +280,7 @@ void MainFrame::SaveProximity(wxCommandEvent& event) inStr.Clear(); inStr = mProxMinx->GetValue(); - toSave.minx = atof(inStr.mb_str()); + toSave.minx = atof(inStr.mb_str()); inStr.Clear(); inStr = mProxMaxx->GetValue(); @@ -368,9 +368,9 @@ void MainFrame::SaveProximity(wxCommandEvent& event) if(canUpdate){ char * mQuery = 0; - MakeAnyLenString(&mQuery, "UPDATE proximities SET minx=%.4f, maxx=%.4f, miny=%.4f, maxy=%.4f, minz=%.4f, maxz=%.4f) WHERE zoneid=%u AND exploreid=%u", + MakeAnyLenString(&mQuery, "UPDATE proximities SET minx=%.4f, maxx=%.4f, miny=%.4f, maxy=%.4f, minz=%.4f, maxz=%.4f) WHERE zoneid=%u AND exploreid=%u", toSave.minx, toSave.maxx, toSave.miny, toSave.maxy, toSave.minz, toSave.maxz, toSave.zoneid, toSave.exploreid); - + mErrorLog->Log(eqEmuLogSQL, "%s", mQuery); if (mysql_query(mMysql, mQuery)) { mErrorLog->Log(eqEmuLogBoth, "MySQL Error: %s", mysql_error(mMysql)); @@ -389,7 +389,7 @@ void MainFrame::SaveProximity(wxCommandEvent& event) MakeAnyLenString(&mQuery, "INSERT INTO `proximities` (`zoneid`,`exploreid`,`minx`,`maxx`,`miny`,`maxy`,`minz`,`maxz`) VALUES (%u,%u,%.4f,%.4f,%.4f,%.4f,%.4f,%.4f)" , toSave.zoneid, toSave.exploreid, toSave.minx, toSave.maxx, toSave.miny, toSave.maxy, toSave.minz, toSave.maxz); - + mErrorLog->Log(eqEmuLogSQL, "%s", mQuery); if (mysql_query(mMysql, mQuery)) { mErrorLog->Log(eqEmuLogBoth, "MySQL Error: %s", mysql_error(mMysql)); diff --git a/utils/TaskMaster/tasks.cpp b/utils/TaskMaster/tasks.cpp index 4929ad26a..48aa44080 100644 --- a/utils/TaskMaster/tasks.cpp +++ b/utils/TaskMaster/tasks.cpp @@ -250,7 +250,7 @@ void MainFrame::SaveTask(wxCommandEvent& event) getStr = mRewardXP->GetValue(); ourTask.xpreward = atoi(getStr.mb_str()); getStr.Clear(); - + int * i = (int*)mStartZone->GetClientData(mStartZone->GetSelection()); ourTask.startzone = *i; @@ -261,7 +261,7 @@ void MainFrame::SaveTask(wxCommandEvent& event) char * mQuery = 0; MakeAnyLenString(&mQuery, "UPDATE tasks SET duration=%u, title='%s', description='%s', reward='%s', rewardid=%u, cashreward=%u, xpreward=%i, rewardmethod=%u, startzone=%u, minlevel=%u, maxlevel=%u, repeatable=%u WHERE id=%u", ourTask.duration, MakeStringSQLSafe(ourTask.title).mb_str(), MakeStringSQLSafe(ourTask.desc).mb_str(), MakeStringSQLSafe(ourTask.reward).mb_str(), ourTask.rewardid, ourTask.cashreward, ourTask.xpreward, ourTask.rewardmethod, ourTask.startzone, ourTask.level_min, ourTask.level_max, ourTask.repeatable, ourTask.id); - + mErrorLog->Log(eqEmuLogSQL, "%s", mQuery); if (mysql_query(mMysql, mQuery)) { mErrorLog->Log(eqEmuLogBoth, "MySQL Error: %s", mysql_error(mMysql)); @@ -278,7 +278,7 @@ void MainFrame::SaveTask(wxCommandEvent& event) MakeAnyLenString(&mQuery, "INSERT INTO `tasks` (`id`,`duration`,`title`,`description`,`reward`,`rewardid`,`cashreward`,`xpreward`,`rewardmethod`,`startzone`, `minlevel`, `maxlevel`) VALUES (%u,%u,'%s','%s','%s',%u,%u,%u,%u,%u,%u,%u)", ourTask.id, ourTask.duration, MakeStringSQLSafe(ourTask.title).mb_str(), MakeStringSQLSafe(ourTask.desc).mb_str(), MakeStringSQLSafe(ourTask.reward).mb_str(), ourTask.rewardid, ourTask.cashreward, ourTask.xpreward, ourTask.rewardmethod, ourTask.startzone, ourTask.level_min, ourTask.level_max); - + mErrorLog->Log(eqEmuLogSQL, "%s", mQuery); if (mysql_query(mMysql, mQuery)) { mErrorLog->Log(eqEmuLogBoth, "MySQL Error: %s", mysql_error(mMysql)); diff --git a/utils/azone2/CMakeLists.txt b/utils/azone2/CMakeLists.txt index e6576fd90..3567df948 100644 --- a/utils/azone2/CMakeLists.txt +++ b/utils/azone2/CMakeLists.txt @@ -106,14 +106,14 @@ IF(MSVC) SET(glmodelviewer_sources GLModelViewer.cpp ) - + SET(glmodelviewer_headers GLModelViewer.h ) - + ADD_EXECUTABLE(glmodelviewer WIN32 ${glmodelviewer_sources} ${glmodelviewer_headers}) TARGET_LINK_LIBRARIES(glmodelviewer azone_common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} "opengl32.lib" "GLU32.lib" "Ws2_32.lib") SET_TARGET_PROPERTIES(glmodelviewer PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - + SET(EXECUTABLE_OUTPUT_PATH ../../Bin) ENDIF(MSVC) diff --git a/utils/azone2/GLModelViewer.cpp b/utils/azone2/GLModelViewer.cpp index 4c44d5257..7ce2c0b70 100644 --- a/utils/azone2/GLModelViewer.cpp +++ b/utils/azone2/GLModelViewer.cpp @@ -30,7 +30,7 @@ typedef struct _vertex{ float x; float y; float z; - + }VERTEX; void DrawEQModel(FileLoader *fileloader, int modnum); @@ -43,10 +43,10 @@ HGLRC hRC=NULL; HWND hWnd=NULL; HINSTANCE hInstance; -bool keys[256]; +bool keys[256]; char ch; bool active=true; -GLuint base; +GLuint base; int modelnum = 1; // The Number of the model we are currently displaying. float angle = 0; // used to rotate the model. Updated by a timer @@ -62,72 +62,72 @@ GLvoid BuildFont(GLvoid) font = CreateFont(-24, 0, 0, 0, FW_BOLD, false, false, false, ANSI_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY, - FF_DONTCARE|DEFAULT_PITCH, "Courier New"); + FF_DONTCARE|DEFAULT_PITCH, "Courier New"); - oldfont = (HFONT)SelectObject(hDC, font); - wglUseFontBitmaps(hDC, 32, 96, base); - SelectObject(hDC, oldfont); - DeleteObject(font); + oldfont = (HFONT)SelectObject(hDC, font); + wglUseFontBitmaps(hDC, 32, 96, base); + SelectObject(hDC, oldfont); + DeleteObject(font); } -GLvoid KillFont(GLvoid) +GLvoid KillFont(GLvoid) { - glDeleteLists(base, 96); + glDeleteLists(base, 96); } GLvoid glPrint(const char *fmt, ...) { char text[256]; - va_list ap; + va_list ap; - if (fmt == NULL) return; + if (fmt == NULL) return; - va_start(ap, fmt); - vsprintf(text, fmt, ap); - va_end(ap); + va_start(ap, fmt); + vsprintf(text, fmt, ap); + va_end(ap); - glPushAttrib(GL_LIST_BIT); - glListBase(base - 32); + glPushAttrib(GL_LIST_BIT); + glListBase(base - 32); glCallLists(strlen(text), GL_UNSIGNED_BYTE, text); - glPopAttrib(); + glPopAttrib(); } GLvoid ReSizeGLScene(GLsizei width, GLsizei height) { - if (height==0)height=1; + if (height==0)height=1; - glViewport(0,0,width,height); + glViewport(0,0,width,height); glMatrixMode(GL_PROJECTION); - glLoadIdentity(); + glLoadIdentity(); gluPerspective(60.0f,(GLfloat)width/(GLfloat)height,0.1f,12000.0f); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); } -int InitGL(GLvoid) +int InitGL(GLvoid) { - glShadeModel(GL_SMOOTH); + glShadeModel(GL_SMOOTH); glClearColor(0.0f, 0.0f, 0.0f, 0.5f); - glClearDepth(1.0f); + glClearDepth(1.0f); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); BuildFont(); - return true; + return true; } -int DrawGLScene(char *ZoneFileName) +int DrawGLScene(char *ZoneFileName) { char textBuffer[100]; glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glLoadIdentity(); + glLoadIdentity(); if(mfileloader->model_data.models[modelnum]) DrawEQModel(mfileloader, modelnum); glLoadIdentity(); - glTranslatef(0.0f,0.0f,-1.2f); + glTranslatef(0.0f,0.0f,-1.2f); glColor3f(100.0f,0.0f,0.0f); glRasterPos2f(-1.15f,0.56f); @@ -139,17 +139,17 @@ int DrawGLScene(char *ZoneFileName) else sprintf(textBuffer," %s: Model Number %4d. Not Viewable (probably zone mesh).", ZoneFileName, modelnum); - glPrint(textBuffer); + glPrint(textBuffer); sprintf(textBuffer," Use the + and - keys to cycle through models."); glRasterPos2f(-1.15f,0.50f); - glPrint(textBuffer); + glPrint(textBuffer); - - return true; + + return true; } GLvoid KillGLWindow(GLvoid) { - if (hRC) { + if (hRC) { if (!wglMakeCurrent(NULL,NULL)) { MessageBox(NULL,"Release Of DC And RC Failed.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); } @@ -157,107 +157,107 @@ GLvoid KillGLWindow(GLvoid) { if (!wglDeleteContext(hRC)) { MessageBox(NULL,"Release Rendering Context Failed.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); } - hRC=NULL; + hRC=NULL; } if (hDC && !ReleaseDC(hWnd,hDC)) { MessageBox(NULL,"Release Device Context Failed.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); - hDC=NULL; + hDC=NULL; } if (hWnd && !DestroyWindow(hWnd)) { MessageBox(NULL,"Could Not Release hWnd.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); - hWnd=NULL; + hWnd=NULL; } if (!UnregisterClass("OpenGL",hInstance)) { MessageBox(NULL,"Could Not Unregister Class.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); - hInstance=NULL; + hInstance=NULL; } KillFont(); } - + BOOL CreateGLWindow(char* title, int width, int height, int bits) { GLuint PixelFormat; - WNDCLASS wc; + WNDCLASS wc; DWORD dwExStyle; DWORD dwStyle; RECT WindowRect; WindowRect.left=(long)0; - WindowRect.right=(long)width; - WindowRect.top=(long)0; - WindowRect.bottom=(long)height; + WindowRect.right=(long)width; + WindowRect.top=(long)0; + WindowRect.bottom=(long)height; - hInstance = GetModuleHandle(NULL); + hInstance = GetModuleHandle(NULL); wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; - wc.lpfnWndProc = (WNDPROC) WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; + wc.lpfnWndProc = (WNDPROC) WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; wc.hInstance = hInstance; - wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); + wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; + wc.hbrBackground = NULL; + wc.lpszMenuName = NULL; wc.lpszClassName = "OpenGL"; if (!RegisterClass(&wc)) { MessageBox(NULL,"Failed To Register The Window Class.","ERROR",MB_OK|MB_ICONEXCLAMATION); - return false; + return false; } - + dwExStyle=WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; - dwStyle=WS_OVERLAPPEDWINDOW; + dwStyle=WS_OVERLAPPEDWINDOW; AdjustWindowRectEx(&WindowRect, dwStyle, false, dwExStyle); if (!(hWnd=CreateWindowEx(dwExStyle, "OpenGL", title, dwStyle|WS_CLIPSIBLINGS|WS_CLIPCHILDREN, 0, 0, WindowRect.right-WindowRect.left, WindowRect.bottom-WindowRect.top, NULL, NULL, hInstance, NULL))) { - KillGLWindow(); + KillGLWindow(); MessageBox(NULL,"Window Creation Error.","ERROR",MB_OK|MB_ICONEXCLAMATION); - return false; + return false; } static PIXELFORMATDESCRIPTOR pfd= { sizeof(PIXELFORMATDESCRIPTOR), 1, PFD_DRAW_TO_WINDOW|PFD_SUPPORT_OPENGL|PFD_DOUBLEBUFFER, PFD_TYPE_RGBA, bits, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, PFD_MAIN_PLANE, - 0, 0, 0, 0 + 0, 0, 0, 0 }; - + if (!(hDC=GetDC(hWnd))) { - KillGLWindow(); + KillGLWindow(); MessageBox(NULL,"Can't Create A GL Device Context.","ERROR",MB_OK|MB_ICONEXCLAMATION); return false; } if (!(PixelFormat=ChoosePixelFormat(hDC,&pfd))) { - KillGLWindow(); + KillGLWindow(); MessageBox(NULL,"Can't Find A Suitable PixelFormat.","ERROR",MB_OK|MB_ICONEXCLAMATION); - return false; + return false; } if(!SetPixelFormat(hDC,PixelFormat,&pfd)) { - KillGLWindow(); + KillGLWindow(); MessageBox(NULL,"Can't Set The PixelFormat.","ERROR",MB_OK|MB_ICONEXCLAMATION); - return false; + return false; } if (!(hRC=wglCreateContext(hDC))) { - KillGLWindow(); + KillGLWindow(); MessageBox(NULL,"Can't Create A GL Rendering Context.","ERROR",MB_OK|MB_ICONEXCLAMATION); - return false; + return false; } if(!wglMakeCurrent(hDC,hRC)) { - KillGLWindow(); + KillGLWindow(); MessageBox(NULL,"Can't Activate The GL Rendering Context.","ERROR",MB_OK|MB_ICONEXCLAMATION); return false; } ShowWindow(hWnd,SW_SHOW); - SetForegroundWindow(hWnd); - SetFocus(hWnd); + SetForegroundWindow(hWnd); + SetFocus(hWnd); ReSizeGLScene(width, height); if (!InitGL()) { @@ -268,17 +268,17 @@ BOOL CreateGLWindow(char* title, int width, int height, int bits) { SetTimer(hWnd, 1, 50, (TIMERPROC) NULL); - return true; + return true; } LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { - case WM_ACTIVATE: - if (!HIWORD(wParam)) active=true; + case WM_ACTIVATE: + if (!HIWORD(wParam)) active=true; else active=false; - - return 0; + + return 0; case WM_SYSCOMMAND: switch (wParam) { case SC_SCREENSAVE: @@ -288,19 +288,19 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { break; case WM_CLOSE: PostQuitMessage(0); - return 0; + return 0; case WM_KEYDOWN: keys[wParam] = true; - return 0; + return 0; case WM_CHAR: ch = wParam; return 0; - case WM_KEYUP: - keys[wParam] = false; - return 0; - case WM_SIZE: - ReSizeGLScene(LOWORD(lParam),HIWORD(lParam)); - return 0; + case WM_KEYUP: + keys[wParam] = false; + return 0; + case WM_SIZE: + ReSizeGLScene(LOWORD(lParam),HIWORD(lParam)); + return 0; case WM_TIMER: angle = angle + 1; if(angle>359) angle = 0; @@ -327,7 +327,7 @@ void ScaleVertex(VERTEX &v, float XScale, float YScale, float ZScale) { void DrawEQModel(FileLoader *fileloader, int modnum) { - + Polygon *poly; Vertex *verts[3]; VERTEX v1, v2, v3; @@ -363,16 +363,16 @@ void DrawEQModel(FileLoader *fileloader, int modnum) { if(maxz-minz>maxDimension) maxDimension = maxz-minz; // Hack for very small models (e.g. spoons) - if(maxDimension>1) - glTranslatef(-1.5f,0.0f,-(maxDimension*2)); + if(maxDimension>1) + glTranslatef(-1.5f,0.0f,-(maxDimension*2)); else - glTranslatef(-1.5f,0.0f,-10); + glTranslatef(-1.5f,0.0f,-10); // angle is updated by a timer every 50ms. glRotatef(angle, 1, 0, 0); glRotatef(angle, 0, 1, 0); glRotatef(angle, 0, 0, 1); - + glBegin(GL_TRIANGLES); for(int i = 0; i < model->poly_count; ++i) { @@ -398,23 +398,23 @@ void DrawEQModel(FileLoader *fileloader, int modnum) { ScaleVertex(v2, 10, 10, 10); ScaleVertex(v3, 10, 10, 10); } - + // Assign a kind of random colour to each polygon //glColor3b((i%50)+50,(i*5)%200,(i*10)%200); float col = (float)(100 + ((i*10) % 150)) /250 * 1.0f; glColor3f(col, col, col); - + glVertex3f(v1.x, v1.z, v1.y); glVertex3f(v2.x, v2.z, v2.y); glVertex3f(v3.x, v3.z, v3.y); - + } glEnd(); } bool ProcessZoneFile(const char *shortname) { - + char bufs[96]; Archive *archive; @@ -427,7 +427,7 @@ bool ProcessZoneFile(const char *shortname) { archive = new PFSLoader(); fff = fopen(bufs, "rb"); - if(fff != NULL) + if(fff != NULL) FileType = S3D; else { sprintf(bufs, "%s.eqg", shortname); @@ -443,15 +443,15 @@ bool ProcessZoneFile(const char *shortname) { if(archive->Open(fff) == 0) { MessageBox(NULL,"Unable to open container file","ERROR",MB_OK|MB_ICONEXCLAMATION); - + return(false); } switch(FileType) { - case S3D: + case S3D: mfileloader = new WLDLoader(); if(mfileloader->Open(NULL, (char *) shortname, archive) == 0) { - + MessageBox(NULL,"Error reading WLD from container file","ERROR",MB_OK|MB_ICONEXCLAMATION); return(false); } @@ -485,11 +485,11 @@ bool ProcessZoneFile(const char *shortname) { int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { MSG msg; BOOL done=false; - FILE *fp; + FILE *fp; - for(int i=0;i<256;i++) + for(int i=0;i<256;i++) keys[i] = false; - + char* buf = (char *) new char[strlen(lpCmdLine) + 1] ; char *pTmp = buf; @@ -501,48 +501,48 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } strcpy(buf,lpCmdLine); - + if(!ProcessZoneFile(buf)) return 0; - + if (!CreateGLWindow("EQ Model Viewer",1280,768,16)) - return 0; - + return 0; + while(!done) { if (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) { - if (msg.message==WM_QUIT) - done=true; + if (msg.message==WM_QUIT) + done=true; else { TranslateMessage(&msg); DispatchMessage(&msg); } } else { - if ((active && !DrawGLScene(buf)) || keys[VK_ESCAPE]) - done=true; + if ((active && !DrawGLScene(buf)) || keys[VK_ESCAPE]) + done=true; else - SwapBuffers(hDC); + SwapBuffers(hDC); // Use + and - to cycle through the models - if (toupper(ch)=='+') { - if(modelnum+1 < mfileloader->model_data.model_count) + if (toupper(ch)=='+') { + if(modelnum+1 < mfileloader->model_data.model_count) modelnum++; else modelnum=0; angle = 0; } - if (toupper(ch)=='-') { + if (toupper(ch)=='-') { if(modelnum>0) modelnum--; else modelnum = mfileloader->model_data.model_count - 1; - angle = 0; + angle = 0; } ch = 0; } } KillGLWindow(); - return (msg.wParam); + return (msg.wParam); } diff --git a/utils/azone2/awater.cpp b/utils/azone2/awater.cpp index ee15a02da..940c27596 100644 --- a/utils/azone2/awater.cpp +++ b/utils/azone2/awater.cpp @@ -10,22 +10,22 @@ Father Nitwit's Zone to map conversion program. Copyright (C) 2004 Father Nitwit (eqemu@8ass.com) - + This thing uses code from freaku, so whatever license that comes under is relavent, if you care. - + the rest of it is GPL, even though I hate the GPL. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -76,7 +76,7 @@ long BSPCountNodes(BSP_Node *tree, long node_number); int main(int argc, char *argv[]) { long DefaultRegionType=RegionTypeWater; - + if((argc < 2) || (argc > 3) || #ifndef WIN32 @@ -90,9 +90,9 @@ int main(int argc, char *argv[]) { printf("\nIf -dl is omitted, untagged special regions will be marked as water\n"); return(1); } - + char bufm[250]; - + if(argc==3) DefaultRegionType=RegionTypeLava; sprintf(bufm, "%s.wtr", argv[argc-1]); @@ -110,15 +110,15 @@ bool BuildWaterMap(const char *shortname, long DefaultRegionType) { char bufs[96]; Archive *archive; WLDLoader *fileloader; - long WaterOrLavaCount = 0; - + long WaterOrLavaCount = 0; + //TODO: clean up a LOT of memory that the freaku code does not - + sprintf(bufs, "%s.s3d", shortname); archive = new PFSLoader(); - + FILE *s3df = fopen(bufs, "rb"); if(s3df == nullptr) { // One day we may try EQG, but not today. @@ -131,8 +131,8 @@ bool BuildWaterMap(const char *shortname, long DefaultRegionType) { } printf("Loading %s...\n", bufs); - fileloader = new WLDLoader(); - + fileloader = new WLDLoader(); + if(fileloader->Open(nullptr, (char *) shortname, archive) == 0) { printf("Error reading WLD from %s\n", bufs); return(false); @@ -152,7 +152,7 @@ bool BuildWaterMap(const char *shortname, long DefaultRegionType) { case RegionTypeUnsupported: { printf("Unsupported\n"); break; } case RegionTypeUntagged: { printf("Untagged. We will set it to "); - if(DefaultRegionType==RegionTypeWater) { + if(DefaultRegionType==RegionTypeWater) { printf("Water\n"); } else printf("Lava\n"); data29->region_type = DefaultRegionType; @@ -172,7 +172,7 @@ bool BuildWaterMap(const char *shortname, long DefaultRegionType) { } - + if(tree==nullptr) { printf("No BSP Tree. Bailing out\n"); return(false); @@ -184,12 +184,12 @@ bool BuildWaterMap(const char *shortname, long DefaultRegionType) { // Now we mark each leaf in the BSP tree that is in a 'special area' with what type the area is // Water, Lava, Zoneline etc - + for(int i=0; ifragcount; i++) { if(fileloader->frags[i]->type == 0x29) { data29 = (struct_Data29 *) fileloader->frags[i]->frag; for(long j=0; jregion_count; j++) { - BSPMarkRegion(tree, 1,data29->region_array[j]+1, data29->region_type); + BSPMarkRegion(tree, 1,data29->region_array[j]+1, data29->region_type); } } } @@ -268,7 +268,7 @@ long BSPCountNodes(BSP_Node *tree, long node_number) { return(NodesInRightBranch + NodesInLeftBranch + 1); } - + long BSPFindRegion(BSP_Node *tree, long node_number, long region) { //printf("Find Region %ld in node %ld\n", region, node_number); @@ -281,7 +281,7 @@ long BSPFindRegion(BSP_Node *tree, long node_number, long region) { if(tree[node_number-1].region==region) return node_number; } - + long retnode ; if(tree[node_number-1].left!=0) { retnode = BSPFindRegion(tree, tree[node_number-1].left, region); @@ -303,15 +303,15 @@ long BSPFindNode(BSP_Node *tree, long node_number, float x, float y, float z) { printf("BSP Find Node, currently in Node %ld\n", node_number); // Are we at a leaf - + if((tree[node_number-1].left==0)&& (tree[node_number-1].right==0)) { return tree[node_number-1].region; } - + // No, so determine which side of the split plane we are on // - + distance = (x * tree[node_number-1].normal[0]) + (y * tree[node_number-1].normal[1]) + (z * tree[node_number-1].normal[2]) + @@ -341,7 +341,7 @@ long BSPFindNode(BSP_Node *tree, long node_number, float x, float y, float z) { } - + long BSPMarkRegion(BSP_Node *tree, long node_number, long region, int region_type) { //printf("Find Region %ld in node %ld\n", region, node_number); if(node_number<1) { @@ -369,7 +369,7 @@ long BSPMarkRegion(BSP_Node *tree, long node_number, long region, int region_typ return 0; } - + diff --git a/utils/azone2/azone.h b/utils/azone2/azone.h index 641676194..3021b118a 100644 --- a/utils/azone2/azone.h +++ b/utils/azone2/azone.h @@ -38,7 +38,7 @@ using namespace std; unsigned shorts are adequate because, worst case even in a zone that is 6000x6000 with a small node size of 30x30, there are only 40000 nodes. - + quadrent definitions: quad 1 (nodes[0]): x>=0, y>=0 @@ -48,7 +48,7 @@ using namespace std; x<0, y<0 quad 4 (nodes[3]): x>=0, y<0 - + */ #define MAX_POLY_VTX 24 //arbitrary, im too lazy to figure it out //cut a triangle at most 6 times.... @@ -65,12 +65,12 @@ public: GPoint(); GPoint(VERTEX &v); GPoint(float x, float y, float z); - + inline void operator()(float nx, float ny, float nz) { x = nx; y = ny; z = nz; } - + GPoint cross(const GPoint &them) const; float dot3(const GPoint &them) const; - + float x; float y; float z; @@ -83,13 +83,13 @@ public: GVector(); GVector(const GPoint &them); GVector(float x, float y, float z, float w = 1.0f); - + inline void operator()(float nx, float ny, float nz, float nw) { x = nx; y = ny; z = nz; W = nw; } float dot4(const GVector &them) const; float dot4(const GPoint &them) const; void normalize(); float length(); - + float W; }; @@ -104,7 +104,7 @@ class QTBuilder { public: QTBuilder(); ~QTBuilder(); - + bool build(const char *shortname); bool build_eqg(const char *shortname); void AddPlaceable(FileLoader *fileloader, char *ZoneFileName, bool ListPlaceable=false); @@ -113,28 +113,28 @@ public: void ScaleVertex(VERTEX &v, float XScale, float YScale, float ZScale); void TranslateVertex(VERTEX &v, float XOffset, float YOffset, float ZOffset); bool writeMap(const char *file); - + bool FaceInNode(const QTNode *q, const FACE *f); protected: - + void AddFace(VERTEX &v1, VERTEX &v2, VERTEX &v3); - + int ClipPolygon(POLYGON *poly, GVector *plane); - + //dynamic during load // vector _VertexList; vector _FaceList; - + //static once loaded // unsigned long vertexCount; unsigned long faceCount; // VERTEX * vertexBlock; FACE * faceBlock; - + VERTEX tempvtx[MAX_POLY_VTX]; - + QTNode *_root; - + static void NormalizeN(FACE *p); #ifdef COUNT_MACTHES @@ -151,28 +151,28 @@ class QTNode { public: QTNode(QTBuilder *builder, float Tminx, float Tmaxx, float Tminy, float Tmaxy); ~QTNode(); - + void clearNodes(); - + void doSplit(); void divideYourself(int depth); - + void buildVertexes(); // bool writeFile(FILE *out); - + unsigned long countNodes() const; unsigned long countFacelists() const; - + void fillBlocks(nodeHeader *heads, unsigned long *flist, unsigned long &hindex, unsigned long &findex); - + float minx; float miny; float maxx; float maxy; unsigned long nfaces; vector faces; - + /* quadrent definitions: quad 1 (node1): @@ -190,7 +190,7 @@ public: QTNode *node4; GPoint v[8]; bool final; - + protected: QTBuilder *builder; }; diff --git a/utils/azone2/dat.cpp b/utils/azone2/dat.cpp index 0dad16ffa..c89bd4d11 100644 --- a/utils/azone2/dat.cpp +++ b/utils/azone2/dat.cpp @@ -98,14 +98,14 @@ string GetToken(uchar *&Buffer, int &Position) ++Position; } ++Position; - //printf("Returning %s\n", Token.c_str()); + //printf("Returning %s\n", Token.c_str()); return Token; } int AddModelName(Content_3D *C3D, string ModelName) { vector::iterator Iterator; - + for(unsigned int i = 0; i < C3D->ModelNames.size(); ++i) { #ifndef WIN32 @@ -116,8 +116,8 @@ int AddModelName(Content_3D *C3D, string ModelName) return i; } - - + + C3D->ModelNames.push_back(ModelName); return C3D->ModelNames.size() - 1; @@ -171,7 +171,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { if(filename != zone_name) delete[] filename; - + buf_start = buffer; //TODO: Find out what these three unknowns are @@ -341,10 +341,10 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { this->model_data.zone_model = new Zone_Model; zm = this->model_data.zone_model; - + zm->vert_count = QuadCount * TileCount * 4; zm->poly_count = QuadCount * 2 * TileCount; - + zm->verts = new Vertex *[zm->vert_count]; zm->polys = new Polygon *[zm->poly_count]; @@ -360,7 +360,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { for(int TileNumber = 0; TileNumber < TileCount; ++TileNumber) { - + int TileLNG = VARSTRUCT_DECODE_TYPE(uint32, buffer); int TileLAT = VARSTRUCT_DECODE_TYPE(uint32, buffer); int TileUNK = VARSTRUCT_DECODE_TYPE(uint32, buffer); @@ -449,7 +449,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { int LayerCount = VARSTRUCT_DECODE_TYPE(uint32, buffer); VARSTRUCT_DECODE_STRING(s, buffer); - + int OverlayCount = 0; for(int Layer = 1; Layer < LayerCount; ++Layer) @@ -462,10 +462,10 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { { uint8 Byte = VARSTRUCT_DECODE_TYPE(uint8, buffer); } - + ++OverlayCount; - } + } int Count1 = VARSTRUCT_DECODE_TYPE(uint32, buffer); #ifdef DEBUGDAT @@ -517,7 +517,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { printf("Model: %s LOC: %8.3f, %8.3f, %8.3f, ROT: %8.3f, %8.3f, %8.3f\n", ModelName, x, y, z, RotX, RotY, RotZ); #endif ObjectGroupEntry NewObjectGroup; - + NewObjectGroup.FromTOG = false; NewObjectGroup.y = y; @@ -534,18 +534,18 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { // of another tile, which means based on the data for the tile we are processing, we should be unable to // calculate the Z value for that object. // - // By hand editing an .EQG, it was discovered that what the client appears to do is calculate the Z value + // By hand editing an .EQG, it was discovered that what the client appears to do is calculate the Z value // for these objects by adjusting the x/y offsets by +/- (QuadsPerTile * UnitsPerVert) until the offsets // are within this tiles boundaries and using the corresponding height values. // - // For example, if a model has an offset of -157.5, -157.5 and QPT * UPV = 160, then the height value used + // For example, if a model has an offset of -157.5, -157.5 and QPT * UPV = 160, then the height value used // would be the height at +2.5, +2.5 in this tile. // // This doesn't make a great deal of sense, but it is how the EQ graphics engine appears to do things. // // These 'Adjusted' x/y offsets are used only for determing the ground Z for the object. The actual placement // of the object relative to the terrain uses the unadjusted offsets. - // + // // For the record, as of SoF, this applies to the following zones and objects: // // arcstone: Model translations adjusted from -14.000, 219.000 to 146.000, 59.000 @@ -737,7 +737,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { float ZAdjust = VARSTRUCT_DECODE_TYPE(float, buffer); #ifdef DEBUGDAT - printf("ZAdjust %8.3f\n", ZAdjust); + printf("ZAdjust %8.3f\n", ZAdjust); #endif char TogFileName[255]; @@ -764,7 +764,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { NewObjectGroup.TileY = TileXStart; NewObjectGroup.TileZ = 0; - + NewObjectGroup.RotX = RotX; NewObjectGroup.RotY = RotY; NewObjectGroup.RotZ = RotZ; @@ -821,7 +821,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { NewObjectGroup.SubObjects.push_back(model_data.PlaceableList.size()-1); } if(Token == "*END_OBJECTGROUP") - { + { #ifdef DEBUGDAT printf("Pushing back new ObjectGroup\n"); printf(" Position : %8.3f, %8.3f, %8.3f\n", NewObjectGroup.x, NewObjectGroup.y, NewObjectGroup.z); @@ -867,7 +867,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { float QuadVertex2X = QuadVertex1X + (QuadsPerTile * UnitsPerVertX); float QuadVertex2Y = QuadVertex1Y; float QuadVertex2Z = QuadVertex1Z; - + float QuadVertex3X = QuadVertex2X; float QuadVertex3Y = QuadVertex1Y + (QuadsPerTile * UnitsPerVertY); float QuadVertex3Z = QuadVertex1Z; @@ -875,7 +875,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { float QuadVertex4X = QuadVertex1X; float QuadVertex4Y = QuadVertex3Y; float QuadVertex4Z = QuadVertex1Z; - + ++VertexNumber; @@ -903,7 +903,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { zm->polys[PolyNumber]->v1 = VertexNumber; zm->polys[PolyNumber]->v2 = VertexNumber - 3; zm->polys[PolyNumber]->v3 = VertexNumber - 2; - zm->polys[PolyNumber]->tex = -1; + zm->polys[PolyNumber]->tex = -1; } else { @@ -915,7 +915,7 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { { if((Quad % QuadsPerTile) == 0) ++RowNumber; - + // Other common values for this Byte are 0x80, 0x82. Setting them all to zero has no obvious visual // effect. if(Bytes[Quad] & 0x01) // Indicates Quad should not be included because an object will overlay it. @@ -924,47 +924,47 @@ int DATLoader::Open(char *base_path, char *zone_name, Archive *archive) { float QuadVertex1X = TileXStart + (RowNumber * UnitsPerVertX); float QuadVertex1Y = TileYStart + (Quad % QuadsPerTile) * UnitsPerVertY; float QuadVertex1Z = Floats[Quad + RowNumber]; - + float QuadVertex2X = QuadVertex1X + UnitsPerVertX; float QuadVertex2Y = QuadVertex1Y; float QuadVertex2Z = Floats[Quad + RowNumber + QuadsPerTile + 1]; - + float QuadVertex3X = QuadVertex1X + UnitsPerVertX; float QuadVertex3Y = QuadVertex1Y + UnitsPerVertY; float QuadVertex3Z = Floats[Quad + RowNumber + QuadsPerTile + 2]; - + float QuadVertex4X = QuadVertex1X; float QuadVertex4Y = QuadVertex1Y + UnitsPerVertY; float QuadVertex4Z = Floats[Quad + RowNumber + 1]; - + ++VertexNumber; - + zm->verts[VertexNumber++] = new Vertex(QuadVertex1Y, QuadVertex1X, QuadVertex1Z); - + zm->verts[VertexNumber++] = new Vertex(QuadVertex2Y, QuadVertex2X, QuadVertex2Z); - + zm->verts[VertexNumber++] = new Vertex(QuadVertex3Y, QuadVertex3X, QuadVertex3Z); - + zm->verts[VertexNumber] = new Vertex(QuadVertex4Y, QuadVertex4X, QuadVertex4Z); - + PolyNumber++; - + zm->polys[PolyNumber] = new Polygon; - + zm->polys[PolyNumber]->v1 = VertexNumber; zm->polys[PolyNumber]->v2 = VertexNumber - 2; zm->polys[PolyNumber]->v3 = VertexNumber - 1; zm->polys[PolyNumber]->tex = -1; - + PolyNumber++; - + zm->polys[PolyNumber] = new Polygon; - + zm->polys[PolyNumber]->v1 = VertexNumber; zm->polys[PolyNumber]->v2 = VertexNumber - 3; zm->polys[PolyNumber]->v3 = VertexNumber - 2; - zm->polys[PolyNumber]->tex = -1; - + zm->polys[PolyNumber]->tex = -1; + } } zm->vert_count = VertexNumber + 1; @@ -995,7 +995,7 @@ int DATLoader::Close() { for(i = 0; i < zm->poly_count; ++i) delete zm->polys[i]; - + delete[] zm->verts; delete[] zm->polys; diff --git a/utils/azone2/listobj.cpp b/utils/azone2/listobj.cpp index 687355e69..f69e5b7de 100644 --- a/utils/azone2/listobj.cpp +++ b/utils/azone2/listobj.cpp @@ -1,18 +1,18 @@ /* - List Placeable Objects in an S3D or EQG. + List Placeable Objects in an S3D or EQG. By Derision, based on OpenEQ File Loaders by Daeken et al. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -48,29 +48,29 @@ enum EQFileType { S3D, EQG, UNKNOWN }; int main(int argc, char *argv[]) { printf("LISTOBJ: List Placeable Objects in .S3D or .EQG zone files.\n"); - + if(argc != 2) { printf("Usage: %s (zone short name)\n", argv[0]); return(1); } - + return(ProcessZoneFile(argv[1])); } bool ProcessZoneFile(const char *shortname) { - + char bufs[96]; Archive *archive; FileLoader *fileloader; Zone_Model *zm; FILE *fff; EQFileType FileType = UNKNOWN; - + sprintf(bufs, "%s.s3d", shortname); archive = new PFSLoader(); fff = fopen(bufs, "rb"); - if(fff != nullptr) + if(fff != nullptr) FileType = S3D; else { sprintf(bufs, "%s.eqg", shortname); @@ -92,7 +92,7 @@ bool ProcessZoneFile(const char *shortname) { bool V4Zone = false; switch(FileType) { - case S3D: + case S3D: fileloader = new WLDLoader(); if(fileloader->Open(nullptr, (char *) shortname, archive) == 0) { printf("Error reading WLD from %s\n", bufs); @@ -118,7 +118,7 @@ bool ProcessZoneFile(const char *shortname) { zm = fileloader->model_data.zone_model; - + if(!V4Zone) ListPlaceable(fileloader, bufs); else @@ -137,11 +137,11 @@ void ListPlaceable(FileLoader *fileloader, char *ZoneFileName) { fileloader->model_data.placeable[i]->x, fileloader->model_data.placeable[i]->z, fileloader->model_data.placeable[i]->model, - fileloader->model_data.models[fileloader->model_data.placeable[i]->model]->name); + fileloader->model_data.models[fileloader->model_data.placeable[i]->model]->name); } } - + void ListPlaceableV4(FileLoader *fileloader, char *ZoneFileName) { @@ -175,7 +175,7 @@ void ListPlaceableV4(FileLoader *fileloader, char *ZoneFileName) list::iterator ModelIterator; ModelIterator = (*Iterator).SubObjects.begin(); - + while(ModelIterator != (*Iterator).SubObjects.end()) { int SubModel = (*ModelIterator); diff --git a/utils/azone2/pfs.cpp b/utils/azone2/pfs.cpp index c58816d5e..05cd8d31e 100644 --- a/utils/azone2/pfs.cpp +++ b/utils/azone2/pfs.cpp @@ -46,12 +46,12 @@ inline void decompress(char *p, char *p2, int len, int uLen) { d_stream.zalloc = (alloc_func)0; d_stream.zfree = (free_func)0; d_stream.opaque = (voidpf)0; - + d_stream.next_in = (Bytef *) p; d_stream.avail_in = len; d_stream.next_out = (Bytef *) p2; d_stream.avail_out = uLen; - + inflateInit(&d_stream); status = inflate(&d_stream, Z_NO_FLUSH); inflateEnd(&d_stream); @@ -107,7 +107,7 @@ int PFSLoader::Open(FILE *fp) fseek(fp, s3d_header.offset, SEEK_SET); fread(&s3d_dir_header, sizeof(struct_directory_header), 1, fp); - + this->count = s3d_dir_header.count - 1; this->filenames = new char *[s3d_dir_header.count]; this->files = new uint32[s3d_dir_header.count - 1]; @@ -206,7 +206,7 @@ const char *PFSLoader::FindExtension(const char *ext) { int i; int elen = strlen(ext); - + for(i = 0; i < this->count; ++i) { int flen = strlen(this->filenames[i]); if(flen <= elen) @@ -234,7 +234,7 @@ int PFSLoader::GetFile(char *name, uchar **buf, int *len) { fread(&s3d_dir, sizeof(struct_directory), 1, this->fp); fseek(this->fp, s3d_dir.offset, SEEK_SET); *buf = new uchar[s3d_dir.size]; - + inf = 0; while(inf < (int)s3d_dir.size) { fread(&s3d_data, sizeof(struct_data_block), 1, this->fp); diff --git a/utils/azone2/ter.cpp b/utils/azone2/ter.cpp index c2e021e4f..bc5dd4f07 100644 --- a/utils/azone2/ter.cpp +++ b/utils/azone2/ter.cpp @@ -105,17 +105,17 @@ int TERLoader::Open(char *base_path, char *zone_name, Archive *archive) { this->model_data.zone_model = new Zone_Model; zm = this->model_data.zone_model; - + zm->vert_count = thdr->vert_count; zm->poly_count = thdr->tri_count; - + zm->verts = new Vertex *[zm->vert_count]; zm->polys = new Polygon *[zm->poly_count]; this->model_data.plac_count = 0; this->model_data.model_count = 0; - - buffer = ter_orig + thdr->list_len + sizeof(ter_header); + + buffer = ter_orig + thdr->list_len + sizeof(ter_header); if(thdr->magic[3] == 'M') buffer = buffer + 4; #ifdef DEBUGTER printf("Starting offset is %8X\n", buffer-ter_orig); @@ -158,7 +158,7 @@ int TERLoader::Open(char *base_path, char *zone_name, Archive *archive) { } - + j = 0; for(i = 0; i < (unsigned int)zm->poly_count; ++i) { ttri = (ter_triangle *) buffer; @@ -167,7 +167,7 @@ int TERLoader::Open(char *base_path, char *zone_name, Archive *archive) { continue; } zm->polys[j] = new Polygon; -/* +/* zm->polys[j]->v1 = ttri->v1; zm->polys[j]->v2 = ttri->v2; zm->polys[j]->v3 = ttri->v3; @@ -201,15 +201,15 @@ int TERLoader::Open(char *base_path, char *zone_name, Archive *archive) { #endif zm->polys[j]->tex = ttri->group; } - + ++j; buffer += sizeof(ter_triangle); } - + zm->poly_count = j; - + zm->tex_count = 0; - + delete[] mlist; delete [] ter_orig; diff --git a/utils/azone2/wld.cpp b/utils/azone2/wld.cpp index 0fddac191..45471738c 100644 --- a/utils/azone2/wld.cpp +++ b/utils/azone2/wld.cpp @@ -150,11 +150,11 @@ FRAG_CONSTRUCTOR(Data21) { } - + } FRAG_CONSTRUCTOR(Data22) { - + int pos; uchar *data6area ; @@ -190,7 +190,7 @@ FRAG_CONSTRUCTOR(Data22) { Frag36Ref = *((long *) (data6area+20)); //printf("Frag 36 reference?: %ld\n", *((long *) (data6area+20))); } - + @@ -198,7 +198,7 @@ FRAG_CONSTRUCTOR(Data22) { } FRAG_CONSTRUCTOR(Data29) { - + long a,flags, numregions, lenstr; struct_Data29 *data29 = (struct_Data29 *) malloc(sizeof(struct_Data29)); @@ -213,7 +213,7 @@ FRAG_CONSTRUCTOR(Data29) { else if(!strncmp((char *) &wld->sHash[-frag_name], "VWA", 3)) data29->region_type = 7; // VWater ? this->frag = (void *) data29; - + flags = *buf; numregions = *((long *)(buf+4)); data29->region_count = numregions ; @@ -277,7 +277,7 @@ FRAG_CONSTRUCTOR(Data30) { this->frag = (void *) tex; return; } - + tex = (Texture *) wld->frags[ref - 1]->frag; if(data->params1 & (1 << 1) || data->params1 & (1 << 2) || data->params1 & (1 << 3) || data->params1 & (1 << 4)) @@ -313,7 +313,7 @@ FRAG_CONSTRUCTOR(Data36) { VertexNormal *vn; Vert *v; - + TexRef *tr; @@ -393,7 +393,7 @@ FRAG_CONSTRUCTOR(Data36) { for(i = 0; i < header->normalsCount; ++i) { - + if(ivertexCount) { vn = (VertexNormal *) buf; vert = model->verts[i]; @@ -419,7 +419,7 @@ FRAG_CONSTRUCTOR(Data36) { // in the WLD loader in the stock azone, and has the effect of screwing up the normals, // Changed to keep things consistent with prior versions. poly->v1 = p->v1; - poly->v2 = p->v2; + poly->v2 = p->v2; poly->v3 = p->v3; #ifdef DEBUGWLD2 printf("Frag36: Polygon: %5d Vertices: %5d, %5d, %5d\n", i, poly->v1, poly->v2, poly->v3); @@ -502,7 +502,7 @@ int WLDLoader::Open(char *base_path, char *zone_name, Archive *archive) { return 0; buffer += sizeof(struct_wld_header); - + this->sHash = buffer; decode(this->sHash, header->stringHashSize); buffer += header->stringHashSize; @@ -535,7 +535,7 @@ int WLDLoader::Open(char *base_path, char *zone_name, Archive *archive) { case 0x30: FRAGMENT(Data30); break; case 0x31: FRAGMENT(Data31); break; case 0x36: FRAGMENT(Data36); break; - + default: this->frags[i] = new Fragment; break; } @@ -545,7 +545,7 @@ int WLDLoader::Open(char *base_path, char *zone_name, Archive *archive) { buffer += frag->size - 4; } - + if(!strcmp(&zone_name[strlen(zone_name) - 4], "_obj")) { @@ -585,12 +585,12 @@ int WLDLoader::Open(char *base_path, char *zone_name, Archive *archive) { } - + zm->verts = new Vertex *[zm->vert_count]; zm->polys = new Polygon *[zm->poly_count]; - + vc = pc = 0; - + for(i = 0; i < this->fragcount; ++i) { if(this->frags[i]->type != 0x36) continue; @@ -714,7 +714,7 @@ int WLDLoader::Close() { for(j = 0; j < zm->tex_count; ++j) delete zm->tex[j]; delete[] zm->tex; - + delete[] zm->verts; delete[] zm->polys; } diff --git a/utils/azone2/wld.hpp b/utils/azone2/wld.hpp index b6760ea8a..4665be754 100644 --- a/utils/azone2/wld.hpp +++ b/utils/azone2/wld.hpp @@ -33,7 +33,7 @@ class WLDLoader : public FileLoader { public: WLDLoader(); ~WLDLoader(); - + virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Close(); diff --git a/utils/azone2/zon.cpp b/utils/azone2/zon.cpp index 82e5812b4..efa275cf7 100644 --- a/utils/azone2/zon.cpp +++ b/utils/azone2/zon.cpp @@ -154,7 +154,7 @@ int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { // Derision: 23/06/08 // dranikcatacombsa.eqg has a couple of model names with a left parenthesis where there should // be an underscore. E.g. OBP_DZ_Lbanner0)_00.MOD instead of OBP_DZ_Lbanner0__00.MOD - // This is the only zone I have seen this in, but is the reason for the follow code to replace + // This is the only zone I have seen this in, but is the reason for the follow code to replace // the parenthesis with an underscore. // for(unsigned int i=0; ilist_len + hdr->NumberOfModels * 4; this->model_data.plac_count = hdr->obj_count - 1; @@ -187,8 +187,8 @@ int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { #ifdef DEBUGPLAC printf(" Placeable count is %d\n", this->model_data.plac_count); #endif - this->model_data.placeable = new Placeable *[this->model_data.plac_count]; - + this->model_data.placeable = new Placeable *[this->model_data.plac_count]; + plac = (zon_placeable *) buffer; base[0] = plac->x; base[1] = plac->y; @@ -250,7 +250,7 @@ int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { long UnknownSize = *((long *)(buffer)); buffer = buffer + 4 + (UnknownSize * 4); } - + } @@ -272,7 +272,7 @@ int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { } // printf("Attempting to open MOD file %s\n", model_names[j]); fflush(stdout); if(model_loaders[j].Open(nullptr, model_names[j], archive)) { - + this->model_data.models[j] = new Model; this->model_data.models[j]->vert_count = model_loaders[j].model_data.zone_model->vert_count; this->model_data.models[j]->poly_count = model_loaders[j].model_data.zone_model->poly_count; @@ -282,10 +282,10 @@ int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { this->model_data.models[j]->tex = model_loaders[j].model_data.zone_model->tex; this->model_data.models[j]->name = new char[strlen(model_names[j])+1]; strcpy(this->model_data.models[j]->name, model_names[j]); - + tex_tmp = 1; // I think this is looking to see if the placeable model textures already exist in the zone model. - // + // for(i = 0; i < this->model_data.models[j]->tex_count; ++i) { tex_tmp = 1; // Derision for(k = 0; k < this->model_data.zone_model->tex_count; ++k) { @@ -310,7 +310,7 @@ int ZonLoader::Open(char *base_path, char *zone_name, Archive *archive) { continue; } for(l = 0; l < this->model_data.models[k]->tex_count; ++l) { - if(this->model_data.models[k]->tex[l]->filenames[0] == this->model_data.models[j]->tex[i]->filenames[0] || + if(this->model_data.models[k]->tex[l]->filenames[0] == this->model_data.models[j]->tex[i]->filenames[0] || (this->model_data.models[k]->tex[l]->filenames[0] && this->model_data.models[j]->tex[i]->filenames[0] && !strcmp(this->model_data.models[k]->tex[l]->filenames[0], this->model_data.models[j]->tex[i]->filenames[0]))) { diff --git a/utils/azone2/zon.hpp b/utils/azone2/zon.hpp index 876bdfc4e..f7198ffa7 100644 --- a/utils/azone2/zon.hpp +++ b/utils/azone2/zon.hpp @@ -35,7 +35,7 @@ class ZonLoader : public FileLoader { public: ZonLoader(); ~ZonLoader(); - + virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Close(); diff --git a/utils/azone2/zonv4.cpp b/utils/azone2/zonv4.cpp index 40abc53d3..c2e0b32af 100644 --- a/utils/azone2/zonv4.cpp +++ b/utils/azone2/zonv4.cpp @@ -26,7 +26,7 @@ Zonv4Loader::~Zonv4Loader() int Zonv4Loader::Open(char *base_path, char *zone_name, Archive *archive) { - + uchar *buffer; int position; int buf_len; diff --git a/utils/azone2/zonv4.hpp b/utils/azone2/zonv4.hpp index c97b3bbd5..cbfd4ef18 100644 --- a/utils/azone2/zonv4.hpp +++ b/utils/azone2/zonv4.hpp @@ -31,7 +31,7 @@ class Zonv4Loader : public FileLoader { public: Zonv4Loader(); ~Zonv4Loader(); - + virtual int Open(char *base_path, char *zone_name, Archive *archive); virtual int Close(); diff --git a/utils/defaults/eqemu_config.xml.full b/utils/defaults/eqemu_config.xml.full index 859dafa33..9f1de78cd 100644 --- a/utils/defaults/eqemu_config.xml.full +++ b/utils/defaults/eqemu_config.xml.full @@ -25,7 +25,7 @@ some long random string - + diff --git a/utils/defaults/mime.types b/utils/defaults/mime.types index e0ef69119..9cf771941 100644 --- a/utils/defaults/mime.types +++ b/utils/defaults/mime.types @@ -3,24 +3,24 @@ # http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/Docs/extension-map.html # for more details -application/postscript ai eps ps -application/rtf rtf -application/x-tex tex -application/x-texinfo texinfo texi -application/x-troff t tr roff -audio/basic au snd +application/postscript ai eps ps +application/rtf rtf +application/x-tex tex +application/x-texinfo texinfo texi +application/x-troff t tr roff +audio/basic au snd audio/x-aiff aif aiff aifc -audio/x-wav wav -image/gif gif -image/ief ief +audio/x-wav wav +image/gif gif +image/ief ief image/jpeg jpeg jpg jpe -image/tiff tiff tif -image/x-xwindowdump xwd -text/html html +image/tiff tiff tif +image/x-xwindowdump xwd +text/html html text/plain txt c cc h -video/mpeg mpeg mpg mpe -video/quicktime qt mov -video/x-msvideo avi +video/mpeg mpeg mpg mpe +video/quicktime qt mov +video/x-msvideo avi video/x-sgi-movie movie text/css css image/png png diff --git a/utils/defaults/plugins/check_handin.pl b/utils/defaults/plugins/check_handin.pl index 57da2fd73..13cad9b91 100644 --- a/utils/defaults/plugins/check_handin.pl +++ b/utils/defaults/plugins/check_handin.pl @@ -34,7 +34,7 @@ sub check_mq_handin { return 1; } -sub return_items { +sub return_items { my $hashref = plugin::var('$itemcount'); my $client = plugin::val('$client'); my $items_returned = 0; @@ -45,7 +45,7 @@ sub return_items { 2 => [ plugin::val('$item3'), plugin::val('$item3_charges'), plugin::val('$item3_attuned') ], 3 => [ plugin::val('$item4'), plugin::val('$item4_charges'), plugin::val('$item4_attuned') ], ); - + foreach my $k (keys(%{$hashref})) { next if($k == 0); diff --git a/utils/defaults/templates/TreeMenu.css b/utils/defaults/templates/TreeMenu.css index 974be6379..b5c3055f8 100644 --- a/utils/defaults/templates/TreeMenu.css +++ b/utils/defaults/templates/TreeMenu.css @@ -28,17 +28,17 @@ font-style: normal; } -/* Since all menu items are links, the following can be equally important - * to your menu appearance. +/* Since all menu items are links, the following can be equally important + * to your menu appearance. * The main thing you may want to change are the A:link and A:visited colors. */ -*.tmenu0text A:link,*.tmenu1text A:link,*.tmenu2text A:link,*.tmenu3text A:link +*.tmenu0text A:link,*.tmenu1text A:link,*.tmenu2text A:link,*.tmenu3text A:link { text-decoration:none; color:#505080 } -*.tmenu0text A:visited,*.tmenu1text A:visited,*.tmenu2text A:visited,*.tmenu3text A:visited +*.tmenu0text A:visited,*.tmenu1text A:visited,*.tmenu2text A:visited,*.tmenu3text A:visited { text-decoration:none; color:#505080 } -*.tmenu0text A:active,*.tmenu1text A:active,*.tmenu2text A:active,*.tmenu3text A:active +*.tmenu0text A:active,*.tmenu1text A:active,*.tmenu2text A:active,*.tmenu3text A:active { text-decoration:none; color:#805050 } -*.tmenu0text A:hover,*.tmenu1text A:hover,*.tmenu2text A:hover,*.tmenu3text A:hover +*.tmenu0text A:hover,*.tmenu1text A:hover,*.tmenu2text A:hover,*.tmenu3text A:hover { text-decoration:underline; color:#FF0000 } @@ -51,7 +51,7 @@ } /* .tmenuSelected is used with linkSelectKey to highlight selected items */ -.tmenuSelected { +.tmenuSelected { background-color: yellow; } *.tmenuSelected A:link { text-decoration:none; color:#2020ff } diff --git a/utils/defaults/templates/TreeMenu.js b/utils/defaults/templates/TreeMenu.js index 90171c157..3f29ff5d0 100644 --- a/utils/defaults/templates/TreeMenu.js +++ b/utils/defaults/templates/TreeMenu.js @@ -12,7 +12,7 @@ // | notice, this list of conditions and the following disclaimer. | // | o Redistributions in binary form must reproduce the above copyright | // | notice, this list of conditions and the following disclaimer in the | -// | documentation and/or other materials provided with the distribution.| +// | documentation and/or other materials provided with the distribution.| // | o The names of the authors may not be used to endorse or promote | // | products derived from this software without specific prior written | // | permission. | @@ -51,7 +51,7 @@ this.imgWidth = 20; this.imgHeight = 20; this.n = new Array(); - + this.branches = new Array(); this.branchStatus = new Array(); this.layerRelations = new Array(); @@ -79,10 +79,10 @@ newNode.lineImageWidth = this.imgWidth; newNode.lineImageHeight = this.imgHeight; this.n[newIndex] = newNode; - + return this.n[newIndex]; } - + TreeMenu.prototype.SetImageSize = function(w, h) { this.imgWidth = w; this.imgHeight = h; @@ -96,15 +96,15 @@ var plustop = new Image; plustop.src = this.iconpath + '/plustop.gif'; var plusbottom = new Image; plusbottom.src = this.iconpath + '/plusbottom.gif'; var plus = new Image; plus.src = this.iconpath + '/plus.gif'; - + var minustop = new Image; minustop.src = this.iconpath + '/minustop.gif'; var minusbottom = new Image; minusbottom.src = this.iconpath + '/minusbottom.gif'; var minus = new Image; minus.src = this.iconpath + '/minus.gif'; - + var branchtop = new Image; branchtop.src = this.iconpath + '/branchtop.gif'; var branchbottom = new Image; branchbottom.src = this.iconpath + '/branchbottom.gif'; var branch = new Image; branch.src = this.iconpath + '/branch.gif'; - + var linebottom = new Image; linebottom.src = this.iconpath + '/linebottom.gif'; var line = new Image; line.src = this.iconpath + '/line.gif'; } @@ -122,7 +122,7 @@ var modifier = ''; var layerID = ''; var parentLayerID = ''; - + /** * Parse any optional arguments */ @@ -132,19 +132,19 @@ var expanded = arguments[3] ? arguments[3] : false; var visibility = arguments[4] ? arguments[4] : 'inline'; var parentLayerID = arguments[5] ? arguments[5] : null; - + var currentlevel = level.length; - + for (var i=0; i', this.iconpath, nodes[i].icon, nodes[i].iconImageWidth, nodes[i].iconImageHeight) : ''; - - + + /** * Build the html to write to the document * IMPORTANT: @@ -210,14 +210,14 @@ var imgTag = this.stringFormat('', this.iconpath, gifname, modifier, layerID, onMDown, nodes[i].lineImageWidth, nodes[i].lineImageHeight); var linkStart = nodes[i].link ? this.stringFormat('', nodes[i].link, this.linkTarget) : ''; var linkEnd = nodes[i].link ? '' : ''; - + // cc 2002-11-12 All these are additions var selectedStart = nodes[i].selected ? "" : ''; var selectedEnd = nodes[i].selected ? '' : ''; var nobrStart = this.brOK ? '' : ''; var nobrEnd = this.brOK ? '' : ''; - + // cc 2002-11-12 modified output = this.stringFormat('{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}
', layerTag, @@ -229,7 +229,7 @@ nodes[i].title, linkEnd, selectedEnd, nobrEnd); - + /** * Write out the HTML. Uses document.write for speed over layers and * innerHTML. This however means no dynamic adding/removing nodes on @@ -249,15 +249,15 @@ */ if (parentLayerID == null && nodes.length == 1) { var newPrepend = ''; - + } else if (i < (nodes.length - 1)) { // cc 2002-11-12 Both lines, added image size parameters. var newPrepend = prepend + this.stringFormat('', this.iconpath, nodes[i].lineImageWidth, nodes[i].lineImageHeight); - + } else { var newPrepend = prepend + this.stringFormat('', this.iconpath, nodes[i].lineImageWidth, nodes[i].lineImageHeight); } - + this.drawMenu(nodes[i].n, level, newPrepend, @@ -276,26 +276,26 @@ { var currentDisplay = this.getLayer(layerID).style.display; var newDisplay = (this.branchStatus[layerID] && currentDisplay == 'inline') ? 'none' : 'inline' - + for (var i=0; iquery($q); - if ($res2) { + if ($res2) { my $row5=$res2->fetch_row_hash; print <<"CHAR"; @@ -95,7 +95,7 @@ CHAR print "Account Name query error."; } } - print ""; + print ""; } else { print "IP Address query error."; } @@ -104,9 +104,9 @@ CHAR my $acctE = $EQDB->escape_string($acct); my $q; $q="select id,charname,sharedplat,status,revoked from account where name='$acctE'"; - + my $res=$EQDB->query($q); - if ($res) { + if ($res) { my $row=$res->fetch_row_hash; print <<"HTML"; @@ -139,17 +139,17 @@ HTML CHAR } - print "
$row2->{zonename} delete, - move acct, + move acct, move zone
"; + print ""; } else { print "Char query error."; } - + $q="SELECT ip,count FROM account_ip WHERE accid=$row->{id}"; my $res3=$EQDB->query($q); if($res3) { @@ -166,7 +166,7 @@ HTML $row3->{ip} $row3->{count} - + CHAR } print ""; @@ -185,7 +185,7 @@ HTML } else { print "Query error."; } - + print "Actions: ban/unban, set status, set world password, delete chars, move chars, delete account and chars"; } diff --git a/utils/defaults/templates/accounts.html b/utils/defaults/templates/accounts.html index 7166e0d91..e89e4e276 100644 --- a/utils/defaults/templates/accounts.html +++ b/utils/defaults/templates/accounts.html @@ -18,7 +18,7 @@ $type = $request->get("type", ""); ?>
Account Search:
- > Account Name   + > Account Name   > Character Name
@@ -41,8 +41,8 @@ if ($query) { } my $res=$EQDB->query($q); - if ($res) { - + if ($res) { + print "\n"; print "\t\n"; if ($type eq "char") { diff --git a/utils/defaults/templates/bugs.html b/utils/defaults/templates/bugs.html index 063bd6d10..7ceb7db64 100644 --- a/utils/defaults/templates/bugs.html +++ b/utils/defaults/templates/bugs.html @@ -12,7 +12,7 @@ my $id = $request->get("id", "0"); $EQW->ResolveBug($id); } - + $offset = $request->get("offset", "0"); $count = $EQW->CountBugs(); @bugs = $EQW->ListBugs($offset); diff --git a/utils/defaults/templates/commands.html b/utils/defaults/templates/commands.html index 441434e91..abfef6636 100644 --- a/utils/defaults/templates/commands.html +++ b/utils/defaults/templates/commands.html @@ -37,7 +37,7 @@ if (defined($gets->{"update.x"})) { my $i=0; $q="select * from commands order by command"; my $res=$EQDB->query($q); - if ($res) { + if ($res) { print "
\n"; printf "\t\t\n"; printf "\t\t\n"; diff --git a/utils/defaults/templates/guild.html b/utils/defaults/templates/guild.html index 53423433f..c420837b5 100644 --- a/utils/defaults/templates/guild.html +++ b/utils/defaults/templates/guild.html @@ -14,7 +14,7 @@ my $gid = $request->getInt("id", 0); if($gid > 0) { my $act = $request->get("action", ""); - + #note: delete action should be done on the actions.html page, so we can redirect elsewhere. if($act eq "makeleader") { my $char = $request->getInt("char", 0); @@ -39,9 +39,9 @@ if($gid > 0) { print "Invalid char in remove member.
"; } } - - - + + + my $q = "SELECT g.id,g.name,g.leader,g.motd,g.motd_setter,g.tribute,c.name AS lname FROM guilds AS g LEFT JOIN character_ AS c ON g.leader=c.id WHERE g.id=$gid"; my $res=$EQDB->query($q); my $row; @@ -61,7 +61,7 @@ HTML ."LEFT JOIN character_ AS c ON g.char_id=c.id " ."LEFT JOIN guild_ranks AS gr ON g.rank=gr.rank AND g.guild_id=gr.guild_id " ."WHERE g.guild_id=$gid"; - + my $res2 = $EQDB->query($q); if($res2) { print <<"HTML"; @@ -93,7 +93,7 @@ HTML CHAR diff --git a/utils/defaults/templates/guilds.html b/utils/defaults/templates/guilds.html index a2392553e..d04606eed 100644 --- a/utils/defaults/templates/guilds.html +++ b/utils/defaults/templates/guilds.html @@ -11,7 +11,7 @@

Guild List

diff --git a/utils/defaults/templates/launcher.html b/utils/defaults/templates/launcher.html index ba6cf48e5..baa8408f6 100644 --- a/utils/defaults/templates/launcher.html +++ b/utils/defaults/templates/launcher.html @@ -114,9 +114,9 @@ if($act eq "Boot") { ?>
@@ -153,7 +153,7 @@ if($act eq "Boot") { ListZones(); - + for my $zone (sort @zones) { my $z = $config->GetZoneDetails($zone); if(!$z) { @@ -161,7 +161,7 @@ if($act eq "Boot") { } elsif($z->{error}) { $zone->{name} = "ERROR: $z->{error}"; } - + print "\n"; print "\t"; if($z->{up}) { diff --git a/utils/defaults/templates/launchers.html b/utils/defaults/templates/launchers.html index 69d6b5fa0..997b51c9f 100644 --- a/utils/defaults/templates/launchers.html +++ b/utils/defaults/templates/launchers.html @@ -9,7 +9,7 @@ ListLaunchers(); - + ?>

Launchers

@@ -51,7 +51,7 @@ print "You have ".($#list+1)." launchers. (@list)"; Add Launcher: Name: -Dynamic Count: +Dynamic Count: diff --git a/utils/defaults/templates/main.css b/utils/defaults/templates/main.css index 1549282c2..8d7db8811 100644 --- a/utils/defaults/templates/main.css +++ b/utils/defaults/templates/main.css @@ -45,26 +45,26 @@ table { border-collapse:collapse; } th { - margin:2px; + margin:2px; padding: 2px; border:1px solid #2b6874; - background-color:#2b6874; - color:#dddddd; + background-color:#2b6874; + color:#dddddd; font-weight:bold; } td { - margin:2px; + margin:2px; padding: 2px; - border:1px solid #2b6874; - background-color:#12282F; - color:#aaaaaa; + border:1px solid #2b6874; + background-color:#12282F; + color:#aaaaaa; } .headtbl { border: 0px; - margin: 0px; - padding: 0px; + margin: 0px; + padding: 0px; background-color: #091315; } diff --git a/utils/defaults/templates/rule.html b/utils/defaults/templates/rule.html index da72cc324..8738d021a 100644 --- a/utils/defaults/templates/rule.html +++ b/utils/defaults/templates/rule.html @@ -25,11 +25,11 @@ print "\t\n"; print "\t\t\n"; print "\t\t\n"; - + my $q2 = "SELECT COUNT(ruleset_id) AS num_rules FROM rule_values WHERE ruleset_id = '$row->{ruleset_id}'"; my $res2 = $EQDB->query($q2); my $row2 = $res2->fetch_row_hash; - + print "\t\t\n"; #print "\t\t\n"; print "\t\n"; diff --git a/utils/defaults/templates/rules.html b/utils/defaults/templates/rules.html index 20ea10565..7a81935c3 100644 --- a/utils/defaults/templates/rules.html +++ b/utils/defaults/templates/rules.html @@ -35,14 +35,14 @@ if ($ruleset_id !~ m/^[0-9]+$/) {$ruleset_id = 1;} #this should default any non-numeric values (particularly blank ones), also making it free from injections my $rule_type = $request->get("rule_type", "All"); #not safe from injection as-is if ($rule_type !~ m/^\w+$/i) {$rule_type = "All";} #this should make it safe from injection, but may cause issues if we start using non-alphanumeric characters in the first part of the rule_name - + #now, we'll put together a list of the rule categories that we can filter by print "
\n\t"; - + if ($rule_type eq "All") {print "";} print "All"; if ($rule_type eq "All") {print "";} - + my $q = "SELECT DISTINCT(SUBSTRING(rule_name, 1, LOCATE(':', rule_name) - 1)) AS rule_type FROM rule_values WHERE ruleset_id = '$ruleset_id' ORDER BY rule_type ASC"; my $res = $EQDB->query($q); if ($res) { @@ -73,7 +73,7 @@ #print "\t\t
\n"; #print "\t\t\n"; #print "\t\n"; - + #lastly, output any matching rules my $w2 = "WHERE ruleset_id = '$ruleset_id'"; if ($rule_type ne "All") { diff --git a/utils/defaults/templates/top.html b/utils/defaults/templates/top.html index b744adba7..6a062c8bf 100644 --- a/utils/defaults/templates/top.html +++ b/utils/defaults/templates/top.html @@ -9,7 +9,7 @@
CommandAccess$tline/$row2->{total_tribute} $row2->{public_note} - Remove - + Remove - Make Leader
$z->{name}
{ruleset_id}\">$row->{name}{ruleset_id}\">$row->{ruleset_id}$row2->{num_rules}
- + diff --git a/utils/defaults/templates/variables.html b/utils/defaults/templates/variables.html index a5f59f83e..06a3df246 100644 --- a/utils/defaults/templates/variables.html +++ b/utils/defaults/templates/variables.html @@ -36,7 +36,7 @@ if (defined($gets->{"update.x"})) { my $i=0; $q="select * from variables order by varname"; my $res=$EQDB->query($q); - if ($res) { + if ($res) { print "
\n"; printf "\t\t\n"; printf "\t\t\n"; diff --git a/utils/defaults/updated_templates/actions/bug_action.html b/utils/defaults/updated_templates/actions/bug_action.html index 8cfea78f1..9dcd1e492 100644 --- a/utils/defaults/updated_templates/actions/bug_action.html +++ b/utils/defaults/updated_templates/actions/bug_action.html @@ -1,7 +1,7 @@ get("action", "none"); my $bug_id = $request->get("bug_id", "-1"); - + if($action eq "resolve") { if($bug_id != -1) { $EQW->ResolveBug($bug_id); diff --git a/utils/defaults/updated_templates/actions/console_action.html b/utils/defaults/updated_templates/actions/console_action.html index 6213b6d0f..4a41b6164 100644 --- a/utils/defaults/updated_templates/actions/console_action.html +++ b/utils/defaults/updated_templates/actions/console_action.html @@ -17,7 +17,7 @@ print "}"; return; } - + print "{"; print "\"status\" : 1,"; print "\"message\" : \"\""; diff --git a/utils/defaults/updated_templates/actions/launcher_action.html b/utils/defaults/updated_templates/actions/launcher_action.html index b4a925d9b..87698c561 100644 --- a/utils/defaults/updated_templates/actions/launcher_action.html +++ b/utils/defaults/updated_templates/actions/launcher_action.html @@ -7,8 +7,8 @@ print "\"message\" : \"Missing launcher name in Remove action\""; print "}"; return; - } - + } + if($action eq "add") { my $dynamic_count = $request->get("dynamic_count", "0"); if($dynamic_count < 0 || $dynamic_count > 254) { @@ -40,7 +40,7 @@ print "}"; return; } - + if($port < 0 || $port > 65535) { print "{"; print "\"status\" : 0, "; @@ -48,14 +48,14 @@ print "}"; return; } - + if(!$config->BootStaticZone($zone, $port)) { print "{"; print "\"status\" : 0, "; print "\"message\" : \"Failed to boot '$zone' on launcher $launcher_name with port $port. Invalid zone?\""; print "}"; return; - } + } } elsif($action eq "change_dynamic_count") { my $dynamic_count = $request->get("dynamic_count", "0"); $config->SetDynamicCount($dynamic_count); @@ -73,7 +73,7 @@ print "\"status\" : 0, "; print "\"message\" : \"Failed to remove '$zone' on launcher $launcher_name. Invalid zone?\""; print "}"; - return; + return; } } } elsif($action eq "reboot_all") { @@ -98,7 +98,7 @@ return; } else { $config->RestartZone($zone); - } + } } elsif($action eq "start_zone") { my $zone = $request->get("zone", "none"); if($zone eq "none" || $zone eq "") { @@ -122,7 +122,7 @@ $config->StopZone($zone); } } - + print "{"; print "\"status\" : 1"; print "}"; diff --git a/utils/defaults/updated_templates/actions/world_action.html b/utils/defaults/updated_templates/actions/world_action.html index 6d50b239b..acdd15890 100644 --- a/utils/defaults/updated_templates/actions/world_action.html +++ b/utils/defaults/updated_templates/actions/world_action.html @@ -7,7 +7,7 @@ } elsif($act eq "lsreconnect") { $EQW->LSReconnect(); } - + print "{"; if($EQW->LSConnected()) { print "\"connected\" : \"1\","; diff --git a/utils/defaults/updated_templates/actions/zone_action.html b/utils/defaults/updated_templates/actions/zone_action.html index 5813cfb2f..7a520a15e 100644 --- a/utils/defaults/updated_templates/actions/zone_action.html +++ b/utils/defaults/updated_templates/actions/zone_action.html @@ -9,7 +9,7 @@ } elsif($act eq "killall") { } elsif($act eq "restartall") { } - + print "{"; print "\"status\" : 1"; print "}"; diff --git a/utils/defaults/updated_templates/bugs.html b/utils/defaults/updated_templates/bugs.html index 5f2dc9703..aa1866c9b 100644 --- a/utils/defaults/updated_templates/bugs.html +++ b/utils/defaults/updated_templates/bugs.html @@ -10,13 +10,13 @@ function GetStatusIdx() { return idx++; } - + var offset = 0; function StatusTic() { $.getJSON("data/bug_data.html?offset="+offset+"&idx="+GetStatusIdx(), function(data) { var elm = document.getElementById("open_bugs_count"); - + var cur_offset = offset / 50; var sep = (data.total_bug_count / 50); var app = ""; @@ -31,7 +31,7 @@ } } elm.innerHTML = app; - + $("#bug_table").empty(); var app_html = ""; app_html += ""; @@ -41,7 +41,7 @@ app_html += ""; app_html += ""; $("#bug_table").append(app_html); - for(var i = 0; i < data.bug_count; i++) { + for(var i = 0; i < data.bug_count; i++) { app_html = ""; var mod = i % 2; if(mod == 1) { @@ -49,7 +49,7 @@ } else { app_html += ""; } - + var bug_text = data.bugs[i].bug; bug_text = bug_text.replace("\r", ""); bug_text = bug_text.replace("\n", "
"); @@ -59,16 +59,16 @@ app_html += ""; app_html += ""; app_html += ""; - $("#bug_table").append(app_html); + $("#bug_table").append(app_html); } }); } - + function OpenBugs(off) { offset = off; StatusTic(); } - + function ResolveBug(id) { $.getJSON("actions/bug_action.html?action=resolve&bug_id="+id+"&idx="+GetStatusIdx(), function(data) { @@ -76,11 +76,11 @@ alert(data.message); return; } - + StatusTic(); }); } - + $(document).ready(function() { setInterval("StatusTic()", 15000); }); @@ -103,7 +103,7 @@ for(my $i = 0; $i < $sep; ++$i) { my $cur = 50 * $i; my $name = $i + 1; - + if($i == $cur_offset) { print "$name "; } @@ -128,13 +128,13 @@ if(!$bug) { next; } - + if($i % 2 == 1) { print ""; } else { print ""; } - + my $bug_val = $bug->{bug}; $bug_val =~ s/\r//g; $bug_val =~ s/\n/
/g; diff --git a/utils/defaults/updated_templates/bugview.html b/utils/defaults/updated_templates/bugview.html index b41ee29c9..3dcac45ee 100644 --- a/utils/defaults/updated_templates/bugview.html +++ b/utils/defaults/updated_templates/bugview.html @@ -10,13 +10,13 @@ function GetStatusIdx() { return idx++; } - + var offset = 0; function StatusTic() { $.getJSON("data/bug_data.html?offset="+offset+"&idx="+GetStatusIdx(), function(data) { var elm = document.getElementById("open_bugs_count"); - + var cur_offset = offset / 50; var sep = (data.total_bug_count / 50); var app = ""; @@ -31,7 +31,7 @@ } } elm.innerHTML = app; - + $("#bug_table").empty(); var app_html = ""; app_html += ""; @@ -40,7 +40,7 @@ app_html += ""; app_html += ""; $("#bug_table").append(app_html); - for(var i = 0; i < data.bug_count; i++) { + for(var i = 0; i < data.bug_count; i++) { app_html = ""; var mod = i % 2; if(mod == 1) { @@ -48,7 +48,7 @@ } else { app_html += ""; } - + var bug_text = data.bugs[i].bug; bug_text = bug_text.replace("\r", ""); bug_text = bug_text.replace("\n", "
"); @@ -57,16 +57,16 @@ app_html += ""; app_html += ""; app_html += ""; - $("#bug_table").append(app_html); + $("#bug_table").append(app_html); } }); } - + function OpenBugs(off) { offset = off; StatusTic(); } - + $(document).ready(function() { setInterval("StatusTic()", 6000); }); @@ -89,7 +89,7 @@ for(my $i = 0; $i < $sep; ++$i) { my $cur = 50 * $i; my $name = $i + 1; - + if($i == $cur_offset) { print "$name "; } @@ -113,13 +113,13 @@ if(!$bug) { next; } - + if($i % 2 == 1) { print ""; } else { print ""; } - + my $bug_val = $bug->{bug}; $bug_val =~ s/\r//g; $bug_val =~ s/\n/
/g; diff --git a/utils/defaults/updated_templates/console.html b/utils/defaults/updated_templates/console.html index e0bb46256..b1a31490e 100644 --- a/utils/defaults/updated_templates/console.html +++ b/utils/defaults/updated_templates/console.html @@ -8,38 +8,38 @@ diff --git a/utils/defaults/updated_templates/data/bug_data.html b/utils/defaults/updated_templates/data/bug_data.html index 52cb5a4a9..100ce2717 100644 --- a/utils/defaults/updated_templates/data/bug_data.html +++ b/utils/defaults/updated_templates/data/bug_data.html @@ -4,14 +4,14 @@ my $bug_count = @bugs; my $total_bug_count = $EQW->CountBugs(); print "{"; - print "\"total_bug_count\" : $total_bug_count,"; + print "\"total_bug_count\" : $total_bug_count,"; print "\"bug_count\" : $bug_count,"; print "\"bugs\" : "; print "["; my $i = 0; for my $bugkey (@bugs) { my $bug = $EQW->GetBugDetails($bugkey); - + my $bug_val = $bug->{bug}; $bug_val =~ s/\\/\\\\/g; $bug_val =~ s/\//\\\//g; @@ -32,7 +32,7 @@ print "\"x\" : \"$bug->{x}\","; print "\"y\" : \"$bug->{y}\","; print "\"z\" : \"$bug->{z}\""; - + print "}"; if($i != $bug_count - 1) { print ","; diff --git a/utils/defaults/updated_templates/data/console_data.html b/utils/defaults/updated_templates/data/console_data.html index 99a3271ff..a96973603 100644 --- a/utils/defaults/updated_templates/data/console_data.html +++ b/utils/defaults/updated_templates/data/console_data.html @@ -4,7 +4,7 @@ print "\"message_count\" : $message_count,"; print "\"messages\" : "; print "["; - for(my $i = 0; $i < $message_count; $i++) + for(my $i = 0; $i < $message_count; $i++) { print "{"; my $msg = $EQW->GetConsoleMessage($i); @@ -19,7 +19,7 @@ $message =~ s/\x0C/\\b/g; $message =~ s/[\x00-\x1F]/\./g; $message =~ s/[\x7F-\xFF]/\./g; - + print "\"message\" : \"$message\""; print "}"; if($i != $message_count - 1) { diff --git a/utils/defaults/updated_templates/data/launcher_data.html b/utils/defaults/updated_templates/data/launcher_data.html index 9ce4d548b..2ead600e4 100644 --- a/utils/defaults/updated_templates/data/launcher_data.html +++ b/utils/defaults/updated_templates/data/launcher_data.html @@ -2,7 +2,7 @@ $launcher_name = $request->get("launcher", "none"); if($launcher_name eq "none") { - @launchers = sort $EQW->ListLaunchers(); + @launchers = sort $EQW->ListLaunchers(); my $launcher_count = @launchers; print "{"; print "\"launcher_count\" : $launcher_count,"; @@ -22,14 +22,14 @@ } print "\"connected\" : ". $conn; print "}"; - + if($i != $launcher_count - 1) { print ","; } $i++; } - print "]"; + print "]"; print "}"; } else { my $l = $EQW->GetLauncher($lname); @@ -56,13 +56,13 @@ print "\"starts\" : $z->{starts},"; print "\"port\" : $z->{port}"; print "}"; - + if($i != $zone_count - 1) { print ", "; } $i++; } - + print "]"; print "}"; } diff --git a/utils/defaults/updated_templates/data/player_data.html b/utils/defaults/updated_templates/data/player_data.html index 9220792c4..17e72b40f 100644 --- a/utils/defaults/updated_templates/data/player_data.html +++ b/utils/defaults/updated_templates/data/player_data.html @@ -7,11 +7,11 @@ print "\"player_count\" : $player_count,"; print "\"players\" : "; print "["; - + my $i = 0; for my $player (@players) { my $pd = $EQW->GetPlayerDetails($player); - + print "{"; print "\"character\" : \"$pd->{character}\","; print "\"account\" : \"$pd->{account}\","; @@ -29,13 +29,13 @@ print "\"status\" : \"$pd->{status}\","; print "\"client_version\" : \"$pd->{client_version}\""; print "}"; - + if($i != $player_count - 1) { print ","; } $i++; } - + print "]"; print "}"; diff --git a/utils/defaults/updated_templates/data/world_status.html b/utils/defaults/updated_templates/data/world_status.html index 47551445c..e31a2bc3b 100644 --- a/utils/defaults/updated_templates/data/world_status.html +++ b/utils/defaults/updated_templates/data/world_status.html @@ -1,4 +1,4 @@ -LSConnected()) { print "\"connected\" : \"1\","; diff --git a/utils/defaults/updated_templates/data/zone_data.html b/utils/defaults/updated_templates/data/zone_data.html index 11b27ed29..3ccfdd07d 100644 --- a/utils/defaults/updated_templates/data/zone_data.html +++ b/utils/defaults/updated_templates/data/zone_data.html @@ -19,9 +19,9 @@ for(my $i = 0; $i < $zone_count; $i++) { print "\"long_name\" : \"$zone->{long_name}\","; print "\"port\" : $zone->{port},"; print "\"player_count\" : $zone->{player_count},"; - print "\"instance_id\" : $zone->{instance_id}"; + print "\"instance_id\" : $zone->{instance_id}"; print "}"; - + if($i != $zone_count - 1) { print ","; } diff --git a/utils/defaults/updated_templates/images/loading.gif b/utils/defaults/updated_templates/images/loading.gif index d0bce1542342e912da81a2c260562df172f30d73..cd5899c6cdf7759b5e541db19bc7ca888b7cf44f 100644 GIT binary patch delta 35 qcmZ3;I+Jxm)0B=ML^Z)<= diff --git a/utils/defaults/updated_templates/index.html b/utils/defaults/updated_templates/index.html index 619674448..a21b40d6e 100644 --- a/utils/defaults/updated_templates/index.html +++ b/utils/defaults/updated_templates/index.html @@ -8,34 +8,34 @@ "; } else { $locked_str = "World is NOT locked. Lock World.
"; } - + print "
"; print "$locked_str"; - print "
"; + print ""; ?> diff --git a/utils/defaults/updated_templates/launcher.html b/utils/defaults/updated_templates/launcher.html index 0cc2c3121..ff6b25a3f 100644 --- a/utils/defaults/updated_templates/launcher.html +++ b/utils/defaults/updated_templates/launcher.html @@ -13,7 +13,7 @@ function GetStatusIdx() { return idx++; } - + function StatusTic() { $.getJSON("data/launcher_data.html?launcher="++"&idx="+GetStatusIdx(), function(data) { @@ -57,23 +57,23 @@ } app_html += ""; app_html += ""; - $("#launcher_table").append(app_html); + $("#launcher_table").append(app_html); } - }); + }); } - + function ShowAddLauncher() { $("#add_launcher_link").hide(); $("#min_add_launcher_link").show(); $("#add_launcher_table").fadeIn("slow"); } - + function HideAddLauncher() { $("#add_launcher_link").show(); $("#min_add_launcher_link").hide(); $("#add_launcher_table").fadeOut("slow"); } - + function BootZone() { var elm = document.getElementById("short_name_field"); var bzone = elm.value; @@ -81,23 +81,23 @@ elm = document.getElementById("port_field"); var bport = elm.value; elm.value = "0"; - + elm = document.getElementById("boot_button_img"); elm.style.display = "inline"; - + elm = document.getElementById("boot_button"); elm.className = "styled_button_disabled"; $('#boot_button').unbind('click'); - + $.getJSON("actions/launcher_action.html?action=boot&launcher_name="++"&zone="+bzone+"&port="+bport+"&idx="+GetStatusIdx(), function(data) { $('#boot_button').bind('click', BootZone); elm = document.getElementById("boot_button"); elm.className = "styled_button"; - + elm = document.getElementById("boot_button_img"); elm.style.display = "none"; - + if(data.status == 0) { alert(data.message); } else { @@ -105,38 +105,38 @@ } }); } - + function ChangeDynamicCount() { var elm = document.getElementById("dynamic_count_field"); var dcount = elm.value; - + elm = document.getElementById("dynamic_count_button_img"); elm.style.display = "inline"; - + elm = document.getElementById("dynamic_count_button"); elm.className = "styled_button_disabled"; $('#dynamic_count_button').unbind('click'); - + $.getJSON("actions/launcher_action.html?action=change_dynamic_count&launcher_name="++"&dynamic_count="+dcount+"&idx="+GetStatusIdx(), function(data) { $('#dynamic_count_button').bind('click', ChangeDynamicCount); elm = document.getElementById("dynamic_count_button"); elm.className = "styled_button"; - + elm = document.getElementById("dynamic_count_button_img"); elm.style.display = "none"; - + if(data.status == 0) { alert(data.message); } else { StatusTic(); } - }); + }); } - + function RemoveZone(zone_name) { $.getJSON("actions/launcher_action.html?action=remove_zone&launcher_name="++"&zone="+zone_name+"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { @@ -144,10 +144,10 @@ } }); } - + function RebootAll() { $.getJSON("actions/launcher_action.html?action=reboot_all&launcher_name="++"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { @@ -155,10 +155,10 @@ } }); } - + function StopAll() { $.getJSON("actions/launcher_action.html?action=stop_all&launcher_name="++"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { @@ -166,10 +166,10 @@ } }); } - + function StartAll() { $.getJSON("actions/launcher_action.html?action=start_all&launcher_name="++"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { @@ -177,21 +177,21 @@ } }); } - + function RestartZone(zone) { $.getJSON("actions/launcher_action.html?action=restart_zone&launcher_name="++"&zone="+zone+"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { StatusTic(); } - }); + }); } - + function StartZone(zone) { $.getJSON("actions/launcher_action.html?action=start_zone&launcher_name="++"&zone="+zone+"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { @@ -199,10 +199,10 @@ } }); } - + function StopZone(zone) { $.getJSON("actions/launcher_action.html?action=stop_zone&launcher_name="++"&zone="+zone+"&idx="+GetStatusIdx(), - function(data) { + function(data) { if(data.status == 0) { alert(data.message); } else { @@ -210,14 +210,14 @@ } }); } - + $(document).ready(function() { setInterval("StatusTic()", 4000); $('#boot_button').bind('click', BootZone); $('#dynamic_count_button').bind('click', ChangeDynamicCount); }); --> - +
@@ -230,8 +230,8 @@ } ?>
@@ -255,7 +255,7 @@
VariableDescription
ActionsDescripton
"+data.bugs[i].target+""+bug_text+"
ReporterDescripton
"+data.bugs[i].target+""+bug_text+"
- + @@ -266,7 +266,7 @@ ListZones(); - + for my $zone (sort @zones) { my $z = $config->GetZoneDetails($zone); if(!$z) { @@ -274,7 +274,7 @@ } elsif($z->{error}) { $zone->{name} = "ERROR: $z->{error}"; } - + print "\n"; print "\t"; if($z->{up}) { @@ -307,7 +307,7 @@ print "\n"; } ?> -
Zone Name
$z->{name}
+
diff --git a/utils/defaults/updated_templates/launchers.html b/utils/defaults/updated_templates/launchers.html index b7b8eb0c1..60345f3ed 100644 --- a/utils/defaults/updated_templates/launchers.html +++ b/utils/defaults/updated_templates/launchers.html @@ -10,11 +10,11 @@ function GetStatusIdx() { return idx++; } - + function StatusTic() { $.getJSON("data/launcher_data.html?idx="+GetStatusIdx(), function(data) { - + $("#launcher_table").empty(); var app_html = ""; app_html += "Launcher Name "; @@ -22,7 +22,7 @@ app_html += "Actions"; app_html += ""; $("#launcher_table").append(app_html); - + var i = 0; for(var i = 0; i < data.launcher_count; i++) { app_html = ""; @@ -37,12 +37,12 @@ app_html += "Remove"; app_html += "\n"; app_html += "\n"; - + $("#launcher_table").append(app_html); } - }); + }); } - + function RemoveLauncher(name) { $.getJSON("actions/launcher_action.html?action=remove&launcher_name="+name+"&idx="+GetStatusIdx(), function(data) { @@ -53,32 +53,32 @@ } }); } - + function AddLauncher() { var elm = document.getElementById("al_add_button_img"); elm.style.display = "inline"; - + elm = document.getElementById("al_add_button"); elm.className = "styled_button_disabled"; $('#al_add_button').unbind('click'); - - elm = document.getElementById("al_name"); + + elm = document.getElementById("al_name"); var launcher_name = elm.value; elm.value = ""; - - elm = document.getElementById("al_count"); + + elm = document.getElementById("al_count"); var dynamic_count = elm.value; elm.value = ""; - + $.getJSON("actions/launcher_action.html?action=add&launcher_name="+launcher_name+"&dynamic_count="+dynamic_count+"&idx="+GetStatusIdx(), function(data) { $('#al_add_button').bind('click', AddLauncher); elm = document.getElementById("al_add_button"); elm.className = "styled_button"; - + elm = document.getElementById("al_add_button_img"); elm.style.display = "none"; - + if(data.status == 0) { alert(data.message); } else { @@ -86,19 +86,19 @@ } }); } - - function ShowAddLauncher() { + + function ShowAddLauncher() { $("#add_launcher_link").hide(); $("#min_add_launcher_link").show(); $("#add_launcher_table").fadeIn("slow"); } - + function HideAddLauncher() { $("#add_launcher_link").show(); $("#min_add_launcher_link").hide(); $("#add_launcher_table").fadeOut("slow"); } - + $(document).ready(function() { setInterval("StatusTic()", 4000); $('#al_add_button').bind('click', AddLauncher); @@ -107,7 +107,7 @@ ListLaunchers(); + @list = sort $EQW->ListLaunchers(); ?>
@@ -139,9 +139,9 @@ print "\n"; print "\n"; } -?> +?> - +
Add Launcher @@ -150,7 +150,7 @@
diff --git a/utils/defaults/updated_templates/zoneview.html b/utils/defaults/updated_templates/zoneview.html index 92b8e20a0..4e919d064 100644 --- a/utils/defaults/updated_templates/zoneview.html +++ b/utils/defaults/updated_templates/zoneview.html @@ -10,13 +10,13 @@ function GetStatusIdx() { return idx++; } - + function StatusTic() { $.getJSON("data/zone_data.html?idx="+GetStatusIdx(), function(data) { var elm = document.getElementById('zone_count'); elm.innerHTML = data.zone_count; - + $("#zone_table").empty(); var app_html = ""; app_html += "Zone Name "; @@ -24,7 +24,7 @@ app_html += "Players"; app_html += ""; $("#zone_table").append(app_html); - + var i = 0; for(var i = 0; i < data.zone_count; i++) { app_html = ""; @@ -37,16 +37,16 @@ } else { app_html += "" + data.zones[i].long_name + " (" + data.zones[i].short_name + ")"; } - + app_html += "" + data.zones[i].instance_id + ""; app_html += "Players"; app_html += ""; - + $("#zone_table").append(app_html); } }); } - + $(document).ready(function() { setInterval("StatusTic()", 4000); }); @@ -101,7 +101,7 @@ print "\n"; } ?> - +
diff --git a/utils/patches/opcodes.conf b/utils/patches/opcodes.conf index 92f208e00..ed2a685d7 100644 --- a/utils/patches/opcodes.conf +++ b/utils/patches/opcodes.conf @@ -63,7 +63,7 @@ OP_BlockedBuffs=0x39C4 # New for SoF 1/1/09 OP_Logout=0x61ff OP_LogoutReply=0x48c2 #0x0F66 is not quite right.. this causes disconnect error... -OP_LevelUpdate=0x6d44 +OP_LevelUpdate=0x6d44 OP_Stamina=0x7a83 # ShowEQ 10/27/05 #Petition Opcodes @@ -78,7 +78,7 @@ OP_PetitionQue=0x0000 OP_PetitionUnCheckout=0x0000 OP_PetitionDelete=0x5692 OP_DeletePetition=0x0000 -OP_PetitionResolve=0x0000 #0x0000 +OP_PetitionResolve=0x0000 #0x0000 OP_PDeletePetition=0x0000 OP_PetitionBug=0x0000 OP_PetitionRefresh=0x0000 @@ -100,7 +100,7 @@ OP_GuildLeader=0x0000 OP_GuildDemote=0x0000 OP_GuildMOTD=0x475a # ShowEQ 10/27/05 OP_SetGuildMOTD=0x0000 -OP_GetGuildsList=0x0000 +OP_GetGuildsList=0x0000 OP_GuildInvite=0x0000 OP_GuildPublicNote=0x17a2 # ShowEQ 10/27/05 OP_GuildDelete=0x0000 @@ -125,7 +125,7 @@ OP_GMZoneRequest2=0x0000 OP_GMSummon=0x1edc #/summon OP_GMEmoteZone=0x39f2 #/emotezone OP_GMEmoteWorld=0x3383 #/emoteworld (not implemented) -OP_GMFind=0x5930 #/find +OP_GMFind=0x5930 #/find OP_GMKick=0x692c #/kick OP_GMNameChange=0x0000 @@ -152,7 +152,7 @@ OP_Consent=0x1081 # ShowEQ 10/27/05 OP_LFGCommand=0x68ac # ShowEQ 10/27/05 OP_LFGGetMatchesRequest=0x022f # ShowEQ 10/27/05 OP_LFGAppearance=0x0000 -OP_LFGResponse=0x0000 +OP_LFGResponse=0x0000 OP_LFGGetMatchesResponse=0x45d0 # ShowEQ 10/27/05 OP_LootItem=0x7081 # ShowEQ 10/27/05 OP_Bug=0x7ac2 # ShowEQ 10/27/05 @@ -221,7 +221,7 @@ OP_SkillUpdate=0x6a93 # ShowEQ 10/27/05 OP_RandomReq=0x5534 # ShowEQ 10/27/05 OP_CastSpell=0x304b # ShowEQ 10/27/05 OP_ClientUpdate=0x14cb # ShowEQ 10/27/05 -OP_Report=0x7f9d +OP_Report=0x7f9d OP_GroundSpawn=0x0f47 # ShowEQ 10/27/05 OP_TargetCommand=0x0dfe # ShowEQ 10/27/05 OP_LFPGetMatchesResponse=0x45d0 # ShowEQ 10/27/05 @@ -232,7 +232,7 @@ OP_BecomeCorpse=0x0000 OP_GMLastName=0x23a1 # ShowEQ 10/27/05 OP_InitialMobHealth=0x3d2d # ShowEQ 10/27/05 OP_Mend=0x14ef # ShowEQ 10/27/05 -OP_MendHPUpdate=0x0000 +OP_MendHPUpdate=0x0000 OP_Feedback=0x5306 # ShowEQ 10/27/05 OP_TGB=0x0c11 # ShowEQ 10/27/05 OP_InterruptCast=0x0000 @@ -270,12 +270,12 @@ OP_MobEnduranceUpdate=0x0000 # 0x6c5f #bazaar trader stuff stuff: #become and buy from #Server->Client: [ Opcode: OP_Unknown (0x0000) Size: 8 ] -# 0: 46 01 00 00 39 01 00 00 | F...9... +# 0: 46 01 00 00 39 01 00 00 | F...9... OP_TraderDelItem=0x0000 OP_BecomeTrader=0x0000 -OP_TraderShop=0x0000 +OP_TraderShop=0x0000 OP_TraderItemUpdate=0x0000 -OP_Trader=0x0000 +OP_Trader=0x0000 OP_ShopItem=0x0000 OP_TraderBuy=0x6dd8 # ShowEQ 10/27/05 @@ -292,7 +292,7 @@ OP_TradeBusy=0x6839 # #merchant crap OP_ShopPlayerSell=0x0e13 # ShowEQ 10/27/05 OP_ShopEnd=0x7e03 # ShowEQ 10/27/05 -OP_ShopPlayerBuy=0x221e +OP_ShopPlayerBuy=0x221e OP_ShopRequest=0x45f9 # ShowEQ 10/27/05 OP_ShopDelItem=0x0000 #0x0000 maybe, 16 bytes though @@ -395,10 +395,10 @@ OP_Taunt=0x5e48 OP_CombatAbility=0x5ee8 OP_SenseTraps=0x5666 # ShowEQ 10/27/05 OP_PickPocket=0x0000 -OP_DisarmTraps=0x0000 +OP_DisarmTraps=0x0000 OP_Disarm=0x0000 -OP_Hide=0x0000 -OP_Sneak=0x0000 +OP_Hide=0x0000 +OP_Sneak=0x0000 OP_Fishing=0x0b36 OP_InstillDoubt=0x0000 @@ -446,7 +446,7 @@ OP_SetTitleReply=0x0000 # EQEmu 06/29/05 OP_Bandolier=0x6f0c OP_OpenDiscordMerchant=0x0000 #8 bytes OP_DiscordMerchantInventory=0x0000 #long item packet -OP_GiveMoney=0x0000 #16 bytes, pp, gp, sp, cp. +OP_GiveMoney=0x0000 #16 bytes, pp, gp, sp, cp. OP_OnLevelMessage=0x0000 OP_RequestKnowledgeBase=0x0000 OP_KnowledgeBase=0x0000 @@ -502,10 +502,10 @@ OP_SentConfirm=0x0000 OP_MobUpdate=0x0000 #not used anymore, here for backwards compat #we need to document the differences between these packets to make identifying them easier -OP_MobHealth=0x0695 +OP_MobHealth=0x0695 OP_HPUpdate=0x3bcf # ShowEQ 10/27/05 OP_Some3ByteHPUpdate=0x0000 #initial HP update for mobs -OP_InitialHPUpdate=0x0000 +OP_InitialHPUpdate=0x0000 # Unmatched: OP_ItemPlayerPacket=5394 # Unmatched: OP_GetGuildMOTD=6d5d diff --git a/utils/patches/patch_6.2.conf b/utils/patches/patch_6.2.conf index ad2b17d30..25944a3b5 100644 --- a/utils/patches/patch_6.2.conf +++ b/utils/patches/patch_6.2.conf @@ -34,7 +34,7 @@ OP_WorldClientReady=0x5e99 # EQEmu 06/29/05 (Guess - Doodman) OP_WorldUnknown001=0x7510 # EQEmu 06/29/05 (New to 6/29) OP_SendSystemStats=0x681b # anonymous system stats reporting OP_WorldLogout=0x7186 -OP_ZoneUnavail=0x6d95 +OP_ZoneUnavail=0x6d95 OP_WorldLevelTooHigh=0x583b # world->client. Cancels zone in. OP_CharInacessable=0x28aa # world->client. Cancels zone in. #OP_InvalidLoginPassword=0x52A4 @@ -122,7 +122,7 @@ OP_GMToggle=0x5ce2 #/toggle OP_GMZoneRequest2=0x0000 OP_GMSummon=0x3383 #/summon OP_GMEmoteZone=0x3905 #/emotezone -OP_GMFind=0x5e6a #/find +OP_GMFind=0x5e6a #/find OP_GMKick=0x1cee #/kick OP_GMNameChange=0x0000 @@ -279,7 +279,7 @@ OP_ApplyPoison=0x4298 #bazaar trader stuff stuff: #become and buy from #Server->Client: [ Opcode: OP_Unknown (0x2403) Size: 8 ] -# 0: 46 01 00 00 39 01 00 00 | F...9... +# 0: 46 01 00 00 39 01 00 00 | F...9... OP_TraderDelItem=0x0da9 OP_BecomeTrader=0x66f9 OP_TraderShop=0x19d8 @@ -302,7 +302,7 @@ OP_TradeMoneyUpdate=0x3e63 #not sure OP_ShopPlayerSell=0x0e13 # ShowEQ 06/29/05 OP_ShopEnd=0x7e03 # ShowEQ 06/29/05 OP_ShopEndConfirm=0x0000 -OP_ShopPlayerBuy=0x221e +OP_ShopPlayerBuy=0x221e OP_ShopRequest=0x3c4b # ShowEQ 06/29/05 OP_ShopDelItem=0x0000 #0x0da9 maybe, 16 bytes though @@ -320,9 +320,9 @@ OP_RequestDuel=0x28e1 OP_DuelResponse=0x2e78 OP_DuelResponse2=0x3bad #when accepted -OP_RezzComplete=0x60fa -OP_RezzRequest=0x417a -OP_RezzAnswer=0x6219 +OP_RezzComplete=0x60fa +OP_RezzRequest=0x417a +OP_RezzAnswer=0x6219 OP_SafeFallSuccess=0x5309 OP_Shielding=0x0000 OP_TargetReject=0x0000 @@ -378,7 +378,7 @@ OP_GroupUpdate=0x66ba # ShowEQ 06/29/05 OP_GroupAcknowledge=0x0797 OP_GroupCancelInvite=0x42c9 # ShowEQ 06/29/05 OP_GroupDelete=0x0000 -OP_GroupFollow2=0x0000 #used with GroupInvite2 +OP_GroupFollow2=0x0000 #used with GroupInvite2 OP_GroupInvite2=0x1f27 #this is sometimes sent instead of OP_GroupInvite OP_CancelInvite=0x0000 @@ -405,7 +405,7 @@ OP_BankerChange=0x6a5b #Rogue packets OP_SenseTraps=0x24ab # ShowEQ 06/29/05 OP_PickPocket=0x4a2a -OP_DisarmTraps=0x0000 +OP_DisarmTraps=0x0000 OP_Disarm=0x17d9 OP_Hide=0x6f64 # ShowEQ 06/29/05 OP_Sneak=0x4312 # ShowEQ 06/29/05 @@ -461,7 +461,7 @@ OP_Bandolier=0x6f0c OP_PotionBelt=0x0719 OP_OpenDiscordMerchant=0x0000 #8 bytes OP_DiscordMerchantInventory=0x0000 #long item packet -OP_GiveMoney=0x56d4 #16 bytes, pp, gp, sp, cp. +OP_GiveMoney=0x56d4 #16 bytes, pp, gp, sp, cp. OP_OnLevelMessage=0x1dde OP_PopupResponse=0x3816 OP_RequestKnowledgeBase=0x7584 diff --git a/utils/patches/patch_RoF.conf b/utils/patches/patch_RoF.conf index e569277ed..00582a08a 100644 --- a/utils/patches/patch_RoF.conf +++ b/utils/patches/patch_RoF.conf @@ -650,4 +650,4 @@ OP_RAWOutOfSession=0x0000 # we need to document the differences between these packets to make identifying them easier OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs -OP_InitialHPUpdate=0x0000 +OP_InitialHPUpdate=0x0000 diff --git a/utils/patches/patch_SoD.conf b/utils/patches/patch_SoD.conf index 833c30610..727811484 100644 --- a/utils/patches/patch_SoD.conf +++ b/utils/patches/patch_SoD.conf @@ -13,11 +13,11 @@ OP_Unknown=0x0000 OP_ExploreUnknown=0x0000 # used for unknown explorer # V = Verified correct -# C = Most likely correct +# C = Most likely correct # U = Unsure, but should be correct or close # world packets -# Required to reach Char Select: +# Required to reach Char Select: OP_SendLoginInfo=0x0ff4 # C OP_ApproveWorld=0x701f # C OP_LogServer=0x4762 # C @@ -49,15 +49,15 @@ OP_FloatListThing=0x10b5 # C # Reasons for Disconnect: OP_ZoneUnavail=0x7930 # C OP_WorldClientReady=0x1a84 # C -OP_CharacterStillInZone=0x0000 # -OP_WorldChecksumFailure=0x0000 # -OP_WorldLoginFailed=0x0000 # -OP_WorldLogout=0x0000 # -OP_WorldLevelTooHigh=0x0000 # -OP_CharInacessable=0x0000 # -OP_UserCompInfo=0x0000 # -# OP_SendExeChecksum=0x0000 # -# OP_SendBaseDataChecksum=0x0000 # +OP_CharacterStillInZone=0x0000 # +OP_WorldChecksumFailure=0x0000 # +OP_WorldLoginFailed=0x0000 # +OP_WorldLogout=0x0000 # +OP_WorldLevelTooHigh=0x0000 # +OP_CharInacessable=0x0000 # +OP_UserCompInfo=0x0000 # +# OP_SendExeChecksum=0x0000 # +# OP_SendBaseDataChecksum=0x0000 # # Zone in opcodes OP_AckPacket=0x3594 # C @@ -69,15 +69,15 @@ OP_PlayerProfile=0x6022 # C OP_TimeOfDay=0x6015 # C OP_LevelUpdate=0x6a99 # C OP_Stamina=0x3e50 # C -OP_LockoutTimerInfo=0x0000 # -OP_ZoneServerReady=0x0000 # +OP_LockoutTimerInfo=0x0000 # +OP_ZoneServerReady=0x0000 # OP_RequestClientZoneChange=0x4885 # C OP_ZoneChange=0x051b # C -OP_ZoneInUnknown=0x0000 # -OP_LogoutReply=0x0000 # -OP_PreLogoutReply=0x0000 # +OP_ZoneInUnknown=0x0000 # +OP_LogoutReply=0x0000 # +OP_PreLogoutReply=0x0000 # # Required to fully log in OP_SpawnAppearance=0x10b7 # C @@ -87,14 +87,14 @@ OP_TaskDescription=0x7b77 # C OP_TaskActivity=0x0525 # C OP_CompletedTasks=0x5412 # C OP_Weather=0x2641 # C -OP_SendAATable=0x322f # C -OP_UpdateAA=0x466c # C -OP_RespondAA=0x0142 # C +OP_SendAATable=0x322f # C +OP_UpdateAA=0x466c # C +OP_RespondAA=0x0142 # C OP_ReqClientSpawn=0x1436 # C OP_SpawnDoor=0x102f # C OP_GroundSpawn=0x33e5 # C OP_SendZonepoints=0x5821 # C -OP_SendAAStats=0x57a3 # C +OP_SendAAStats=0x57a3 # C OP_WorldObjectsSent=0x7b73 # C OP_BlockedBuffs=0x0baa # C OP_RemoveBlockedBuffs=0x064d # C @@ -136,14 +136,14 @@ OP_GuildManageBanker=0x11bc # C OP_GuildBank=0x0fce # C OP_SetGuildRank=0x4ffe # C OP_GuildUpdateURLAndChannel=0x5422 -OP_GuildMemberLevelUpdate=0x0000 # -OP_ZoneGuildList=0x0000 # -OP_GetGuildsList=0x0000 # +OP_GuildMemberLevelUpdate=0x0000 # +OP_ZoneGuildList=0x0000 # +OP_GetGuildsList=0x0000 # OP_GuildStatus=0x5479 # OP_LFGuild=0x40e8 # -# OP_GuildManageRemove=0x0000 # -# OP_GuildManageAdd=0x0000 # -# OP_GuildManageStatus=0x0000 # +# OP_GuildManageRemove=0x0000 # +# OP_GuildManageAdd=0x0000 # +# OP_GuildManageStatus=0x0000 # # GM/guide opcodes OP_GMServers=0x6989 # C @@ -329,8 +329,8 @@ OP_VetClaimReply=0x2f95 # C OP_CrystalCountUpdate=0x2d0e # C OP_CrystalReclaim=0x4d4b OP_CrystalCreate=0x6c80 -OP_DisciplineUpdate=0x7b87 # -OP_BecomeCorpse=0x0000 # +OP_DisciplineUpdate=0x7b87 # +OP_BecomeCorpse=0x0000 # OP_MobUpdate=0x0000 # Unused? OP_CameraEffect=0x0d96 # V OP_SpellEffect=0x7309 # V @@ -370,12 +370,12 @@ OP_DzChooseZone=0xd8a #0x1d99 was grouped with these too but I don't really know it's purpose. # New Opcodes -OP_SpawnPositionUpdate=0x4656 # +OP_SpawnPositionUpdate=0x4656 # OP_ManaUpdate=0x4b61 # -OP_EnduranceUpdate=0x02d6 # +OP_EnduranceUpdate=0x02d6 # OP_MobManaUpdate=0x2ac1 # OP_MobEnduranceUpdate=0x6c5f # - + # Looting OP_LootRequest=0x2701 # C OP_EndLootRequest=0x6ad7 # C @@ -387,13 +387,13 @@ OP_BazaarSearch=0x4675 # C OP_TraderDelItem=0x63c8 # C OP_BecomeTrader=0x528f # C OP_TraderShop=0x7598 # C -OP_TraderItemUpdate=0x0000 # +OP_TraderItemUpdate=0x0000 # OP_Trader=0x7092 # C -OP_ShopItem=0x0000 # +OP_ShopItem=0x0000 # OP_TraderBuy=0x053a # C OP_Barter=0x4b49 # -OP_BazaarInspect=0x0000 # -OP_Bazaar=0x0000 # +OP_BazaarInspect=0x0000 # +OP_Bazaar=0x0000 # # pc/npc trading OP_TradeRequest=0x47ae # C @@ -442,10 +442,10 @@ OP_TributeItem=0x416b # C OP_TributeMoney=0x0b89 # C OP_TributeToggle=0x45b3 # C OP_TributePointUpdate=0x7d05 # C -OP_TributeNPC=0x0000 # -OP_GuildTributeInfo=0x0000 # -OP_OpenTributeReply=0x0000 # -# OP_GuildTributeStatus=0x0000 # +OP_TributeNPC=0x0000 # +OP_GuildTributeInfo=0x0000 # +OP_OpenTributeReply=0x0000 # +# OP_GuildTributeStatus=0x0000 # # Adventure packets: OP_LeaveAdventure=0x2ab6 # C @@ -474,7 +474,7 @@ OP_GroupUpdate=0x21be OP_GroupUpdateB=0x7351 OP_GroupCancelInvite=0x5251 # C - Same as OP_CancelInvite? OP_GroupAcknowledge=0x3e22 # C -OP_GroupDelete=0x58e6 # +OP_GroupDelete=0x58e6 # OP_CancelInvite=0x5251 # C OP_GroupFollow2=0x2736 # C OP_GroupInvite2=0x548c # C @@ -490,20 +490,20 @@ OP_LFGGetMatchesResponse=0x7d90 # C OP_LFPGetMatchesRequest=0x0479 # C OP_LFPGetMatchesResponse=0x16f5 # C OP_LFPCommand=0x710e # C -OP_LFGAppearance=0x0000 # -OP_LFGResponse=0x0000 # +OP_LFGAppearance=0x0000 # +OP_LFGResponse=0x0000 # # Raid Opcodes OP_RaidInvite=0x3b52 # C OP_RaidUpdate=0x32c6 # C -OP_RaidJoin=0x0000 # +OP_RaidJoin=0x0000 # # Button-push commands OP_Taunt=0x1418 # C OP_CombatAbility=0x24c5 # C OP_SenseTraps=0x1e04 # C OP_PickPocket=0x25f0 # C -OP_DisarmTraps=0x0000 # +OP_DisarmTraps=0x0000 # OP_Disarm=0x6def # C OP_Sneak=0x03e7 # C OP_Fishing=0x7093 # C @@ -521,7 +521,7 @@ OP_AcceptNewTask=0x5832 # C OP_TaskHistoryRequest=0x29d7 # C OP_TaskHistoryReply=0x3d2a # C OP_CancelTask=0x726b # C -OP_DeclineAllTasks=0x0000 # +OP_DeclineAllTasks=0x0000 # OP_Shroud=0x6d1f OP_ShroudRemove=0x17f6 OP_ShroudUnknown1=0x169a @@ -556,53 +556,53 @@ OP_MercenaryDismiss=0x0bd0 # OP_MercenaryTimerRequest=0x0924 # # mail opcodes -OP_Command=0x0000 # -OP_MailboxHeader=0x0000 # -OP_MailHeader=0x0000 # -OP_MailBody=0x0000 # -OP_NewMail=0x0000 # -OP_SentConfirm=0x0000 # +OP_Command=0x0000 # +OP_MailboxHeader=0x0000 # +OP_MailHeader=0x0000 # +OP_MailBody=0x0000 # +OP_NewMail=0x0000 # +OP_SentConfirm=0x0000 # -# # # # # # # # # # # Below this point should not be needed # # # # # # # # # # # +# # # # # # # # # # # Below this point should not be needed # # # # # # # # # # # # This section are all unknown in Titanium -OP_ForceFindPerson=0x0000 # -OP_LocInfo=0x0000 # -OP_ReloadUI=0x0000 # -OP_ItemName=0x0000 # -OP_ItemLinkText=0x0000 # -OP_MultiLineMsg=0x0000 # -OP_MendHPUpdate=0x0000 # -OP_TargetReject=0x0000 # -OP_SafePoint=0x0000 # -OP_IncreaseStats=0x0000 # -OP_ApproveZone=0x0000 # -OP_ZoneComplete=0x0000 # -OP_ClientError=0x0000 # -OP_DumpName=0x0000 # -OP_Heartbeat=0x0000 # -OP_CrashDump=0x0000 # -OP_LoginComplete=0x0000 # +OP_ForceFindPerson=0x0000 # +OP_LocInfo=0x0000 # +OP_ReloadUI=0x0000 # +OP_ItemName=0x0000 # +OP_ItemLinkText=0x0000 # +OP_MultiLineMsg=0x0000 # +OP_MendHPUpdate=0x0000 # +OP_TargetReject=0x0000 # +OP_SafePoint=0x0000 # +OP_IncreaseStats=0x0000 # +OP_ApproveZone=0x0000 # +OP_ZoneComplete=0x0000 # +OP_ClientError=0x0000 # +OP_DumpName=0x0000 # +OP_Heartbeat=0x0000 # +OP_CrashDump=0x0000 # +OP_LoginComplete=0x0000 # # discovered opcodes not yet used: -OP_PickLockSuccess=0x0000 # -OP_PlayMP3=0x0000 # -OP_ReclaimCrystals=0x0000 # -OP_DynamicWall=0x0000 # -OP_OpenDiscordMerchant=0x0000 # -OP_DiscordMerchantInventory=0x0000 # -OP_GiveMoney=0x0000 # -OP_RequestKnowledgeBase=0x0000 # -OP_KnowledgeBase=0x0000 # +OP_PickLockSuccess=0x0000 # +OP_PlayMP3=0x0000 # +OP_ReclaimCrystals=0x0000 # +OP_DynamicWall=0x0000 # +OP_OpenDiscordMerchant=0x0000 # +OP_DiscordMerchantInventory=0x0000 # +OP_GiveMoney=0x0000 # +OP_RequestKnowledgeBase=0x0000 # +OP_KnowledgeBase=0x0000 # OP_SlashAdventure=0x0000 # /adventure -OP_BecomePVPPrompt=0x0000 # +OP_BecomePVPPrompt=0x0000 # OP_MoveLogRequest=0x0000 # gone I think OP_MoveLogDisregard=0x0000 # gone I think # named unknowns, to make looking for real unknown easier -OP_AnnoyingZoneUnknown=0x0000 # +OP_AnnoyingZoneUnknown=0x0000 # OP_Some6ByteHPUpdate=0x0000 # seems to happen when you target group members -OP_QueryResponseThing=0x0000 # +OP_QueryResponseThing=0x0000 # # realityincarnate: these are just here to stop annoying several thousand byte packet dumps @@ -614,47 +614,47 @@ OP_PetitionSearch=0x0000 # search term for petition OP_PetitionSearchResults=0x0000 # (list of?) matches from search OP_PetitionSearchText=0x0000 # text results of search -OP_PetitionUpdate=0x0000 # -OP_PetitionCheckout=0x0000 # -OP_PetitionCheckIn=0x0000 # -OP_PetitionQue=0x0000 # -OP_PetitionUnCheckout=0x0000 # -OP_PetitionDelete=0x0000 # -OP_DeletePetition=0x0000 # -OP_PetitionResolve=0x0000 # -OP_PDeletePetition=0x0000 # -OP_PetitionBug=0x0000 # -OP_PetitionRefresh=0x0000 # -OP_PetitionCheckout2=0x0000 # -OP_PetitionViewPetition=0x0000 # +OP_PetitionUpdate=0x0000 # +OP_PetitionCheckout=0x0000 # +OP_PetitionCheckIn=0x0000 # +OP_PetitionQue=0x0000 # +OP_PetitionUnCheckout=0x0000 # +OP_PetitionDelete=0x0000 # +OP_DeletePetition=0x0000 # +OP_PetitionResolve=0x0000 # +OP_PDeletePetition=0x0000 # +OP_PetitionBug=0x0000 # +OP_PetitionRefresh=0x0000 # +OP_PetitionCheckout2=0x0000 # +OP_PetitionViewPetition=0x0000 # # Login opcodes -OP_SessionReady=0x0001 # -OP_Login=0x0002 # -OP_ServerListRequest=0x0004 # -OP_PlayEverquestRequest=0x000d # -OP_PlayEverquestResponse=0x0021 # -OP_ChatMessage=0x0016 # -OP_LoginAccepted=0x0017 # -OP_ServerListResponse=0x0018 # -OP_Poll=0x0029 # -OP_EnterChat=0x000f # -OP_PollResponse=0x0011 # +OP_SessionReady=0x0001 # +OP_Login=0x0002 # +OP_ServerListRequest=0x0004 # +OP_PlayEverquestRequest=0x000d # +OP_PlayEverquestResponse=0x0021 # +OP_ChatMessage=0x0016 # +OP_LoginAccepted=0x0017 # +OP_ServerListResponse=0x0018 # +OP_Poll=0x0029 # +OP_EnterChat=0x000f # +OP_PollResponse=0x0011 # # raw opcodes -OP_RAWSessionRequest=0x0000 # -OP_RAWSessionResponse=0x0000 # -OP_RAWCombined=0x0000 # -OP_RAWSessionDisconnect=0x0000 # -OP_RAWKeepAlive=0x0000 # -OP_RAWSessionStatRequest=0x0000 # -OP_RAWSessionStatResponse=0x0000 # -OP_RAWPacket=0x0000 # -OP_RAWFragment=0x0000 # -OP_RAWOutOfOrderAck=0x0000 # -OP_RAWAck=0x0000 # -OP_RAWAppCombined=0x0000 # -OP_RAWOutOfSession=0x0000 # +OP_RAWSessionRequest=0x0000 # +OP_RAWSessionResponse=0x0000 # +OP_RAWCombined=0x0000 # +OP_RAWSessionDisconnect=0x0000 # +OP_RAWKeepAlive=0x0000 # +OP_RAWSessionStatRequest=0x0000 # +OP_RAWSessionStatResponse=0x0000 # +OP_RAWPacket=0x0000 # +OP_RAWFragment=0x0000 # +OP_RAWOutOfOrderAck=0x0000 # +OP_RAWAck=0x0000 # +OP_RAWAppCombined=0x0000 # +OP_RAWOutOfSession=0x0000 # # we need to document the differences between these packets to make identifying them easier OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs diff --git a/utils/patches/patch_SoF.conf b/utils/patches/patch_SoF.conf index 73bbb44c6..3f01e0ad5 100644 --- a/utils/patches/patch_SoF.conf +++ b/utils/patches/patch_SoF.conf @@ -39,7 +39,7 @@ OP_MOTD=0x5711 #SEQ 12/04/08 OP_SetChatServer=0x71B8 #SEQ 12/04/08 OP_SetChatServer2=0x32CC #SEQ 12/04/08 OP_ZoneServerInfo=0x18B1 #SEQ 12/04/08 -OP_WorldComplete=0x2486 #SEQ 12/04/08 +OP_WorldComplete=0x2486 #SEQ 12/04/08 OP_WorldUnknown001=0x7930 #Trevius 1/20/08 OP_FloatListThing=0x6177 #Trevius 12/20/08 @@ -60,7 +60,7 @@ OP_UserCompInfo=0x0000 #NEW FROM SEQ 12/04/08 0x02a5 OP_AckPacket=0x4D38 #SEQ 12/04/08 OP_ZoneEntry=0x737E #SEQ 12/04/08 OP_ReqNewZone=0x5417 #SEQ 12/04/08 -OP_NewZone=0x5D22 #SEQ 12/04/08 +OP_NewZone=0x5D22 #SEQ 12/04/08 OP_ZoneSpawns=0x5AF2 #SEQ 12/04/08 OP_PlayerProfile=0x0FEB #SEQ 12/04/08 OP_TimeOfDay=0x7274 #SEQ 12/04/08 @@ -155,7 +155,7 @@ OP_GMToggle=0x7AB6 #/toggletell OP_GMSummon=0x3235 #/summon OP_GMEmoteZone=0x26CC #/emotezone OP_GMEmoteWorld=0x6256 #/emoteworld (not implemented) -OP_GMFind=0x24D8 #/find +OP_GMFind=0x24D8 #/find OP_GMKick=0x7A92 #/kick OP_GMKill=0x7B6B #/kill OP_GMNameChange=0x74B5 #/name @@ -172,7 +172,7 @@ OP_CastSpell=0x7F5D #SEQ 12/04/08 OP_Consider=0x32E1 #SEQ 12/04/08 OP_FormattedMessage=0x5B9E #SEQ 12/04/08 OP_SimpleMessage=0x553E #SEQ 12/04/08 -OP_Buff=0x7BD6 #SEQ 12/04/08 +OP_Buff=0x7BD6 #SEQ 12/04/08 OP_Illusion=0x7F86 #SEQ 12/04/08 OP_MoneyOnCorpse=0x51C9 #SEQ 12/04/08 OP_RandomReply=0x649C #SEQ 12/04/08 @@ -201,10 +201,10 @@ OP_ConsiderCorpse=0x4CBB #Xinu 02/20/09 OP_CorpseDrag=0x51e1 # OP_CorpseDrop=0x77a6 # OP_Bug=0x1CF0 #Trevius 01/16/09 -OP_Feedback=0x216C #Trevius 01/16/09 - size: 1148 -OP_Report=0x5BD9 #Trevius 01/16/09 - size: 729 +OP_Feedback=0x216C #Trevius 01/16/09 - size: 1148 +OP_Report=0x5BD9 #Trevius 01/16/09 - size: 729 OP_Damage=0x0EF2 #Trevius 02/18/09 -OP_ChannelMessage=0x3C7D #SEQ 12/04/08 +OP_ChannelMessage=0x3C7D #SEQ 12/04/08 OP_Assist=0x15A4 #Xinu 02/20/09 OP_AssistGroup=0x3ce # OP_MoveCoin=0x1D9D #Xinu 02/20/09 @@ -292,7 +292,7 @@ OP_Stun=0x55BF #Derision 2009 OP_FindPersonRequest=0x07F0 #Derision 2009 OP_FindPersonReply=0x7770 #Derision 2009 OP_Sound=0x2B02 #Derision 2009 -OP_PetBuffWindow=0x124A #Derision 2009 +OP_PetBuffWindow=0x124A #Derision 2009 OP_LevelAppearance=0x3EC8 #Derision 2009 OP_Translocate=0x1F0F #Derision 2009 OP_Sacrifice=0x55C9 #Derision 2009 @@ -371,7 +371,7 @@ OP_Bazaar=0x0000 # OP_TradeRequest=0x180D #Trevius 02/16/09 OP_TradeAcceptClick=0x1D07 #Trevius 03/09/09 OP_TradeRequestAck=0x1255 #Xinu 02/24/09 -OP_TradeCoins=0x08CA #Trevius 03/10/09 +OP_TradeCoins=0x08CA #Trevius 03/10/09 OP_FinishTrade=0x30B7 #Trevius 03/09/09 OP_CancelTrade=0x7A43 #Xinu 02/24/09 OP_TradeMoneyUpdate=0x69E7 @@ -439,15 +439,15 @@ OP_AdventureLeaderboardRequest=0x2A28 #Trevius 06/03/09 OP_AdventureLeaderboardReply=0x6555 #Trevius 06/03/09 #Group Opcodes -OP_GroupDisband=0x4B26 #SEQ 12/04/08 +OP_GroupDisband=0x4B26 #SEQ 12/04/08 OP_GroupInvite=0x6321 #SEQ 12/04/08 -OP_GroupFollow=0x1A12 #SEQ 12/04/08 -OP_GroupUpdate=0x2E5C #SEQ 12/04/08 -OP_GroupCancelInvite=0x596C #SEQ 12/04/08 +OP_GroupFollow=0x1A12 #SEQ 12/04/08 +OP_GroupUpdate=0x2E5C #SEQ 12/04/08 +OP_GroupCancelInvite=0x596C #SEQ 12/04/08 OP_GroupAcknowledge=0x1306 #Trevius 02/17/09 OP_GroupDelete=0x0000 # OP_CancelInvite=0x596C #Trevius 03/02/09 -OP_GroupFollow2=0x59D4 #Xinu 02/20/09 +OP_GroupFollow2=0x59D4 #Xinu 02/20/09 OP_GroupInvite2=0x07F6 #Xinu 02/20/09 #LFG/LFP Opcodes @@ -545,7 +545,7 @@ OP_CrystalCountUpdate=0x64C1 # OP_DynamicWall=0x0000 # OP_OpenDiscordMerchant=0x0000 # OP_DiscordMerchantInventory=0x0000 # -OP_GiveMoney=0x0000 # +OP_GiveMoney=0x0000 # OP_RequestKnowledgeBase=0x0000 # OP_KnowledgeBase=0x0000 # OP_SlashAdventure=0x0000 #/adventure @@ -559,9 +559,9 @@ OP_Some6ByteHPUpdate=0x0000 #seems to happen when you target group members OP_QueryResponseThing=0x0000 # # realityincarnate: these are just here to stop annoying several thousand byte packet dumps -OP_LoginUnknown1=0x22cf -OP_LoginUnknown2=0x43ba -OP_ItemViewUnknown=0x4db4 +OP_LoginUnknown1=0x22cf +OP_LoginUnknown2=0x43ba +OP_ItemViewUnknown=0x4db4 #Petition Opcodes OP_PetitionSearch=0x0000 #search term for petition @@ -610,7 +610,7 @@ OP_RAWAck=0x0000 # OP_RAWAppCombined=0x0000 # OP_RAWOutOfSession=0x0000 # -#we need to document the differences between these packets to make identifying them easier +#we need to document the differences between these packets to make identifying them easier OP_Some3ByteHPUpdate=0x0000 #initial HP update for mobs OP_InitialHPUpdate=0x0000 # @@ -633,7 +633,7 @@ OP_InitialHPUpdate=0x0000 # #OP_ItemPlayerPacket=0x0000 # #OP_GetGuildMOTD=0x0000 # #OP_GuildTributeStatus=0x0000 # -#OP_GMEndTrainingResponse=0x0000 # +#OP_GMEndTrainingResponse=0x0000 # #OP_ObfuscatorInfo=0x7930 #SEQ 12/04/08 --NEW FROM SEQ #OP_GroupDisband2=0x0000 #SEQ 10/07/08 --NEW FROM SEQ #OP_GroupLeader=0x0000 #SEQ 10/07/08 --NEW FROM SEQ diff --git a/utils/patches/patch_Titanium.conf b/utils/patches/patch_Titanium.conf index 2c05520d0..9cb638462 100644 --- a/utils/patches/patch_Titanium.conf +++ b/utils/patches/patch_Titanium.conf @@ -64,7 +64,7 @@ OP_ZoneServerReady=0x0000 #dosent exist in this version OP_Logout=0x61ff OP_LogoutReply=0x3cdc #0x48c2 #0x0F66 is not quite right.. this causes disconnect error... OP_PreLogoutReply=0x711e #0 len packet sent during logout/zoning -OP_LevelUpdate=0x6d44 +OP_LevelUpdate=0x6d44 OP_Stamina=0x7a83 # ShowEQ 10/27/05 #Petition Opcodes @@ -79,7 +79,7 @@ OP_PetitionQue=0x33c3 OP_PetitionUnCheckout=0x0000 OP_PetitionDelete=0x5692 OP_DeletePetition=0x0000 -OP_PetitionResolve=0x0000 #0x0000 +OP_PetitionResolve=0x0000 #0x0000 OP_PDeletePetition=0x0000 OP_PetitionBug=0x0000 OP_PetitionRefresh=0x0000 @@ -103,7 +103,7 @@ OP_GuildLeader=0x12b1 OP_GuildDemote=0x4eb9 OP_GuildMOTD=0x475a OP_SetGuildMOTD=0x591c -OP_GetGuildsList=0x0000 +OP_GetGuildsList=0x0000 OP_GuildInvite=0x18b7 OP_GuildPublicNote=0x17a2 # ShowEQ 10/27/05 OP_GuildDelete=0x6cce @@ -130,7 +130,7 @@ OP_GMZoneRequest2=0x244c OP_GMSummon=0x1edc #/summon OP_GMEmoteZone=0x39f2 #/emotezone OP_GMEmoteWorld=0x3383 #/emoteworld (not implemented) -OP_GMFind=0x5930 #/find +OP_GMFind=0x5930 #/find OP_GMKick=0x692c #/kick OP_GMNameChange=0x0000 @@ -161,7 +161,7 @@ OP_ConsentResponse=0x6380 # ShowEQ 10/27/05 OP_LFGCommand=0x68ac # ShowEQ 10/27/05 OP_LFGGetMatchesRequest=0x022f # ShowEQ 10/27/05 OP_LFGAppearance=0x1a85 -OP_LFGResponse=0x0000 +OP_LFGResponse=0x0000 OP_LFGGetMatchesResponse=0x45d0 # ShowEQ 10/27/05 OP_LootItem=0x7081 # ShowEQ 10/27/05 OP_Bug=0x7ac2 # ShowEQ 10/27/05 @@ -238,7 +238,7 @@ OP_MobHealth=0x0695 # ShowEQ 10/27/05 OP_SkillUpdate=0x6a93 # ShowEQ 10/27/05 OP_RandomReq=0x5534 # ShowEQ 10/27/05 OP_ClientUpdate=0x14cb # ShowEQ 10/27/05 -OP_Report=0x7f9d +OP_Report=0x7f9d OP_GroundSpawn=0x0f47 # ShowEQ 10/27/05 OP_LFPGetMatchesResponse=0x06c5 OP_Jump=0x0797 # ShowEQ 10/27/05 @@ -248,7 +248,7 @@ OP_BecomeCorpse=0x4DBC OP_GMLastName=0x23a1 # ShowEQ 10/27/05 OP_InitialMobHealth=0x3d2d # ShowEQ 10/27/05 OP_Mend=0x14ef # ShowEQ 10/27/05 -OP_MendHPUpdate=0x0000 +OP_MendHPUpdate=0x0000 OP_Feedback=0x5306 # ShowEQ 10/27/05 OP_TGB=0x0c11 # ShowEQ 10/27/05 OP_InterruptCast=0x0b97 @@ -281,7 +281,7 @@ OP_KeyRing=0x68c4 OP_ApplyPoison=0x0c2c OP_AugmentInfo=0x45ff #RealityIncarnate 4/28/09 OP_SetStartCity=0x41dc #realityincarnate 6/25/09 -OP_SpellEffect=0x22C5 +OP_SpellEffect=0x22C5 OP_RemoveNimbusEffect=0x0000 OP_CrystalReclaim=0x7cfe OP_CrystalCreate=0x62c3 @@ -308,7 +308,7 @@ OP_DzChooseZone=0x1022 #bazaar trader stuff stuff: #become and buy from #Server->Client: [ Opcode: OP_Unknown (0x0000) Size: 8 ] -# 0: 46 01 00 00 39 01 00 00 | F...9... +# 0: 46 01 00 00 39 01 00 00 | F...9... OP_TraderDelItem=0x0da9 OP_BecomeTrader=0x2844 OP_TraderShop=0x35e8 @@ -332,7 +332,7 @@ OP_TradeMoneyUpdate=0x0000 #not sure OP_ShopPlayerSell=0x0e13 # ShowEQ 10/27/05 OP_ShopEnd=0x7e03 # ShowEQ 10/27/05 OP_ShopEndConfirm=0x20b2 -OP_ShopPlayerBuy=0x221e +OP_ShopPlayerBuy=0x221e OP_ShopRequest=0x45f9 # ShowEQ 10/27/05 OP_ShopDelItem=0x0da9 @@ -441,8 +441,8 @@ OP_SenseTraps=0x5666 # ShowEQ 10/27/05 OP_PickPocket=0x2ad8 OP_DisarmTraps=0x1241 OP_Disarm=0x17d9 -OP_Hide=0x4312 -OP_Sneak=0x74e1 +OP_Hide=0x4312 +OP_Sneak=0x74e1 OP_Fishing=0x0b36 OP_InstillDoubt=0x389e #intimidation OP_LDoNOpen=0x083b @@ -514,7 +514,7 @@ OP_Bandolier=0x6f0c OP_PotionBelt=0x0719 OP_OpenDiscordMerchant=0x0000 #8 bytes OP_DiscordMerchantInventory=0x0000 #long item packet -OP_GiveMoney=0x0000 #16 bytes, pp, gp, sp, cp. +OP_GiveMoney=0x0000 #16 bytes, pp, gp, sp, cp. OP_OnLevelMessage=0x1dde OP_PopupResponse=0x3816 OP_RequestKnowledgeBase=0x0000 @@ -584,10 +584,10 @@ OP_SentConfirm=0x0000 OP_MobUpdate=0x0000 #not used anymore, here for backwards compat #we need to document the differences between these packets to make identifying them easier -OP_MobHealth=0x0695 +OP_MobHealth=0x0695 OP_HPUpdate=0x3bcf # ShowEQ 10/27/05 OP_Some3ByteHPUpdate=0x0000 #initial HP update for mobs -OP_InitialHPUpdate=0x0000 +OP_InitialHPUpdate=0x0000 # Unmatched: OP_ItemPlayerPacket=5394 # Unmatched: OP_GetGuildMOTD=6d5d diff --git a/utils/patches/patch_Underfoot.conf b/utils/patches/patch_Underfoot.conf index e9cbedd57..a409fdaa1 100644 --- a/utils/patches/patch_Underfoot.conf +++ b/utils/patches/patch_Underfoot.conf @@ -13,11 +13,11 @@ OP_Unknown=0x0000 OP_ExploreUnknown=0x0000 # used for unknown explorer # V = Verified correct -# C = Most likely correct +# C = Most likely correct # U = Unsure, but should be correct or close # world packets -# Required to reach Char Select: +# Required to reach Char Select: OP_SendLoginInfo=0x13da # V OP_ApproveWorld=0x86c7 # C OP_LogServer=0x6f79 # C @@ -49,15 +49,15 @@ OP_FloatListThing=0x61ba # V # Reasons for Disconnect: OP_ZoneUnavail=0x3288 # C 0x1190 OP_WorldClientReady=0x7d05 # C 0x4786 -OP_CharacterStillInZone=0x0000 # -OP_WorldChecksumFailure=0x0000 # -OP_WorldLoginFailed=0x0000 # -OP_WorldLogout=0x0000 # -OP_WorldLevelTooHigh=0x0000 # -OP_CharInacessable=0x0000 # -OP_UserCompInfo=0x0000 # -# OP_SendExeChecksum=0x0000 # -# OP_SendBaseDataChecksum=0x0000 # +OP_CharacterStillInZone=0x0000 # +OP_WorldChecksumFailure=0x0000 # +OP_WorldLoginFailed=0x0000 # +OP_WorldLogout=0x0000 # +OP_WorldLevelTooHigh=0x0000 # +OP_CharInacessable=0x0000 # +OP_UserCompInfo=0x0000 # +# OP_SendExeChecksum=0x0000 # +# OP_SendBaseDataChecksum=0x0000 # # Zone in opcodes OP_AckPacket=0x3594 # V @@ -72,11 +72,11 @@ OP_Stamina=0x3d86 # V OP_RequestClientZoneChange=0x18ea # C OP_ZoneChange=0x6d37 # C -OP_LockoutTimerInfo=0x0000 # -OP_ZoneServerReady=0x0000 # -OP_ZoneInUnknown=0x0000 # -OP_LogoutReply=0x0000 # -OP_PreLogoutReply=0x0000 # +OP_LockoutTimerInfo=0x0000 # +OP_ZoneServerReady=0x0000 # +OP_ZoneInUnknown=0x0000 # +OP_LogoutReply=0x0000 # +OP_PreLogoutReply=0x0000 # # Required to fully log in OP_SpawnAppearance=0x3e17 # V @@ -87,14 +87,14 @@ OP_TaskDescription=0x156c # C OP_TaskActivity=0x31f3 # C OP_CompletedTasks=0x687f # C OP_Weather=0x4658 # V -OP_SendAATable=0x6ef9 # V -OP_UpdateAA=0x7bf6 # V +OP_SendAATable=0x6ef9 # V +OP_UpdateAA=0x7bf6 # V OP_RespondAA=0x1fbd # C 0x2bad OP_ReqClientSpawn=0x69cd # V OP_SpawnDoor=0x6f2b # V OP_GroundSpawn=0x5c85 # V OP_SendZonepoints=0x2370 # V -OP_SendAAStats=0x78b9 # C +OP_SendAAStats=0x78b9 # C OP_WorldObjectsSent=0x7b73 # V OP_BlockedBuffs=0x05d5 # V OP_RemoveBlockedBuffs=0x37c1 # V @@ -136,15 +136,15 @@ OP_GuildManageBanker=0x1e4c # C OP_GuildBank=0x0d8a # C OP_SetGuildRank=0x4ffe # C OP_GuildUpdateURLAndChannel=0x5232 # C -OP_GuildMemberLevelUpdate=0x0000 # -OP_ZoneGuildList=0x0000 # -OP_GetGuildsList=0x0000 # +OP_GuildMemberLevelUpdate=0x0000 # +OP_ZoneGuildList=0x0000 # +OP_GetGuildsList=0x0000 # OP_GuildStatus=0x28c8 # OP_GuildCreate=0x192d # OP_LFGuild=0x7e23 # -# OP_GuildManageRemove=0x0000 # -# OP_GuildManageAdd=0x0000 # -# OP_GuildManageStatus=0x0000 # +# OP_GuildManageRemove=0x0000 # +# OP_GuildManageAdd=0x0000 # +# OP_GuildManageStatus=0x0000 # # GM/guide opcodes OP_GMServers=0x6989 # C @@ -313,7 +313,7 @@ OP_OnLevelMessage=0x24cb # C OP_AugmentInfo=0x31b1 # C OP_Petition=0x31d1 # C OP_SomeItemPacketMaybe=0x2c27 # C -OP_PVPStats=0x0000 # +OP_PVPStats=0x0000 # OP_PVPLeaderBoardRequest=0x4973 # C OP_PVPLeaderBoardReply=0x3842 # C OP_PVPLeaderBoardDetailsRequest=0x6c75 # C @@ -330,8 +330,8 @@ OP_VetRewardsAvaliable=0x0baa # C Mispelled? OP_VetClaimRequest=0x34f8 # C OP_VetClaimReply=0x6a5d # C OP_CrystalCountUpdate=0x3fc8 # C -OP_DisciplineUpdate=0x6ed3 # -OP_BecomeCorpse=0x0000 # +OP_DisciplineUpdate=0x6ed3 # +OP_BecomeCorpse=0x0000 # OP_Action2=0x0000 # C OP_Damage? OP_MobUpdate=0x4656 # Same as OP_SpawnPositionUpdate OP_NPCMoveUpdate=0x0f3e # @@ -378,7 +378,7 @@ OP_ManaUpdate=0x0433 # C OP_EnduranceUpdate=0x6b76 # C OP_MobManaUpdate=0x7901 # C OP_MobEnduranceUpdate=0x6c5f # C - + # Looting OP_LootRequest=0x6ad7 # C OP_EndLootRequest=0x6546 # C @@ -393,10 +393,10 @@ OP_TraderShop=0x2881 # C OP_Trader=0x0c08 # C OP_TraderBuy=0x3672 # C OP_Barter=0x6db5 # C -OP_ShopItem=0x0000 # -OP_BazaarInspect=0x0000 # -OP_Bazaar=0x0000 # -OP_TraderItemUpdate=0x0000 # +OP_ShopItem=0x0000 # +OP_BazaarInspect=0x0000 # +OP_Bazaar=0x0000 # +OP_TraderItemUpdate=0x0000 # # pc/npc trading OP_TradeRequest=0x7113 # C @@ -445,10 +445,10 @@ OP_TributeItem=0x0b89 # C OP_TributeMoney=0x314f # C OP_TributeToggle=0x6dc3 # C OP_TributePointUpdate=0x15a7 # C -OP_TributeNPC=0x0000 # -OP_GuildTributeInfo=0x0000 # -OP_OpenTributeReply=0x0000 # -# OP_GuildTributeStatus=0x0000 # +OP_TributeNPC=0x0000 # +OP_GuildTributeInfo=0x0000 # +OP_OpenTributeReply=0x0000 # +# OP_GuildTributeStatus=0x0000 # # Adventure packets: OP_LeaveAdventure=0x3ed4 # C @@ -473,11 +473,11 @@ OP_AdventureLeaderboardReply=0x4423 # C OP_GroupDisband=0x54e8 # C OP_GroupInvite=0x4f60 # C OP_GroupFollow=0x7f2b # C -OP_GroupUpdate=0x5331 # C -OP_GroupUpdateB=0x0786 # C +OP_GroupUpdate=0x5331 # C +OP_GroupUpdateB=0x0786 # C OP_GroupCancelInvite=0x2736 # C - Same as OP_CancelInvite? OP_GroupAcknowledge=0x3e22 # C -OP_GroupDelete=0x58e6 # +OP_GroupDelete=0x58e6 # OP_CancelInvite=0x2736 # C OP_GroupFollow2=0x6c16 # C OP_GroupInvite2=0x5251 # C @@ -494,20 +494,20 @@ OP_LFGGetMatchesResponse=0x7a16 # C OP_LFPGetMatchesRequest=0x189e # C OP_LFPGetMatchesResponse=0x589f # C OP_LFPCommand=0x7429 # C -OP_LFGAppearance=0x0000 # -OP_LFGResponse=0x0000 # +OP_LFGAppearance=0x0000 # +OP_LFGResponse=0x0000 # # Raid Opcodes OP_RaidInvite=0x60b5 # C OP_RaidUpdate=0x4d8b # C -OP_RaidJoin=0x0000 # +OP_RaidJoin=0x0000 # # Button-push commands OP_Taunt=0x30e2 # C OP_CombatAbility=0x36f8 # C OP_SenseTraps=0x7e45 # C OP_PickPocket=0x5821 # C -OP_DisarmTraps=0x0000 # +OP_DisarmTraps=0x0000 # OP_Disarm=0x6def # C OP_Sneak=0x1d22 # C OP_Fishing=0x7093 # C @@ -525,7 +525,7 @@ OP_AcceptNewTask=0x17d5 # C OP_TaskHistoryRequest=0x547c # C OP_TaskHistoryReply=0x4524 # C OP_CancelTask=0x3bf5 # C -OP_DeclineAllTasks=0x0000 # +OP_DeclineAllTasks=0x0000 # # Title opcodes OP_NewTitlesAvailable=0x4b49 # C @@ -551,52 +551,52 @@ OP_MercenaryDismiss=0x319a # OP_MercenaryTimerRequest=0x184e # # mail opcodes -OP_Command=0x0000 # -OP_MailboxHeader=0x0000 # -OP_MailHeader=0x0000 # -OP_MailBody=0x0000 # -OP_NewMail=0x0000 # -OP_SentConfirm=0x0000 # +OP_Command=0x0000 # +OP_MailboxHeader=0x0000 # +OP_MailHeader=0x0000 # +OP_MailBody=0x0000 # +OP_NewMail=0x0000 # +OP_SentConfirm=0x0000 # -# # # # # # # # # # # Below this point should not be needed # # # # # # # # # # # +# # # # # # # # # # # Below this point should not be needed # # # # # # # # # # # # This section are all unknown in Titanium -OP_ForceFindPerson=0x0000 # -OP_LocInfo=0x0000 # -OP_ReloadUI=0x0000 # -OP_ItemName=0x0000 # -OP_ItemLinkText=0x0000 # -OP_MultiLineMsg=0x0000 # -OP_MendHPUpdate=0x0000 # -OP_TargetReject=0x0000 # -OP_SafePoint=0x0000 # -OP_ApproveZone=0x0000 # -OP_ZoneComplete=0x0000 # -OP_ClientError=0x0000 # -OP_DumpName=0x0000 # -OP_Heartbeat=0x0000 # -OP_CrashDump=0x0000 # -OP_LoginComplete=0x0000 # +OP_ForceFindPerson=0x0000 # +OP_LocInfo=0x0000 # +OP_ReloadUI=0x0000 # +OP_ItemName=0x0000 # +OP_ItemLinkText=0x0000 # +OP_MultiLineMsg=0x0000 # +OP_MendHPUpdate=0x0000 # +OP_TargetReject=0x0000 # +OP_SafePoint=0x0000 # +OP_ApproveZone=0x0000 # +OP_ZoneComplete=0x0000 # +OP_ClientError=0x0000 # +OP_DumpName=0x0000 # +OP_Heartbeat=0x0000 # +OP_CrashDump=0x0000 # +OP_LoginComplete=0x0000 # # discovered opcodes not yet used: -OP_PickLockSuccess=0x0000 # -OP_PlayMP3=0x0000 # -OP_ReclaimCrystals=0x0000 # -OP_DynamicWall=0x0000 # -OP_OpenDiscordMerchant=0x0000 # -OP_DiscordMerchantInventory=0x0000 # -OP_GiveMoney=0x0000 # -OP_RequestKnowledgeBase=0x0000 # -OP_KnowledgeBase=0x0000 # +OP_PickLockSuccess=0x0000 # +OP_PlayMP3=0x0000 # +OP_ReclaimCrystals=0x0000 # +OP_DynamicWall=0x0000 # +OP_OpenDiscordMerchant=0x0000 # +OP_DiscordMerchantInventory=0x0000 # +OP_GiveMoney=0x0000 # +OP_RequestKnowledgeBase=0x0000 # +OP_KnowledgeBase=0x0000 # OP_SlashAdventure=0x0000 # /adventure -OP_BecomePVPPrompt=0x0000 # +OP_BecomePVPPrompt=0x0000 # OP_MoveLogRequest=0x0000 # gone I think OP_MoveLogDisregard=0x0000 # gone I think # named unknowns, to make looking for real unknown easier -OP_AnnoyingZoneUnknown=0x0000 # +OP_AnnoyingZoneUnknown=0x0000 # OP_Some6ByteHPUpdate=0x0000 # seems to happen when you target group members -OP_QueryResponseThing=0x0000 # +OP_QueryResponseThing=0x0000 # # realityincarnate: these are just here to stop annoying several thousand byte packet dumps @@ -608,47 +608,47 @@ OP_PetitionSearch=0x0000 # search term for petition OP_PetitionSearchResults=0x0000 # (list of?) matches from search OP_PetitionSearchText=0x0000 # text results of search -OP_PetitionUpdate=0x0000 # -OP_PetitionCheckout=0x0000 # -OP_PetitionCheckIn=0x0000 # -OP_PetitionQue=0x0000 # -OP_PetitionUnCheckout=0x0000 # -OP_PetitionDelete=0x0000 # -OP_DeletePetition=0x0000 # -OP_PetitionResolve=0x0000 # -OP_PDeletePetition=0x0000 # -OP_PetitionBug=0x0000 # -OP_PetitionRefresh=0x0000 # -OP_PetitionCheckout2=0x0000 # -OP_PetitionViewPetition=0x0000 # +OP_PetitionUpdate=0x0000 # +OP_PetitionCheckout=0x0000 # +OP_PetitionCheckIn=0x0000 # +OP_PetitionQue=0x0000 # +OP_PetitionUnCheckout=0x0000 # +OP_PetitionDelete=0x0000 # +OP_DeletePetition=0x0000 # +OP_PetitionResolve=0x0000 # +OP_PDeletePetition=0x0000 # +OP_PetitionBug=0x0000 # +OP_PetitionRefresh=0x0000 # +OP_PetitionCheckout2=0x0000 # +OP_PetitionViewPetition=0x0000 # # Login opcodes -OP_SessionReady=0x0001 # -OP_Login=0x0002 # -OP_ServerListRequest=0x0004 # -OP_PlayEverquestRequest=0x000d # -OP_PlayEverquestResponse=0x0021 # -OP_ChatMessage=0x0016 # -OP_LoginAccepted=0x0017 # -OP_ServerListResponse=0x0018 # -OP_Poll=0x0029 # -OP_EnterChat=0x000f # -OP_PollResponse=0x0011 # +OP_SessionReady=0x0001 # +OP_Login=0x0002 # +OP_ServerListRequest=0x0004 # +OP_PlayEverquestRequest=0x000d # +OP_PlayEverquestResponse=0x0021 # +OP_ChatMessage=0x0016 # +OP_LoginAccepted=0x0017 # +OP_ServerListResponse=0x0018 # +OP_Poll=0x0029 # +OP_EnterChat=0x000f # +OP_PollResponse=0x0011 # # raw opcodes -OP_RAWSessionRequest=0x0000 # -OP_RAWSessionResponse=0x0000 # -OP_RAWCombined=0x0000 # -OP_RAWSessionDisconnect=0x0000 # -OP_RAWKeepAlive=0x0000 # -OP_RAWSessionStatRequest=0x0000 # -OP_RAWSessionStatResponse=0x0000 # -OP_RAWPacket=0x0000 # -OP_RAWFragment=0x0000 # -OP_RAWOutOfOrderAck=0x0000 # -OP_RAWAck=0x0000 # -OP_RAWAppCombined=0x0000 # -OP_RAWOutOfSession=0x0000 # +OP_RAWSessionRequest=0x0000 # +OP_RAWSessionResponse=0x0000 # +OP_RAWCombined=0x0000 # +OP_RAWSessionDisconnect=0x0000 # +OP_RAWKeepAlive=0x0000 # +OP_RAWSessionStatRequest=0x0000 # +OP_RAWSessionStatResponse=0x0000 # +OP_RAWPacket=0x0000 # +OP_RAWFragment=0x0000 # +OP_RAWOutOfOrderAck=0x0000 # +OP_RAWAck=0x0000 # +OP_RAWAppCombined=0x0000 # +OP_RAWOutOfSession=0x0000 # # we need to document the differences between these packets to make identifying them easier OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs diff --git a/utils/player_profile_set/player_profile_set/MiscFunctions.cpp b/utils/player_profile_set/player_profile_set/MiscFunctions.cpp index cdf8808fd..5af82a611 100644 --- a/utils/player_profile_set/player_profile_set/MiscFunctions.cpp +++ b/utils/player_profile_set/player_profile_set/MiscFunctions.cpp @@ -231,8 +231,8 @@ bool atobool(char* iBool) { return false; } -/* - * solar: generate a random integer in the range low-high +/* + * solar: generate a random integer in the range low-high * this should be used instead of the rand()%limit method */ int MakeRandomInt(int low, int high) @@ -255,7 +255,7 @@ double MakeRandomFloat(double low, double high) char *CleanMobName(const char *in, char *out) { unsigned i, j; - + for(i = j = 0; i < strlen(in); i++) { // convert _ to space.. any other conversions like this? I *think* this diff --git a/utils/player_profile_set/player_profile_set/database.cpp b/utils/player_profile_set/player_profile_set/database.cpp index f44ed7c73..be85d51a2 100644 --- a/utils/player_profile_set/player_profile_set/database.cpp +++ b/utils/player_profile_set/player_profile_set/database.cpp @@ -14,8 +14,8 @@ EQEmuDatabase::EQEmuDatabase(std::string ServerName, std::string DatabaseName, s _mysql = mysql_init(NULL); if(_mysql) { - if (!mysql_real_connect(_mysql, GetServerName().c_str(), GetDBUsername().c_str(), - GetDBPassword().c_str(), GetDatabaseName().c_str(), 0, NULL, 0)) + if (!mysql_real_connect(_mysql, GetServerName().c_str(), GetDBUsername().c_str(), + GetDBPassword().c_str(), GetDatabaseName().c_str(), 0, NULL, 0)) { cout << "MYSQL CONNECT FAILED: " << endl; cout << GetServerName() << endl; @@ -48,7 +48,7 @@ void EQEmuDatabase::GetPlayer(std::string name) MYSQL_RES *res; MYSQL_ROW row; char * mQuery = 0; - MakeAnyLenString(&mQuery, "SELECT profile, id FROM character_ WHERE name='%s'", name.c_str()); + MakeAnyLenString(&mQuery, "SELECT profile, id FROM character_ WHERE name='%s'", name.c_str()); if (mysql_query(_mysql, mQuery)) { cout << "Query failed: " << mQuery << endl; return; @@ -85,7 +85,7 @@ void EQEmuDatabase::GetPlayers() MYSQL_RES *res; MYSQL_ROW row; char * mQuery = 0; - MakeAnyLenString(&mQuery, "SELECT profile, id FROM character_"); + MakeAnyLenString(&mQuery, "SELECT profile, id FROM character_"); if (mysql_query(_mysql, mQuery)) { cout << "Query failed: " << mQuery << endl; return; diff --git a/utils/player_profile_set/player_profile_set/eq_player_structs.h b/utils/player_profile_set/player_profile_set/eq_player_structs.h index 2696c8906..7b4137dc8 100644 --- a/utils/player_profile_set/player_profile_set/eq_player_structs.h +++ b/utils/player_profile_set/player_profile_set/eq_player_structs.h @@ -98,7 +98,7 @@ enum AdventureObjective Adventure_Rescue = 4 }; -struct AdventureInfo +struct AdventureInfo { uint32 id; std::string zone_name; @@ -522,7 +522,7 @@ struct SpellBuffFade_Struct { struct PetBuff_Struct { /*000*/ uint32 petid; /*004*/ uint32 spellid[BUFF_COUNT]; -/*104*/ uint32 unknown700; +/*104*/ uint32 unknown700; /*108*/ uint32 unknown701; /*112*/ uint32 unknown702; /*116*/ uint32 unknown703; @@ -1818,7 +1818,7 @@ struct AdventureLeaderboard_Struct /*008*/ int32 success; /*012*/ int32 failure; /*016*/ int32 our_rank; -/*020*/ +/*020*/ }; /*struct Item_Shop_Struct { @@ -2513,7 +2513,7 @@ struct BarterSearchRequest_Struct { struct BuyerItemSearchLinkRequest_Struct { /*000*/ uint32 Action; // 0x00000015 -/*004*/ uint32 ItemID; +/*004*/ uint32 ItemID; /*008*/ uint32 Unknown008; /*012*/ uint32 Unknown012; }; @@ -3849,7 +3849,7 @@ struct RespawnWindow_Struct { /** * Shroud spawn. For others shrouding, this has their spawnId and * spawnStruct. - * + * * Length: 586 * OpCode: OP_Shroud */ diff --git a/utils/player_profile_set/player_profile_set/ini.cpp b/utils/player_profile_set/player_profile_set/ini.cpp index d47fe3533..fdbbd72df 100644 --- a/utils/player_profile_set/player_profile_set/ini.cpp +++ b/utils/player_profile_set/player_profile_set/ini.cpp @@ -22,10 +22,10 @@ INIParser::~INIParser() void INIParser::Parse() { FILE *fp; - if(fp = fopen(file, "r")) + if(fp = fopen(file, "r")) { char Option[255], Param[255]; - while(!feof(fp)) + while(!feof(fp)) { ReadLine(fp, Option, Param); AddOption(std::string(Option), std::string(Param)); @@ -34,12 +34,12 @@ void INIParser::Parse() } } -void INIParser::ReadLine(FILE *fp, char *Option, char *Param) +void INIParser::ReadLine(FILE *fp, char *Option, char *Param) { typedef enum ReadingState { ReadingOption, ReadingParameter }; ReadingState State = ReadingOption; - + int StrIndex = 0; char ch; diff --git a/utils/player_profile_set/player_profile_set/ini.h b/utils/player_profile_set/player_profile_set/ini.h index 54356c477..f6e021ec7 100644 --- a/utils/player_profile_set/player_profile_set/ini.h +++ b/utils/player_profile_set/player_profile_set/ini.h @@ -19,7 +19,7 @@ public: ~INIParser(); void Parse(); void ReadLine(FILE *fp, char *Option, char *Param); - + void AddOption(std::string option, std::string param); std::string GetOption(std::string option); diff --git a/utils/player_profile_set/player_profile_set/main.cpp b/utils/player_profile_set/player_profile_set/main.cpp index 368e3d83e..727df6157 100644 --- a/utils/player_profile_set/player_profile_set/main.cpp +++ b/utils/player_profile_set/player_profile_set/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char* argv[]) std::string player_name = argv[4]; program_action = EQEmuString::ToUpper(program_action); program_field = EQEmuString::ToUpper(program_field); - + emu_db = new EQEmuDatabase(host.c_str(), datab.c_str(), user.c_str(), pass.c_str()); if(!emu_db->Connected()) { @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) { player_entry pe = (*iter); PlayerProfile_Struct *m_pp = (PlayerProfile_Struct*)pe.data; - + if(program_action == "SET") { m_pp->ldon_points_available = 0; diff --git a/utils/player_profile_set/player_profile_set/types.h b/utils/player_profile_set/player_profile_set/types.h index 07703ae0b..3b60ca298 100644 --- a/utils/player_profile_set/player_profile_set/types.h +++ b/utils/player_profile_set/player_profile_set/types.h @@ -68,7 +68,7 @@ typedef const char Const_char; //for perl XS #define strcasecmp _stricmp typedef void ThreadReturnType; // #define THREAD_RETURN(x) return; - #define THREAD_RETURN(x) _endthread(); return; + #define THREAD_RETURN(x) _endthread(); return; #else typedef void* ThreadReturnType; // typedef int SOCKET; diff --git a/utils/scripts/Examples/ListIteration.pl b/utils/scripts/Examples/ListIteration.pl index daec901b1..686cd8672 100644 --- a/utils/scripts/Examples/ListIteration.pl +++ b/utils/scripts/Examples/ListIteration.pl @@ -1,5 +1,5 @@ -sub EVENT_SAY -{ +sub EVENT_SAY +{ if($text=~/mob/i) { my @moblist = $entity_list->GetMobList(); @@ -8,7 +8,7 @@ sub EVENT_SAY $ent->Shout("I'm a mob!"); } } - + if($text=~/npc/i) { my @npclist = $entity_list->GetNPCList(); @@ -17,7 +17,7 @@ sub EVENT_SAY $ent->Shout("I'm a npc!"); } } - + if($text=~/client/i) { my @clientlist = $entity_list->GetClientList(); @@ -26,7 +26,7 @@ sub EVENT_SAY $ent->Shout("I'm a client!"); } } - + if($text=~/corpse/i) { my @corpselist = $entity_list->GetCorpseList(); @@ -42,7 +42,7 @@ sub EVENT_SAY } quest::say("There are $index corpses in the zone and $index_two of them belong to you."); } - + if($text=~/summon/i) { my @corpselist = $entity_list->GetCorpseList(); @@ -54,7 +54,7 @@ sub EVENT_SAY } } } - + if($text=~/rez/i) { my @corpselist = $entity_list->GetCorpseList(); @@ -66,7 +66,7 @@ sub EVENT_SAY return; } } - } + } } sub EVENT_AGGRO_SAY @@ -83,7 +83,7 @@ sub EVENT_AGGRO_SAY { my $h_ent_name = $h_ent->GetName(); quest::say("$h_ent_name is on my hate list with $h_hate hate and $h_dmg damage."); - } + } } } } diff --git a/utils/scripts/Examples/SpawnManipulation.pl b/utils/scripts/Examples/SpawnManipulation.pl index a651b369a..5cbc0ef53 100644 --- a/utils/scripts/Examples/SpawnManipulation.pl +++ b/utils/scripts/Examples/SpawnManipulation.pl @@ -1,4 +1,4 @@ -sub EVENT_SAY { +sub EVENT_SAY { if($text=~/despawn/i) { quest::disable_spawn2(10842); diff --git a/utils/scripts/factionmod.pl b/utils/scripts/factionmod.pl index c13f3fb78..f74300040 100644 --- a/utils/scripts/factionmod.pl +++ b/utils/scripts/factionmod.pl @@ -27,7 +27,7 @@ while (my $ref = $sth->fetchrow_hashref()) { $count++; } } - + for(my $i = 1; $i <= 12; $i++) { my $field_name = "mod_r" . $i; if($ref->{$field_name} != 0) { @@ -37,74 +37,74 @@ while (my $ref = $sth->fetchrow_hashref()) { $count++; } } - + if($ref->{"mod_r14"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r14"}, "r14"); $count++; } - + if($ref->{"mod_r42"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r42"}, "r42"); $count++; } - + if($ref->{"mod_r75"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r75"}, "r75"); $count++; } - + if($ref->{"mod_r108"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r108"}, "r108"); $count++; } - + if($ref->{"mod_r128"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r128"}, "r128"); $count++; } - + if($ref->{"mod_r130"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r130"}, "r130"); $count++; } - + if($ref->{"mod_r161"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r161"}, "r161"); $count++; } - + if($ref->{"mod_r330"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r330"}, "r330"); $count++; } - + if($ref->{"mod_r367"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r367"}, "r367"); $count++; } - + if($ref->{"mod_r522"} != 0) { my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{"mod_r522"}, "r522"); $count++; } - + for(my $i = 201; $i <= 216; $i++) { my $field_name = "mod_d" . $i; if($ref->{$field_name} != 0) { my $mod_name = "d" . $i; my $rsth = $dbh->prepare("REPLACE INTO `faction_list_mod` (`faction_id`,`mod`,`mod_name`) VALUES(?, ?, ?)"); $rsth->execute($ref->{id}, $ref->{$field_name}, $mod_name); - $count++; + $count++; } } } diff --git a/utils/scripts/import_showeq b/utils/scripts/import_showeq index 670daf592..2bb9ccb00 100644 --- a/utils/scripts/import_showeq +++ b/utils/scripts/import_showeq @@ -24,7 +24,7 @@ while() { } close(F); -my %fixes = ( +my %fixes = ( 'OP_TributeInfo' => 'OP_SendTributes', 'OP_CancelInvite' => 'OP_GroupCancelInvite', 'OP_GMFind' => 'OP_FindPersonRequest', diff --git a/utils/scripts/import_spells.pl b/utils/scripts/import_spells.pl index 832ccea4d..fdc877880 100644 --- a/utils/scripts/import_spells.pl +++ b/utils/scripts/import_spells.pl @@ -107,7 +107,7 @@ while() { } my $insert1 = join("`,`", @t_col_names); - my $insert2 = join("','", @s); #put everything in quotes & separate w/ commas for the query, plus the beginning & ending quotes. this doesn't print out to the console correctly (for me), but hopefully the query will be fine + my $insert2 = join("','", @s); #put everything in quotes & separate w/ commas for the query, plus the beginning & ending quotes. this doesn't print out to the console correctly (for me), but hopefully the query will be fine my $insert = sprintf("REPLACE INTO %s (`%s`) VALUES ('%s')", $table, $insert1, $insert2); printf("Loading \"%s\" (%d) \r", $s[1], $s[0]); # name (id) @@ -118,7 +118,7 @@ while() { } else { $loadedspells++; #to compare db inserts to total spells } - + $highid = $s[0]; #set to current id } diff --git a/utils/scripts/ppreader.pl b/utils/scripts/ppreader.pl index bfbc16b24..24ed3df91 100644 --- a/utils/scripts/ppreader.pl +++ b/utils/scripts/ppreader.pl @@ -54,12 +54,12 @@ if($mode eq "-r") { usage(); } my $old_struct = $ARGV[1]; - + print STDERR "Reading old player profile...\n"; (my $old_order, my $old_fields, my $old_offsets) = readpp($old_struct, "../common/eq_old_structs.h"); print STDERR "Reading new player profile...\n"; (my $order, my $fields, my $offsets) = readpp("PlayerProfile_Struct", "../common/eq_packet_structs.h"); - + compare_pps($old_order, $old_fields, $old_offsets, $order, $fields, $offsets); } elsif($mode eq "-c") { @@ -68,12 +68,12 @@ if($mode eq "-r") { } my $old_struct = $ARGV[1]; my $old2_struct = $ARGV[2]; - + print STDERR "Reading old player profile...\n"; (my $old_order, my $old_fields, my $old_offsets) = readpp($old_struct, "../common/eq_old_structs.h"); print STDERR "Reading old2 player profile...\n"; (my $order, my $fields, my $offsets) = readpp($old2_struct, "../common/eq_old_structs.h"); - + compare_pps($old_order, $old_fields, $old_offsets, $order, $fields, $offsets); } else { @@ -84,9 +84,9 @@ if($mode eq "-r") { sub compare_pps { (my $old_order, my $old_fields, my $old_offsets, my $order, my $fields, my $offsets) = @_; - + #will not catch order changes very well for now - + my $last_diff = 0; my $first = $old_order->[0]; my $taildrop = 0; @@ -101,9 +101,9 @@ sub compare_pps { # print STDERR "field $f was lost in new profile, it could be at $guess.\n"; next; } - + my $diff = $offsets->{$f} - $old_offsets->{$f}; - + if($last_diff != $diff) { #a change in deltas... print a rule for last block my $tail = $f; @@ -112,11 +112,11 @@ sub compare_pps { } # print "// delta change from $last_diff to $diff at field $f ($tail)\n"; print "\t\tmemcpy(\&pp->$first, \&ops->$first, StructDist(ops, $first, $tail));\n"; - + $first = $f; $last_diff = $diff; $taildrop = ""; - + } else { #another field with the same delta... $final = $f; @@ -130,7 +130,7 @@ sub compare_pps { $tail = $taildrop; } print "\t\tmemcpy(\&pp->$first, \&ops->$first, StructDist(ops, $first, $tail));\n"; - + } @@ -148,7 +148,7 @@ sub readpp { $in = 1; } next if(!$in); - + if($_ =~ /\}\s*;/) { $in = 0; last; @@ -170,7 +170,7 @@ sub readpp { push(@order, $field); } close(F); - + open(F, ">$temp.cpp") || die("Unable to open $temp.cpp"); print F <<"EOC"; #include "../common/types.h" @@ -190,11 +190,11 @@ EOC } print F "\n\treturn(0);\n}\n\n"; close(F); - + if(system("g++ $temp.cpp -I. -o $temp") != 0) { die("Error compiling $temp.cpp\n"); } - + system("./$temp >$temp.out"); open(F, "<$temp.out"); while() { @@ -210,11 +210,11 @@ EOC $offsets{$1} = $2; } close(F); - + # unlink("$temp.cpp"); # unlink("$temp.out"); # unlink("$temp"); - + return(\@order, \%fields, \%offsets); } diff --git a/world/Adventure.cpp b/world/Adventure.cpp index 98a480073..f8b4a0611 100644 --- a/world/Adventure.cpp +++ b/world/Adventure.cpp @@ -125,7 +125,7 @@ bool Adventure::Process() { Finished(AWS_Lose); } - + MoveCorpsesToGraveyard(); database.DeleteInstance(instance_id); return false; @@ -378,9 +378,9 @@ void Adventure::MoveCorpsesToGraveyard() MYSQL_RES *result; MYSQL_ROW row; - if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, charid FROM player_corpses WHERE instanceid=%d", GetInstanceID()), errbuf, &result)) + if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, charid FROM player_corpses WHERE instanceid=%d", GetInstanceID()), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { dbid_list.push_back(atoi(row[0])); charid_list.push_back(atoi(row[1])); @@ -400,8 +400,8 @@ void Adventure::MoveCorpsesToGraveyard() float x = GetTemplate()->graveyard_x + MakeRandomFloat(-GetTemplate()->graveyard_radius, GetTemplate()->graveyard_radius); float y = GetTemplate()->graveyard_y + MakeRandomFloat(-GetTemplate()->graveyard_radius, GetTemplate()->graveyard_radius); float z = GetTemplate()->graveyard_z; - if(database.RunQuery(query,MakeAnyLenString(&query, "UPDATE player_corpses SET zoneid=%d, instanceid=0, x=%f, y=%f, z=%f WHERE instanceid=%d", - GetTemplate()->graveyard_zone_id, x, y, z, GetInstanceID()), errbuf)) + if(database.RunQuery(query,MakeAnyLenString(&query, "UPDATE player_corpses SET zoneid=%d, instanceid=0, x=%f, y=%f, z=%f WHERE instanceid=%d", + GetTemplate()->graveyard_zone_id, x, y, z, GetInstanceID()), errbuf)) { safe_delete_array(query); } diff --git a/world/AdventureManager.cpp b/world/AdventureManager.cpp index d6e03ee0e..abd202d61 100644 --- a/world/AdventureManager.cpp +++ b/world/AdventureManager.cpp @@ -67,7 +67,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) return; } - /** + /** * This block checks to see if we actually have any adventures for the requested theme. */ map >::iterator adv_list_iter = adventure_entries.find(sar->template_id); @@ -135,7 +135,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) adv.version = finished_adventures[i]->GetTemplate()->zone_version; excluded_zones.push_back(adv); } - if(!IsInExcludedZoneInList(excluded_zone_ins, finished_adventures[i]->GetTemplate()->zone_in_zone_id, + if(!IsInExcludedZoneInList(excluded_zone_ins, finished_adventures[i]->GetTemplate()->zone_in_zone_id, finished_adventures[i]->GetTemplate()->zone_in_object_id)) { AdventureZoneIn adv; @@ -253,7 +253,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) strcpy(deny->leader, sar->leader); stringstream ss(stringstream::out | stringstream::in); - ss << "The maximum level range for this adventure is " << RuleI(Adventure, MaxLevelRange); + ss << "The maximum level range for this adventure is " << RuleI(Adventure, MaxLevelRange); ss << " but the level range calculated was " << (max_level - min_level) << "."; strcpy(deny->reason, ss.str().c_str()); pack->Deflate(); @@ -396,7 +396,7 @@ void AdventureManager::TryAdventureCreate(const char *data) delete adv; return; } - + adv->AddPlayer((data + sizeof(ServerAdventureRequestCreate_Struct) + (64 * i))); } @@ -409,7 +409,7 @@ void AdventureManager::TryAdventureCreate(const char *data) { int f_count = 0; Adventure** finished_adventures = GetFinishedAdventures((data + sizeof(ServerAdventureRequestCreate_Struct) + (64 * i)), f_count); - ServerPacket *pack = new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) + ServerPacket *pack = new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) + (sizeof(ServerFinishedAdventures_Struct) * f_count)); ServerSendAdventureData_Struct *sca = (ServerSendAdventureData_Struct*)pack->pBuffer; @@ -428,8 +428,8 @@ void AdventureManager::TryAdventureCreate(const char *data) sca->finished_adventures = f_count; for(int f = 0; f < f_count; ++f) { - ServerFinishedAdventures_Struct *sfa = (ServerFinishedAdventures_Struct*)(pack->pBuffer - + sizeof(ServerSendAdventureData_Struct) + ServerFinishedAdventures_Struct *sfa = (ServerFinishedAdventures_Struct*)(pack->pBuffer + + sizeof(ServerSendAdventureData_Struct) + (sizeof(ServerFinishedAdventures_Struct) * f)); sfa->zone_in_id = finished_adventures[f]->GetTemplate()->zone_in_zone_id; sfa->zone_in_object = finished_adventures[f]->GetTemplate()->zone_in_object_id; @@ -464,7 +464,7 @@ void AdventureManager::GetAdventureData(const char *name) int f_count = 0; Adventure** finished_adventures = GetFinishedAdventures(name, f_count); Adventure *current = GetActiveAdventure(name); - ServerPacket *pack = new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) + ServerPacket *pack = new ServerPacket(ServerOP_AdventureData, sizeof(ServerSendAdventureData_Struct) + (sizeof(ServerFinishedAdventures_Struct) * f_count)); ServerSendAdventureData_Struct *sca = (ServerSendAdventureData_Struct*)pack->pBuffer; @@ -508,8 +508,8 @@ void AdventureManager::GetAdventureData(const char *name) sca->finished_adventures = f_count; for(int i = 0; i < f_count; ++i) { - ServerFinishedAdventures_Struct *sfa = (ServerFinishedAdventures_Struct*)(pack->pBuffer - + sizeof(ServerSendAdventureData_Struct) + ServerFinishedAdventures_Struct *sfa = (ServerFinishedAdventures_Struct*)(pack->pBuffer + + sizeof(ServerSendAdventureData_Struct) + (sizeof(ServerFinishedAdventures_Struct) * i)); sfa->zone_in_id = finished_adventures[i]->GetTemplate()->zone_in_zone_id; sfa->zone_in_object = finished_adventures[i]->GetTemplate()->zone_in_object_id; @@ -644,9 +644,9 @@ bool AdventureManager::LoadAdventureTemplates() "assa_y, assa_z, assa_h, text, duration, zone_in_time, win_points, lose_points, " "theme, zone_in_zone_id, zone_in_x, zone_in_y, zone_in_object_id, dest_x, dest_y," " dest_z, dest_h, graveyard_zone_id, graveyard_x, graveyard_y, graveyard_z, " - "graveyard_radius FROM adventure_template"), errbuf, &result)) + "graveyard_radius FROM adventure_template"), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { uint8 x = 0; AdventureTemplate *t = new AdventureTemplate; @@ -704,9 +704,9 @@ bool AdventureManager::LoadAdventureEntries() MYSQL_RES *result; MYSQL_ROW row; - if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, template_id FROM adventure_template_entry"), errbuf, &result)) + if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, template_id FROM adventure_template_entry"), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { int id = atoi(row[0]); int template_id = atoi(row[1]); @@ -862,7 +862,7 @@ void AdventureManager::IncrementCount(uint16 instance_id) ServerAdventureCountUpdate_Struct *ac = (ServerAdventureCountUpdate_Struct*)pack->pBuffer; ac->count = current->GetCount(); ac->total = current->GetTemplate()->type_count; - + while(siter != slist.end()) { ClientListEntry *pc = client_list.FindCharacter((*siter).c_str()); @@ -1097,9 +1097,9 @@ void AdventureManager::LoadLeaderboardInfo() MYSQL_ROW row; if(database.RunQuery(query,MakeAnyLenString(&query,"select ch.name, ch.id, adv_stats.* from adventure_stats " - "AS adv_stats ""left join character_ AS ch on adv_stats.player_id = ch.id;"), errbuf, &result)) + "AS adv_stats ""left join character_ AS ch on adv_stats.player_id = ch.id;"), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { if(row[0]) { @@ -1329,7 +1329,7 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1396,7 +1396,7 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1463,7 +1463,7 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1530,7 +1530,7 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1597,7 +1597,7 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1664,7 +1664,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1731,7 +1731,7 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1798,7 +1798,7 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1865,7 +1865,7 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1932,7 +1932,7 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -1999,7 +1999,7 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -2066,7 +2066,7 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player) al->success = our_successes; al->failure = our_failures; } - + pack->Deflate(); zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack); delete pack; @@ -2119,7 +2119,7 @@ void AdventureManager::Save() int number_of_elements = adventure_list.size(); ss.write((const char*)&number_of_elements, sizeof(int)); - + char null_term = 0; list::iterator a_iter = adventure_list.begin(); while(a_iter != adventure_list.end()) diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt index 768072677..85423e5f1 100644 --- a/world/CMakeLists.txt +++ b/world/CMakeLists.txt @@ -70,7 +70,7 @@ ADD_DEFINITIONS(-DWORLD) TARGET_LINK_LIBRARIES(world Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY}) IF(MSVC) - + SET_TARGET_PROPERTIES(world PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") TARGET_LINK_LIBRARIES(world "Ws2_32.lib") ENDIF(MSVC) diff --git a/world/EQLConfig.h b/world/EQLConfig.h index faf679142..1588c5d60 100644 --- a/world/EQLConfig.h +++ b/world/EQLConfig.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -36,39 +36,39 @@ typedef struct { class EQLConfig { public: EQLConfig(const char *launcher_name); - + void LoadSettings(); static EQLConfig *CreateLauncher(const char *name, uint8 dynamic_count); - + void GetZones(std::vector &result); - + //BEGIN PERL EXPORT Const_char * GetName() const { return(m_name.c_str()); } int GetStaticCount() const { return(m_zones.size()); } bool IsConnected() const; //is this launcher connected to world - + void DeleteLauncher(); //kill this launcher and all its zones. - + void RestartZone(Const_char *zone_ref); void StopZone(Const_char *zone_ref); void StartZone(Const_char *zone_ref); - + bool BootStaticZone(Const_char *short_name, uint16 port); bool ChangeStaticZone(Const_char *short_name, uint16 port); bool DeleteStaticZone(Const_char *short_name); - + bool SetDynamicCount(int count); int GetDynamicCount() const; - + vector ListZones(); //returns an array of zone refs map GetZoneDetails(Const_char *zone_ref); //END PERL EXPORT - + protected: const string m_name; - + uint8 m_dynamics; - + map m_zones; //static zones. }; diff --git a/world/EQW.cpp b/world/EQW.cpp index cdf264310..0214b2a6c 100644 --- a/world/EQW.cpp +++ b/world/EQW.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -61,10 +61,10 @@ extern volatile bool RunLoops; EQW EQW::s_EQW; //IO Capture routine -XS(XS_EQWIO_PRINT); /* prototype to pass -Wmissing-prototypes */ -XS(XS_EQWIO_PRINT) +XS(XS_EQWIO_PRINT); /* prototype to pass -Wmissing-prototypes */ +XS(XS_EQWIO_PRINT) { - dXSARGS; + dXSARGS; if (items < 2) return; @@ -73,8 +73,8 @@ XS(XS_EQWIO_PRINT) char *str = SvPV_nolen(ST(r)); EQW::Singleton()->AppendOutput(str); } - - XSRETURN_EMPTY; + + XSRETURN_EMPTY; } EQW::EQW() { @@ -120,29 +120,29 @@ int EQW::CountZones() { //returns an array of zone_refs (opaque) vector EQW::ListBootedZones() { vector res; - + vector zones; zoneserver_list.GetZoneIDList(zones); - + vector::iterator cur, end; cur = zones.begin(); end = zones.end(); for(; cur != end; cur++) { res.push_back(itoa(*cur)); } - + return(res); } map EQW::GetZoneDetails(Const_char *zone_ref) { map res; - + ZoneServer *zs = zoneserver_list.FindByID(atoi(zone_ref)); if(zs == nullptr) { res["error"] = "Invalid zone."; return(res); } - + res["type"] = zs->IsStaticZone()?"static":"dynamic"; res["zone_id"] = itoa(zs->GetZoneID()); res["launch_name"] = zs->GetLaunchName(); @@ -151,7 +151,7 @@ map EQW::GetZoneDetails(Const_char *zone_ref) { res["long_name"] = zs->GetZoneLongName(); res["port"] = itoa(zs->GetCPort()); res["player_count"] = itoa(zs->NumPlayers()); - + //this isnt gunna work for dynamic zones... res["launcher"] = ""; if(zs->GetZoneID() != 0) { @@ -159,7 +159,7 @@ map EQW::GetZoneDetails(Const_char *zone_ref) { if(ll != nullptr) res["launcher"] = ll->GetName(); } - + return(res); } @@ -170,10 +170,10 @@ int EQW::CountPlayers() { //returns an array of character names in the zone (empty=all zones) vector EQW::ListPlayers(Const_char *zone_name) { vector res; - + vector list; client_list.GetClients(zone_name, list); - + vector::iterator cur, end; cur = list.begin(); end = list.end(); @@ -185,13 +185,13 @@ vector EQW::ListPlayers(Const_char *zone_name) { map EQW::GetPlayerDetails(Const_char *char_name) { map res; - + ClientListEntry *cle = client_list.FindCharacter(char_name); if(cle == nullptr) { res["error"] = "1"; return(res); } - + res["character"] = cle->name(); res["account"] = cle->AccountName(); res["account_id"] = itoa(cle->AccountID()); @@ -208,14 +208,14 @@ map EQW::GetPlayerDetails(Const_char *char_name) { res["guild"] = guild_mgr.GetGuildName(cle->GuildID()); res["status"] = itoa(cle->Admin()); // res["patch"] = cle->DescribePatch(); - + return(res); } int EQW::CountLaunchers(bool active_only) { if(active_only) return(launcher_list.GetLauncherCount()); - + vector it(EQW::ListLaunchers()); return(it.size()); } @@ -232,13 +232,13 @@ vector EQW::ListLaunchers() { vector launchers; launcher_list.GetLauncherNameList(launchers); return(launchers); - + /* if(list.empty()) { return(launchers); } else if(launchers.empty()) { return(list); } - + //union the two lists. vector::iterator curo, endo, curi, endi; curo = list.begin(); @@ -286,7 +286,7 @@ void EQW::LSReconnect() { /* map EQW::GetLaunchersDetails(Const_char *launcher_name) { map res; - + LauncherLink *ll = launcher_list.Get(launcher_name); if(ll == nullptr) { res["name"] = launcher_name; @@ -302,7 +302,7 @@ map EQW::GetLaunchersDetails(Const_char *launcher_name) { res["zone_count"] = itoa(ll->CountZones()); res["connected"] = "yes"; } - + return(res); } diff --git a/world/EQW.h b/world/EQW.h index 788fc41a9..c1527435b 100644 --- a/world/EQW.h +++ b/world/EQW.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -31,35 +31,35 @@ class EQW { EQW(); public: static EQW *Singleton() { return(&s_EQW); } - + void AppendOutput(const char *str); const std::string &GetOutput() const; void ClearOutput() { m_outputBuffer = ""; } - + //BEGIN PERL EXPORT //NOTE: you must have a space after the * of a return value Const_char * GetConfig(Const_char *var_name); void LockWorld(); void UnlockWorld(); - + bool LSConnected(); void LSReconnect(); - + int CountZones(); vector ListBootedZones(); //returns an array of zone_refs (opaque) map GetZoneDetails(Const_char *zone_ref); //returns a hash ref of details - + int CountPlayers(); vector ListPlayers(Const_char *zone_name = ""); //returns an array of player refs (opaque) map GetPlayerDetails(Const_char *player_ref); //returns a hash ref of details - + int CountLaunchers(bool active_only); // vector ListActiveLaunchers(); //returns an array of launcher names vector ListLaunchers(); //returns an array of launcher names EQLConfig * GetLauncher(Const_char *launcher_name); //returns the EQLConfig object for the specified launcher. void CreateLauncher(Const_char *launcher_name, int dynamic_count); // EQLConfig * FindLauncher(Const_char *zone_ref); - + //Guild routines, mostly wrappers around guild_mgr uint32 CreateGuild(const char* name, uint32 leader_char_id); bool DeleteGuild(uint32 guild_id); @@ -71,7 +71,7 @@ public: bool SetBankerFlag(uint32 charid, bool is_banker); bool SetTributeFlag(uint32 charid, bool enabled); bool SetPublicNote(uint32 charid, const char *note); - + //bugs int CountBugs(); vector ListBugs(uint32 offset); //returns an array of zone_refs (opaque) @@ -85,9 +85,9 @@ public: protected: std::string m_outputBuffer; std::string m_returnBuffer; - + bool m_worldLocked; - + private: static EQW s_EQW; }; diff --git a/world/EQWHTTPHandler.cpp b/world/EQWHTTPHandler.cpp index 7e46ddd81..8bba5c476 100644 --- a/world/EQWHTTPHandler.cpp +++ b/world/EQWHTTPHandler.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -40,7 +40,7 @@ EQWHTTPHandler::EQWHTTPHandler(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 } EQWHTTPHandler::~EQWHTTPHandler() { - + } #ifdef EMBPERL @@ -71,16 +71,16 @@ void EQWHTTPHandler::Exec() { m_sentHeaders = false; m_responseCode = "200"; // printf("Request: %s, %s, %s, %s.\n", GetMethod().c_str(), GetUrl().c_str(), GetUri().c_str(), GetQueryString().c_str()); - + SetHttpVersion("HTTP/1.0"); AddResponseHeader("Connection", "close"); - + if(GetUri().find("..") != string::npos) { SendResponse("403", "Forbidden"); printf("%s is forbidden.\n", GetUri().c_str()); return; } - + if(!CheckAuth()) { AddResponseHeader("Content-type", "text/plain"); AddResponseHeader("WWW-Authenticate", "Basic realm=\"EQEmulator\""); @@ -110,23 +110,23 @@ void EQWHTTPHandler::Exec() { void EQWHTTPHandler::OnHeader(const std::string& key,const std::string& value) { HttpdSocket::OnHeader(key, value); - + if (!strcasecmp(key.c_str(),"Authorization")) { if(strncasecmp(value.c_str(), "Basic ", 6)) { printf("Invalid auth type. Expected Basic: %s\n", value.c_str()); return; } - + std::string dec; Base64::decode(value.c_str() + 6, dec); - + std::string::size_type cpos; cpos = dec.find_first_of(':'); if(cpos == string::npos) { printf("Invalid auth string: %s\n", dec.c_str()); return; } - + m_username = dec.substr(0, cpos); m_password = dec.substr(cpos+1); } @@ -137,7 +137,7 @@ void EQWHTTPHandler::OnHeader(const std::string& key,const std::string& value) { bool EQWHTTPHandler::CheckAuth() const { if(m_username.length() < 1) return(false); - + int16 status = 0; uint32 acctid = database.CheckLogin(m_username.c_str(), m_password.c_str(), &status); if(acctid == 0) { @@ -148,15 +148,15 @@ bool EQWHTTPHandler::CheckAuth() const { _log(WORLD__HTTP_ERR, "Login of %s failed: status too low.", m_username.c_str()); return(false); } - + return(true); } void EQWHTTPHandler::SendPage(const std::string &file) { - + string path = "templates/"; path += file; - + FILE *f = fopen(path.c_str(), "rb"); if(f == nullptr) { SendResponse("404", "Not Found"); @@ -164,10 +164,10 @@ void EQWHTTPHandler::SendPage(const std::string &file) { printf("%s not found.\n", file.c_str()); return; } - + string type = s_mime.GetMimeFromFilename(file); AddResponseHeader("Content-type", type); - + bool process = false; #ifdef EMBPERL if(type == "text/html") @@ -180,7 +180,7 @@ void EQWHTTPHandler::SendPage(const std::string &file) { } #endif - + char *buffer = new char[READ_BUFFER_LEN+1]; size_t len; string to_process; @@ -198,10 +198,10 @@ void EQWHTTPHandler::SendPage(const std::string &file) { //convert the base form into a useful perl exportable form HTTPRequest req(this, GetHttpForm()); GetParser()->SetHTTPRequest("testing", &req); - + //parse out the page and potentially pass some stuff on to perl. ProcessAndSend(to_process); - + //clear out the form, just in case (since it gets destroyed next) GetParser()->SetHTTPRequest("testing", nullptr); } @@ -217,7 +217,7 @@ void EQWHTTPHandler::ProcessAndSend(const string &str) { string::size_type len = str.length(); string::size_type start = 0; string::size_type pos, end; - + while((pos = str.find("EQW_eval("testing", script_body.c_str()); const string &res = EQW::Singleton()->GetOutput(); if(!res.empty()) { @@ -291,7 +291,7 @@ bool EQWHTTPServer::Start(uint16 port, const char *mime_file) { _log(WORLD__HTTP_ERR, "HTTP Service is already running on port %d", m_port); return(false); } - + //load up our nice mime types if(!EQWHTTPHandler::LoadMimeTypes(mime_file)) { _log(WORLD__HTTP_ERR, "Failed to load mime types from '%s'", mime_file); @@ -299,25 +299,25 @@ bool EQWHTTPServer::Start(uint16 port, const char *mime_file) { } else { _log(WORLD__HTTP, "Loaded mime types from %s", mime_file); } - + //fire up the server thread char errbuf[TCPServer_ErrorBufferSize]; if(!Open(port, errbuf)) { _log(WORLD__HTTP_ERR, "Unable to bind to port %d for HTTP service: %s", port, errbuf); return(false); } - + m_running = true; m_port = port; - + /* - + #ifdef _WINDOWS _beginthread(ThreadProc, 0, this); #else pthread_create(&m_thread, nullptr, ThreadProc, this); #endif*/ - + return(true); } diff --git a/world/EQWHTTPHandler.h b/world/EQWHTTPHandler.h index cf6a2f508..793d5b0c6 100644 --- a/world/EQWHTTPHandler.h +++ b/world/EQWHTTPHandler.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -31,38 +31,38 @@ class EQWHTTPHandler : public HttpdSocket { public: EQWHTTPHandler(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort); virtual ~EQWHTTPHandler(); - + void SetResponseCode(const char *code) { m_responseCode = code; } - + //HttpdSocket interface: virtual void Exec(); virtual void OnHeader(const std::string& key,const std::string& value); - + static bool LoadMimeTypes(const char *filename); protected: bool CheckAuth() const; void SendPage(const std::string &file); - + //credentials std::string m_username; std::string m_password; - + bool m_closeOnFinish; std::string m_responseCode; bool m_sentHeaders; - - + + //our mime type manager static Mime s_mime; - - + + #ifdef EMBPERL void ProcessAndSend(const std::string &entire_html_page); void ProcessScript(const std::string &script_body); void ProcessText(const char *txt, int len); - + static EQWParser *GetParser(); - + private: static EQWParser *s_parser; #endif @@ -71,24 +71,24 @@ private: class EQWHTTPServer : protected TCPServer { public: EQWHTTPServer(); - + bool Start(uint16 port, const char *mime_file); void Stop(); - - + + protected: volatile bool m_running; uint16 m_port; - + virtual void CreateNewConnection(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort); - + /* //I decided to put this into its own thread so that the HTTP pages //cannot block the main world server's operation. static ThreadReturnType ThreadProc(void* tmp); void Run(); - - - + + + #ifndef WIN32 pthread_t m_thread; #endif*/ diff --git a/world/EQWParser.cpp b/world/EQWParser.cpp index 2ad5e1d4b..def0c4ec3 100644 --- a/world/EQWParser.cpp +++ b/world/EQWParser.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -44,16 +44,16 @@ EXTERN_C XS(boot_EQDBRes); EXTERN_C XS(boot_HTTPRequest); EXTERN_C XS(boot_EQLConfig); -EXTERN_C void xs_init(pTHX) +EXTERN_C void xs_init(pTHX) { char file[256]; strncpy(file, __FILE__, 256); file[255] = '\0'; - + char buf[128]; //shouldent have any function names longer than this. - + //add the strcpy stuff to get rid of const warnings.... - + newXS(strcpy(buf, "DynaLoader::boot_DynaLoader"), boot_DynaLoader, file); newXS(strcpy(buf, "EQW::boot_EQW"), boot_EQW, file); newXS(strcpy(buf, "EQDB::boot_EQDB"), boot_EQDB, file); @@ -92,10 +92,10 @@ void EQWParser::DoInit() { perl_parse(my_perl, xs_init, argc, argv, env); perl_run(my_perl); - + //a little routine we use a lot. eval_pv("sub my_eval {eval $_[0];}", TRUE); //dies on error - + //ruin the perl exit and command: eval_pv("sub my_exit {}",TRUE); eval_pv("sub my_sleep {}",TRUE); @@ -107,7 +107,7 @@ void EQWParser::DoInit() { GvCV_set(sleepgp, perl_get_cv("my_sleep", TRUE)); //dies on error GvIMPORTED_CV_on(sleepgp); } - + //setup eval_file eval_pv( "our %Cache;" @@ -125,7 +125,7 @@ void EQWParser::DoInit() { "}" "}" ,FALSE); - + //make a tie-able class to capture IO and get it where it needs to go eval_pv( "package EQWIO; " @@ -142,12 +142,12 @@ void EQWParser::DoInit() { " tie *STDOUT, 'EQWIO';" " tie *STDERR, 'EQWIO';" ,FALSE); - + eval_pv( "package world; " ,FALSE ); - + //make sure the EQW pointer is set up in this package EQW *curc = EQW::Singleton(); SV *l = get_sv("world::EQW", true); @@ -157,7 +157,7 @@ void EQWParser::DoInit() { //clear out the value, mainly to get rid of blessedness sv_setsv(l, _empty_sv); } - + //make sure the EQDB pointer is set up in this package EQDB::SetMySQL(database.getMySQL()); EQDB *curc_db = EQDB::Singleton(); @@ -168,7 +168,7 @@ void EQWParser::DoInit() { //clear out the value, mainly to get rid of blessedness sv_setsv(l_db, _empty_sv); } - + //load up EQW eval_pv( "package EQW;" @@ -182,15 +182,15 @@ void EQWParser::DoInit() { "package EQLConfig;" "&boot_EQLConfig;" //load our EQLConfig XS , FALSE ); - - + + #ifdef EMBPERL_PLUGIN _log(WORLD__PERL, "Loading worldui perl plugins."); string err; if(!eval_file("world", "worldui.pl", err)) { _log(WORLD__PERL_ERR, "Warning - world.pl: %s", err.c_str()); } - + eval_pv( "package world; " "if(opendir(D,'worldui')) { " @@ -234,7 +234,7 @@ bool EQWParser::dosub(const char * subname, const std::vector &args { for(std::vector::const_iterator i = args.begin(); i != args.end(); ++i) {/* push the arguments onto the perl stack */ - XPUSHs(sv_2mortal(newSVpv(i->c_str(), i->length()))); + XPUSHs(sv_2mortal(newSVpv(i->c_str(), i->length()))); } } PUTBACK; /* make local stack pointer global */ @@ -245,7 +245,7 @@ bool EQWParser::dosub(const char * subname, const std::vector &args } FREETMPS; /* free temp values */ LEAVE; /* ...and the XPUSHed "mortal" args.*/ - + if(err) { error = "Perl runtime error: "; error += SvPVX(ERRSV); @@ -263,10 +263,10 @@ bool EQWParser::eval(const char * code, string &error) { void EQWParser::EQW_eval(const char *pkg, const char *code) { char namebuf[64]; - + snprintf(namebuf, 64, "package %s;", pkg); eval_pv(namebuf, FALSE); - + //make sure the EQW pointer is set up EQW *curc = EQW::Singleton(); snprintf(namebuf, 64, "EQW"); @@ -289,7 +289,7 @@ void EQWParser::EQW_eval(const char *pkg, const char *code) { //clear out the value, mainly to get rid of blessedness sv_setsv(l_db, _empty_sv); } - + string err; if(!eval(code, err)) { EQW::Singleton()->AppendOutput(err.c_str()); @@ -298,10 +298,10 @@ void EQWParser::EQW_eval(const char *pkg, const char *code) { void EQWParser::SetHTTPRequest(const char *pkg, HTTPRequest *it) { char namebuf[64]; - + snprintf(namebuf, 64, "package %s;", pkg); eval_pv(namebuf, FALSE); - + snprintf(namebuf, 64, "request"); // snprintf(namebuf, 64, "%s::EQW", pkg); SV *l = get_sv(namebuf, true); diff --git a/world/EQWParser.h b/world/EQWParser.h index 777cbb700..357bdcc8f 100644 --- a/world/EQWParser.h +++ b/world/EQWParser.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -36,10 +36,10 @@ class EQWParser { public: EQWParser(); ~EQWParser(); - + void EQW_eval(const char *pkg, const char *code); void SetHTTPRequest(const char *pkg, HTTPRequest *it); - + //put an integer into a perl varable void seti(const char *varname, int val) const { SV *t = get_sv(varname, true); @@ -55,7 +55,7 @@ public: SV *t = get_sv(varname, true); sv_setpv(t, val); } - + protected: void DoInit(); bool eval(const char * code, std::string &error); diff --git a/world/HTTPRequest.cpp b/world/HTTPRequest.cpp index b68dab7da..34e375244 100644 --- a/world/HTTPRequest.cpp +++ b/world/HTTPRequest.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/world/HTTPRequest.h b/world/HTTPRequest.h index 41a7af383..eb4b05a9f 100644 --- a/world/HTTPRequest.h +++ b/world/HTTPRequest.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -34,19 +34,19 @@ using namespace std; class HTTPRequest { public: HTTPRequest(EQWHTTPHandler *h, HttpdForm *form); - + //BEGIN PERL EXPORT - + Const_char * get(Const_char *name, Const_char *default_value = "") const; int getInt(Const_char *name, int default_value = 0) const; float getFloat(Const_char *name, float default_value = 0.0) const; - + //returns a database-safe string Const_char * getEscaped(Const_char *name, Const_char *default_value = "") const; - + map get_all() const; - + void redirect(Const_char *URL); void SetResponseCode(Const_char *code); void header(Const_char *name, Const_char *value); diff --git a/world/LauncherLink.cpp b/world/LauncherLink.cpp index 186124929..802ecfd79 100644 --- a/world/LauncherLink.cpp +++ b/world/LauncherLink.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -53,7 +53,7 @@ LauncherLink::~LauncherLink() { bool LauncherLink::Process() { if (!tcpc->Connected()) return false; - + if(m_bootTimer.Check(false)) { //force a boot on any zone which isnt running. std::map::iterator cur, end; @@ -66,7 +66,7 @@ bool LauncherLink::Process() { } m_bootTimer.Disable(); } - + ServerPacket *pack = 0; while((pack = tcpc->PopPacket())) { _hex(WORLD__ZONE_TRACE,pack->pBuffer,pack->size); @@ -125,20 +125,20 @@ bool LauncherLink::Process() { break; } m_name = it->name; - + EQLConfig *config = launcher_list.GetConfig(m_name.c_str()); if(config == nullptr) { _log(WORLD__LAUNCH, "Unknown launcher '%s' connected. Disconnecting.", it->name); Disconnect(); break; } - + _log(WORLD__LAUNCH, "Launcher Identified itself as '%s'. Loading zone list.", it->name); - + std::vector result; //database.GetLauncherZones(it->name, result); config->GetZones(result); - + std::vector::iterator cur, end; cur = result.begin(); end = result.end(); @@ -150,12 +150,12 @@ bool LauncherLink::Process() { _log(WORLD__LAUNCH_TRACE, "%s: Loaded zone '%s' on port %d", m_name.c_str(), cur->name.c_str(), zs.port); m_states[cur->name] = zs; } - + //now we add all the dynamics. BootDynamics(config->GetDynamicCount()); - + m_bootTimer.Start(); - + break; } case ServerOP_LauncherZoneStatus: { @@ -186,7 +186,7 @@ bool LauncherLink::Process() { bool LauncherLink::ContainsZone(const char *short_name) const { return(m_states.find(short_name) != m_states.end()); - + /* * std::map::const_iterator cur, end; cur = m_states.begin(); @@ -203,17 +203,17 @@ void LauncherLink::BootZone(const char *short_name, uint16 port) { zs.starts = 0; _log(WORLD__LAUNCH_TRACE, "%s: Loaded zone '%s' on port %d", m_name.c_str(), short_name, zs.port); m_states[short_name] = zs; - + StartZone(short_name); } void LauncherLink::StartZone(const char *short_name) { ServerPacket* pack = new ServerPacket(ServerOP_LauncherZoneRequest, sizeof(LauncherZoneRequest)); LauncherZoneRequest* s = (LauncherZoneRequest *) pack->pBuffer; - + strn0cpy(s->short_name, short_name, 32); s->command = ZR_Start; - + SendPacket(pack); delete pack; } @@ -221,10 +221,10 @@ void LauncherLink::StartZone(const char *short_name) { void LauncherLink::RestartZone(const char *short_name) { ServerPacket* pack = new ServerPacket(ServerOP_LauncherZoneRequest, sizeof(LauncherZoneRequest)); LauncherZoneRequest* s = (LauncherZoneRequest *) pack->pBuffer; - + strn0cpy(s->short_name, short_name, 32); s->command = ZR_Restart; - + SendPacket(pack); delete pack; } @@ -232,10 +232,10 @@ void LauncherLink::RestartZone(const char *short_name) { void LauncherLink::StopZone(const char *short_name) { ServerPacket* pack = new ServerPacket(ServerOP_LauncherZoneRequest, sizeof(LauncherZoneRequest)); LauncherZoneRequest* s = (LauncherZoneRequest *) pack->pBuffer; - + strn0cpy(s->short_name, short_name, 32); s->command = ZR_Stop; - + SendPacket(pack); delete pack; } @@ -243,15 +243,15 @@ void LauncherLink::StopZone(const char *short_name) { void LauncherLink::BootDynamics(uint8 new_count) { if(m_dynamicCount == new_count) return; - + ZoneState zs; if(m_dynamicCount < new_count) { //we are booting more dynamics. - + zs.port = 0; zs.up = false; zs.starts = 0; - + int r; char nbuf[20]; uint8 index; @@ -278,7 +278,7 @@ void LauncherLink::BootDynamics(uint8 new_count) { } } else { //need to get rid of some zones... - + //quick and dirty way to do this.. should do better (like looking for idle zones) int found = 0; std::map::iterator cur, end; @@ -294,10 +294,10 @@ void LauncherLink::BootDynamics(uint8 new_count) { } } } - + m_dynamicCount = new_count; } - + } @@ -312,7 +312,7 @@ void LauncherLink::GetZoneList(std::vector &l) { void LauncherLink::GetZoneDetails(const char *short_name, std::map &res) { res.clear(); - + std::map::iterator r; r = m_states.find(short_name); if(r == m_states.end()) { diff --git a/world/LauncherLink.h b/world/LauncherLink.h index 04749b95d..7aaf27e3b 100644 --- a/world/LauncherLink.h +++ b/world/LauncherLink.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -30,22 +30,22 @@ class LauncherLink { public: LauncherLink(int id, EmuTCPConnection *tcpc); ~LauncherLink(); - + bool Process(); bool SendPacket(ServerPacket* pack) { return tcpc->SendPacket(pack); } // bool SendPacket(TCPConnection::TCPNetPacket_Struct* tnps) { return tcpc->SendPacket(tnps); } - + int GetID() const { return(ID); } void Disconnect() { tcpc->Disconnect(); } - + inline bool HasName() const { return(m_name.length() > 0); } inline uint32 GetIP() const { return tcpc->GetrIP(); } inline uint16 GetPort() const { return tcpc->GetrPort(); } inline const char * GetName() const { return(m_name.c_str()); } inline int CountZones() const { return(m_states.size()); } - + bool ContainsZone(const char *short_name) const; - + //commands void Shutdown(); void BootZone(const char *short_name, uint16 port); @@ -53,19 +53,19 @@ public: void RestartZone(const char *short_name); void StopZone(const char *short_name); void BootDynamics(uint8 new_total); - + void GetZoneList(std::vector &list); void GetZoneDetails(const char *short_name, std::map &result); - + protected: const int ID; EmuTCPConnection*const tcpc; bool authenticated; std::string m_name; Timer m_bootTimer; - + uint8 m_dynamicCount; - + typedef struct { bool up; uint32 starts; //number of times this zone has started diff --git a/world/LauncherList.cpp b/world/LauncherList.cpp index 28d286fc6..b7c886b10 100644 --- a/world/LauncherList.cpp +++ b/world/LauncherList.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -37,14 +37,14 @@ LauncherList::~LauncherList() { for(; cur != end; cur++) { delete *cur; } - + map::iterator curc, endc; curc = m_configs.begin(); endc = m_configs.end(); for(; curc != endc; curc++) { delete curc->second; } - + map::iterator curl, endl; curl = m_launchers.begin(); endl = m_launchers.end(); @@ -52,7 +52,7 @@ LauncherList::~LauncherList() { delete curl->second; } } - + void LauncherList::Process() { //process pending launchers.. vector::iterator cur, end; @@ -84,7 +84,7 @@ void LauncherList::Process() { cur++; } } - + //process active launchers. map::iterator curl, tmp; curl = m_launchers.begin(); @@ -111,7 +111,7 @@ LauncherLink *LauncherList::Get(const char *name) { return(nullptr); return(res->second); /* string goal(name); - + vector::iterator cur, end; cur = m_launchers.begin(); end = m_launchers.end(); @@ -155,9 +155,9 @@ void LauncherList::GetLauncherNameList(std::vector &res) { void LauncherList::LoadList() { vector launchers; - + database.GetLauncherList(launchers); - + vector::iterator cur, end; cur = launchers.begin(); end = launchers.end(); @@ -186,7 +186,7 @@ void LauncherList::Remove(const char *name) { delete resc->second; m_configs.erase(resc); } - + map::iterator resl; resl = m_launchers.find(name); if(resl != m_launchers.end()) { diff --git a/world/LauncherList.h b/world/LauncherList.h index 61e95555d..37d9e1aae 100644 --- a/world/LauncherList.h +++ b/world/LauncherList.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -31,21 +31,21 @@ class LauncherList { public: LauncherList(); ~LauncherList(); - + void Process(); - + void LoadList(); EQLConfig *GetConfig(const char *name); void CreateLauncher(const char *name, uint8 dynamic_count); void Remove(const char *name); - + void Add(EmuTCPConnection *conn); LauncherLink *Get(const char *name); LauncherLink *FindByZone(const char *short_name); - + int GetLauncherCount(); void GetLauncherNameList(std::vector &list); - + protected: std::map m_configs; //we own these objects std::map m_launchers; //we own these objects diff --git a/world/LoginServer.cpp b/world/LoginServer.cpp index bb1c671da..f30d92431 100644 --- a/world/LoginServer.cpp +++ b/world/LoginServer.cpp @@ -96,7 +96,7 @@ bool LoginServer::Process() { if (statusupdate_timer.Check()) { this->SendStatus(); } - + /************ Get all packets from packet manager out queue and process them ************/ ServerPacket *pack = 0; while((pack = tcpc->PopPacket())) @@ -112,7 +112,7 @@ bool LoginServer::Process() { break; } case ServerOP_UsertoWorldReq: { - UsertoWorldRequest_Struct* utwr = (UsertoWorldRequest_Struct*) pack->pBuffer; + UsertoWorldRequest_Struct* utwr = (UsertoWorldRequest_Struct*) pack->pBuffer; uint32 id = database.GetAccountIDFromLSID(utwr->lsaccountid); int16 status = database.CheckStatus(id); @@ -154,9 +154,9 @@ bool LoginServer::Process() { ServerLSClientAuth* slsca = (ServerLSClientAuth*) pack->pBuffer; if (RuleI(World, AccountSessionLimit) >= 0) { - // Enforce the limit on the number of characters on the same account that can be + // Enforce the limit on the number of characters on the same account that can be // online at the same time. - client_list.EnforceSessionLimit(slsca->lsaccount_id); + client_list.EnforceSessionLimit(slsca->lsaccount_id); } client_list.CLEAdd(slsca->lsaccount_id, slsca->name, slsca->key, slsca->worldadmin, slsca->ip, slsca->local); diff --git a/world/LoginServerList.h b/world/LoginServerList.h index f6af8a8a2..29ee8ed74 100644 --- a/world/LoginServerList.h +++ b/world/LoginServerList.h @@ -21,7 +21,7 @@ class LoginServerList{ public: LoginServerList(); ~LoginServerList(); - + void Add(const char*, uint16, const char*, const char*); void InitLoginServer(); @@ -31,13 +31,13 @@ public: bool SendNewInfo(); bool SendStatus(); - bool SendPacket(ServerPacket *pack); - bool SendAccountUpdate(ServerPacket *pack); + bool SendPacket(ServerPacket *pack); + bool SendAccountUpdate(ServerPacket *pack); bool Connected(); bool AllConnected(); bool MiniLogin(); bool CanUpdate(); - + protected: LinkedList list; }; diff --git a/world/SoFCharCreateData.h b/world/SoFCharCreateData.h index 7f8deafdd..97d9e8014 100644 --- a/world/SoFCharCreateData.h +++ b/world/SoFCharCreateData.h @@ -17,7 +17,7 @@ struct RaceClassCombos { unsigned int AllocationIndex; unsigned int Zone; }; - + /*struct SoFCCData { unsigned char Unknown; unsigned int RaceClassStatEntryCount; diff --git a/world/WorldConfig.cpp b/world/WorldConfig.cpp index 13433e387..fc377db86 100644 --- a/world/WorldConfig.cpp +++ b/world/WorldConfig.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/world/WorldConfig.h b/world/WorldConfig.h index 750f1a22d..d1209ea35 100644 --- a/world/WorldConfig.h +++ b/world/WorldConfig.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -40,7 +40,7 @@ public: // Produce a const singleton static const WorldConfig *get() { - if (_world_config == nullptr) + if (_world_config == nullptr) LoadConfig(); return(_world_config); } @@ -61,7 +61,7 @@ public: static void DisableStats() { if (_world_config) _world_config->UpdateStats=false; } static void EnableStats() { if (_world_config) _world_config->UpdateStats=true; } - + static void DisableLoginserver() { if (_world_config) _world_config->LoginDisabled=true; } static void EnableLoginserver() { if (_world_config) _world_config->LoginDisabled=false; } diff --git a/world/client.cpp b/world/client.cpp index f082a22e7..2023af71f 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -120,7 +120,7 @@ void Client::SendLogServer() if(RuleB(Chat, EnableVoiceMacros)) l->enablevoicemacros = 1; - + l->enable_pvp = (RuleI(World, PVPSettings)); if(RuleB(World, IsGMPetitionWindowEnabled)) @@ -188,7 +188,7 @@ void Client::SendCharInfo() { void Client::SendMaxCharCreate(int max_chars) { EQApplicationPacket *outapp = new EQApplicationPacket(OP_SendMaxCharacters, sizeof(MaxCharacters_Struct)); MaxCharacters_Struct* mc = (MaxCharacters_Struct*)outapp->pBuffer; - + mc->max_chars = max_chars; QueuePacket(outapp); @@ -219,7 +219,7 @@ void Client::SendMembership() { 15. In-Game Popup Advertising That is 15 possible fields, and there are 15 unknowns in the struct...Coincidence? */ - + mc->membership = 2; //Hardcode to gold for now. We don't use anything else. mc->races = 0x1ffff; // Available Races (4110 for silver) mc->classes = 0x1ffff; // Available Classes (4614 for silver) - Was 0x101ffff @@ -236,7 +236,7 @@ void Client::SendMembership() { mc->entries[9] = 0xffffffff; // Unknown - Maybe Loyalty Points every 12 hours? 60 per week for Silver mc->entries[10] = 1; // 1 for Silver mc->entries[11] = 0xffffffff; // Shared Bank Slots - mc->entries[12] = 0xffffffff; // Unknown - Maybe Max Active Tasks? + mc->entries[12] = 0xffffffff; // Unknown - Maybe Max Active Tasks? mc->entries[13] = 1; // 1 for Silver mc->entries[14] = 1; // 0 for Silver mc->entries[15] = 1; // 0 for Silver @@ -263,7 +263,7 @@ void Client::SendMembershipSettings() { { for (int setting_index=0; setting_index < 3; setting_index++) { - + mds->settings[entry_count].setting_index = setting_index; mds->settings[entry_count].setting_id = setting_id; mds->settings[entry_count].setting_value = gold_settings[setting_id]; @@ -327,7 +327,7 @@ void Client::SendMembershipSettings() { mds->exit_url_length = 0; // Live uses 42 //strcpy(eq->exit_url, "http://www.everquest.com/free-to-play/exit"); mds->exit_url_length2 = 0; // Live uses 49 - //strcpy(eq->exit_url2, "http://www.everquest.com/free-to-play/exit-silver"); + //strcpy(eq->exit_url2, "http://www.everquest.com/free-to-play/exit-silver"); /* Account Access Level Settings @@ -658,7 +658,7 @@ bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) { DumpPacket(app); // the previous behavior was essentially returning true here // but that seems a bit odd to me. - return true; + return true; } CharCreate_Struct *cc = (CharCreate_Struct*)app->pBuffer; @@ -672,7 +672,7 @@ bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) { } else SendCharInfo(); - + return true; } @@ -947,7 +947,7 @@ bool Client::HandlePacket(const EQApplicationPacket *app) { switch(opcode) { case OP_World_Client_CRC1: - case OP_World_Client_CRC2: + case OP_World_Client_CRC2: { // There is no obvious entry in the CC struct to indicate that the 'Start Tutorial button // is selected when a character is created. I have observed that in this case, OP_EnterWorld is sent @@ -968,7 +968,7 @@ bool Client::HandlePacket(const EQApplicationPacket *app) { { return HandleGenerateRandomNamePacket(app); } - case OP_CharacterCreateRequest: + case OP_CharacterCreateRequest: { // New OpCode in SoF return HandleCharacterCreateRequestPacket(app); @@ -981,11 +981,11 @@ bool Client::HandlePacket(const EQApplicationPacket *app) { { return HandleEnterWorldPacket(app); } - case OP_DeleteCharacter: + case OP_DeleteCharacter: { return HandleDeleteCharacterPacket(app); } - case OP_WorldComplete: + case OP_WorldComplete: { eqs->Close(); return true; @@ -1002,12 +1002,12 @@ bool Client::HandlePacket(const EQApplicationPacket *app) { case OP_LoginComplete: case OP_ApproveWorld: case OP_WorldClientReady: - { + { // Essentially we are just 'eating' these packets, indicating // they are handled. return true; } - default: + default: { clog(WORLD__CLIENT_ERR,"Received unknown EQApplicationPacket"); _pkt(WORLD__CLIENT_ERR,app); @@ -1492,7 +1492,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) clog(WORLD__CLIENT_ERR,"Error getting zone id for '%s'", startzone); } else // otherwise use normal starting zone logic - { + { bool ValidStartZone = false; if(ClientVersionBit & BIT_TitaniumAndEarlier) @@ -1561,9 +1561,9 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc) for(int i = 0; i < combos; ++i) { if(character_create_race_class_combos[i].Class == cc->class_ && character_create_race_class_combos[i].Race == cc->race && - character_create_race_class_combos[i].Deity == cc->deity) { - if(RuleB(World, EnableTutorialButton) && - (RuleI(World, TutorialZoneID) == cc->start_zone || + character_create_race_class_combos[i].Deity == cc->deity) { + if(RuleB(World, EnableTutorialButton) && + (RuleI(World, TutorialZoneID) == cc->start_zone || (character_create_race_class_combos[i].Zone == cc->start_zone))) { class_combo = character_create_race_class_combos[i]; found = true; @@ -1599,11 +1599,11 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc) } max_stats = allocation.DefaultPointAllocation[0] + - allocation.DefaultPointAllocation[1] + - allocation.DefaultPointAllocation[2] + - allocation.DefaultPointAllocation[3] + - allocation.DefaultPointAllocation[4] + - allocation.DefaultPointAllocation[5] + + allocation.DefaultPointAllocation[1] + + allocation.DefaultPointAllocation[2] + + allocation.DefaultPointAllocation[3] + + allocation.DefaultPointAllocation[4] + + allocation.DefaultPointAllocation[5] + allocation.DefaultPointAllocation[6]; if(cc->STR > allocation.BaseStats[0] + max_stats || cc->STR < allocation.BaseStats[0]) { @@ -1845,11 +1845,11 @@ void Client::SetClassStartingSkills( PlayerProfile_Struct *pp ) i == RESEARCH || i == ALCHEMY || i == BAKING || - i == TAILORING || + i == TAILORING || i == BLACKSMITHING || i == FLETCHING || - i == BREWING || - i == POTTERY || + i == BREWING || + i == POTTERY || i == JEWELRY_MAKING || i == BEGGING) { continue; diff --git a/world/client.h b/world/client.h index 877ec17a0..1e8f98a74 100644 --- a/world/client.h +++ b/world/client.h @@ -37,7 +37,7 @@ class Client { public: Client(EQStreamInterface* ieqs); ~Client(); - + bool Process(); void ReceiveData(uchar* buf, int len); void SendCharInfo(); @@ -72,10 +72,10 @@ public: inline ClientListEntry* GetCLE() { return cle; } inline void SetCLE(ClientListEntry* iCLE) { cle = iCLE; } private: - + uint32 ip; uint16 port; - uint32 charid; + uint32 charid; char char_name[64]; uint32 zoneID; uint32 instanceID; diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 0ea413cc1..9651063d2 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -34,7 +34,7 @@ ClientListEntry::ClientListEntry(uint32 in_id, uint32 iLSID, const char* iLoginN : id(in_id) { ClearVars(true); - + pIP = ip; pLSID = iLSID; if(iLSID > 0) @@ -51,7 +51,7 @@ ClientListEntry::ClientListEntry(uint32 in_id, uint32 iAccID, const char* iAccNa : id(in_id) { ClearVars(true); - + pIP = 0; pLSID = 0; pworldadmin = 0; @@ -68,7 +68,7 @@ ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList : id(in_id) { ClearVars(true); - + pIP = 0; pLSID = scl->LSAccountID; strn0cpy(plsname, scl->name, sizeof(plsname)); diff --git a/world/clientlist.cpp b/world/clientlist.cpp index 986f763e7..008ec5df3 100644 --- a/world/clientlist.cpp +++ b/world/clientlist.cpp @@ -47,11 +47,11 @@ ClientList::~ClientList() { void ClientList::Process() { - + if (CLStale_timer.Check()) CLCheckStale(); - - + + LinkedListIterator iterator(list); iterator.Reset(); @@ -167,13 +167,13 @@ void ClientList::GetCLEIP(uint32 iIP) { // If the number of connections exceeds the lower limit if (IPInstances > (RuleI(World, MaxClientsPerIP))) { - + // If MaxClientsSetByStatus is set to True, override other IP Limit Rules if (RuleB(World, MaxClientsSetByStatus)) { // The IP Limit is set by the status of the account if status > MaxClientsPerIP if (IPInstances > countCLEIPs->Admin()) { - + if(RuleB(World, IPLimitDisconnectAll)) { DisconnectByIP(iIP); return; @@ -273,7 +273,7 @@ ClientListEntry* ClientList::FindCLEByAccountID(uint32 iAccID) { ClientListEntry* ClientList::FindCLEByCharacterID(uint32 iCharID) { LinkedListIterator iterator(clientlist); - + iterator.Reset(); while(iterator.MoreElements()) { if (iterator.GetData()->CharID() == iCharID) { @@ -428,9 +428,9 @@ ClientListEntry* ClientList::CheckAuth(const char* iName, const char* iPassword) iterator.Advance(); } int16 tmpadmin; - + _log(WORLD__ZONELIST,"Login with '%s' and '%s'", iName, iPassword); - + uint32 accid = database.CheckLogin(iName, iPassword, &tmpadmin); if (accid) { ClientListEntry* tmp = new ClientListEntry(GetNextCLEID(), accid, iName, tmpMD5, tmpadmin); @@ -531,16 +531,16 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S const char* tmpZone = database.GetZoneName(countcle->zone()); if ( (countcle->Online() >= CLE_Status_Zoning) && - (!countcle->GetGM() || countcle->Anon() != 1 || admin >= countcle->Admin()) && + (!countcle->GetGM() || countcle->Anon() != 1 || admin >= countcle->Admin()) && (whom == 0 || ( - ((countcle->Admin() >= 80 && countcle->GetGM()) || whom->gmlookup == 0xFFFF) && - (whom->lvllow == 0xFFFF || (countcle->level() >= whom->lvllow && countcle->level() <= whom->lvlhigh && (countcle->Anon()==0 || admin > countcle->Admin()))) && - (whom->wclass == 0xFFFF || (countcle->class_() == whom->wclass && (countcle->Anon()==0 || admin > countcle->Admin()))) && + ((countcle->Admin() >= 80 && countcle->GetGM()) || whom->gmlookup == 0xFFFF) && + (whom->lvllow == 0xFFFF || (countcle->level() >= whom->lvllow && countcle->level() <= whom->lvlhigh && (countcle->Anon()==0 || admin > countcle->Admin()))) && + (whom->wclass == 0xFFFF || (countcle->class_() == whom->wclass && (countcle->Anon()==0 || admin > countcle->Admin()))) && (whom->wrace == 0xFFFF || (countcle->race() == whom->wrace && (countcle->Anon()==0 || admin > countcle->Admin()))) && (whomlen == 0 || ( - (tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) || - strncasecmp(countcle->name(),whom->whom, whomlen) == 0 || - (strncasecmp(guild_mgr.GetGuildName(countcle->GuildID()), whom->whom, whomlen) == 0) || + (tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) || + strncasecmp(countcle->name(),whom->whom, whomlen) == 0 || + (strncasecmp(guild_mgr.GetGuildName(countcle->GuildID()), whom->whom, whomlen) == 0) || (admin >= 100 && strncasecmp(countcle->AccountName(), whom->whom, whomlen) == 0) )) )) @@ -607,20 +607,20 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S int idx=-1; while(iterator.MoreElements()) { cle = iterator.GetData(); - + const char* tmpZone = database.GetZoneName(cle->zone()); if ( (cle->Online() >= CLE_Status_Zoning) && - (!cle->GetGM() || cle->Anon() != 1 || admin >= cle->Admin()) && + (!cle->GetGM() || cle->Anon() != 1 || admin >= cle->Admin()) && (whom == 0 || ( - ((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) && - (whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh && (cle->Anon()==0 || admin>cle->Admin()))) && - (whom->wclass == 0xFFFF || (cle->class_() == whom->wclass && (cle->Anon()==0 || admin>cle->Admin()))) && + ((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) && + (whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh && (cle->Anon()==0 || admin>cle->Admin()))) && + (whom->wclass == 0xFFFF || (cle->class_() == whom->wclass && (cle->Anon()==0 || admin>cle->Admin()))) && (whom->wrace == 0xFFFF || (cle->race() == whom->wrace && (cle->Anon()==0 || admin>cle->Admin()))) && (whomlen == 0 || ( - (tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) || - strncasecmp(cle->name(),whom->whom, whomlen) == 0 || - (strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) == 0) || + (tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) || + strncasecmp(cle->name(),whom->whom, whomlen) == 0 || + (strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) == 0) || (admin >= 100 && strncasecmp(cle->AccountName(), whom->whom, whomlen) == 0) )) )) @@ -676,7 +676,7 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S formatstring=5023;//display guild else if(cle->Anon()==2 && admin>=cle->Admin() && admin>0) formatstring=5022;//display everything - + //war* wars2 = (war*)pack2->pBuffer; uint32 plclass_=0; @@ -695,20 +695,20 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S zonestring=5006; plzone=cle->zone(); } - - + + if(admin>=cle->Admin() && admin>0) unknown80[0]=cle->Admin(); else unknown80[0]=0xFFFFFFFF; unknown80[1]=0xFFFFFFFF;//1035 - + //char plstatus[20]={0}; //sprintf(plstatus, "Status %i",cle->Admin()); char plname[64]={0}; strcpy(plname,cle->name()); - + char placcount[30]={0}; if(admin>=cle->Admin() && admin>0) strcpy(placcount,cle->AccountName()); @@ -803,7 +803,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon try{ ClientListEntry* cle; int FriendsOnline = FriendsCLEs.size(); - int PacketLength = sizeof(WhoAllReturnStruct) + (47 * FriendsOnline) + TotalLength; + int PacketLength = sizeof(WhoAllReturnStruct) + (47 * FriendsOnline) + TotalLength; ServerPacket* pack2 = new ServerPacket(ServerOP_WhoAllReply, PacketLength); memset(pack2->pBuffer,0,pack2->size); uchar *buffer=pack2->pBuffer; @@ -833,7 +833,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon for(int CLEEntry = 0; CLEEntry < FriendsOnline; CLEEntry++) { cle = FriendsCLEs[CLEEntry]; - + char GuildName[67]={0}; if (cle->GuildID() != GUILD_NONE && cle->GuildID()>0) sprintf(GuildName,"<%s>", guild_mgr.GetGuildName(cle->GuildID())); @@ -855,11 +855,11 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon PlayerRace=cle->race(); ZoneMSGID=5006; // 5006 ZONE: %1 PlayerZone=cle->zone(); - } + } char PlayerName[64]={0}; strcpy(PlayerName,cle->name()); - + WhoAllPlayerPart1* WAPP1 = (WhoAllPlayerPart1*)bufptr; WAPP1->FormatMSGID = FormatMSGID; @@ -895,7 +895,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon pack2->Deflate(); SendPacket(FriendsWho->FromName,pack2); safe_delete(pack2); - } + } catch(...){ _log(WORLD__ZONELIST_ERR,"Unknown error in world's SendFriendsWho (probably mem error), ignoring..."); return; @@ -1000,20 +1000,20 @@ void ClientList::ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct* if ( (cle->Online() >= CLE_Status_Zoning) && (whom == 0 || ( - ((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) && - (whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh)) && - (whom->wclass == 0xFFFF || cle->class_() == whom->wclass) && - (whom->wrace == 0xFFFF || cle->race() == whom->wrace) && + ((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) && + (whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh)) && + (whom->wclass == 0xFFFF || cle->class_() == whom->wclass) && + (whom->wrace == 0xFFFF || cle->race() == whom->wrace) && (whomlen == 0 || ( - (tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) || - strncasecmp(cle->name(),whom->whom, whomlen) == 0 || - (strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) == 0) || + (tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) || + strncasecmp(cle->name(),whom->whom, whomlen) == 0 || + (strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) == 0) || (admin >= 100 && strncasecmp(cle->AccountName(), whom->whom, whomlen) == 0) )) )) ) { line[0] = 0; -// MYRA - use new (5.x) Status labels in who for telnet connection +// MYRA - use new (5.x) Status labels in who for telnet connection if (cle->Admin() >=250) strcpy(tmpgm, "* GM-Impossible * "); else if (cle->Admin() >= 200) @@ -1046,7 +1046,7 @@ void ClientList::ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct* strcpy(tmpgm, "* Steward * "); else tmpgm[0] = 0; -// end Myra +// end Myra if (guild_mgr.GuildExists(cle->GuildID())) { snprintf(tmpguild, 36, " <%s>", guild_mgr.GetGuildName(cle->GuildID())); @@ -1180,7 +1180,7 @@ void ClientList::ZoneBootup(ZoneServer* zs) { while(iterator.MoreElements()) { if (iterator.GetData()->WaitingForBootup()) { - if (iterator.GetData()->GetZoneID() == zs->GetZoneID() + if (iterator.GetData()->GetZoneID() == zs->GetZoneID() && iterator.GetData()->GetInstanceID() == zs->GetInstanceID()) { iterator.GetData()->EnterWorld(false); } @@ -1236,7 +1236,7 @@ bool ClientList::SendPacket(const char* to, ServerPacket* pack) { void ClientList::SendGuildPacket(uint32 guild_id, ServerPacket* pack) { set zone_ids; - + LinkedListIterator iterator(clientlist); iterator.Reset(); @@ -1246,7 +1246,7 @@ void ClientList::SendGuildPacket(uint32 guild_id, ServerPacket* pack) { } iterator.Advance(); } - + //now we know all the zones, send it to each one... this is kinda a shitty way to do this //since its basically O(n^2) set::iterator cur, end; @@ -1279,7 +1279,7 @@ int ClientList::GetClientCount() { void ClientList::GetClients(const char *zone_name, vector &res) { LinkedListIterator iterator(clientlist); iterator.Reset(); - + if(zone_name[0] == '\0') { while(iterator.MoreElements()) { ClientListEntry* tmp = iterator.GetData(); diff --git a/world/clientlist.h b/world/clientlist.h index 11dae6a79..025894a21 100644 --- a/world/clientlist.h +++ b/world/clientlist.h @@ -20,9 +20,9 @@ class ClientList { public: ClientList(); ~ClientList(); - + void Process(); - + //from old ClientList void Add(Client* client); Client* Get(uint32 ip, uint16 port); @@ -31,10 +31,10 @@ public: void ZoneBootup(ZoneServer* zs); void RemoveCLEReferances(ClientListEntry* cle); - - + + //from ZSList - + void SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_Struct* whom, WorldTCPConnection* connection); void SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPConnection* connection); void SendOnlineGuildMembers(uint32 FromID, uint32 GuildID); @@ -45,7 +45,7 @@ public: bool SendPacket(const char* to, ServerPacket* pack); void SendGuildPacket(uint32 guild_id, ServerPacket* pack); - + void ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* scl); void CLERemoveZSRef(ZoneServer* iZS); ClientListEntry* CheckAuth(uint32 iLSID, const char* iKey); @@ -62,16 +62,16 @@ public: void CLEKeepAlive(uint32 numupdates, uint32* wid); void CLEAdd(uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = 0, uint32 ip = 0, uint8 local=0); void UpdateClientGuild(uint32 char_id, uint32 guild_id); - + int GetClientCount(); void GetClients(const char *zone_name, std::vector &into); protected: inline uint32 GetNextCLEID() { return NextCLEID++; } - + //this is the list of people actively connected to zone LinkedList list; - + //this is the list of people in any zone, not nescesarily connected to world Timer CLStale_timer; uint32 NextCLEID; diff --git a/world/console.cpp b/world/console.cpp index 21431836e..052308654 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -230,7 +230,7 @@ bool Console::Process() { if(tcpc->GetMode() == EmuTCPConnection::modeConsole) tcpc->Send((const uchar*) "Username: ", strlen("Username: ")); } - + if (timeout_timer.Check()) { SendMessage(1, 0); SendMessage(1, "Timeout, disconnecting..."); @@ -239,7 +239,7 @@ bool Console::Process() { _log(WORLD__CONSOLE,"TCP connection timeout from %s:%d",inet_ntoa(in),GetPort()); return false; } - + if (tcpc->GetMode() == EmuTCPConnection::modePacket) { struct in_addr in; in.s_addr = GetIP(); @@ -498,7 +498,7 @@ void Console::ProcessCommand(const char* command) { else if (database.SetLocalPassword(tmpid, sep.arg[2])) SendMessage(1, "Password changed."); else - SendMessage(1, "Error changing password."); + SendMessage(1, "Error changing password."); } } else if (strcasecmp(sep.arg[0], "uptime") == 0) { @@ -612,7 +612,7 @@ void Console::ProcessCommand(const char* command) { // SCORPIOUS2K - reversed parameter order for flag if(sep.arg[2][0]==0 || !sep.IsNumber(1)) SendMessage(1, "Usage: flag [status] [accountname]"); - else + else { if (atoi(sep.arg[1]) > this->Admin()) SendMessage(1, "You cannot set people's status to higher than your own"); diff --git a/world/console.h b/world/console.h index 2a595e598..b0ce233aa 100644 --- a/world/console.h +++ b/world/console.h @@ -92,7 +92,7 @@ class ConsoleList public: ConsoleList() {} ~ConsoleList() {} - + void Add(Console* con); void Process(); void KillAll(); diff --git a/world/lfplist.cpp b/world/lfplist.cpp index b21378ffa..b72e66b2e 100644 --- a/world/lfplist.cpp +++ b/world/lfplist.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -58,7 +58,7 @@ void GroupLFP::SetDetails(ServerLFPUpdate_Struct *Update) { } for(unsigned int i=0; iMembers[i].Name); + strcpy(Members[i].Name,Update->Members[i].Name); // If we were passed the class/level and zone information, use that. if(Update->Members[i].Class && Update->Members[i].Level && Update->Members[i].Zone) { Members[i].Class = Update->Members[i].Class; @@ -99,7 +99,7 @@ void GroupLFPList::Process() { // Once a minute, check for clients in a LFP group who are no longer connected, and remove them. // If the client that posted the LFP group has gone, remove the entire LFP entry. // - // We also update the level, class and zone for each member of the group. Their class will usually + // We also update the level, class and zone for each member of the group. Their class will usually // never change, but if the LFP group is posted while a member is zoning, it will initially be // 'Unknown Class', so we will fill it in here. @@ -129,7 +129,7 @@ void GroupLFPList::Process() { // The first member entry is always the person who posted the LFP group, either // a single ungrouped player, or the leader of the group. If (s)he is gone, remove // the group from LFP. - if(i==0) break; + if(i==0) break; Group->RemoveMember(i); } else { @@ -266,12 +266,12 @@ void GroupLFPList::SendLFPMatches(ServerLFPMatchesRequest_Struct* smrs) { ClientListEntry* CLE = client_list.FindCharacter(smrs->FromName); if (CLE != nullptr) { - if (CLE->Server() != nullptr) + if (CLE->Server() != nullptr) CLE->Server()->SendPacket(Pack); } else { ZoneServer* zs = zoneserver_list.FindByName(smrs->FromName); - if (zs != nullptr) + if (zs != nullptr) zs->SendPacket(Pack); } safe_delete(Pack); diff --git a/world/lfplist.h b/world/lfplist.h index a829603ca..6801424e8 100644 --- a/world/lfplist.h +++ b/world/lfplist.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -37,7 +37,7 @@ public: friend class GroupLFPList; private: - uint32 LeaderID; + uint32 LeaderID; uint8 MatchFilter; uint32 FromLevel; uint32 ToLevel; diff --git a/world/net.cpp b/world/net.cpp index 4be92a893..9bb0aaa3e 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -67,7 +67,7 @@ using namespace std; ushort *array; struct seminfo *__buf; void *__pad; - }; + }; #endif #endif @@ -141,11 +141,11 @@ int main(int argc, char** argv) { _log(WORLD__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION); - + #ifdef _DEBUG _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); #endif - + if (signal(SIGINT, CatchSignal) == SIG_ERR) { _log(WORLD__INIT_ERR, "Could not set signal handler"); return 0; @@ -177,7 +177,7 @@ int main(int argc, char** argv) { iterator.Advance(); } } - + _log(WORLD__INIT, "Connecting to MySQL..."); if (!database.Connect( Config->DatabaseHost.c_str(), @@ -190,7 +190,7 @@ int main(int argc, char** argv) { } dbasync = new DBAsync(&database); guild_mgr.SetDatabase(&database); - + if (argc >= 2) { char tmp[2]; if (strcasecmp(argv[1], "help") == 0 || strcasecmp(argv[1], "?") == 0 || strcasecmp(argv[1], "/?") == 0 || strcasecmp(argv[1], "-?") == 0 || strcasecmp(argv[1], "-h") == 0 || strcasecmp(argv[1], "-help") == 0) { @@ -270,14 +270,14 @@ int main(int argc, char** argv) { return 0; } } - + if(Config->WorldHTTPEnabled) { _log(WORLD__INIT, "Starting HTTP world service..."); http_server.Start(Config->WorldHTTPPort, Config->WorldHTTPMimeFile.c_str()); } else { _log(WORLD__INIT, "HTTP world service disabled."); } - + _log(WORLD__INIT, "Loading variables.."); database.LoadVariables(); _log(WORLD__INIT, "Loading zones.."); @@ -318,15 +318,15 @@ int main(int argc, char** argv) { _log(WORLD__INIT_ERR, "Unable to load %s", Config->EQTimeFile.c_str()); _log(WORLD__INIT, "Loading launcher list.."); launcher_list.LoadList(); - + char tmp[20]; tmp[0] = '\0'; - database.GetVariable("holdzones",tmp, 20); + database.GetVariable("holdzones",tmp, 20); if ((strcasecmp(tmp, "1") == 0)) { holdzones = true; } _log(WORLD__INIT, "Reboot zone modes %s",holdzones ? "ON" : "OFF"); - + _log(WORLD__INIT, "Deleted %i stale player corpses from database", database.DeleteStalePlayerCorpses()); if (RuleB(World, DeleteStaleCorpeBackups) == true) { _log(WORLD__INIT, "Deleted %i stale player backups from database", database.DeleteStalePlayerBackups()); @@ -383,10 +383,10 @@ int main(int argc, char** argv) { EQStream* eqs; EmuTCPConnection* tcpc; EQStreamInterface *eqsi; - + while(RunLoops) { Timer::SetCurrentTime(); - + //check the factory for any new incoming streams. while ((eqs = eqsf.Pop())) { //pull the stream out of the factory and give it to the stream identifier @@ -397,10 +397,10 @@ int main(int argc, char** argv) { _log(WORLD__CLIENT, "New connection from %s:%d", inet_ntoa(in),ntohs(eqs->GetRemotePort())); stream_identifier.AddStream(eqs); //takes the stream } - + //give the stream identifier a chance to do its work.... stream_identifier.Process(); - + //check the stream identifier for any now-identified streams while((eqsi = stream_identifier.PopIdentified())) { //now that we know what patch they are running, start up their client object @@ -425,9 +425,9 @@ int main(int argc, char** argv) { client_list.Add(client); } } - + client_list.Process(); - + while ((tcpc = tcps.NewQueuePop())) { struct in_addr in; in.s_addr = tcpc->GetrIP(); @@ -439,26 +439,26 @@ int main(int argc, char** argv) { { database.PurgeExpiredInstances(); } - + //check for timeouts in other threads timeout_manager.CheckTimeouts(); - + loginserverlist.Process(); - + console_list.Process(); - + zoneserver_list.Process(); - + launcher_list.Process(); UCSLink.Process(); - + QSLink.Process(); LFPGroupList.Process(); adventure_manager.Process(); - + if (InterserverTimer.Check()) { InterserverTimer.Start(); database.ping(); diff --git a/world/perl_EQLConfig.cpp b/world/perl_EQLConfig.cpp index 5d014447c..7321c2a78 100644 --- a/world/perl_EQLConfig.cpp +++ b/world/perl_EQLConfig.cpp @@ -37,7 +37,7 @@ typedef const char Const_char; #endif #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -413,12 +413,12 @@ XS(XS_EQLConfig_GetZoneDetails) RETVAL = THIS->GetZoneDetails(zone_ref); ST(0) = sv_newmortal(); if (RETVAL.begin()!=RETVAL.end()) - { + { //NOTE: we are leaking the original ST(0) right now HV *hv = newHV(); sv_2mortal((SV*)hv); ST(0) = newRV((SV*)hv); - + map::const_iterator cur, end; cur = RETVAL.begin(); end = RETVAL.end(); @@ -464,7 +464,7 @@ XS(boot_EQLConfig) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/world/perl_EQW.cpp b/world/perl_EQW.cpp index 501879ae7..3ddbf669d 100644 --- a/world/perl_EQW.cpp +++ b/world/perl_EQW.cpp @@ -876,7 +876,7 @@ XS(XS_EQW_ListBugs) Perl_croak(aTHX_ "THIS is not of type EQW"); if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - + RETVAL = THIS->ListBugs(id); ST(0) = sv_newmortal(); { @@ -963,7 +963,7 @@ XS(XS_EQW_ResolveBug) Perl_croak(aTHX_ "THIS is not of type EQW"); if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - + THIS->ResolveBug(id); } XSRETURN_EMPTY; diff --git a/world/perl_HTTPRequest.cpp b/world/perl_HTTPRequest.cpp index 139948be6..0fa250739 100644 --- a/world/perl_HTTPRequest.cpp +++ b/world/perl_HTTPRequest.cpp @@ -37,7 +37,7 @@ typedef const char Const_char; #endif #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -199,12 +199,12 @@ XS(XS_HTTPRequest_get_all) RETVAL = THIS->get_all(); ST(0) = sv_newmortal(); if (RETVAL.begin()!=RETVAL.end()) - { + { //NOTE: we are leaking the original ST(0) right now HV *hv = newHV(); sv_2mortal((SV*)hv); ST(0) = newRV((SV*)hv); - + map::const_iterator cur, end; cur = RETVAL.begin(); end = RETVAL.end(); @@ -323,7 +323,7 @@ XS(boot_HTTPRequest) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/world/queryserv.cpp b/world/queryserv.cpp index 256c2c8b1..4181ca362 100644 --- a/world/queryserv.cpp +++ b/world/queryserv.cpp @@ -25,7 +25,7 @@ void QueryServConnection::SetConnection(EmuTCPConnection *inStream) _log(QUERYSERV__ERROR, "Incoming QueryServ Connection while we were already connected to a QueryServ."); Stream->Disconnect(); } - + Stream = inStream; authenticated = false; @@ -35,7 +35,7 @@ bool QueryServConnection::Process() { if (!Stream || !Stream->Connected()) return false; - + ServerPacket *pack = 0; while((pack = Stream->PopPacket())) @@ -49,7 +49,7 @@ bool QueryServConnection::Process() uint8 tmppass[16]; MD5::Generate((const uchar*) WorldConfig::get()->SharedKey.c_str(), WorldConfig::get()->SharedKey.length(), tmppass); - + if (memcmp(pack->pBuffer, tmppass, 16) == 0) authenticated = true; else diff --git a/world/ucs.cpp b/world/ucs.cpp index 0e73c8dd6..36e29592f 100644 --- a/world/ucs.cpp +++ b/world/ucs.cpp @@ -20,7 +20,7 @@ void UCSConnection::SetConnection(EmuTCPConnection *inStream) _log(UCS__ERROR, "Incoming UCS Connection while we were already connected to a UCS."); Stream->Disconnect(); } - + Stream = inStream; authenticated = false; @@ -30,7 +30,7 @@ bool UCSConnection::Process() { if (!Stream || !Stream->Connected()) return false; - + ServerPacket *pack = 0; while((pack = Stream->PopPacket())) @@ -44,7 +44,7 @@ bool UCSConnection::Process() uint8 tmppass[16]; MD5::Generate((const uchar*) WorldConfig::get()->SharedKey.c_str(), WorldConfig::get()->SharedKey.length(), tmppass); - + if (memcmp(pack->pBuffer, tmppass, 16) == 0) authenticated = true; else diff --git a/world/wguild_mgr.cpp b/world/wguild_mgr.cpp index eba8451f6..ba93980cb 100644 --- a/world/wguild_mgr.cpp +++ b/world/wguild_mgr.cpp @@ -66,7 +66,7 @@ void WorldGuildManager::SendGuildDelete(uint32 guild_id) { void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) { switch(pack->opcode) { - + case ServerOP_RefreshGuild: { if(pack->size != sizeof(ServerGuildRefresh_Struct)) { _log(GUILDS__ERROR, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildRefresh_Struct)); @@ -74,19 +74,19 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) { } ServerGuildRefresh_Struct *s = (ServerGuildRefresh_Struct *) pack->pBuffer; _log(GUILDS__REFRESH, "Received and broadcasting guild refresh for %d, changes: name=%d, motd=%d, rank=d, relation=%d", s->guild_id, s->name_change, s->motd_change, s->rank_change, s->relation_change); - + //broadcast this packet to all zones. zoneserver_list.SendPacket(pack); - + //preform a local refresh. if(!RefreshGuild(s->guild_id)) { _log(GUILDS__ERROR, "Unable to preform local refresh on guild %d", s->guild_id); //can we do anything? } - + break; } - + case ServerOP_GuildCharRefresh: { if(pack->size != sizeof(ServerGuildCharRefresh_Struct)) { _log(GUILDS__ERROR, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildCharRefresh_Struct)); @@ -94,18 +94,18 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) { } ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer; _log(GUILDS__REFRESH, "Received and broadcasting guild member refresh for char %d to all zones with members of guild %d", s->char_id, s->guild_id); - + //preform the local update client_list.UpdateClientGuild(s->char_id, s->guild_id); - + //broadcast this update to any zone with a member in this guild. //client_list.SendGuildPacket(s->guild_id, pack); //because im sick of this not working, sending it to all zones, just spends a bit more bandwidth. zoneserver_list.SendPacket(pack); - + break; } - + case ServerOP_DeleteGuild: { if(pack->size != sizeof(ServerGuildID_Struct)) { _log(GUILDS__ERROR, "Received ServerOP_DeleteGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildID_Struct)); @@ -113,31 +113,31 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) { } ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer; _log(GUILDS__REFRESH, "Received and broadcasting guild delete for guild %d", s->guild_id); - + //broadcast this packet to all zones. zoneserver_list.SendPacket(pack); - + //preform a local refresh. if(!LocalDeleteGuild(s->guild_id)) { _log(GUILDS__ERROR, "Unable to preform local delete on guild %d", s->guild_id); //can we do anything? } - + break; } - + case ServerOP_GuildMemberUpdate: { if(pack->size != sizeof(ServerGuildMemberUpdate_Struct)) { _log(GUILDS__ERROR, "Received ServerOP_GuildMemberUpdate of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildMemberUpdate_Struct)); return; } - + zoneserver_list.SendPacket(pack); break; } - + default: _log(GUILDS__ERROR, "Unknown packet 0x%x received from zone??", pack->opcode); break; diff --git a/world/wguild_mgr.h b/world/wguild_mgr.h index d5200d82d..c992f3cf3 100644 --- a/world/wguild_mgr.h +++ b/world/wguild_mgr.h @@ -9,18 +9,18 @@ class ServerPacket; class WorldGuildManager : public BaseGuildManager { public: - + //called by zoneserver when it receives a guild message from zone. void ProcessZonePacket(ServerPacket *pack); - + uint8 *MakeGuildMembers(uint32 guild_id, const char *prefix_name, uint32 &length); //make a guild member list packet, returns ownership of the buffer. - + protected: virtual void SendGuildRefresh(uint32 guild_id, bool name, bool motd, bool rank, bool relation); virtual void SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uint32 charid); virtual void SendRankUpdate(uint32 CharID) { return; } virtual void SendGuildDelete(uint32 guild_id); - + //map m_tribute; //map from guild ID to current tribute ammount }; diff --git a/world/world_logsys.cpp b/world/world_logsys.cpp index d3934e126..2d94a4042 100644 --- a/world/world_logsys.cpp +++ b/world/world_logsys.cpp @@ -11,7 +11,7 @@ void log_message_clientVA(LogType type, Client *who, const char *fmt, va_list ar char prefix_buffer[256]; snprintf(prefix_buffer, 255, "[%s] %s: ", log_type_info[type].name, who->GetAccountName()); prefix_buffer[255] = '\0'; - + LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args); } @@ -34,7 +34,7 @@ void log_message_zoneVA(LogType type, ZoneServer *who, const char *fmt, va_list snprintf(prefix_buffer, 255, "[%s] %s ", log_type_info[type].name, zone_tag); prefix_buffer[255] = '\0'; - + LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args); } diff --git a/world/worlddb.cpp b/world/worlddb.cpp index 7f98746e2..b6f59b8ea 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -41,7 +41,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* MYSQL_RES *result; MYSQL_ROW row; Inventory *inv; - + for (int i=0; i<10; i++) { strcpy(cs->name[i], ""); cs->zone[i] = 0; @@ -49,10 +49,10 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* cs->tutorial[i] = 0; cs->gohome[i] = 0; } - + int char_num = 0; unsigned long* lengths; - + // Populate character info if (RunQuery(query, MakeAnyLenString(&query, "SELECT name,profile,zonename,class,level FROM character_ WHERE account_id=%i order by name limit 10", account_id), errbuf, &result)) { safe_delete_array(query); @@ -66,7 +66,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* PlayerProfile_Struct* pp = (PlayerProfile_Struct*)row[1]; uint8 clas = atoi(row[3]); uint8 lvl = atoi(row[4]); - + // Character information if(lvl == 0) cs->level[char_num] = pp->level; //no level in DB, trust PP @@ -214,7 +214,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* { printf("Error loading inventory for %s\n", cs->name[char_num]); } - safe_delete(inv); + safe_delete(inv); if (++char_num > 10) break; } @@ -233,7 +233,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* safe_delete_array(query); return; } - + return; } @@ -268,15 +268,15 @@ int WorldDatabase::MoveCharacterToBind(int CharID, uint8 bindnum) { if(!strcmp(BindZoneName, "UNKNWN")) return pp.zone_id; - if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET zonename = '%s',zoneid=%i,x=%f, y=%f, z=%f, instanceid=0 WHERE id='%i'", + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET zonename = '%s',zoneid=%i,x=%f, y=%f, z=%f, instanceid=0 WHERE id='%i'", BindZoneName, pp.binds[bindnum].zoneId, pp.binds[bindnum].x, pp.binds[bindnum].y, pp.binds[bindnum].z, CharID), errbuf, 0,&affected_rows)) { return pp.zone_id; } safe_delete_array(query); - - return pp.binds[bindnum].zoneId; + + return pp.binds[bindnum].zoneId; } bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc) @@ -301,26 +301,26 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc->race), errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Start zone query failed: %s : %s\n", query, errbuf); - safe_delete_array(query); + safe_delete_array(query); return false; } - + LogFile->write(EQEMuLog::Status, "Start zone query: %s\n", query); - safe_delete_array(query); - + safe_delete_array(query); + if((rows = mysql_num_rows(result)) > 0) row = mysql_fetch_row(result); - + if(row) - { + { LogFile->write(EQEMuLog::Status, "Found starting location in start_zones"); - in_pp->x = atof(row[0]); - in_pp->y = atof(row[1]); - in_pp->z = atof(row[2]); - in_pp->heading = atof(row[3]); - in_pp->zone_id = atoi(row[4]); - in_pp->binds[0].zoneId = atoi(row[5]); - } + in_pp->x = atof(row[0]); + in_pp->y = atof(row[1]); + in_pp->z = atof(row[2]); + in_pp->heading = atof(row[3]); + in_pp->zone_id = atoi(row[4]); + in_pp->binds[0].zoneId = atoi(row[5]); + } else { printf("No start_zones entry in database, using defaults\n"); @@ -387,19 +387,19 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* break; } case 10: - { + { in_pp->zone_id =61; // felwithea in_pp->binds[0].zoneId = 54; // gfaydark break; } case 11: - { + { in_pp->zone_id =55; // akanon in_pp->binds[0].zoneId = 56; // steamfont break; } case 12: - { + { in_pp->zone_id =82; // cabwest in_pp->binds[0].zoneId = 78; // fieldofbone break; @@ -418,8 +418,8 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* if(in_pp->binds[0].x == 0 && in_pp->binds[0].y == 0 && in_pp->binds[0].z == 0) database.GetSafePoints(in_pp->binds[0].zoneId, 0, &in_pp->binds[0].x, &in_pp->binds[0].y, &in_pp->binds[0].z); - if(result) - mysql_free_result(result); + if(result) + mysql_free_result(result); return true; } @@ -453,26 +453,26 @@ bool WorldDatabase::GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Stru in_cc->race), errbuf, &result)) { LogFile->write(EQEMuLog::Status, "SoF Start zone query failed: %s : %s\n", query, errbuf); - safe_delete_array(query); + safe_delete_array(query); return false; } LogFile->write(EQEMuLog::Status, "SoF Start zone query: %s\n", query); - safe_delete_array(query); - + safe_delete_array(query); + if((rows = mysql_num_rows(result)) > 0) row = mysql_fetch_row(result); - + if(row) - { + { LogFile->write(EQEMuLog::Status, "Found starting location in start_zones"); - in_pp->x = atof(row[0]); - in_pp->y = atof(row[1]); - in_pp->z = atof(row[2]); - in_pp->heading = atof(row[3]); + in_pp->x = atof(row[0]); + in_pp->y = atof(row[1]); + in_pp->z = atof(row[2]); + in_pp->heading = atof(row[3]); in_pp->zone_id = in_cc->start_zone; - in_pp->binds[0].zoneId = atoi(row[4]); - } + in_pp->binds[0].zoneId = atoi(row[4]); + } else { printf("No start_zones entry in database, using defaults\n"); @@ -493,8 +493,8 @@ bool WorldDatabase::GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Stru if(in_pp->binds[0].x == 0 && in_pp->binds[0].y == 0 && in_pp->binds[0].z == 0) database.GetSafePoints(in_pp->binds[0].zoneId, 0, &in_pp->binds[0].x, &in_pp->binds[0].y, &in_pp->binds[0].z); - if(result) - mysql_free_result(result); + if(result) + mysql_free_result(result); return true; } @@ -503,9 +503,9 @@ void WorldDatabase::GetLauncherList(std::vector &rl) { char* query = 0; MYSQL_RES *result; MYSQL_ROW row; - + rl.clear(); - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT name FROM launcher" ) , errbuf, &result)) @@ -530,14 +530,14 @@ void WorldDatabase::SetMailKey(int CharID, int IPAddress, int MailKey) { if(RuleB(Chat, EnableMailKeyIPVerification) == true) sprintf(MailKeyString, "%08X%08X", IPAddress, MailKey); - else + else sprintf(MailKeyString, "%08X", MailKey); - if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET mailkey = '%s' WHERE id='%i'", - MailKeyString, CharID), errbuf)) + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET mailkey = '%s' WHERE id='%i'", + MailKeyString, CharID), errbuf)) LogFile->write(EQEMuLog::Error, "WorldDatabase::SetMailKey(%i, %s) : %s", CharID, MailKeyString, errbuf); - + safe_delete_array(query); } @@ -548,7 +548,7 @@ bool WorldDatabase::GetCharacterLevel(const char *name, int &level) char* query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if(RunQuery(query, MakeAnyLenString(&query, "SELECT level FROM character_ WHERE name='%s'", name), errbuf, &result)) { if(row = mysql_fetch_row(result)) @@ -560,7 +560,7 @@ bool WorldDatabase::GetCharacterLevel(const char *name, int &level) } mysql_free_result(result); } - else + else { LogFile->write(EQEMuLog::Error, "WorldDatabase::GetCharacterLevel: %s", errbuf); } diff --git a/world/worlddb.h b/world/worlddb.h index ffa5af953..ea2e8a5b6 100644 --- a/world/worlddb.h +++ b/world/worlddb.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -30,10 +30,10 @@ class WorldDatabase : public SharedDatabase { public: bool GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc); bool GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc); - + void GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct*); int MoveCharacterToBind(int CharID, uint8 bindnum = 0); - + void GetLauncherList(std::vector &result); void SetMailKey(int CharID, int IPAddress, int MailKey); bool GetCharacterLevel(const char *name, int &level); @@ -41,10 +41,10 @@ public: bool LoadCharacterCreateAllocations(); bool LoadCharacterCreateCombos(); protected: - + }; -extern WorldDatabase database; +extern WorldDatabase database; #endif /*WORLDDB_H_*/ diff --git a/world/zonelist.cpp b/world/zonelist.cpp index f8ffe4578..729409767 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -75,7 +75,7 @@ void ZSList::KillAll() { } void ZSList::Process() { - + if(shutdowntimer && shutdowntimer->Check()){ _log(WORLD__ZONELIST, "Shutdown timer has expired. Telling all zones to shut down and exiting. (fake sigint)"); ServerPacket* pack2 = new ServerPacket; @@ -118,7 +118,7 @@ void ZSList::Process() { bool ZSList::SendPacket(ServerPacket* pack) { LinkedListIterator iterator(list); - + iterator.Reset(); while(iterator.MoreElements()) { iterator.GetData()->SendPacket(pack); @@ -158,7 +158,7 @@ bool ZSList::SendPacket(uint32 ZoneID, uint16 instanceID, ServerPacket* pack) { else { while(iterator.MoreElements()) { - if (iterator.GetData()->GetZoneID() == ZoneID + if (iterator.GetData()->GetZoneID() == ZoneID && iterator.GetData()->GetInstanceID() == 0) { ZoneServer* tmp = iterator.GetData(); return(tmp->SendPacket(pack)); @@ -283,7 +283,7 @@ void ZSList::ListLockedZones(const char* to, WorldTCPConnection* connection) { void ZSList::SendZoneStatus(const char* to, int16 admin, WorldTCPConnection* connection) { LinkedListIterator iterator(list); struct in_addr in; - + iterator.Reset(); char locked[4]; if (WorldConfig::get()->Locked == true) @@ -458,7 +458,7 @@ void ZSList::SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16 to_m pack->pBuffer = new uchar[pack->size]; memset(pack->pBuffer, 0, pack->size); ServerEmoteMessage_Struct* sem = (ServerEmoteMessage_Struct*) pack->pBuffer; - + if (to) { if (to[0] == '*') { Console* con = console_list.FindByAccountName(&to[1]); @@ -566,7 +566,7 @@ void ZSList::RebootZone(const char* ip1,uint16 port,const char* ip2, uint32 skip return; } uint32 z = MakeRandomInt(0, y-1); - + ServerPacket* pack = new ServerPacket(ServerOP_ZoneReboot, sizeof(ServerZoneReboot_Struct)); ServerZoneReboot_Struct* s = (ServerZoneReboot_Struct*) pack->pBuffer; // strcpy(s->ip1,ip1); @@ -592,7 +592,7 @@ uint16 ZSList::GetAvailableZonePort() i=LastAllocatedPort+1; while(i!=LastAllocatedPort && port==0) { - if (i>Config->ZonePortHigh) + if (i>Config->ZonePortHigh) i=Config->ZonePortLow; if (!FindByPort(i)) { @@ -683,7 +683,7 @@ uint32 ZSList::TriggerBootup(uint32 iZoneID, uint32 iInstanceID) { } uint32 z = rand() % y; - + tmp[z]->TriggerBootup(iZoneID); uint32 ret = tmp[z]->GetID(); safe_delete(tmp); @@ -713,7 +713,7 @@ void ZSList::GetZoneIDList(vector &zones) { zones.push_back(zs->GetID()); iterator.Advance(); } - + } void ZSList::WorldShutDown(uint32 time, uint32 interval) diff --git a/world/zonelist.h b/world/zonelist.h index 6a4b074a4..ce3dad431 100644 --- a/world/zonelist.h +++ b/world/zonelist.h @@ -15,7 +15,7 @@ class ZSList { public: enum { MaxLockedZones = 10 }; - + static void ShowUpTime(WorldTCPConnection* con, const char* adminname = 0); ZSList(); @@ -25,7 +25,7 @@ public: ZoneServer* FindByZoneID(uint32 ZoneID); ZoneServer* FindByPort(uint16 port); ZoneServer* FindByInstanceID(uint32 InstanceID); - + void SendChannelMessage(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message, ...); void SendChannelMessageRaw(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message); void SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...); @@ -33,7 +33,7 @@ public: void SendZoneStatus(const char* to, int16 admin, WorldTCPConnection* connection); - void SendTimeSync(); + void SendTimeSync(); void Add(ZoneServer* zoneserver); void Process(); void KillAll(); @@ -64,8 +64,8 @@ protected: uint16 pLockedZones[MaxLockedZones]; uint32 CurGroupID; uint16 LastAllocatedPort; - - + + }; diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 9be2c410d..02967cfa7 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -48,7 +48,7 @@ extern UCSConnection UCSLink; extern QueryServConnection QSLink; void CatchSignal(int sig_num); -ZoneServer::ZoneServer(EmuTCPConnection* itcpc) +ZoneServer::ZoneServer(EmuTCPConnection* itcpc) : WorldTCPConnection(), tcpc(itcpc), ls_zboot(5000) { ID = zoneserver_list.GetNextID(); memset(zone_name, 0, sizeof(zone_name)); @@ -72,12 +72,12 @@ ZoneServer::~ZoneServer() { bool ZoneServer::SetZone(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { BootingUp = false; - + const char* zn = MakeLowerString(database.GetZoneName(iZoneID)); char* longname; if (iZoneID) - zlog(WORLD__ZONE,"Setting to '%s' (%d:%d)%s",(zn) ? zn : "",iZoneID, iInstanceID, + zlog(WORLD__ZONE,"Setting to '%s' (%d:%d)%s",(zn) ? zn : "",iZoneID, iInstanceID, iStaticZone ? " (Static)" : ""); zoneID = iZoneID; @@ -107,7 +107,7 @@ bool ZoneServer::SetZone(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { { strcpy(zone_name, ""); strcpy(long_name, ""); - } + } client_list.ZoneBootup(this); ls_zboot.Start(); @@ -497,7 +497,7 @@ bool ZoneServer::Process() { case ServerOP_VoiceMacro: { ServerVoiceMacro_Struct* svm = (ServerVoiceMacro_Struct*) pack->pBuffer; - + if(svm->Type == VoiceMacroTell) { ClientListEntry* cle = client_list.FindCharacter(svm->To); @@ -548,7 +548,7 @@ bool ZoneServer::Process() { if(pack->size != sizeof(SetZone_Struct)) break; - SetZone_Struct* szs = (SetZone_Struct*) pack->pBuffer; + SetZone_Struct* szs = (SetZone_Struct*) pack->pBuffer; if (szs->zoneid != 0) { if(database.GetZoneName(szs->zoneid)) SetZone(szs->zoneid, szs->instanceid, szs->staticzone); @@ -661,7 +661,7 @@ bool ZoneServer::Process() { // called, so it will be available when they ask to zone. // - + if(pack->size != sizeof(ZoneToZone_Struct)) break; ZoneToZone_Struct* ztz = (ZoneToZone_Struct*) pack->pBuffer; @@ -783,7 +783,7 @@ bool ZoneServer::Process() { case ServerOP_RequestOnlineGuildMembers: { ServerRequestOnlineGuildMembers_Struct *srogms = (ServerRequestOnlineGuildMembers_Struct*) pack->pBuffer; - zlog(GUILDS__IN_PACKETS, "ServerOP_RequestOnlineGuildMembers Recieved. FromID=%i GuildID=%i", srogms->FromID, srogms->GuildID); + zlog(GUILDS__IN_PACKETS, "ServerOP_RequestOnlineGuildMembers Recieved. FromID=%i GuildID=%i", srogms->FromID, srogms->GuildID); client_list.SendOnlineGuildMembers(srogms->FromID, srogms->GuildID); break; } @@ -825,8 +825,8 @@ bool ZoneServer::Process() { break; } case ServerOP_LFPUpdate: { - ServerLFPUpdate_Struct* sus = (ServerLFPUpdate_Struct*) pack->pBuffer; - if(sus->Action) + ServerLFPUpdate_Struct* sus = (ServerLFPUpdate_Struct*) pack->pBuffer; + if(sus->Action) LFPGroupList.UpdateGroup(sus); else LFPGroupList.RemoveGroup(sus); @@ -845,7 +845,7 @@ bool ZoneServer::Process() { zoneserver_list.SendPacket(pack); break; } - + case ServerOP_GuildRankUpdate: { zoneserver_list.SendPacket(pack); @@ -859,7 +859,7 @@ bool ZoneServer::Process() { guild_mgr.ProcessZonePacket(pack); break; } - + case ServerOP_FlagUpdate: { ClientListEntry* cle = client_list.FindCLEByAccountID(*((uint32*) pack->pBuffer)); if (cle) @@ -893,7 +893,7 @@ bool ZoneServer::Process() { break; } ServerLock_Struct* slock = (ServerLock_Struct*) pack->pBuffer; - if (slock->mode >= 1) + if (slock->mode >= 1) WorldConfig::LockWorld(); else WorldConfig::UnlockWorld(); @@ -907,7 +907,7 @@ bool ZoneServer::Process() { else { if (slock->mode >= 1) this->SendEmoteMessage(slock->myname, 0, 0, 13, "World locked, but login server not connected."); - else + else this->SendEmoteMessage(slock->myname, 0, 0, 13, "World unlocked, but login server not conencted."); } break; @@ -946,7 +946,7 @@ bool ZoneServer::Process() { case ServerOP_GetWorldTime: { zlog(WORLD__ZONE,"Broadcasting a world time update"); ServerPacket* pack = new ServerPacket; - + pack->opcode = ServerOP_SyncWorldTime; pack->size = sizeof(eqTimeOfDay); pack->pBuffer = new uchar[pack->size]; @@ -1177,7 +1177,7 @@ bool ZoneServer::Process() { } zoneserver_list.SendPacket(pack); - break; + break; } case ServerOP_QGlobalDelete: @@ -1188,7 +1188,7 @@ bool ZoneServer::Process() { } zoneserver_list.SendPacket(pack); - break; + break; } case ServerOP_AdventureRequest: @@ -1260,7 +1260,7 @@ bool ZoneServer::Process() { break; } - case ServerOP_UCSMailMessage: + case ServerOP_UCSMailMessage: { UCSLink.SendPacket(pack); break; @@ -1325,7 +1325,7 @@ bool ZoneServer::Process() { } delete pack; - } + } return true; } @@ -1351,7 +1351,7 @@ void ZoneServer::SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16 pack->pBuffer = new uchar[pack->size]; memset(pack->pBuffer, 0, pack->size); ServerEmoteMessage_Struct* sem = (ServerEmoteMessage_Struct*) pack->pBuffer; - + if (to != 0) { strcpy((char *) sem->to, to); } @@ -1363,7 +1363,7 @@ void ZoneServer::SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16 sem->minstatus = to_minstatus; sem->type = type; strcpy(&sem->message[0], message); - + pack->Deflate(); SendPacket(pack); delete pack; @@ -1397,7 +1397,7 @@ void ZoneServer::TriggerBootup(uint32 iZoneID, uint32 iInstanceID, const char* a s->ZoneServerID = ID; if (adminname != 0) strcpy(s->adminname, adminname); - + if (iZoneID == 0) s->zoneid = this->GetZoneID(); else diff --git a/world/zoneserver.h b/world/zoneserver.h index 95da895ac..8828dadec 100644 --- a/world/zoneserver.h +++ b/world/zoneserver.h @@ -32,7 +32,7 @@ public: ZoneServer(EmuTCPConnection* itcpc); ~ZoneServer(); virtual inline bool IsZoneServer() { return true; } - + bool Process(); bool SendPacket(ServerPacket* pack) { return tcpc->SendPacket(pack); } void SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...); diff --git a/zone/AA.cpp b/zone/AA.cpp index cb1c90f92..a9e9c146d 100644 --- a/zone/AA.cpp +++ b/zone/AA.cpp @@ -468,7 +468,7 @@ void Client::HandleAAAction(aaID activate) { case aaActionEscape: Escape(); break; - + // Don't think this code is used any longer for Bestial Alignment as the AA has a spell_id and no nonspell_action. case aaActionBeastialAlignment: switch(GetBaseRace()) { @@ -1961,21 +1961,21 @@ void Client::DurationRampage(uint32 duration) } } -AA_SwarmPetInfo::AA_SwarmPetInfo() -{ - target = 0; - owner_id = 0; +AA_SwarmPetInfo::AA_SwarmPetInfo() +{ + target = 0; + owner_id = 0; duration = nullptr; } -AA_SwarmPetInfo::~AA_SwarmPetInfo() -{ - target = 0; - owner_id = 0; - safe_delete(duration); +AA_SwarmPetInfo::~AA_SwarmPetInfo() +{ + target = 0; + owner_id = 0; + safe_delete(duration); } -Mob *AA_SwarmPetInfo::GetOwner() -{ - return entity_list.GetMobID(owner_id); +Mob *AA_SwarmPetInfo::GetOwner() +{ + return entity_list.GetMobID(owner_id); } diff --git a/zone/AA.h b/zone/AA.h index cb3a5f889..b813171de 100644 --- a/zone/AA.h +++ b/zone/AA.h @@ -74,7 +74,7 @@ enum { //leadership AA indexes groupAAFindPathToPC, groupAAHealthOfTargetsTarget, groupAA15, - + raidAAMarkNPC, //0x10, things assume this is the first raid ability raidAANPCHealth, raidAADelegateMainAssist, @@ -91,13 +91,13 @@ enum { //leadership AA indexes raidAAHealthOfTargetsTarget, raidAA14, raidAA15, - + _maxLeaderAA //=32 }; #define MAX_LEADERSHIP_TIERS 6 //each progression should be 0 terminated to mark it as the end. -static const uint8 LeadershipAACosts[_maxLeaderAA][MAX_LEADERSHIP_TIERS] = { +static const uint8 LeadershipAACosts[_maxLeaderAA][MAX_LEADERSHIP_TIERS] = { { 1, 2, 3, 0, 0, 0 }, //groupAAMarkNPC { 2, 0, 0, 0, 0, 0 }, //groupAANPCHealth { 4, 0, 0, 0, 0, 0 }, //groupAADelegateMainAssist - Have seen DelegateMainAssist come in with two different codes. @@ -114,7 +114,7 @@ static const uint8 LeadershipAACosts[_maxLeaderAA][MAX_LEADERSHIP_TIERS] = { { 4, 0, 0, 0, 0, 0 }, //groupAAFindPathToPC { 7, 0, 0, 0, 0, 0 }, //groupAAHealthOfTargetsTarget { 0, 0, 0, 0, 0, 0 }, //groupAA15 - + { 5, 6, 7, 0, 0, 0 }, //raidAAMarkNPC //0x10 { 4, 0, 0, 0, 0, 0 }, //raidAANPCHealth { 6, 7, 8, 0, 0, 0 }, //raidAADelegateMainAssist @@ -151,16 +151,16 @@ typedef enum { //AA IDs aaInnateDiseaseProtection = 57, //works aaInnateRunSpeed = 62, //works aaInnateRegeneration = 65, //works - aaInnateMetabolism = 68, + aaInnateMetabolism = 68, aaInnateLungCapacity = 71, //handled by client aaFirstAid = 74, //untested aaHealingAdept = 77, //untested aaHealingGift = 80, //untested aaSpellCastingMastery = 83, //untested aaSpellCastingReinforcement = 86, //untested - aaMentalClarity = 89, + aaMentalClarity = 89, aaSpellCastingFury = 92, //untested - aaChanellingFocus = 95, + aaChanellingFocus = 95, aaSpellCastingSubtlety = 98, //untested aaSpellCastingExpertise = 101, //untested aaSpellCastingDeftness = 104, //untested @@ -181,18 +181,18 @@ typedef enum { //AA IDs aaQuickEvacuation = 137, //untested aaExodus = 140, //untested aaQuickDamage = 141, //untested - aaEnhancedRoot = 144, + aaEnhancedRoot = 144, aaDireCharm = 145, //untested aaCannibalization = 146, //DB aaQuickBuff = 147, //untested - aaAlchemyMastery = 150, + aaAlchemyMastery = 150, aaRabidBear = 153, //DB aaManaBurn = 154, //DB aaImprovedFamiliar = 155, //untested, implemented? aaNexusGate = 156, //DB - aaUnknown54 = 157, - aaPermanentIllusion = 158, - aaJewelCraftMastery = 159, + aaUnknown54 = 157, + aaPermanentIllusion = 158, + aaJewelCraftMastery = 159, aaGatherMana = 162, //DB aaMendCompanion = 163, //DB aaQuickSummoning = 164, //untested @@ -210,11 +210,11 @@ typedef enum { //AA IDs aaFleshToBone = 186, //DB aaCallToCorpse = 187, //DB aaDivineStun = 188, //DB - aaImprovedLayOnHands = 189, - aaSlayUndead = 190, + aaImprovedLayOnHands = 189, + aaSlayUndead = 190, aaActOfValor = 193, //DB aaHolySteed = 194, //DB - aaFearless = 195, + aaFearless = 195, aa2HandBash = 196, //works. handled by client? aaInnateCamouflage = 197, //DB aaAmbidexterity = 198, //untested @@ -224,24 +224,24 @@ typedef enum { //AA IDs aaUnholySteed = 206, //DB aaImprovedHarmTouch = 207, //untested aaLeechTouch = 208, //DB - aaDeathPeace = 209, + aaDeathPeace = 209, aaSoulAbrasion = 210, //untested aaInstrumentMastery = 213, //untested aaUnknown91 = 216, //not used aaUnknown92 = 219, //not used aaUnknown93 = 222, //not used - aaJamFest = 225, + aaJamFest = 225, aaUnknown95 = 228, - aaSonicCall = 229, + aaSonicCall = 229, aaCriticalMend = 230, //untested aaPurifyBody = 233, //DB - aaChainCombo = 234, + aaChainCombo = 234, aaRapidFeign = 237, //works - aaReturnKick = 240, + aaReturnKick = 240, aaEscape = 243, //DB - aaPoisonMastery = 244, + aaPoisonMastery = 244, aaDoubleRiposte = 247, //untested - aaQuickHide = 250, + aaQuickHide = 250, aaQuickThrow = 253, //corrected from dbstr_us.txt aaPurgePoison = 254, //DB aaFlurry = 255, //untested @@ -252,14 +252,14 @@ typedef enum { //AA IDs aaSpellCastingReinforcementMastery = 266, //untested aaSpellCastingFuryMastery = 267, //untested aaExtendedNotes = 270, //untested - aaDragonPunch = 273, + aaDragonPunch = 273, aaStrongRoot = 274, //DB aaSingingMastery = 275, //untested aaBodyAndMindRejuvenation = 278, //added aaPhysicalEnhancement = 279, //untested aaAdvTrapNegotiation = 280, //untested aaAcrobatics = 283, //untested - aaScribbleNotes = 286, + aaScribbleNotes = 286, aaChaoticStab = 287, //untested aaPetDiscipline = 288, //added aaHobbleofSpirits = 289, //DB @@ -315,45 +315,45 @@ typedef enum { //AA IDs aaSuspendedMinion = 526, //untested aaSpiritCall = 528, //DB aaCelestialRenewal = 531, //DB - aaAllegiantFamiliar = 533, + aaAllegiantFamiliar = 533, aaHandofPiety = 534, //DB aaMithanielsBinding = 537, //untested - aaMendingoftheTranquil = 539, - aaRagingFlurry = 542, - aaGuardianoftheForest = 545, //DB + aaMendingoftheTranquil = 539, + aaRagingFlurry = 542, + aaGuardianoftheForest = 545, //DB aaSpiritoftheWood = 548, //DB aaBestialFrenzy = 551, //untested aaHarmoniousAttack = 556, //untested - aaKnightsAdvantage = 561, - aaFerocity = 564, - aaViscidRoots = 567, + aaKnightsAdvantage = 561, + aaFerocity = 564, + aaViscidRoots = 567, aaSionachiesCrescendo = 568, //untested - aaAyonaesTutelage = 571, - aaFeignedMinion = 574, - aaUnfailingDivinity = 577, - aaAnimationEmpathy = 580, // Implemented - aaRushtoJudgement = 583, - aaLivingShield = 586, + aaAyonaesTutelage = 571, + aaFeignedMinion = 574, + aaUnfailingDivinity = 577, + aaAnimationEmpathy = 580, // Implemented + aaRushtoJudgement = 583, + aaLivingShield = 586, aaConsumptionoftheSoul = 589, //untested aaBoastfulBellow = 592, //DB aaFervrentBlessing = 593, //untested aaTouchoftheWicked = 596, //untested - aaPunishingBlade = 599, - aaSpeedoftheKnight = 602, - aaShroudofStealth = 605, - aaNimbleEvasion = 606, - aaTechniqueofMasterWu = 611, + aaPunishingBlade = 599, + aaSpeedoftheKnight = 602, + aaShroudofStealth = 605, + aaNimbleEvasion = 606, + aaTechniqueofMasterWu = 611, aaHostoftheElements = 616, //DB aaCallofXuzl = 619, //DB - aaHastenedStealth = 622, - aaIngenuity = 625, - aaFleetofFoot = 628, - aaFadingMemories = 630, - aaTacticalMastery = 631, - aaTheftofLife = 634, + aaHastenedStealth = 622, + aaIngenuity = 625, + aaFleetofFoot = 628, + aaFadingMemories = 630, + aaTacticalMastery = 631, + aaTheftofLife = 634, aaFuryofMagic = 637, aaFuryofMagicMastery2 = 640, //whats the difference? - aaProjectIllusion = 643, + aaProjectIllusion = 643, aaHeadshot = 644, //added aaEntrap = 645, //DB aaUnholyTouch = 646, //untested @@ -422,7 +422,7 @@ typedef enum { //AA IDs aaImmobilizingBash = 852, aaViciousSmash = 855, aaRadiantCure2 = 860, //whats the difference? - aaPurification = 863, + aaPurification = 863, aaPrecisionofthePathfinder = 864, aaCoatofThistles = 867, aaFlamingArrows = 872, //untested @@ -578,7 +578,7 @@ typedef enum { //AA IDs aaCripplingStrike2 = 1352, //whats the difference? aaStunningKick2 = 1353, //whats the difference? aaEyeGouge2 = 1358, //whats the difference? - + //Dragons of Norrath //good info here: http://www.eqthieves.com/exp-don-progression.htm and here: http://everquest.allakhazam.com/db/guides.html?guide=811 aaGiftoftheDarkReign = 1361, //from dbstr_us.txt @@ -591,8 +591,8 @@ typedef enum { //AA IDs aaEmbraceoftheKeepers = 1368, //from dbstr_us.txt aaPoweroftheKeepers = 1369, //from dbstr_us.txt aaSanctityoftheKeepers = 1370, //from dbstr_us.txt - - //Veteran AAs + + //Veteran AAs aaLessonoftheDevoted = 1371, //from dbstr_us.txt aaInfusionoftheFaithful = 1372, //from dbstr_us.txt aaChaoticJester = 1373, //from dbstr_us.txt @@ -1076,7 +1076,7 @@ typedef enum { //AA IDs aaEchoingCries =1155, aaViciousFrenzy =1158, aaCrazedOnslaught =1163, - aaFrenziedDefense2 =1166,//implemented as bonus + aaFrenziedDefense2 =1166,//implemented as bonus aaOverwhelmingAttack =1172, aaFuriousRage =1175, aaBloodPact =1178, @@ -1500,7 +1500,7 @@ typedef enum { //AA IDs aaMassEnchantTemporite =7740, aaLayonHandsRank16 =7866, //Duplicate ID with aaExtendedAstralProjection! - + aaHarmTouch =7800,//First 10 AA cost 0 per rank aaHarmToch2 =7810,//Next 6+ AA cost 3 +1inc per rank aaLayonHands =7850,//First 10 AA cost 0 per rank diff --git a/zone/Map.cpp b/zone/Map.cpp index 3e16a667c..cbe17bdba 100644 --- a/zone/Map.cpp +++ b/zone/Map.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -64,15 +64,15 @@ Map* Map::LoadMapfile(const char* in_zonename, const char *directory) { char zBuf[64]; char cWork[256]; Map* ret = 0; - + //have to convert to lower because the short names im getting //are not all lower anymore, copy since strlwr edits the str. strn0cpy(zBuf, in_zonename, 64); - + if(directory == nullptr) directory = MAP_DIR; snprintf(cWork, 250, "%s/%s.map", directory, strlwr(zBuf)); - + if ((fp = fopen( cWork, "rb" ))) { ret = new Map(); if(ret != nullptr) { @@ -96,7 +96,7 @@ Map::Map() { _maxz = FLT_MIN; _maxx = FLT_MIN; _maxy = FLT_MIN; - + m_Faces = 0; m_Nodes = 0; m_FaceLists = 0; @@ -122,22 +122,22 @@ bool Map::loadMap(FILE *fp) { printf("Invalid map version 0x%lx\n", (unsigned long)head.version); return(false); } - + printf("Map header: %lu faces, %u nodes, %lu facelists\n", (unsigned long)head.face_count, (unsigned int)head.node_count, (unsigned long)head.facelist_count); m_Faces = head.face_count; m_Nodes = head.node_count; m_FaceLists = head.facelist_count; - + /* fread(&m_Vertex, 4, 1, fp); fread(&m_Faces , 4, 1, fp);*/ // mFinalVertex = new VERTEX[m_Vertex]; mFinalFaces = new FACE [m_Faces]; mNodes = new NODE[m_Nodes]; mFaceLists = new uint32[m_FaceLists]; - + // fread(mFinalVertex, m_Vertex, sizeof(VERTEX), fp); - + //this was changed to this loop from the single read because valgrind was //hanging on this read otherwise... I dont pretend to understand it. #ifdef SLOW_AND_CRAPPY_MAKES_VALGRIND_HAPPY @@ -155,7 +155,7 @@ bool Map::loadMap(FILE *fp) { return(false); } #endif - + #ifdef SLOW_AND_CRAPPY_MAKES_VALGRIND_HAPPY for(r = 0; r < m_Nodes; r++) { if(fread(mNodes+r, sizeof(NODE), 1, fp) != 1) { @@ -169,7 +169,7 @@ bool Map::loadMap(FILE *fp) { return(false); } #endif - + #ifdef SLOW_AND_CRAPPY_MAKES_VALGRIND_HAPPY for(r = 0; r < m_FaceLists; r++) { if(fread(mFaceLists+r, sizeof(uint32), 1, fp) != 1) { @@ -183,8 +183,8 @@ bool Map::loadMap(FILE *fp) { return(false); } #endif - - + + /* mRoot = new NODE(); RecLoadNode(mRoot, fp );*/ @@ -248,7 +248,7 @@ for(m = 0; m < _node->faces.count; m++) { FACE *c = &mFinalFaces[ *cfl ]; printf(" %lu (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f)\n", *cfl, c->a.x, c->a.y, c->a.z, - c->b.x, c->b.y, c->b.z, + c->b.x, c->b.y, c->b.z, c->c.x, c->c.y, c->c.z); cfl++; }*/ @@ -257,24 +257,24 @@ for(m = 0; m < _node->faces.count; m++) { } #ifdef DEBUG_SEEK printf(" Kids: %u, %u, %u, %u\n", _node->nodes[0], _node->nodes[1], _node->nodes[2], _node->nodes[3]); - + printf(" Contained In Box: (%.2f -> %.2f, %.2f -> %.2f)\n", _node->minx, _node->maxx, _node->miny, _node->maxy); - + /*printf(" Node found has children.\n"); if(_node->node1 != nullptr) { - printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", + printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", _node->node1->minx, _node->node1->maxx, _node->node1->miny, _node->node1->maxy); } if(_node->node2 != nullptr) { - printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", + printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", _node->node2->minx, _node->node2->maxx, _node->node2->miny, _node->node2->maxy); } if(_node->node3 != nullptr) { - printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", + printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", _node->node3->minx, _node->node3->maxx, _node->node3->miny, _node->node3->maxy); } if(_node->node4 != nullptr) { - printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", + printf("\tNode: (%.2f -> %.2f, %.2f -> %.2f)\n", _node->node4->minx, _node->node4->maxx, _node->node4->miny, _node->node4->maxy); }*/ #endif @@ -334,8 +334,8 @@ int* Map::SeekFace( NodeRef node_r, float x, float y ) { if(!(_node->flags & nodeFinal)) { return(nullptr); //not a final node... could find the proper node... } - - + + //printf("Seeking face for (%.2f, %.2f) with root 0x%x.\n", x, y, _node); float dx,dy; float nx,ny; @@ -346,19 +346,19 @@ int* Map::SeekFace( NodeRef node_r, float x, float y ) { const VERTEX &v1 = cf.a; const VERTEX &v2 = cf.b; const VERTEX &v3 = cf.c; - + dx = v2.x - v1.x; dy = v2.y - v1.y; nx = x - v1.x; ny = y - v1.y; if( dx*ny - dy*nx >0.0f ) continue; - + dx = v3.x - v2.x; dy = v3.y - v2.y; nx = x - v2.x; ny = y - v2.y; if( dx*ny - dy*nx >0.0f ) continue; - + dx = v1.x - v3.x; dy = v1.y - v3.y; nx = x - v3.x; ny = y - v3.y; if( dx*ny - dy*nx >0.0f ) continue; - + *face++ = mFaceLists[_node->faces.offset + i]; } *face = -1; @@ -388,7 +388,7 @@ bool Map::LineIntersectsZone(VERTEX start, VERTEX end, float step_mag, VERTEX *r curz = start.z; VERTEX cur = start; - + stepx = end.x - start.x; stepy = end.y - start.y; stepz = end.z - start.z; @@ -421,7 +421,7 @@ bool Map::LineIntersectsZone(VERTEX start, VERTEX end, float step_mag, VERTEX *r stepx = (stepx/factor)*step_mag; stepy = (stepy/factor)*step_mag; stepz = (stepz/factor)*step_mag; - + cnode = SeekNode(GetRoot(), curx, cury); if(cnode != lnode) { @@ -432,7 +432,7 @@ bool Map::LineIntersectsZone(VERTEX start, VERTEX end, float step_mag, VERTEX *r if(LineIntersectsNode(cnode, start, end, result, on)) return(true); - + if(cnode == finalnode) return false; } @@ -472,12 +472,12 @@ bool Map::LineIntersectsNode( NodeRef node_r, VERTEX p1, VERTEX p2, VERTEX *resu if(!(_node->flags & nodeFinal)) { return(true); //not a final node... not sure best action } - + unsigned long i; - + PFACE cur; const uint32 *cfl = mFaceLists + _node->faces.offset; - + for(i = 0; i < _node->faces.count; i++) { if(*cfl > m_Faces) continue; //watch for invalid lists, they seem to happen @@ -514,14 +514,14 @@ float Map::FindBestZ( NodeRef node_r, VERTEX p1, VERTEX *result, FACE **on) cons if(!(_node->flags & nodeFinal)) { return(BEST_Z_INVALID); //not a final node... could find the proper node... } - + VERTEX tmp_result; //dummy placeholder if they do not ask for a result. if(result == nullptr) result = &tmp_result; - + VERTEX p2(p1); p2.z = BEST_Z_INVALID; - + float best_z = BEST_Z_INVALID; int zAttempt; @@ -531,7 +531,7 @@ float Map::FindBestZ( NodeRef node_r, VERTEX p1, VERTEX *result, FACE **on) cons // If we don't find a bestZ on the first attempt, we try again from a position CurrentZ + 10 higher // This is in case the pathing between waypoints temporarily sends the NPC below ground level. - // + // for(zAttempt=1; zAttempt<=2; zAttempt++) { const uint32 *cfl = mFaceLists + _node->faces.offset; @@ -549,7 +549,7 @@ printf("Start finding best Z...\n"); #ifdef DEBUG_BEST_Z printf(" %lu (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f)\n", *cfl, cur->a.x, cur->a.y, cur->a.z, - cur->b.x, cur->b.y, cur->b.z, + cur->b.x, cur->b.y, cur->b.z, cur->c.x, cur->c.y, cur->c.z); printf("Found a z: %.2f\n", result->z); #endif @@ -579,14 +579,14 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) if( cface == nullptr ) { return(false); //cant intersect a face we dont have... i guess } - + const VERTEX &pa = cface->a; const VERTEX &pb = cface->b; const VERTEX &pc = cface->c; - + //quick bounding box checks float tbb; - + tbb = Vmin3(x, pa, pb, pc); if(p1.x < tbb && p2.x < tbb) return(false); @@ -596,7 +596,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) tbb = Vmin3(z, pa, pb, pc); if(p1.z < tbb && p2.z < tbb) return(false); - + tbb = Vmax3(x, pa, pb, pc); if(p1.x > tbb && p2.x > tbb) return(false); @@ -606,16 +606,16 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) tbb = Vmax3(z, pa, pb, pc); if(p1.z > tbb && p2.z > tbb) return(false); - + //begin attempt 2 //#define RTOD 57.2957795 //radians to degrees constant. float d; float denom,mu; VERTEX n, intersect; - + // FACE *thisface = &mFinalFaces[ _node->pfaces[ i ] ]; - + VERTEX *p = &intersect; if(result != nullptr) p = result; @@ -635,14 +635,14 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) n.z = cface->nz; d = cface->nd; #endif - + //try inverting the normals... n.x = -n.x; n.y = -n.y; n.z = -n.z; d = - n.x * pa.x - n.y * pa.y - n.z * pa.z; //recalc - - + + // Calculate the position on the line that intersects the plane denom = n.x * (p2.x - p1.x) + n.y * (p2.y - p1.y) + n.z * (p2.z - p1.z); if (ABS(denom) < EPS) // Line and plane don't intersect @@ -676,7 +676,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) a1 = pa1.x*pa2.x + pa1.y*pa2.y + pa1.z*pa2.z; a2 = pa2.x*pa3.x + pa2.y*pa3.y + pa2.z*pa3.z; a3 = pa3.x*pa1.x + pa3.y*pa1.y + pa3.z*pa1.z; - + //holy hell these 3 acos are slow, we need to rewrite this... // total = (acos(a1) + acos(a2) + acos(a3)); // if (ABS(total - 2*M_PI) > EPS) @@ -687,7 +687,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) return(true); */ -/* +/* //yet another failed method, project triangle and point into //2 space based on largest component of the normal //and check the triangle there. @@ -704,7 +704,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) tz = -n.z; else tz = n.z; - + VERTEX pa2, pb2, pc2; if(tx < ty) { //keep x @@ -733,7 +733,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) pc2.x = pc.x; pc2.y = pc.y; } } - + // Determine whether or not the intersection point is bounded by pa,pb,pc #define Sign(p1, p2, p3) \ ((p1->x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1->y - p3.y)) @@ -745,10 +745,10 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) return ((b1 == b2) && (b2 == b3)); */ - + /* //not working well, seems to block LOS a lot - //a new check based on barycentric coordinates, stolen from + //a new check based on barycentric coordinates, stolen from //http://www.flipcode.com/cgi-bin/fcmsg.cgi?thread_show=7766 float xcp, ycp, xab, yab, xac, yac; float divb; @@ -802,7 +802,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) return(true); */ - + /* Yet another method adapted from this code: Vec3 pa1 = pa - p; @@ -816,7 +816,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) if (d < 0) return false; return true; */ - + //in practice, this seems to actually take longer //than the arc cosine method above... n.x = -n.x; @@ -824,55 +824,55 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) n.z = -n.z; VERTEX pa1,pa2,pa3, tmp; float t; - + //pa1 = pa - p pa1.x = pa.x - p->x; pa1.y = pa.y - p->y; pa1.z = pa.z - p->z; - + //pa2 = pb - p pa2.x = pb.x - p->x; pa2.y = pb.y - p->y; pa2.z = pb.z - p->z; - + //tmp = pa1 cross pa2 tmp.x = pa1.y * pa2.z - pa1.z * pa2.y; tmp.y = pa1.z * pa2.x - pa1.x * pa2.z; tmp.z = pa1.x * pa2.y - pa1.y * pa2.x; - + //t = tmp dot n t = tmp.x * n.x + tmp.y * n.y + tmp.z * n.z; if(t < 0) return(false); //printf("t = %f\n", t); - + //pa3 = pb - p pa3.x = pc.x - p->x; pa3.y = pc.y - p->y; pa3.z = pc.z - p->z; - + //tmp = pa2 cross pa3 tmp.x = pa2.y * pa3.z - pa2.z * pa3.y; tmp.y = pa2.z * pa3.x - pa2.x * pa3.z; tmp.z = pa2.x * pa3.y - pa2.y * pa3.x; - + //t = tmp dot n t = tmp.x * n.x + tmp.y * n.y + tmp.z * n.z; if(t < 0) return(false); //printf("t = %f\n", t); - + //tmp = pa3 cross pa1 tmp.x = pa3.y * pa1.z - pa3.z * pa1.y; tmp.y = pa3.z * pa1.x - pa3.x * pa1.z; tmp.z = pa3.x * pa1.y - pa3.y * pa1.x; - + //t = tmp dot n t = tmp.x * n.x + tmp.y * n.y + tmp.z * n.z; if(t < 0) return(false); //printf("t = %f\n", t); - + return(true); } @@ -890,7 +890,7 @@ bool Map::LineIntersectsZoneNoZLeaps(VERTEX start, VERTEX end, float step_mag, V cur.x = start.x; cur.y = start.y; cur.z = start.z; - + step.x = end.x - start.x; step.y = end.y - start.y; step.z = end.z - start.z; @@ -914,7 +914,7 @@ bool Map::LineIntersectsZoneNoZLeaps(VERTEX start, VERTEX end, float step_mag, V step.y = -0.001f; if (step.z < 0 && step.z > -0.001f) step.z = -0.001f; - + NodeRef cnode, lnode; lnode = 0; //while we are not past end @@ -926,7 +926,7 @@ bool Map::LineIntersectsZoneNoZLeaps(VERTEX start, VERTEX end, float step_mag, V if (cnode == NODE_NONE) { return(true); - } + } VERTEX me; me.x = cur.x; me.y = cur.y; @@ -948,7 +948,7 @@ bool Map::LineIntersectsZoneNoZLeaps(VERTEX start, VERTEX end, float step_mag, V } lnode = cnode; } - + //move 1 step if (cur.x != end.x) cur.x += step.x; @@ -956,7 +956,7 @@ bool Map::LineIntersectsZoneNoZLeaps(VERTEX start, VERTEX end, float step_mag, V cur.y += step.y; if (cur.z != end.z) cur.z += step.z; - + //watch for end conditions if ( (cur.x > end.x && end.x >= start.x) || (cur.x < end.x && end.x <= start.x) || (step.x == 0) ) { cur.x = end.x; @@ -968,7 +968,7 @@ bool Map::LineIntersectsZoneNoZLeaps(VERTEX start, VERTEX end, float step_mag, V cur.z = end.z; } } - + //walked entire line and didnt run into anything... return(false); } @@ -980,19 +980,19 @@ float Map::FindClosestZ(VERTEX p ) const std::list ZSet; NodeRef NodeR = SeekNode(MAP_ROOT_NODE, p.x, p.y); - + if( NodeR == NODE_NONE || NodeR >= m_Nodes) return 0; - + PNODE CurrentNode = &mNodes[NodeR]; if(!(CurrentNode->flags & nodeFinal)) - return 0; - + return 0; + VERTEX p1(p), p2(p), Result; p1.z = 999999; - + p2.z = BEST_Z_INVALID; const uint32 *CurrentFaceList = mFaceLists + CurrentNode->faces.offset; @@ -1006,7 +1006,7 @@ float Map::FindClosestZ(VERTEX p ) const if(CurrentFace->nz > 0 && LineIntersectsFace(CurrentFace, p1, p2, &Result)) ZSet.push_back(Result.z); - + CurrentFaceList++; } diff --git a/zone/MobAI.cpp b/zone/MobAI.cpp index 5aaf7e04d..8634cb79a 100644 --- a/zone/MobAI.cpp +++ b/zone/MobAI.cpp @@ -64,16 +64,16 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if (MakeRandomInt(0, 100) >= iChance) return false; } - + float dist2; if (iSpellTypes & SpellType_Escape) { dist2 = 0; //DistNoRoot(*this); //WTF was up with this... - } else + } else dist2 = DistNoRoot(*tar); bool checked_los = false; //we do not check LOS until we are absolutely sure we need to, and we only do it once. - + float manaR = GetManaRatio(); for (int i = static_cast(AIspells.size()) - 1; i >= 0; i--) { if (AIspells[i].spellid <= 0 || AIspells[i].spellid >= SPDAT_RECORDS) { @@ -102,9 +102,9 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { #if MobAI_DEBUG_Spells >= 21 cout << "Mob::AICastSpell: Casting: spellid=" << AIspells[i].spellid - << ", tar=" << tar->GetName() - << ", dist2[" << dist2 << "]<=" << spells[AIspells[i].spellid].range *spells[AIspells[i].spellid].range - << ", mana_cost[" << mana_cost << "]<=" << GetMana() + << ", tar=" << tar->GetName() + << ", dist2[" << dist2 << "]<=" << spells[AIspells[i].spellid].range *spells[AIspells[i].spellid].range + << ", mana_cost[" << mana_cost << "]<=" << GetMana() << ", cancast[" << AIspells[i].time_cancast << "]<=" << Timer::GetCurrentTime() << ", type=" << AIspells[i].type << endl; #endif @@ -129,8 +129,8 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { } case SpellType_Root: { if ( - !tar->IsRooted() - && dist2 >= 900 + !tar->IsRooted() + && dist2 >= 900 && MakeRandomInt(0, 99) < 50 && tar->DontRootMeBefore() < Timer::GetCurrentTime() && tar->CanBuffStack(AIspells[i].spellid, GetLevel(), true) >= 0 @@ -154,13 +154,13 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { && !tar->IsImmuneToSpell(AIspells[i].spellid, this) && tar->CanBuffStack(AIspells[i].spellid, GetLevel(), true) >= 0 && !(tar->IsPet() && tar->GetOwner()->IsClient() && this != tar) //no buffing PC's pets, but they can buff themself - ) + ) { if(!checked_los) { - if(!CheckLosFN(tar)) - return(false); - checked_los = true; - } + if(!CheckLosFN(tar)) + return(false); + checked_los = true; + } uint32 tempTime = 0; AIDoSpellCast(i, tar, mana_cost, &tempTime); tar->SetDontBuffMeBefore(tempTime); @@ -179,7 +179,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { } case SpellType_Escape: { - if (GetHPRatio() <= 5 ) + if (GetHPRatio() <= 5 ) { AIDoSpellCast(i, tar, mana_cost); return true; @@ -233,8 +233,8 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { } break; } - - case SpellType_Charm: + + case SpellType_Charm: { if(MakeRandomInt(0, 99) < 20) { @@ -329,14 +329,14 @@ bool NPC::AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain cout << "Mob::AIDoSpellCast: spellid=" << AIspells[i].spellid << ", tar=" << tar->GetName() << ", mana=" << mana_cost << ", Name: " << spells[AIspells[i].spellid].name << endl; #endif casting_spell_AIindex = i; - + //stop moving if were casting a spell and were not a bard... if(!IsBardSong(AIspells[i].spellid)) { SetRunAnimSpeed(0); SendPosition(); SetMoving(false); } - + return CastSpell(AIspells[i].spellid, tar->GetID(), 1, AIspells[i].manacost == -2 ? 0 : -1, mana_cost, oDontDoAgainBefore, -1, -1, 0, 0, &(AIspells[i].resist_adjust)); } @@ -352,7 +352,7 @@ bool EntityList::AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float _log(AI__ERROR, "Error: detrimental spells requested from AICheckCloseBeneficialSpells!!"); return(false); } - + if(!caster) return false; @@ -371,15 +371,15 @@ bool EntityList::AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float return(false); // well, if we dont have a faction set, we're gonna be indiff to everybody float iRange2 = iRange*iRange; - + float t1, t2, t3; - + //Only iterate through NPCs LinkedListIterator iterator(npc_list); for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { NPC* mob = iterator.GetData(); - + //Since >90% of mobs will always be out of range, try to //catch them with simple bounding box checks first. These //checks are about 6X faster than DistNoRoot on my athlon 1Ghz @@ -439,7 +439,7 @@ void Mob::AI_Init() { void NPC::AI_Init() { Mob::AI_Init(); - + AIautocastspell_timer = 0; casting_spell_AIindex = static_cast(AIspells.size()); @@ -500,7 +500,7 @@ void Client::AI_Start(uint32 iMoveDelay) { if (!pAIControlled) return; - + pClientSideTarget = GetTarget() ? GetTarget()->GetID() : 0; SendAppearancePacket(AT_Anim, ANIM_FREEZE); // this freezes the client SendAppearancePacket(AT_Linkdead, 1); // Sending LD packet so *LD* appears by the player name when charmed/feared -Kasai @@ -512,7 +512,7 @@ void NPC::AI_Start(uint32 iMoveDelay) { Mob::AI_Start(iMoveDelay); if (!pAIControlled) return; - + if (AIspells.size() == 0) { AIautocastspell_timer = new Timer(1000); AIautocastspell_timer->Disable(); @@ -520,12 +520,12 @@ void NPC::AI_Start(uint32 iMoveDelay) { AIautocastspell_timer = new Timer(750); AIautocastspell_timer->Start(RandomTimer(0, 15000), false); } - + if (NPCTypedata) { AI_AddNPCSpells(NPCTypedata->npc_spells_id); NPCSpecialAttacks(NPCTypedata->npc_attacks,0); } - + SendTo(GetX(), GetY(), GetZ()); SetChanged(); SaveGuardSpot(); @@ -619,7 +619,7 @@ void Client::AI_SpellCast() continue; } - if(!GetPTimers().Expired(&database, pTimerSpellStart + current_spell, false)) + if(!GetPTimers().Expired(&database, pTimerSpellStart + current_spell, false)) { continue; } @@ -663,7 +663,7 @@ void Client::AI_SpellCast() tar = GetTarget(); if(tar && IsFearSpell(spell_to_cast)) { - if(!IsBardSong(spell_to_cast)) + if(!IsBardSong(spell_to_cast)) { SetRunAnimSpeed(0); SendPosition(); @@ -679,7 +679,7 @@ void Client::AI_SpellCast() Mob *tar = GetTarget(); if(tar) { - if(!IsBardSong(spell_to_cast)) + if(!IsBardSong(spell_to_cast)) { SetRunAnimSpeed(0); SendPosition(); @@ -703,7 +703,7 @@ void Client::AI_Process() if (IsCasting()) return; - + bool engaged = IsEngaged(); Mob *ow = GetOwner(); @@ -774,7 +774,7 @@ void Client::AI_Process() } } - if (engaged) + if (engaged) { if (IsRooted()) SetTarget(hate_list.GetClosest(this)); @@ -793,12 +793,12 @@ void Client::AI_Process() RemoveFromHateList(this); return; } - + if(DivineAura()) return; - + bool is_combat_range = CombatRange(GetTarget()); - + if(is_combat_range) { if(charm_class_attacks_timer.Check()) { DoClassAttacks(GetTarget()); @@ -838,7 +838,7 @@ void Client::AI_Process() if (flurrychance) { - if(MakeRandomInt(0, 100) < flurrychance) + if(MakeRandomInt(0, 100) < flurrychance) { Message_StringID(MT_NPCFlurry, 128); Attack(GetTarget(), 13, false); @@ -851,7 +851,7 @@ void Client::AI_Process() if (ExtraAttackChanceBonus && GetTarget()) { ItemInst *wpn = GetInv().GetItem(SLOT_PRIMARY); if(wpn){ - if(wpn->GetItem()->ItemType == ItemType2HS || + if(wpn->GetItem()->ItemType == ItemType2HS || wpn->GetItem()->ItemType == ItemType2HB || wpn->GetItem()->ItemType == ItemType2HPierce ) { @@ -863,14 +863,14 @@ void Client::AI_Process() } } - if (GetClass() == WARRIOR || GetClass() == BERSERKER) + if (GetClass() == WARRIOR || GetClass() == BERSERKER) { - if(!dead && !berserk && this->GetHPRatio() < 30) + if(!dead && !berserk && this->GetHPRatio() < 30) { entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName()); berserk = true; } - else if (berserk && this->GetHPRatio() > 30) + else if (berserk && this->GetHPRatio() > 30) { entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName()); berserk = false; @@ -888,11 +888,11 @@ void Client::AI_Process() if(GetTarget()) { float DualWieldProbability = 0.0f; - + int16 Ambidexterity = aabonuses.Ambidexterity + spellbonuses.Ambidexterity + itembonuses.Ambidexterity; DualWieldProbability = (GetSkill(DUAL_WIELD) + GetLevel() + Ambidexterity) / 400.0f; // 78.0 max int16 DWBonus = spellbonuses.DualWieldChance + itembonuses.DualWieldChance; - DualWieldProbability += DualWieldProbability*float(DWBonus)/ 100.0f; + DualWieldProbability += DualWieldProbability*float(DWBonus)/ 100.0f; if(MakeRandomFloat(0.0, 1.0) < DualWieldProbability) { @@ -923,7 +923,7 @@ void Client::AI_Process() tar_ndx = 20; CalculateNewPosition2(Goal.x, Goal.y, Goal.z, GetRunspeed()); - } + } } else if(IsMoving()) { @@ -931,7 +931,7 @@ void Client::AI_Process() SetRunAnimSpeed(0); SendPosition(); SetMoving(false); - moved=false; + moved=false; } } AI_SpellCast(); @@ -963,14 +963,14 @@ void Client::AI_Process() } } - if(IsPet()) - { + if(IsPet()) + { Mob* owner = GetOwner(); if(owner == nullptr) return; float dist = DistNoRoot(*owner); - if (dist >= 100) + if (dist >= 100) { float speed = dist >= 225 ? GetRunspeed() : GetWalkspeed(); animation = 21 * speed; @@ -1002,7 +1002,7 @@ void Mob::AI_Process() { if (IsCasting()) return; - + bool engaged = IsEngaged(); bool doranged = false; @@ -1049,13 +1049,13 @@ void Mob::AI_Process() { } } } - + // trigger EVENT_SIGNAL if required if(IsNPC()) { CastToNPC()->CheckSignal(); } - - if (engaged) + + if (engaged) { _ZP(Mob_AI_Process_engaged); if (IsRooted()) @@ -1092,7 +1092,7 @@ void Mob::AI_Process() { return; } #endif //BOTS - + if(DivineAura()) return; @@ -1107,21 +1107,21 @@ void Mob::AI_Process() { } } } - - if (GetHPRatio() < (RuleI(NPC, StartEnrageValue)+1) && - (!RuleB(NPC, LiveLikeEnrage) || - (RuleB(NPC, LiveLikeEnrage) && - ((IsPet() && !IsCharmed() && GetOwner() && GetOwner()->IsClient()) || + + if (GetHPRatio() < (RuleI(NPC, StartEnrageValue)+1) && + (!RuleB(NPC, LiveLikeEnrage) || + (RuleB(NPC, LiveLikeEnrage) && + ((IsPet() && !IsCharmed() && GetOwner() && GetOwner()->IsClient()) || (CastToNPC()->GetSwarmOwner() && entity_list.GetMob(CastToNPC()->GetSwarmOwner())->IsClient()))))) { StartEnrage(); } - + bool is_combat_range = CombatRange(target); - - if (is_combat_range) + + if (is_combat_range) { - if (AImovement_timer->Check()) + if (AImovement_timer->Check()) { SetRunAnimSpeed(0); } @@ -1133,13 +1133,13 @@ void Mob::AI_Process() { SendPosition(); tar_ndx =0; } - + //casting checked above... if(target && !IsStunned() && !IsMezzed() && GetAppearance() != eaDead && !IsMeleeDisabled()) { - + //we should check to see if they die mid-attacks, previous //crap of checking target for null was not gunna cut it - + //try main hand first if(attack_timer.Check()) { if(IsNPC()) { @@ -1154,8 +1154,8 @@ void Mob::AI_Process() { } else { Attack(target, 13); } - - if (target) + + if (target) { //we use this random value in three comparisons with different //thresholds, and if its truely random, then this should work @@ -1163,19 +1163,19 @@ void Mob::AI_Process() { int32 RandRoll = MakeRandomInt(0, 99); if (CanThisClassDoubleAttack() //check double attack, this is NOT the same rules that clients use... - && RandRoll < (GetLevel() + NPCDualAttackModifier)) + && RandRoll < (GetLevel() + NPCDualAttackModifier)) { - if (Attack(target, 13)) + if (Attack(target, 13)) { // lets see if we can do a triple attack with the main hand //pets are excluded from triple and quads... if (SpecAttacks[SPECATK_TRIPLE] && !IsPet() && RandRoll < (GetLevel()+NPCTripleAttackModifier)) { - if (Attack(target, 13)) + if (Attack(target, 13)) { // now lets check the quad attack if (SpecAttacks[SPECATK_QUAD] - && RandRoll < (GetLevel() + NPCQuadAttackModifier)) + && RandRoll < (GetLevel() + NPCQuadAttackModifier)) { Attack(target, 13); } @@ -1184,21 +1184,21 @@ void Mob::AI_Process() { } } } - + if (SpecAttacks[SPECATK_FLURRY]) { - + uint8 npc_flurry = RuleI(Combat, NPCFlurryChance); if (GetFlurryChance()) - npc_flurry = GetFlurryChance(); + npc_flurry = GetFlurryChance(); if (MakeRandomInt(0, 99) < npc_flurry) Flurry(); } if (IsPet()) { - + Mob *owner = GetOwner(); - + if (owner){ int16 flurry_chance = owner->aabonuses.PetFlurry + owner->spellbonuses.PetFlurry + owner->itembonuses.PetFlurry; @@ -1206,15 +1206,15 @@ void Mob::AI_Process() { Flurry(); } } - - if (SpecAttacks[SPECATK_RAMPAGE]) + + if (SpecAttacks[SPECATK_RAMPAGE]) { //simply based off dex for now, probably a better calc if(MakeRandomInt(0, 100) < ((int)(GetDEX() / ((GetLevel() * 0.760) + 10.0)) + 5)) Rampage(); } - if (SpecAttacks[SPECATK_AREA_RAMPAGE]) + if (SpecAttacks[SPECATK_AREA_RAMPAGE]) { //simply based off dex for now, probably a better calc @@ -1222,9 +1222,9 @@ void Mob::AI_Process() { AreaRampage(); } } - + //now off hand - if (attack_dw_timer.Check() && CanThisClassDualWield()) + if (attack_dw_timer.Check() && CanThisClassDualWield()) { int myclass = GetClass(); //can only dual wield without a weapon if your a monk @@ -1233,10 +1233,10 @@ void Mob::AI_Process() { if(MakeRandomFloat(0.0, 1.0) < DualWieldProbability) { Attack(target, 14); - if (CanThisClassDoubleAttack()) + if (CanThisClassDoubleAttack()) { int32 RandRoll = MakeRandomInt(0, 99); - if (RandRoll < (GetLevel() + 20)) + if (RandRoll < (GetLevel() + 20)) { if (Attack(target, 14)); } @@ -1244,7 +1244,7 @@ void Mob::AI_Process() { } } } - + //now special attacks (kick, etc) if(IsNPC()) CastToNPC()->DoClassAttacks(target); @@ -1272,7 +1272,7 @@ void Mob::AI_Process() { } // See if we can summon the mob to us - if (!HateSummon()) + if (!HateSummon()) { //could not summon them, check ranged... if(SpecAttacks[SPECATK_RANGED_ATK]) @@ -1283,7 +1283,7 @@ void Mob::AI_Process() { if(AI_PursueCastCheck()){ //we did something, so do not process movement. } - else if (AImovement_timer->Check()) + else if (AImovement_timer->Check()) { if(!IsRooted()) { mlog(AI__WAYPOINTS, "Pursuing %s while engaged.", target->GetName()); @@ -1302,20 +1302,20 @@ void Mob::AI_Process() { CalculateNewPosition2(Goal.x, Goal.y, Goal.z, GetRunspeed()); } - } + } else if(IsMoving()) { SetHeading(CalculateHeadingToTarget(target->GetX(), target->GetY())); SetRunAnimSpeed(0); SendPosition(); SetMoving(false); moved=false; - + } } } } } - else + else { if(AIfeignremember_timer->Check()) { // EverHood - 6/14/06 @@ -1344,13 +1344,13 @@ void Mob::AI_Process() { } } } - if (AI_IdleCastCheck()) + if (AI_IdleCastCheck()) { //we processed a spell action, so do nothing else. } - else if (AIscanarea_timer->Check()) + else if (AIscanarea_timer->Check()) { - /* + /* * This is where NPCs look around to see if they want to attack anybody. * * if REVERSE_AGGRO is enabled, then this timer is disabled unless they @@ -1359,33 +1359,33 @@ void Mob::AI_Process() { * */ _ZP(Mob_AI_Process_scanarea); - + Mob* tmptar = entity_list.AICheckCloseAggro(this, GetAggroRange(), GetAssistRange()); - if (tmptar) + if (tmptar) AddToHateList(tmptar); } - else if (AImovement_timer->Check() && !IsRooted()) + else if (AImovement_timer->Check() && !IsRooted()) { _ZP(Mob_AI_Process_move); SetRunAnimSpeed(0); - if (IsPet()) + if (IsPet()) { _ZP(Mob_AI_Process_pet); // we're a pet, do as we're told - switch (pStandingPetOrder) + switch (pStandingPetOrder) { - case SPO_Follow: + case SPO_Follow: { - + Mob* owner = GetOwner(); if(owner == nullptr) break; - + //if(owner->IsClient()) // printf("Pet start pos: (%f, %f, %f)\n", GetX(), GetY(), GetZ()); - + float dist = DistNoRoot(*owner); - if (dist >= 400) + if (dist >= 400) { float speed = GetWalkspeed(); if (dist >= 5625) @@ -1401,7 +1401,7 @@ void Mob::AI_Process() { SendPosition(); } } - + /* //fix up Z float zdiff = GetZ() - owner->GetZ(); @@ -1411,19 +1411,19 @@ void Mob::AI_Process() { SendTo(GetX(), GetY(), owner->GetZ()); SendPosition(); } - + if(owner->IsClient()) printf("Pet pos: (%f, %f, %f)\n", GetX(), GetY(), GetZ()); */ - + break; } - case SPO_Sit: + case SPO_Sit: { SetAppearance(eaSitting, false); break; } - case SPO_Guard: + case SPO_Guard: { //only NPCs can guard stuff. (forced by where the guard movement code is in the AI) if(IsNPC()) { @@ -1433,11 +1433,11 @@ void Mob::AI_Process() { } } } - else if (GetFollowID()) + else if (GetFollowID()) { Mob* follow = entity_list.GetMob(GetFollowID()); if (!follow) SetFollowID(0); - else + else { float dist2 = DistNoRoot(*follow); int followdist = GetFollowDistance(); @@ -1457,22 +1457,22 @@ void Mob::AI_Process() { moved=false; SetMoving(false); } - } + } } } else //not a pet, and not following somebody... { // dont move till a bit after you last fought - if (pLastFightingDelayMoving < Timer::GetCurrentTime()) + if (pLastFightingDelayMoving < Timer::GetCurrentTime()) { - if (this->IsClient()) + if (this->IsClient()) { // LD timer expired, drop out of world if (this->CastToClient()->IsLD()) this->CastToClient()->Disconnect(); return; } - + if(IsNPC()) { if(RuleB(NPC, SmartLastFightingDelayMoving) && !feign_memory_list.empty()) @@ -1483,9 +1483,9 @@ void Mob::AI_Process() { CastToNPC()->AI_DoMovement(); } } - - } - } // else if (AImovement_timer->Check()) + + } + } // else if (AImovement_timer->Check()) } //Do Ranged attack here @@ -1499,7 +1499,7 @@ void NPC::AI_DoMovement() { float walksp = GetMovespeed(); if(walksp <= 0.0f) return; //this is idle movement at walk speed, and we are unable to walk right now. - + if (roambox_distance > 0) { _ZP(Mob_AI_Process_roambox); if ( @@ -1507,7 +1507,7 @@ void NPC::AI_DoMovement() { || roambox_movingto_x < roambox_min_x || roambox_movingto_y > roambox_max_y || roambox_movingto_y < roambox_min_y - ) + ) { float movedist = roambox_distance*roambox_distance; float movex = MakeRandomFloat(0, movedist); @@ -1527,10 +1527,10 @@ void NPC::AI_DoMovement() { if (roambox_movingto_y > roambox_max_y || roambox_movingto_y < roambox_min_y) roambox_movingto_y = roambox_max_y; } - - mlog(AI__WAYPOINTS, "Roam Box: d=%.3f (%.3f->%.3f,%.3f->%.3f): Go To (%.3f,%.3f)", + + mlog(AI__WAYPOINTS, "Roam Box: d=%.3f (%.3f->%.3f,%.3f->%.3f): Go To (%.3f,%.3f)", roambox_distance, roambox_min_x, roambox_max_x, roambox_min_y, roambox_max_y, roambox_movingto_x, roambox_movingto_y); - if (!CalculateNewPosition2(roambox_movingto_x, roambox_movingto_y, GetZ(), walksp, true)) + if (!CalculateNewPosition2(roambox_movingto_x, roambox_movingto_y, GetZ(), walksp, true)) { roambox_movingto_x = roambox_max_x + 1; // force update pLastFightingDelayMoving = Timer::GetCurrentTime() + RandomTimer(roambox_delay, roambox_delay + 5000); @@ -1538,7 +1538,7 @@ void NPC::AI_DoMovement() { SendPosition(); // makes mobs stop clientside } } - else if (roamer) + else if (roamer) { _ZP(Mob_AI_Process_roamer); if (AIwalking_timer->Check()) @@ -1547,8 +1547,8 @@ void NPC::AI_DoMovement() { AIwalking_timer->Disable(); } - - int16 gridno = CastToNPC()->GetGrid(); + + int16 gridno = CastToNPC()->GetGrid(); if (gridno > 0 || cur_wp==-2) { if (movetimercompleted==true) { // time to pause at wp is over @@ -1559,8 +1559,8 @@ void NPC::AI_DoMovement() { CastToNPC()->Depop(false);//depop without spawn timer } else { - movetimercompleted=false; - + movetimercompleted=false; + mlog(QUESTS__PATHING, "We are departing waypoint %d.", cur_wp); //if we were under quest control (with no grid), we are done now.. @@ -1569,18 +1569,18 @@ void NPC::AI_DoMovement() { roamer = false; cur_wp = 0; } - + if(GetAppearance() != eaStanding) SetAppearance(eaStanding, false); - + entity_list.OpenDoorsNear(CastToNPC()); if(!DistractedFromGrid) { //kick off event_waypoint depart - char temp[16]; + char temp[16]; sprintf(temp, "%d", cur_wp); parse->EventNPC(EVENT_WAYPOINT_DEPART, CastToNPC(), nullptr, temp, 0); - + //setup our next waypoint, if we are still on our normal grid //remember that the quest event above could have done anything it wanted with our grid if(gridno > 0) { @@ -1590,11 +1590,11 @@ void NPC::AI_DoMovement() { else { DistractedFromGrid = false; } - } - } // endif (movetimercompleted==true) + } + } // endif (movetimercompleted==true) else if (!(AIwalking_timer->Enabled())) { // currently moving - if (cur_wp_x == GetX() && cur_wp_y == GetY()) + if (cur_wp_x == GetX() && cur_wp_y == GetY()) { // are we there yet? then stop mlog(AI__WAYPOINTS, "We have reached waypoint %d (%.3f,%.3f,%.3f) on grid %d", cur_wp, GetX(), GetY(), GetZ(), GetGrid()); SetWaypointPause(); @@ -1605,20 +1605,20 @@ void NPC::AI_DoMovement() { SetHeading(cur_wp_heading); } SendPosition(); - + //kick off event_waypoint arrive - char temp[16]; + char temp[16]; sprintf(temp, "%d", cur_wp); parse->EventNPC(EVENT_WAYPOINT_ARRIVE, CastToNPC(), nullptr, temp, 0); - + // wipe feign memory since we reached our first waypoint if(cur_wp == 1) ClearFeignMemory(); - } + } else { // not at waypoint yet, so keep moving if(!RuleB(Pathing, AggroReturnToGrid) || !zone->pathing || (DistractedFromGrid == 0)) - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, walksp, true); + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, walksp, true); else { bool WaypointChanged; @@ -1628,18 +1628,18 @@ void NPC::AI_DoMovement() { tar_ndx = 20; if(NodeReached) - entity_list.OpenDoorsNear(CastToNPC()); + entity_list.OpenDoorsNear(CastToNPC()); CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp, true); } } - } - } // endif (gridno > 0) + } + } // endif (gridno > 0) // handle new quest grid command processing - else if (gridno < 0) + else if (gridno < 0) { // this mob is under quest control - if (movetimercompleted==true) + if (movetimercompleted==true) { // time to pause has ended SetGrid( 0 - GetGrid()); // revert to AI control mlog(QUESTS__PATHING, "Quest pathing is finished. Resuming on grid %d", GetGrid()); @@ -1651,8 +1651,8 @@ void NPC::AI_DoMovement() { } } - } - else if (IsGuarding()) + } + else if (IsGuarding()) { _ZP(Mob_AI_Process_guard); @@ -1669,7 +1669,7 @@ void NPC::AI_DoMovement() { tar_ndx = 20; if(NodeReached) - entity_list.OpenDoorsNear(CastToNPC()); + entity_list.OpenDoorsNear(CastToNPC()); CP2Moved = CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp); } @@ -1686,15 +1686,15 @@ void NPC::AI_DoMovement() { SetMoving(false); if (GetTarget() == nullptr || DistNoRoot(*GetTarget()) >= 5*5 ) { - SetHeading(guard_heading); - } else { - FaceTarget(GetTarget()); + SetHeading(guard_heading); + } else { + FaceTarget(GetTarget()); } - SendPosition(); + SendPosition(); SetAppearance(GetGuardPointAnim()); } - } - } + } + } } // Note: Mob that caused this may not get added to the hate list until after this function call completes @@ -1805,9 +1805,9 @@ bool NPC::AI_EngagedCastCheck() { if (AIautocastspell_timer->Check(false)) { _ZP(Mob_AI_Process_engaged_cast); AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. - + mlog(AI__SPELLS, "Engaged autocast check triggered. Trying to cast healing spells then maybe offensive spells."); - + // try casting a heal or gate if (!AICastSpell(this, 100, SpellType_Heal | SpellType_Escape | SpellType_InCombatBuff)) { // try casting a heal on nearby @@ -1817,11 +1817,11 @@ bool NPC::AI_EngagedCastCheck() { //no spell to cast, try again soon. AIautocastspell_timer->Start(RandomTimer(500, 1000), false); } - } + } } return(true); } - + return(false); } @@ -1829,7 +1829,7 @@ bool NPC::AI_PursueCastCheck() { if (AIautocastspell_timer->Check(false)) { _ZP(Mob_AI_Process_pursue_cast); AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. - + mlog(AI__SPELLS, "Engaged (pursuing) autocast check triggered. Trying to cast offensive spells."); if(!AICastSpell(GetTarget(), 90, SpellType_Root | SpellType_Nuke | SpellType_Lifetap | SpellType_Snare | SpellType_DOT | SpellType_Dispel | SpellType_Mez | SpellType_Slow | SpellType_Debuff)) { //no spell cast, try again soon. @@ -1849,7 +1849,7 @@ bool NPC::AI_IdleCastCheck() { AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. if (!AICastSpell(this, 100, SpellType_Heal | SpellType_Buff | SpellType_Pet)) { if(!entity_list.AICheckCloseBeneficialSpells(this, 33, MobAISpellRange, SpellType_Heal | SpellType_Buff)) { - //if we didnt cast any spells, our autocast timer just resets to the + //if we didnt cast any spells, our autocast timer just resets to the //last duration it was set to... try to put up a more reasonable timer... AIautocastspell_timer->Start(RandomTimer(1000, 5000), false); } //else, spell casting finishing will reset the timer. @@ -1896,7 +1896,7 @@ void Mob::ProcessEnrage(){ } } -bool Mob::IsEnraged() +bool Mob::IsEnraged() { return bEnraged; } @@ -1951,7 +1951,7 @@ bool Mob::Rampage() for (int i = 0; i < RampageArray.size(); i++) { if(index_hit >= RuleI(Combat, MaxRampageTargets)) - break; + break; // range is important Mob *m_target = entity_list.GetMob(RampageArray[i].c_str()); if(m_target) @@ -1987,7 +1987,7 @@ void Mob::AreaRampage() uint32 Mob::GetLevelCon(uint8 mylevel, uint8 iOtherLevel) { int16 diff = iOtherLevel - mylevel; uint32 conlevel=0; - + if (diff == 0) return CON_WHITE; else if (diff >= 1 && diff <= 2) @@ -2184,7 +2184,7 @@ create table npc_spells_entries ( priority smallint(5) not null default 0, index npc_spells_id (npc_spells_id) ); -*/ +*/ bool IsSpellInList(DBnpcspells_Struct* spell_list, int16 iSpellID); bool Compare_AI_Spells(AISpells_Struct i, AISpells_Struct j); @@ -2229,8 +2229,8 @@ bool NPC::AI_AddNPCSpells(uint32 iDBSpellsID) { if (GetLevel() >= parentlist->entries[i].minlevel && GetLevel() <= parentlist->entries[i].maxlevel && parentlist->entries[i].spellid > 0) { if (!IsSpellInList(spell_list, parentlist->entries[i].spellid)) { - AddSpellToNPCList(parentlist->entries[i].priority, - parentlist->entries[i].spellid, parentlist->entries[i].type, + AddSpellToNPCList(parentlist->entries[i].priority, + parentlist->entries[i].spellid, parentlist->entries[i].type, parentlist->entries[i].manacost, parentlist->entries[i].recast_delay, parentlist->entries[i].resist_adjust); } @@ -2243,14 +2243,14 @@ bool NPC::AI_AddNPCSpells(uint32 iDBSpellsID) { } for (i=0; inumentries; i++) { if (GetLevel() >= spell_list->entries[i].minlevel && GetLevel() <= spell_list->entries[i].maxlevel && spell_list->entries[i].spellid > 0) { - AddSpellToNPCList(spell_list->entries[i].priority, - spell_list->entries[i].spellid, spell_list->entries[i].type, - spell_list->entries[i].manacost, spell_list->entries[i].recast_delay, + AddSpellToNPCList(spell_list->entries[i].priority, + spell_list->entries[i].spellid, spell_list->entries[i].type, + spell_list->entries[i].manacost, spell_list->entries[i].recast_delay, spell_list->entries[i].resist_adjust); } } std::sort(AIspells.begin(), AIspells.end(), Compare_AI_Spells); - + if (attack_proc_spell > 0) AddProcToWeapon(attack_proc_spell, true, proc_chance); @@ -2269,22 +2269,22 @@ bool IsSpellInList(DBnpcspells_Struct* spell_list, int16 iSpellID) { return false; } -bool Compare_AI_Spells(AISpells_Struct i, AISpells_Struct j) -{ - return(i.priority > j.priority); +bool Compare_AI_Spells(AISpells_Struct i, AISpells_Struct j) +{ + return(i.priority > j.priority); } // adds a spell to the list, taking into account priority and resorting list as needed. -void NPC::AddSpellToNPCList(int16 iPriority, int16 iSpellID, uint16 iType, - int16 iManaCost, int32 iRecastDelay, int16 iResistAdjust) +void NPC::AddSpellToNPCList(int16 iPriority, int16 iSpellID, uint16 iType, + int16 iManaCost, int32 iRecastDelay, int16 iResistAdjust) { - + if(!IsValidSpell(iSpellID)) return; HasAISpell = true; AISpells_Struct t; - + t.priority = iPriority; t.spellid = iSpellID; t.type = iType; @@ -2333,7 +2333,7 @@ DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, parent_list, attack_proc, proc_chance from npc_spells where id=%d", iDBSpellsID), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) { @@ -2392,8 +2392,8 @@ DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) { safe_delete_array(query); return 0; } - - return 0; + + return 0; } return 0; } @@ -2403,7 +2403,7 @@ uint32 ZoneDatabase::GetMaxNPCSpellsID() { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT max(id) from npc_spells"), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) { @@ -2421,7 +2421,7 @@ uint32 ZoneDatabase::GetMaxNPCSpellsID() { safe_delete_array(query); return 0; } - - return 0; + + return 0; } diff --git a/zone/Object.cpp b/zone/Object.cpp index 77b01b7cd..2e33959a4 100644 --- a/zone/Object.cpp +++ b/zone/Object.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -42,10 +42,10 @@ extern EntityList entity_list; Object::Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const ItemInst* inst) : respawn_timer(0), decay_timer(300000) { - + user = nullptr; last_user = nullptr; - + // Initialize members m_id = id; m_type = type; @@ -62,7 +62,7 @@ Object::Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, decay_timer.Disable(); } respawn_timer.Disable(); - + // Set drop_id to zero - it will be set when added to zone with SetID() m_data.drop_id = 0; } @@ -71,7 +71,7 @@ Object::Object(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, Object::Object(const ItemInst* inst, char* name,float max_x,float min_x,float max_y,float min_y,float z,float heading,uint32 respawntimer) : respawn_timer(respawntimer), decay_timer(300000) { - + user = nullptr; last_user = nullptr; m_max_x=max_x; @@ -94,7 +94,7 @@ Object::Object(const ItemInst* inst, char* name,float max_x,float min_x,float ma respawn_timer.Disable(); strcpy(m_data.object_name, name); RandomSpawn(false); - + // Hardcoded portion for unknown members m_data.unknown024 = 0x7f001194; m_data.unknown076 = 0x0000d5fe; @@ -107,7 +107,7 @@ Object::Object(Client* client, const ItemInst* inst) { user = nullptr; last_user = nullptr; - + // Initialize members m_id = 0; m_inst = (inst) ? inst->Clone() : nullptr; @@ -122,7 +122,7 @@ Object::Object(Client* client, const ItemInst* inst) m_data.y = client->GetY(); m_data.z = client->GetZ(); m_data.zone_id = zone->GetZoneID(); - + decay_timer.Start(); respawn_timer.Disable(); @@ -130,7 +130,7 @@ Object::Object(Client* client, const ItemInst* inst) m_data.unknown024 = 0x7f001194; m_data.unknown076 = 0x0000d5fe; m_data.unknown084 = 0xFFFFFFFF; - + // Set object name if (inst) { const Item_Struct* item = inst->GetItem(); @@ -145,7 +145,7 @@ Object::Object(Client* client, const ItemInst* inst) if (len_copy > sizeof(DEFAULT_OBJECT_NAME_SUFFIX)) { len_copy = sizeof(DEFAULT_OBJECT_NAME_SUFFIX); } - + memcpy(&m_data.object_name[0], inst->GetItem()->IDFile, len_idfile); memcpy(&m_data.object_name[len_idfile], DEFAULT_OBJECT_NAME_SUFFIX, len_copy); } @@ -161,7 +161,7 @@ Object::Object(const ItemInst *inst, float x, float y, float z, float heading, u { user = nullptr; last_user = nullptr; - + // Initialize members m_id = 0; m_inst = (inst) ? inst->Clone() : nullptr; @@ -176,7 +176,7 @@ Object::Object(const ItemInst *inst, float x, float y, float z, float heading, u m_data.y = y; m_data.z = z; m_data.zone_id = zone->GetZoneID(); - + if (decay_time) decay_timer.Start(); @@ -186,7 +186,7 @@ Object::Object(const ItemInst *inst, float x, float y, float z, float heading, u m_data.unknown024 = 0x7f001194; m_data.unknown076 = 0x0000d5fe; m_data.unknown084 = 0xFFFFFFFF; - + // Set object name if (inst) { const Item_Struct* item = inst->GetItem(); @@ -201,7 +201,7 @@ Object::Object(const ItemInst *inst, float x, float y, float z, float heading, u if (len_copy > sizeof(DEFAULT_OBJECT_NAME_SUFFIX)) { len_copy = sizeof(DEFAULT_OBJECT_NAME_SUFFIX); } - + memcpy(&m_data.object_name[0], inst->GetItem()->IDFile, len_idfile); memcpy(&m_data.object_name[len_idfile], DEFAULT_OBJECT_NAME_SUFFIX, len_copy); } @@ -219,7 +219,7 @@ Object::Object(const char *model, float x, float y, float z, float heading, uint last_user = nullptr; ItemInst* inst = nullptr; inst = new ItemInst(ItemUseWorldContainer); - + // Initialize members m_id = 0; m_inst = (inst) ? inst->Clone() : nullptr; @@ -263,7 +263,7 @@ void Object::SetID(uint16 set_id) { // Invoke base class Entity::SetID(set_id); - + // Store new id as drop_id m_data.drop_id = (uint32)this->GetID(); } @@ -272,7 +272,7 @@ void Object::SetID(uint16 set_id) void Object::ResetState() { safe_delete(m_inst); - + m_id = 0; m_type = 0; m_icon = 0; @@ -289,7 +289,7 @@ bool Object::Save() // Doesn't yet exist, add now m_id = database.AddObject(m_type, m_icon, m_data, m_inst); } - + return true; } @@ -302,7 +302,7 @@ uint16 Object::VarSave() else { // Doesn't yet exist, add now m_id = database.AddObject(m_type, m_icon, m_data, m_inst); - } + } return m_id; } @@ -312,7 +312,7 @@ void Object::Delete(bool reset_state) if (m_id != 0) { database.DeleteObject(m_id); } - + if (reset_state) { ResetState(); } @@ -325,7 +325,7 @@ void Object::PutItem(uint8 index, const ItemInst* inst) LogFile->write(EQEMuLog::Error, "Object::PutItem: Invalid index specified (%i)", index); return; } - + if (m_inst && m_inst->IsType(ItemClassContainer)) { if (inst) { m_inst->PutItem(index, *inst); @@ -369,7 +369,7 @@ void Object::DeleteItem(uint8 index) { if (m_inst && m_inst->IsType(ItemClassContainer)) { m_inst->DeleteItem(index); - + // This is _highly_ inefficient, but for now it will work: Save entire object to database Save(); } @@ -379,14 +379,14 @@ void Object::DeleteItem(uint8 index) ItemInst* Object::PopItem(uint8 index) { ItemInst* inst = nullptr; - + if (m_inst && m_inst->IsType(ItemClassContainer)) { inst = m_inst->PopItem(index); - + // This is _highly_ inefficient, but for now it will work: Save entire object to database Save(); } - + return inst; } @@ -422,7 +422,7 @@ bool Object::Process(){ database.DeleteObject(m_id); return false; } - + if(m_ground_spawn && respawn_timer.Check()){ RandomSpawn(true); } @@ -432,11 +432,11 @@ bool Object::Process(){ void Object::RandomSpawn(bool send_packet) { if(!m_ground_spawn) return; - + m_data.x = MakeRandomFloat(m_min_x, m_max_x); m_data.y = MakeRandomFloat(m_min_y, m_max_y); respawn_timer.Disable(); - + if(send_packet) { EQApplicationPacket app; CreateSpawnPacket(&app); @@ -452,7 +452,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) if (m_type == OT_DROPPEDITEM) { bool cursordelete = false; if (m_inst && sender) { - // if there is a lore conflict, delete the offending item from the server inventory + // if there is a lore conflict, delete the offending item from the server inventory // the client updates itself and takes care of sending "duplicate lore item" messages if(sender->CheckLoreConflict(m_inst->GetItem())) { int16 loreslot = sender->GetInv().HasItem(m_inst->GetItem()->ID, 0, invWhereBank); @@ -470,10 +470,10 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) // Transfer item to client sender->PutItemInInventory(SLOT_CURSOR, *m_inst, false); sender->SendItemPacket(SLOT_CURSOR, m_inst, ItemPacketTrade); - + if(cursordelete) // delete the item if it's a duplicate lore. We have to do this because the client expects the item packet - sender->DeleteItemInInventory(SLOT_CURSOR); - + sender->DeleteItemInInventory(SLOT_CURSOR); + if(!m_ground_spawn) safe_delete(m_inst); @@ -481,13 +481,13 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) sender->SetTradeskillObject(nullptr); user = nullptr; } - + // Send click to all clients (removes entity on client) EQApplicationPacket* outapp = new EQApplicationPacket(OP_ClickObject, sizeof(ClickObject_Struct)); memcpy(outapp->pBuffer, click_object, sizeof(ClickObject_Struct)); entity_list.QueueClients(nullptr, outapp, false); safe_delete(outapp); - + // Remove object database.DeleteObject(m_id); if(!m_ground_spawn) @@ -496,7 +496,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) // Tradeskill item EQApplicationPacket* outapp = new EQApplicationPacket(OP_ClickObjectAction, sizeof(ClickObjectAction_Struct)); ClickObjectAction_Struct* coa = (ClickObjectAction_Struct*)outapp->pBuffer; - + //TODO: there is prolly a better way to do this. //if this is not the main user, send them a close and a message if(user == nullptr || user == sender) @@ -507,12 +507,12 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) } m_inuse = true; coa->type = m_type; - coa->unknown16 = 0x0a; - + coa->unknown16 = 0x0a; + coa->drop_id = click_object->drop_id; coa->player_id = click_object->player_id; coa->icon = m_icon; - + if(sender->IsLooting()) { coa->open = 0x00; @@ -521,16 +521,16 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) sender->QueuePacket(outapp); safe_delete(outapp); - + //if the object allready had a user, we are done if(user != nullptr) return(false); - + // Starting to use this object sender->SetTradeskillObject(this); - + user = sender; - + // Send items inside of container if (m_inst && m_inst->IsType(ItemClassContainer)) { @@ -538,7 +538,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) //Clear out no-drop and no-rent items first if different player opens it if(user != last_user) m_inst->ClearByFlags(byFlagSet, byFlagSet); - + EQApplicationPacket* outapp=new EQApplicationPacket(OP_ClientReady,0); sender->QueuePacket(outapp); safe_delete(outapp); @@ -551,7 +551,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) } } } - + return true; } @@ -560,28 +560,28 @@ uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& ob { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - + uint32 database_id = 0; uint32 item_id = 0; int16 charges = 0; - + if (inst && inst->GetItem()) { item_id = inst->GetItem()->ID; charges = inst->GetCharges(); } - + // SQL Escape object_name uint32 len = strlen(object.object_name) * 2 + 1; char* object_name = new char[len]; DoEscapeString(object_name, object.object_name, strlen(object.object_name)); - + // Construct query uint32 len_query = MakeAnyLenString(&query, "insert into object (zoneid, xpos, ypos, zpos, heading, itemid, charges, objectname, " "type, icon) values (%i, %f, %f, %f, %f, %i, %i, '%s', %i, %i)", object.zone_id, object.x, object.y, object.z, object.heading, item_id, charges, object_name, type, icon); - + // Save new record for object if (!RunQuery(query, len_query, errbuf, nullptr, nullptr, &database_id)) { LogFile->write(EQEMuLog::Error, "Unable to insert object: %s", errbuf); @@ -592,7 +592,7 @@ uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& ob SaveWorldContainer(object.zone_id, database_id, inst); } } - + safe_delete_array(object_name); safe_delete_array(query); return database_id; @@ -603,27 +603,27 @@ void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Objec { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - + uint32 item_id = 0; int16 charges = 0; - + if (inst && inst->GetItem()) { item_id = inst->GetItem()->ID; charges = inst->GetCharges(); } - + // SQL Escape object_name uint32 len = strlen(object.object_name) * 2 + 1; char* object_name = new char[len]; DoEscapeString(object_name, object.object_name, strlen(object.object_name)); - + // Construct query uint32 len_query = MakeAnyLenString(&query, "update object set zoneid=%i, xpos=%f, ypos=%f, zpos=%f, heading=%f, " "itemid=%i, charges=%i, objectname='%s', type=%i, icon=%i where id=%i", object.zone_id, object.x, object.y, object.z, object.heading, item_id, charges, object_name, type, icon, id); - + // Save new record for object if (!RunQuery(query, len_query, errbuf)) { LogFile->write(EQEMuLog::Error, "Unable to update object: %s", errbuf); @@ -634,7 +634,7 @@ void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Objec SaveWorldContainer(object.zone_id, id, inst); } } - + safe_delete_array(object_name); safe_delete_array(query); } @@ -643,7 +643,7 @@ Ground_Spawns* ZoneDatabase::LoadGroundSpawns(uint32 zone_id, int16 version, Gro char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT max_x,max_y,max_z,min_x,min_y,heading,name,item,max_allowed,respawn_timer from ground_spawns where zoneid=%i and (version=%u OR version=-1) limit 50", zone_id, version), errbuf, &result)) { safe_delete_array(query); @@ -673,11 +673,11 @@ void ZoneDatabase::DeleteObject(uint32 id) { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - + // Construct query uint32 len_query = MakeAnyLenString(&query, "delete from object where id=%i", id); - + // Save new record for object if (!RunQuery(query, len_query, errbuf)) { LogFile->write(EQEMuLog::Error, "Unable to delete object: %s", errbuf); @@ -686,7 +686,7 @@ void ZoneDatabase::DeleteObject(uint32 id) // Delete contained items, if any // DeleteWorldContainer(id); //} - + safe_delete_array(query); } @@ -712,7 +712,7 @@ uint32 Object::GetIcon() } float Object::GetX() -{ +{ return this->m_data.x; } @@ -840,7 +840,7 @@ uint32 Object::GetItemID() void Object::SetItemID(uint32 itemid) { safe_delete(this->m_inst); - + if (itemid) { this->m_inst = database.CreateItem(itemid); diff --git a/zone/PlayerCorpse.cpp b/zone/PlayerCorpse.cpp index 6e4fb74f3..8fd0b9c20 100644 --- a/zone/PlayerCorpse.cpp +++ b/zone/PlayerCorpse.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -86,7 +86,7 @@ Corpse* Corpse::LoadFromDBData(uint32 in_dbid, uint32 in_charid, char* in_charna isSoF = false; } } - + if(isSoF) { DBPlayerCorpse_Struct* dbpcs = (DBPlayerCorpse_Struct*) in_data; @@ -216,9 +216,9 @@ Corpse::Corpse(NPC* in_npc, ItemList* in_itemlist, uint32 in_npctypeid, const NP itemlist = *in_itemlist; in_itemlist->clear(); } - + SetCash(in_npc->GetCopper(), in_npc->GetSilver(), in_npc->GetGold(), in_npc->GetPlatinum()); - + npctype_id = in_npctypeid; SetPKItem(0); charid = 0; @@ -226,7 +226,7 @@ Corpse::Corpse(NPC* in_npc, ItemList* in_itemlist, uint32 in_npctypeid, const NP p_depop = false; strcpy(orgname, in_npc->GetName()); strcpy(name, in_npc->GetName()); - // Added By Hogie + // Added By Hogie for(int count = 0; count < 100; count++) { if ((level >= npcCorpseDecayTimes[count].minlvl) && (level <= npcCorpseDecayTimes[count].maxlvl)) { corpse_decay_timer.SetTimer(npcCorpseDecayTimes[count].seconds*1000); @@ -261,7 +261,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) 0, client->GetGender(), client->GetRace(), - client->GetClass(), + client->GetClass(), BT_Humanoid, // bodytype added client->GetDeity(), client->GetLevel(), @@ -339,7 +339,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) platinum = 0; strcpy(orgname, pp->name); strcpy(name, pp->name); - + //become_npc was not being initialized which led to some pretty funky things with newly created corpses become_npc = false; @@ -356,13 +356,13 @@ Corpse::Corpse(Client* client, int32 in_rezexp) pp->gold = 0; pp->platinum = 0; } - + // get their tints memcpy(item_tint, &client->GetPP().item_tint, sizeof(item_tint)); - + // solar: TODO soulbound items need not be added to corpse, but they need // to go into the regular slots on the player, out of bags - + // worn + inventory + cursor std::list removed_list; bool cursor = false; @@ -372,15 +372,15 @@ Corpse::Corpse(Client* client, int32 in_rezexp) item = client->GetInv().GetItem(9999); if((item && (!client->IsBecomeNPC())) || (item && client->IsBecomeNPC() && !item->GetItem()->NoRent)) { std::list slot_list = MoveItemToCorpse(client, item, 9999); - removed_list.merge(slot_list); + removed_list.merge(slot_list); } - + } item = client->GetInv().GetItem(i); if((item && (!client->IsBecomeNPC())) || (item && client->IsBecomeNPC() && !item->GetItem()->NoRent)) { std::list slot_list = MoveItemToCorpse(client, item, i); - removed_list.merge(slot_list); + removed_list.merge(slot_list); } } @@ -389,7 +389,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) // bumped starting assignment to 8001 because any in-memory 'slot 8000' item was moved above as 'slot 30' // this was mainly for client profile state reflection..should match db player inventory entries now. - + iter_queue it; for(it=client->GetInv().cursor_begin(),i=8001; it!=client->GetInv().cursor_end(); it++,i++) { item = *it; @@ -401,7 +401,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) } } } - + if(removed_list.size() != 0) { std::stringstream ss(""); ss << "DELETE FROM inventory WHERE charid=" << client->CharacterID(); @@ -423,7 +423,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) if(cursor) { // all cursor items should be on corpse (client < SoF or RespawnFromHover = false) while(!client->GetInv().CursorEmpty()) - client->DeleteItemInInventory(SLOT_CURSOR, 0, false, false); + client->DeleteItemInInventory(SLOT_CURSOR, 0, false, false); } else { // only visible cursor made it to corpse (client >= Sof and RespawnFromHover = true) std::list::const_iterator start = client->GetInv().cursor_begin(); @@ -434,7 +434,7 @@ Corpse::Corpse(Client* client, int32 in_rezexp) client->CalcBonuses(); // will only affect offline profile viewing of dead characters..unneeded overhead client->Save(); } //end "not leaving naked corpses" - + Rezzed(false); Save(); } @@ -501,7 +501,7 @@ Corpse::Corpse(uint32 in_dbid, uint32 in_charid, char* in_charname, ItemList* in charid = in_charid; itemlist = *in_itemlist; in_itemlist->clear(); - + strcpy(orgname, in_charname); strcpy(name, in_charname); this->copper = in_copper; @@ -548,7 +548,7 @@ bool Corpse::Save() { return true; if (!pIsChanged) return true; - + uint32 tmp = this->CountItems(); uint32 tmpsize = sizeof(DBPlayerCorpse_Struct) + (tmp * sizeof(player_lootitem::ServerLootItem_Struct)); DBPlayerCorpse_Struct* dbpc = (DBPlayerCorpse_Struct*) new uchar[tmpsize]; @@ -595,7 +595,7 @@ bool Corpse::Save() { dbpc->drakkin_heritage = drakkin_heritage; dbpc->drakkin_tattoo = drakkin_tattoo; dbpc->drakkin_details = drakkin_details; - + uint32 x = 0; ItemList::iterator cur,end; cur = itemlist.begin(); @@ -672,7 +672,7 @@ void Corpse::AddItem(uint32 itemnum, uint16 charges, int16 slot, uint32 aug1, ui ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct** bag_item_data) { ServerLootItem_Struct *sitem = 0, *sitem2; - + // find the item ItemList::iterator cur,end; cur = itemlist.begin(); @@ -699,7 +699,7 @@ ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct** } } } - + return sitem; } @@ -714,7 +714,7 @@ uint32 Corpse::GetWornItem(int16 equipSlot) const { return item->item_id; } } - + return 0; } @@ -740,7 +740,7 @@ void Corpse::RemoveItem(uint16 lootslot) void Corpse::RemoveItem(ServerLootItem_Struct* item_data) { uint8 material; - + ItemList::iterator cur,end; cur = itemlist.begin(); end = itemlist.end(); @@ -754,9 +754,9 @@ void Corpse::RemoveItem(ServerLootItem_Struct* item_data) material = Inventory::CalcMaterialFromSlot(sitem->equipSlot); if(material != 0xFF) SendWearChange(material); - + safe_delete(sitem); - + return; } } @@ -787,7 +787,7 @@ bool Corpse::IsEmpty() const { bool Corpse::Process() { if (p_depop) return false; - + if(corpse_delay_timer.Check()) { for (int i=0; iHasGraveyard()) { Save(); p_depop = true; - database.GraveyardPlayerCorpse(dbid, zone->graveyard_zoneid(), - (zone->GetZoneID() == zone->graveyard_zoneid()) ? zone->GetInstanceID() : 0, zone->graveyard_x(), + database.GraveyardPlayerCorpse(dbid, zone->graveyard_zoneid(), + (zone->GetZoneID() == zone->graveyard_zoneid()) ? zone->GetInstanceID() : 0, zone->graveyard_x(), zone->graveyard_y(), zone->graveyard_z(), zone->graveyard_heading()); corpse_graveyard_timer.Disable(); ServerPacket* pack = new ServerPacket(ServerOP_SpawnPlayerCorpse, sizeof(SpawnPlayerCorpse_Struct)); @@ -813,7 +813,7 @@ bool Corpse::Process() { LogFile->write(EQEMuLog::Debug, "Moved %s player corpse to the designated graveyard in zone %s.", this->GetName(), database.GetZoneName(zone->graveyard_zoneid())); dbid = 0; } - + corpse_graveyard_timer.Disable(); return false; } @@ -842,7 +842,7 @@ bool Corpse::Process() { corpse_decay_timer.Disable(); return false; } - + return true; } @@ -921,14 +921,14 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a else if(GetPKItem() == -1 && CanMobLoot(client->CharacterID())) { tCanLoot = 3; } //pvp loot all items, variable cash else if(GetPKItem() == 1 && CanMobLoot(client->CharacterID())) { tCanLoot = 4; } //pvp loot 1 item, variable cash else if(GetPKItem() > 1 && CanMobLoot(client->CharacterID())) { tCanLoot = 5; } //pvp loot 1 set item, variable cash - + if(tCanLoot == 1) { if(client->Admin() < 100 || !client->GetGM()) { SendLootReqErrorPacket(client, 2); } } if(tCanLoot >= 2 || (tCanLoot == 1 && client->Admin() >= 100 && client->GetGM())) { this->BeingLootedBy = client->GetID(); EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoneyOnCorpse, sizeof(moneyOnCorpseStruct)); moneyOnCorpseStruct* d = (moneyOnCorpseStruct*) outapp->pBuffer; - + d->response = 1; d->unknown1 = 0x42; d->unknown2 = 0xef; @@ -978,7 +978,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a } outapp->priority = 6; - client->QueuePacket(outapp); + client->QueuePacket(outapp); safe_delete(outapp); if(tCanLoot == 5) { int pkitem = GetPKItem(); @@ -999,21 +999,21 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a ItemList::iterator cur,end; cur = itemlist.begin(); end = itemlist.end(); - + uint8 containercount = 0; int corpselootlimit; - + if(client->GetClientVersion() >= EQClientRoF) { corpselootlimit = 34; } else if(client->GetClientVersion() >= EQClientSoF) { corpselootlimit = 32; } else if(client->GetClientVersion() == EQClientTitanium) { corpselootlimit = 31; } else { corpselootlimit = 30; } - + for(; cur != end; cur++) { ServerLootItem_Struct* item_data = *cur; item_data->lootslot = 0xFFFF; - + // Dont display the item if it's in a bag - + // Added cursor queue slots to corpse item visibility list. Nothing else should be making it to corpse. if(!IsPlayerCorpse() || item_data->equipSlot <= 30 || item_data->equipSlot == 9999 || tCanLoot>=3 || (item_data->equipSlot >= 8000 && item_data->equipSlot <= 8999)) { @@ -1040,12 +1040,12 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a client->Message(0, "Remove items and re-loot corpse to access remaining inventory."); client->Message(0, "(%s contains %i additional %s.)", GetName(), (i - corpselootlimit), (i - corpselootlimit) == 1 ? "item" : "items"); } - + if(IsPlayerCorpse() && i == 0 && itemlist.size() > 0) { // somehow, player corpse contains items, but client doesn't see them... client->Message(13, "This corpse contains items that are inaccessable!"); client->Message(15, "Contact a GM for item replacement, if necessary."); client->Message(15, "BUGGED CORPSE [DBID: %i, Name: %s, Item Count: %i]", GetDBID(), GetName(), itemlist.size()); - + cur = itemlist.begin(); end = itemlist.end(); for(; cur != end; cur++) { @@ -1057,7 +1057,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a } } } - + // Disgrace: Client seems to require that we send the packet back... client->QueuePacket(app); @@ -1111,7 +1111,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) const Item_Struct* item = 0; ItemInst *inst = 0; ServerLootItem_Struct* item_data = nullptr, *bag_item_data[10]; - + memset(bag_item_data, 0, sizeof(bag_item_data)); if(GetPKItem()>1) item = database.GetItem(GetPKItem()); @@ -1124,7 +1124,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) { item = database.GetItem(item_data->item_id); } - + if (item != 0) { if(item_data) @@ -1205,7 +1205,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) } else if (admin<=255){ if ((zone->lootvar<8) && (zone->lootvar>0)) - client->LogLoot(client,this,item); + client->LogLoot(client,this,item); } } @@ -1248,10 +1248,10 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) } } } - + if(GetPKItem()!=-1) SetPKItem(0); - + //now send messages to all interested parties //creates a link for the item @@ -1299,7 +1299,7 @@ void Corpse::EndLoot(Client* client, const EQApplicationPacket* app) { outapp->size = 0; client->QueuePacket(outapp); safe_delete(outapp); - + //client->Save(); //inventory operations auto-commit this->BeingLootedBy = 0xFFFFFFFF; if (this->IsEmpty()) @@ -1311,9 +1311,9 @@ void Corpse::EndLoot(Client* client, const EQApplicationPacket* app) { void Corpse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { Mob::FillSpawnStruct(ns, ForWho); - + ns->spawn.max_hp = 120; - + if (IsPlayerCorpse()) ns->spawn.NPC = 3; else @@ -1330,7 +1330,7 @@ void Corpse::QueryLoot(Client* to) { end = itemlist.end(); int corpselootlimit; - + if (to->GetClientVersion() >= EQClientSoF) { corpselootlimit = 32; } else if (to->GetClientVersion() == EQClientTitanium) { corpselootlimit = 31; } else { corpselootlimit = 30; } @@ -1343,14 +1343,14 @@ void Corpse::QueryLoot(Client* to) { sitem->lootslot = 0xFFFF; else x < corpselootlimit ? sitem->lootslot = x : sitem->lootslot = 0xFFFF; - + const Item_Struct* item = database.GetItem(sitem->item_id); if (item) to->Message((sitem->lootslot == 0xFFFF), "LootSlot: %i (EquipSlot: %i) Item: %s (%d), Count: %i", static_cast(sitem->lootslot), sitem->equipSlot, item->Name, item->ID, sitem->charges); else to->Message((sitem->lootslot == 0xFFFF), "Error: 0x%04x", sitem->item_id); - + if (sitem->lootslot != 0xFFFF) x++; @@ -1359,7 +1359,7 @@ void Corpse::QueryLoot(Client* to) { else { sitem->lootslot=y; const Item_Struct* item = database.GetItem(sitem->item_id); - + if (item) to->Message(0, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges); else @@ -1397,7 +1397,7 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) return false; } } - else + else { bool consented = false; std::list::iterator itr; @@ -1451,15 +1451,15 @@ bool ZoneDatabase::DeleteGraveyard(uint32 zone_id, uint32 graveyard_id) { char* query = new char[256]; uint32 query_length = 0; uint32 affected_rows = 0; - + query_length = sprintf(query,"UPDATE zone SET graveyard_id=0 WHERE zoneidnumber=%u AND version=0", zone_id); - + if (!RunQuery(query, query_length, errbuf, 0, &affected_rows)) { safe_delete_array(query); cerr << "Error1 in DeleteGraveyard query " << errbuf << endl; return false; } - + if (affected_rows == 0) { cerr << "Error2 in DeleteGraveyard query: affected_rows = 0" << endl; return false; @@ -1473,7 +1473,7 @@ bool ZoneDatabase::DeleteGraveyard(uint32 zone_id, uint32 graveyard_id) { return false; } safe_delete_array(query); - + if (affected_rows == 0) { cerr << "Error4 in DeleteGraveyard query: affected_rows = 0" << endl; return false; @@ -1486,16 +1486,16 @@ uint32 ZoneDatabase::AddGraveyardIDToZone(uint32 zone_id, uint32 graveyard_id) { char* query = new char[256]; char* end = query; uint32 affected_rows = 0; - + end += sprintf(end,"UPDATE zone SET graveyard_id=%u WHERE zoneidnumber=%u AND version=0", graveyard_id, zone_id); - + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { safe_delete_array(query); cerr << "Error1 in AddGraveyardIDToZone query " << errbuf << endl; return 0; } safe_delete_array(query); - + if (affected_rows == 0) { cerr << "Error2 in AddGraveyardIDToZone query: affected_rows = 0" << endl; return 0; @@ -1509,16 +1509,16 @@ uint32 ZoneDatabase::NewGraveyardRecord(uint32 graveyard_zoneid, float graveyard char* end = query; uint32 affected_rows = 0; uint32 new_graveyard_id = 0; - + end += sprintf(end,"INSERT INTO graveyard SET zone_id=%u, x=%1.1f, y=%1.1f, z=%1.1f, heading=%1.1f", graveyard_zoneid, graveyard_x, graveyard_y, graveyard_z, graveyard_heading); - + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows, &new_graveyard_id)) { safe_delete_array(query); cerr << "Error1 in NewGraveyardRecord query " << errbuf << endl; return 0; } safe_delete_array(query); - + if (affected_rows == 0) { cerr << "Error2 in NewGraveyardRecord query: affected_rows = 0" << endl; return 0; @@ -1536,17 +1536,17 @@ uint32 ZoneDatabase::GraveyardPlayerCorpse(uint32 dbid, uint32 zoneid, uint16 in char* query = new char[256]; char* end = query; uint32 affected_rows = 0; - + // We probably don't want a graveyard located in an instance. end += sprintf(end,"Update player_corpses SET zoneid=%u, instanceid=0, x=%1.1f, y=%1.1f, z=%1.1f, heading=%1.1f, WasAtGraveyard=1 WHERE id=%d", zoneid, x, y, z, heading, dbid); - + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { safe_delete_array(query); cerr << "Error1 in GraveyardPlayerCorpse query " << errbuf << endl; return 0; } safe_delete_array(query); - + if (affected_rows == 0) { cerr << "Error2 in GraveyardPlayerCorpse query: affected_rows = 0" << endl; return 0; @@ -1558,20 +1558,20 @@ uint32 ZoneDatabase::UpdatePlayerCorpse(uint32 dbid, uint32 charid, const char* char* query = new char[256+(datasize*2)]; char* end = query; uint32 affected_rows = 0; - + end += sprintf(end, "Update player_corpses SET data="); *end++ = '\''; end += DoEscapeString(end, (char*)data, datasize); *end++ = '\''; end += sprintf(end,", charname='%s', zoneid=%u, instanceid=%u, charid=%d, x=%1.1f, y=%1.1f, z=%1.1f, heading=%1.1f WHERE id=%d", charname, zoneid, instanceid, charid, x, y, z, heading, dbid); - + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { safe_delete_array(query); cerr << "Error1 in UpdatePlayerCorpse query " << errbuf << endl; return 0; } safe_delete_array(query); - + if (affected_rows == 0) { cerr << "Error2 in UpdatePlayerCorpse query: affected_rows = 0" << endl; return 0; @@ -1605,20 +1605,20 @@ uint32 ZoneDatabase::CreatePlayerCorpse(uint32 charid, const char* charname, uin //MYSQL_ROW row; uint32 affected_rows = 0; uint32 last_insert_id = 0; - + end += sprintf(end, "Insert into player_corpses SET data="); *end++ = '\''; end += DoEscapeString(end, (char*)data, datasize); *end++ = '\''; end += sprintf(end,", charname='%s', zoneid=%u, instanceid=%u, charid=%d, x=%1.1f, y=%1.1f, z=%1.1f, heading=%1.1f, timeofdeath=Now(), IsBurried=0", charname, zoneid, instanceid, charid, x, y, z, heading); - + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows, &last_insert_id)) { safe_delete_array(query); cerr << "Error1 in CreatePlayerCorpse query " << errbuf << endl; return 0; } safe_delete_array(query); - + if (affected_rows == 0) { cerr << "Error2 in CreatePlayerCorpse query: affected_rows = 0" << endl; return 0; @@ -1640,7 +1640,7 @@ bool ZoneDatabase::CreatePlayerCorpseBackup(uint32 dbid, uint32 charid, const ch uint32 last_insert_id = 0; bool result = false; DBPlayerCorpse_Struct* dbpcs = (DBPlayerCorpse_Struct*) data; - + if (dbid != 0) { if(RuleB(Character, LeaveCorpses) == true && dbpcs->level >= RuleI(Character, DeathItemLossLevel)){ end += sprintf(end, "Insert into player_corpses_backup SET data="); @@ -1648,7 +1648,7 @@ bool ZoneDatabase::CreatePlayerCorpseBackup(uint32 dbid, uint32 charid, const ch end += DoEscapeString(end, (char*)data, datasize); *end++ = '\''; end += sprintf(end,", charname='%s', zoneid=%u, instanceid=%u, charid=%d, x=%1.1f, y=%1.1f, z=%1.1f, heading=%1.1f, timeofdeath=Now(), IsBurried=0, id=%u", charname, zoneid, instanceid, charid, x, y, z, heading, dbid); - + if (RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { if (affected_rows == 1) result = true; @@ -1672,7 +1672,7 @@ uint32 ZoneDatabase::GetPlayerBurriedCorpseCount(uint32 char_id) { MYSQL_RES *result; MYSQL_ROW row; uint32 CorpseCount = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "select count(*) from player_corpses where charid = '%u' and IsBurried = 1", char_id), errbuf, &result)) { row = mysql_fetch_row(result); CorpseCount = atoi(row[0]); @@ -1681,7 +1681,7 @@ uint32 ZoneDatabase::GetPlayerBurriedCorpseCount(uint32 char_id) { else { cerr << "Error in GetPlayerBurriedCorpseCount query '" << query << "' " << errbuf << endl; } - + safe_delete_array(query); return CorpseCount; @@ -1693,7 +1693,7 @@ uint32 ZoneDatabase::GetPlayerCorpseCount(uint32 char_id) { MYSQL_RES *result; MYSQL_ROW row; uint32 CorpseCount = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "select count(*) from player_corpses where charid = '%u'", char_id), errbuf, &result)) { row = mysql_fetch_row(result); CorpseCount = atoi(row[0]); @@ -1702,7 +1702,7 @@ uint32 ZoneDatabase::GetPlayerCorpseCount(uint32 char_id) { else { cerr << "Error in GetPlayerCorpseCount query '" << query << "' " << errbuf << endl; } - + safe_delete_array(query); return CorpseCount; @@ -1714,7 +1714,7 @@ uint32 ZoneDatabase::GetPlayerCorpseID(uint32 char_id, uint8 corpse) { MYSQL_RES *result; MYSQL_ROW row; uint32 id = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "select id from player_corpses where charid = '%u'", char_id), errbuf, &result)) { for (int i=0; iwrite(EQEMuLog::Error, "Error moving corpses, Query = %s, Error = %s\n", query, errbuf); safe_delete_array(query); - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, charname, data, timeofdeath, rezzed FROM player_corpses WHERE charid='%u'" "ORDER BY timeofdeath", char_id), errbuf, &result)) { @@ -1817,7 +1817,7 @@ bool ZoneDatabase::SummonAllPlayerCorpses(uint32 char_id, uint32 dest_zoneid, ui } else LogFile->write(EQEMuLog::Error, "Error in SummonAllPlayerCorpses Query = %s, Error = %s\n", query, errbuf); - + safe_delete_array(query); return (CorpseCount > 0); @@ -1829,9 +1829,9 @@ bool ZoneDatabase::UnburyPlayerCorpse(uint32 dbid, uint32 new_zoneid, uint16 new char* end = query; uint32 affected_rows = 0; bool Result = false; - + end += sprintf(end, "UPDATE player_corpses SET IsBurried=0, zoneid=%u, instanceid=%u, x=%f, y=%f, z=%f, heading=%f, timeofdeath=Now(), WasAtGraveyard=0 WHERE id=%u", new_zoneid, new_instanceid, new_x, new_y, new_z, new_heading, dbid); - + if (RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { if (affected_rows == 1) Result = true; @@ -1853,7 +1853,7 @@ Corpse* ZoneDatabase::LoadPlayerCorpse(uint32 player_corpse_id) { MYSQL_ROW row; Corpse* NewCorpse = 0; unsigned long* lengths; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, charid, charname, x, y, z, heading, data, timeofdeath, rezzed, WasAtGraveyard FROM player_corpses WHERE id='%u'", player_corpse_id), errbuf, &result)) { row = mysql_fetch_row(result); lengths = mysql_fetch_lengths(result); @@ -1868,7 +1868,7 @@ Corpse* ZoneDatabase::LoadPlayerCorpse(uint32 player_corpse_id) { cerr << "Error in LoadPlayerCorpse query '" << query << "' " << errbuf << endl; cerr << "Note that if your missing the 'rezzed' field you can add it with:\nALTER TABLE `player_corpses` ADD `rezzed` TINYINT UNSIGNED DEFAULT \"0\";\n"; } - + safe_delete_array(query); return NewCorpse; @@ -1880,7 +1880,7 @@ bool ZoneDatabase::LoadPlayerCorpses(uint32 iZoneID, uint16 iInstanceID) { MYSQL_RES *result; MYSQL_ROW row; uint32 query_length = 0; - + unsigned long* lengths; if(!RuleB(Zone, EnableShadowrest)) @@ -1902,7 +1902,7 @@ bool ZoneDatabase::LoadPlayerCorpses(uint32 iZoneID, uint16 iInstanceID) { safe_delete_array(query); return false; } - + return true; } @@ -1912,7 +1912,7 @@ uint32 ZoneDatabase::GetFirstCorpseID(uint32 char_id) { MYSQL_RES *result; MYSQL_ROW row; uint32 CorpseID = 0; - + MakeAnyLenString(&query, "SELECT id FROM player_corpses WHERE charid='%u' AND IsBurried=0 ORDER BY timeofdeath LIMIT 1", char_id); if (RunQuery(query, strlen(query), errbuf, &result)) { if (mysql_num_rows(result)!= 0){ @@ -1926,7 +1926,7 @@ uint32 ZoneDatabase::GetFirstCorpseID(uint32 char_id) { safe_delete_array(query); return 0; } - + safe_delete_array(query); return CorpseID; } @@ -1934,13 +1934,13 @@ uint32 ZoneDatabase::GetFirstCorpseID(uint32 char_id) { bool ZoneDatabase::BuryPlayerCorpse(uint32 dbid) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried = 1 WHERE id=%d", dbid), errbuf)) { cerr << "Error in BuryPlayerCorpse query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + safe_delete_array(query); return true; } @@ -1948,13 +1948,13 @@ bool ZoneDatabase::BuryPlayerCorpse(uint32 dbid) { bool ZoneDatabase::BuryAllPlayerCorpses(uint32 charid) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried = 1 WHERE charid=%d", charid), errbuf)) { cerr << "Error in BuryPlayerCorpse query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + safe_delete_array(query); return true; } @@ -1962,13 +1962,13 @@ bool ZoneDatabase::BuryAllPlayerCorpses(uint32 charid) { bool ZoneDatabase::DeletePlayerCorpse(uint32 dbid) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "Delete from player_corpses where id=%d", dbid), errbuf)) { cerr << "Error in DeletePlayerCorpse query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + safe_delete_array(query); return true; } @@ -1976,7 +1976,7 @@ bool ZoneDatabase::DeletePlayerCorpse(uint32 dbid) { // these functions operate with a material slot, which is from 0 to 8 uint32 Corpse::GetEquipment(uint8 material_slot) const { int invslot; - + if(material_slot > 8) { return 0; diff --git a/zone/QGlobals.h b/zone/QGlobals.h index f449b4fb8..577fd3c11 100644 --- a/zone/QGlobals.h +++ b/zone/QGlobals.h @@ -9,7 +9,7 @@ struct QGlobal { QGlobal() { } - QGlobal(std::string g_name, uint32 c_id, uint32 n_id, uint32 z_id, std::string n_value, uint32 expire_date) + QGlobal(std::string g_name, uint32 c_id, uint32 n_id, uint32 z_id, std::string n_value, uint32 expire_date) : name(g_name), char_id(c_id), npc_id(n_id), zone_id(z_id), value(n_value), expdate(expire_date) { id = 0; } std::string name; uint32 char_id; @@ -29,7 +29,7 @@ public: //assumes cacheA is already a valid or empty list and doesn't check for valid items. static void Combine(std::list &cacheA, std::list cacheB, uint32 npcID, uint32 charID, uint32 zoneID); - + void PurgeExpiredGlobals(); void LoadByNPCID(uint32 npcID); //npc void LoadByCharID(uint32 charID); //client diff --git a/zone/Quest.cpp b/zone/Quest.cpp index 7128b9950..5efd868ba 100644 --- a/zone/Quest.cpp +++ b/zone/Quest.cpp @@ -71,7 +71,7 @@ bool ZoneDatabase::OpenQuery(char* zonename) { strcpy( Quest::m_pQuests[ l_cnt ].m_pQuestText, row[1] ); Quest::m_pQuests[ l_cnt ].m_pQuestEnd = new char[ strlen( row[2] )+1 ]; strcpy( Quest::m_pQuests[ l_cnt ].m_pQuestEnd, row[2] ); - + Quest::m_pQuests[ l_cnt ].m_iNpcId = atoi( row[3] ); Quest::m_pQuests[ l_cnt ].m_iQuestObject= atoi( row[4] ); Quest::m_pQuests[ l_cnt ].m_iQuestPrice = atoi( row[5] ); diff --git a/zone/Quest.h b/zone/Quest.h index f394a07c2..5c30b3be4 100644 --- a/zone/Quest.h +++ b/zone/Quest.h @@ -33,7 +33,7 @@ typedef struct _tag_quest_entry{ class Quest{ -public: +public: Quest(); ~Quest(); static pquest_entry Test(int NpcId, int QuestObject); diff --git a/zone/QuestParserCollection.cpp b/zone/QuestParserCollection.cpp index e61ef57cf..552f3a9e0 100644 --- a/zone/QuestParserCollection.cpp +++ b/zone/QuestParserCollection.cpp @@ -51,7 +51,7 @@ void QuestParserCollection::ReloadQuests(bool reset_timers) { bool QuestParserCollection::HasQuestSub(uint32 npcid, const char *subname) { std::map::iterator iter = _npc_quest_status.find(npcid); - + if(iter != _npc_quest_status.end()) { //loaded or failed to load if(iter->second != QuestFailedToLoad) { @@ -97,7 +97,7 @@ bool QuestParserCollection::PlayerHasQuestSub(const char *subname) { if(qi) { _global_player_quest_status = qi->GetIdentifier(); } - + qi = GetQIByPlayerQuest(); if(qi) { _player_quest_status = qi->GetIdentifier(); @@ -207,7 +207,7 @@ void QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, std::s qi->EventPlayer(evt, client, data, extra_data); } - } else { + } else { if(_global_player_quest_status != QuestFailedToLoad) { std::map::iterator iter = _interfaces.find(_global_player_quest_status); if(iter != _interfaces.end()) @@ -435,7 +435,7 @@ QuestInterface *QuestParserCollection::GetQIByPlayerQuest() { } iter++; - } + } //second look for /quests/zone/player.ext (precedence) filename = "quests/"; @@ -555,7 +555,7 @@ QuestInterface *QuestParserCollection::GetQIBySpellQuest(uint32 spell_id) { } iter++; - } + } return nullptr; } @@ -580,7 +580,7 @@ QuestInterface *QuestParserCollection::GetQIByItemQuest(std::string item_script) } iter++; - } + } return nullptr; } diff --git a/zone/StringIDs.h b/zone/StringIDs.h index 03d2b6769..d54f56c23 100644 --- a/zone/StringIDs.h +++ b/zone/StringIDs.h @@ -86,7 +86,7 @@ #define INVIS_BEGIN_BREAK 275 //You feel yourself starting to appear. #define DISCIPLINE_CONLOST 278 //You lose the concentration to remain in your fighting discipline. #define REZ_REGAIN 289 //You regain some experience from resurrection. -#define DUP_LORE 290 //Duplicate lore items are not allowed. +#define DUP_LORE 290 //Duplicate lore items are not allowed. #define TGB_ON 293 //Target other group buff is *ON*. #define TGB_OFF 294 //Target other group buff is *OFF*. #define LDON_SENSE_TRAP1 306 //You do not Sense any traps. @@ -171,7 +171,7 @@ #define DUEL_FINISHED 1088 //dont know text #define EATING_MESSAGE 1091 //Chomp, chomp, chomp... %1 takes a bite from a %2. #define DRINKING_MESSAGE 1093 //Glug, glug, glug... %1 takes a drink from a %2. -#define SUCCESSFUL_TAUNT 1095 //I'll teach you to interfere with me %3. +#define SUCCESSFUL_TAUNT 1095 //I'll teach you to interfere with me %3. #define PET_SIT_STRING 1130 //Changing position, Master. #define PET_CALMING 1131 //Sorry, Master..calming down. #define PET_FOLLOWING 1132 //Following you, Master. @@ -269,7 +269,7 @@ #define MAX_RAID_LEADERSHIP_POINTS 8591 // #define LEADERSHIP_EXP_ON 8653 // #define LEADERSHIP_EXP_OFF 8654 // -#define CURRENT_SPELL_EFFECTS 8757 //%1's current spell effects: +#define CURRENT_SPELL_EFFECTS 8757 //%1's current spell effects: #define GAIN_GROUP_LEADERSHIP_EXP 8788 // #define GAIN_RAID_LEADERSHIP_EXP 8789 // #define BUFF_MINUTES_REMAINING 8799 //%1 (%2 minutes remaining) diff --git a/zone/ZoneConfig.cpp b/zone/ZoneConfig.cpp index d5b182899..3c3f4ffdc 100644 --- a/zone/ZoneConfig.cpp +++ b/zone/ZoneConfig.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA diff --git a/zone/ZoneConfig.h b/zone/ZoneConfig.h index 76e116514..41eae1b9c 100644 --- a/zone/ZoneConfig.h +++ b/zone/ZoneConfig.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -37,7 +37,7 @@ class ZoneConfig : public EQEmuConfig { // Produce a const singleton static const ZoneConfig *get() { - if (_zone_config == nullptr) + if (_zone_config == nullptr) LoadConfig(); return(_zone_config); } diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 524ae8d85..347c52264 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -41,7 +41,7 @@ void EntityList::CheckClientAggro(Client *around) { Mob* mob = iterator.GetData(); if(mob->IsClient()) //also ensures that mob != around continue; - + if(mob->CheckWillAggro(around)) { if(mob->IsEngaged()) { @@ -57,24 +57,24 @@ void EntityList::CheckClientAggro(Client *around) { void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbose) { float d2 = d*d; - + towho->Message(0, "Describing aggro for %s", from_who->GetName()); - + bool engaged = from_who->IsEngaged(); if(engaged) { Mob *top = from_who->GetHateTop(); towho->Message(0, ".. I am currently fighting with %s", top == nullptr?"(nullptr)":top->GetName()); } bool check_npcs = from_who->WillAggroNPCs(); - + if(verbose) { char namebuf[256]; - + int my_primary = from_who->GetPrimaryFaction(); Mob *own = from_who->GetOwner(); if(own != nullptr) my_primary = own->GetPrimaryFaction(); - + if(my_primary == 0) { strcpy(namebuf, "(No faction)"); } else if(my_primary < 0) { @@ -85,16 +85,16 @@ void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbo } towho->Message(0, ".. I am on faction %s (%d)\n", namebuf, my_primary); } - + LinkedListIterator iterator(mob_list); for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { Mob* mob = iterator.GetData(); if(mob->IsClient()) //also ensures that mob != around continue; - + if(mob->DistNoRoot(*from_who) > d2) continue; - + if(engaged) { uint32 amm = from_who->GetHateAmount(mob); if(amm == 0) { @@ -113,7 +113,7 @@ void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbo void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { //this logic is duplicated from below, try to keep it up to date. float iAggroRange = GetAggroRange(); - + float t1, t2, t3; t1 = mob->GetX() - GetX(); t2 = mob->GetY() - GetY(); @@ -132,7 +132,7 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { t1, t2, t3, iAggroRange); return; } - + if(mob->IsInvisible(this)) { towho->Message(0, "...%s is invisible to me. ", mob->GetName()); return; @@ -142,14 +142,14 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { || mob->CastToClient()->IsLD() || mob->CastToClient()->IsBecomeNPC() || mob->CastToClient()->GetGM() - ) + ) )) { towho->Message(0, "...%s is my owner. ", mob->GetName()); return; } - - + + if(mob == GetOwner()) { towho->Message(0, "...%s a GM or is not connected. ", mob->GetName()); return; @@ -162,13 +162,13 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { dist2, iAggroRange2); return; } - + if(GetINT() > 75 && mob->GetLevelCon(GetLevel()) == CON_GREEN ) { towho->Message(0, "...%s is red to me (basically)", mob->GetName(), dist2, iAggroRange2); return; } - + if(verbose) { int my_primary = GetPrimaryFaction(); int mob_primary = mob->GetPrimaryFaction(); @@ -178,7 +178,7 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { own = mob->GetOwner(); if(mob_primary > 0 && own != nullptr) mob_primary = own->GetPrimaryFaction(); - + if(mob_primary == 0) { towho->Message(0, "...%s has no primary faction", mob->GetName()); } else if(mob_primary < 0) { @@ -214,9 +214,9 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { } } } - + FACTION_VALUE fv = mob->GetReverseFactionCon(this); - + if(!( fv == FACTION_SCOWLS || @@ -230,12 +230,12 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { if(fv == FACTION_THREATENLY) { towho->Message(0, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName()); } - + if(!CheckLosFN(mob)) { - towho->Message(0, "...%s is out of sight.", mob->GetName()); + towho->Message(0, "...%s is out of sight.", mob->GetName()); } - - towho->Message(0, "...%s meets all conditions, I should be attacking them.", mob->GetName()); + + towho->Message(0, "...%s meets all conditions, I should be attacking them.", mob->GetName()); } /* @@ -249,24 +249,24 @@ bool Mob::CheckWillAggro(Mob *mob) { //sometimes if a client has some lag while zoning into a dangerous place while either invis or a GM //they will aggro mobs even though it's supposed to be impossible, to lets make sure we've finished connecting - if (mob->IsClient()) { + if (mob->IsClient()) { if (!mob->CastToClient()->ClientFinishedLoading() || mob->CastToClient()->IsHoveringForRespawn()) return false; } - + Mob *ownr = mob->GetOwner(); if(ownr && ownr->IsClient() && !ownr->CastToClient()->ClientFinishedLoading()) return false; float iAggroRange = GetAggroRange(); - + // Check If it's invisible and if we can see invis // Check if it's a client, and that the client is connected and not linkdead, // and that the client isn't Playing an NPC, with thier gm flag on // Check if it's not a Interactive NPC // Trumpcard: The 1st 3 checks are low cost calcs to filter out unnessecary distance checks. Leave them at the beginning, they are the most likely occurence. // Image: I moved this up by itself above faction and distance checks because if one of these return true, theres no reason to go through the other information - + float t1, t2, t3; t1 = mob->GetX() - GetX(); t2 = mob->GetY() - GetY(); @@ -287,7 +287,7 @@ bool Mob::CheckWillAggro(Mob *mob) { || mob->CastToClient()->IsLD() || mob->CastToClient()->IsBecomeNPC() || mob->CastToClient()->GetGM() - ) + ) )) { return(false); @@ -308,11 +308,11 @@ bool Mob::CheckWillAggro(Mob *mob) { // Skip it, out of range return(false); } - + //Image: Get their current target and faction value now that its required //this function call should seem backwards FACTION_VALUE fv = mob->GetReverseFactionCon(this); - + // Make sure they're still in the zone // Are they in range? // Are they kos? @@ -362,7 +362,7 @@ bool Mob::CheckWillAggro(Mob *mob) { printf("Faction: %d\n", fv); printf("Int: %d\n", GetINT()); printf("Con: %d\n", GetLevelCon(mob->GetLevel())); -#endif +#endif return(false); } @@ -381,11 +381,11 @@ Mob* EntityList::AICheckCloseAggro(Mob* sender, float iAggroRange, float iAssist //float distZ; while(iterator.MoreElements()) { Mob* mob = iterator.GetData(); - + if(sender->CheckWillAggro(mob)) { return(mob); } - + iterator.Advance(); } //LogFile->write(EQEMuLog::Debug, "Check aggro for %s no target.", sender->GetName()); @@ -407,7 +407,7 @@ int EntityList::GetHatedCount(Mob *attacker, Mob *exclude) { NPC* mob = iterator.GetData(); if(!mob || (mob == exclude)) continue; - + if(!mob->IsEngaged()) continue; if(mob->IsFeared() || mob->IsMezzed()) continue; @@ -419,7 +419,7 @@ int EntityList::GetHatedCount(Mob *attacker, Mob *exclude) { float AggroRange = mob->GetAggroRange(); // Square it because we will be using DistNoRoot - + AggroRange = AggroRange * AggroRange; if(mob->DistNoRoot(*attacker) > AggroRange) continue; @@ -438,9 +438,9 @@ void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) { return; if (sender->GetPrimaryFaction() == 0 ) return; // well, if we dont have a faction set, we're gonna be indiff to everybody - + LinkedListIterator iterator(npc_list); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { NPC* mob = iterator.GetData(); if(!mob){ @@ -480,8 +480,8 @@ void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) { //attacking someone on same faction, or a friend //Father Nitwit: make sure we can see them. if(mob->CheckLosFN(sender)) { -#if (EQDEBUG>=5) - LogFile->write(EQEMuLog::Debug, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f", +#if (EQDEBUG>=5) + LogFile->write(EQEMuLog::Debug, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f", sender->GetName(), attacker->GetName(), mob->GetName(), attacker->GetName(), mob->DistNoRoot(*sender), fabs(sender->GetZ()+mob->GetZ())); #endif mob->AddToHateList(attacker, 1, 0, false); @@ -528,7 +528,7 @@ bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack) return false; else if(our_owner && our_owner == target) return false; - + //cannot hurt untargetable mobs bodyType bt = target->GetBodyType(); @@ -553,10 +553,10 @@ bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack) return false; } } - + // solar: the format here is a matrix of mob type vs mob type. // redundant ones are omitted and the reverse is tried if it falls through. - + // first figure out if we're pets. we always look at the master's flags. // no need to compare pets to anything mob1 = our_owner ? our_owner : this; @@ -571,7 +571,7 @@ bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack) { c1 = mob1->CastToClient(); c2 = mob2->CastToClient(); - + if // if both are pvp they can fight ( c1->GetPVP() && @@ -590,19 +590,19 @@ bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack) return false; } else if(_NPC(mob2)) // client vs npc - { + { return true; } else if(_BECOMENPC(mob2)) // client vs becomenpc { c1 = mob1->CastToClient(); becomenpc = mob2->CastToClient(); - + if(c1->GetLevel() > becomenpc->GetBecomeNPCLevel()) return false; else return true; - } + } else if(_CLIENTCORPSE(mob2)) // client vs client corpse { return false; @@ -722,7 +722,7 @@ bool Mob::IsBeneficialAllowed(Mob *target) return true; // solar: see IsAttackAllowed for notes - + // first figure out if we're pets. we always look at the master's flags. // no need to compare pets to anything mob1 = this->GetOwnerID() ? this->GetOwner() : this; @@ -880,7 +880,7 @@ bool Mob::CombatRange(Mob* other) // prevention of ridiculously sized hit boxes if (size_mod > 10000) size_mod = size_mod / 7; - + if (DistNoRoot(*other) <= size_mod) { return true; @@ -1036,16 +1036,16 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { #endif } _ZP(Mob_CheckLosFN); - + VERTEX myloc; VERTEX oloc; - + #define LOS_DEFAULT_HEIGHT 6.0f - + myloc.x = GetX(); myloc.y = GetY(); myloc.z = GetZ() + (GetSize()==0.0?LOS_DEFAULT_HEIGHT:GetSize())/2 * HEAD_POSITION; - + oloc.x = posX; oloc.y = posY; oloc.z = posZ + (mobSize==0.0?LOS_DEFAULT_HEIGHT:mobSize)/2 * SEE_POSITION; @@ -1053,11 +1053,11 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { #if LOSDEBUG>=5 LogFile->write(EQEMuLog::Debug, "LOS from (%.2f, %.2f, %.2f) to (%.2f, %.2f, %.2f) sizes: (%.2f, %.2f)", myloc.x, myloc.y, myloc.z, oloc.x, oloc.y, oloc.z, GetSize(), mobSize); #endif - + FACE *onhit; NodeRef mynode; NodeRef onode; - + VERTEX hit; //see if anything in our node is in the way mynode = zone->zonemap->SeekNode( zone->zonemap->GetRoot(), myloc.x, myloc.y); @@ -1067,7 +1067,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { LogFile->write(EQEMuLog::Debug, "Check LOS for %s target position, cannot see.", GetName()); LogFile->write(EQEMuLog::Debug, "\tPoly: (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f)\n", onhit->a.x, onhit->a.y, onhit->a.z, - onhit->b.x, onhit->b.y, onhit->b.z, + onhit->b.x, onhit->b.y, onhit->b.z, onhit->c.x, onhit->c.y, onhit->c.z); #endif return(false); @@ -1078,7 +1078,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { LogFile->write(EQEMuLog::Debug, "WTF, I have no node, what am I standing on??? (%.2f, %.2f).", myloc.x, myloc.y); } #endif - + //see if they are in a different node. //if so, see if anything in their node is blocking me. if(! zone->zonemap->LocWithinNode(mynode, oloc.x, oloc.y)) { @@ -1089,7 +1089,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { LogFile->write(EQEMuLog::Debug, "Check LOS for %s target position, cannot see (2).", GetName()); LogFile->write(EQEMuLog::Debug, "\tPoly: (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f)\n", onhit->a.x, onhit->a.y, onhit->a.z, - onhit->b.x, onhit->b.y, onhit->b.z, + onhit->b.x, onhit->b.y, onhit->b.z, onhit->c.x, onhit->c.y, onhit->c.z); #endif return(false); @@ -1101,23 +1101,23 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { } #endif } - + /* if(zone->zonemap->LineIntersectsZone(myloc, oloc, CHECK_LOS_STEP, &onhit)) { #if LOSDEBUG>=5 LogFile->write(EQEMuLog::Debug, "Check LOS for %s target %s, cannot see.", GetName(), other->GetName() ); LogFile->write(EQEMuLog::Debug, "\tPoly: (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f)\n", onhit->a.x, onhit->a.y, onhit->a.z, - onhit->b.x, onhit->b.y, onhit->b.z, + onhit->b.x, onhit->b.y, onhit->b.z, onhit->c.x, onhit->c.y, onhit->c.z); #endif return(false); }*/ - + #if LOSDEBUG>=5 LogFile->write(EQEMuLog::Debug, "Check LOS for %s target position, CAN SEE.", GetName()); #endif - + return(true); } @@ -1189,8 +1189,8 @@ int32 Mob::CheckAggroAmount(uint16 spellid, bool isproc) { int val = CalcSpellEffectValue_formula(spells[spell_id].formula[o], spells[spell_id].base[o], spells[spell_id].max[o], this->GetLevel(), spell_id); if (val < 0) { - AggroAmount -= val*2; - } + AggroAmount -= val*2; + } break; } case SE_ResistMagic: @@ -1245,7 +1245,7 @@ int32 Mob::CheckAggroAmount(uint16 spellid, bool isproc) { } case SE_Amnesia: case SE_Silence:{ - AggroAmount += slevel*2; + AggroAmount += slevel*2; break; } case SE_Destroy:{ @@ -1287,7 +1287,7 @@ int32 Mob::CheckAggroAmount(uint16 spellid, bool isproc) { } case SE_CancelMagic: case SE_DispelDetrimental:{ - AggroAmount += slevel; + AggroAmount += slevel; break; } case SE_ReduceHate: @@ -1313,7 +1313,7 @@ int32 Mob::CheckAggroAmount(uint16 spellid, bool isproc) { AggroAmount = AggroAmount * RuleI(Aggro, SongAggroMod) / 100; if (GetOwner() && IsPet()) AggroAmount = AggroAmount * RuleI(Aggro, PetSpellAggroMod) / 100; - + if(AggroAmount > 0) { @@ -1333,8 +1333,8 @@ int32 Mob::CheckAggroAmount(uint16 spellid, bool isproc) { //every time you cast on live you get a certain amount of "this is a spell" aggro //confirmed by EQ devs to be 100 exactly at level 85. From their wording it doesn't seem like it's affected //by hate modifiers either. - //AggroAmount += (slevel*slevel/72); - // Saved so I can reimplement it; + //AggroAmount += (slevel*slevel/72); + // Saved so I can reimplement it; // this should only be on the spell to aggro the npc not every spell } @@ -1385,7 +1385,7 @@ int32 Mob::CheckHealAggroAmount(uint16 spellid, uint32 heal_possible) { //Live AA - Spell casting subtlety HateMod += aabonuses.hatemod + spellbonuses.hatemod + itembonuses.hatemod; - + AggroAmount = (AggroAmount * HateMod) / 100; //made up number probably scales a bit differently on live but it seems like it will be close enough @@ -1425,7 +1425,7 @@ void Mob::RemoveFromFeignMemory(Client* attacker) { void Mob::ClearFeignMemory() { std::set::iterator RememberedCharID = feign_memory_list.begin(); - while (RememberedCharID != feign_memory_list.end()) + while (RememberedCharID != feign_memory_list.end()) { Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID); if(remember_client != nullptr) //Still in zone @@ -1461,15 +1461,15 @@ bool Mob::PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id) { //2: The mob makes a resistance check against the charm if (resist_check == 100) - return true; - + return true; + else { if (caster->IsClient()) { - //3: At maxed ability, Total Domination has a 50% chance of preventing the charm break that otherwise would have occurred. + //3: At maxed ability, Total Domination has a 50% chance of preventing the charm break that otherwise would have occurred. uint16 TotalDominationBonus = caster->aabonuses.CharmBreakChance + caster->spellbonuses.CharmBreakChance + caster->itembonuses.CharmBreakChance; - + if (MakeRandomInt(0, 100) < TotalDominationBonus) return true; @@ -1481,7 +1481,7 @@ bool Mob::PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id) { { // Assume this is a harmony/pacify spell if (resist_check == 100) - return true; + return true; } return false; diff --git a/zone/attack.cpp b/zone/attack.cpp index 170ed0fe7..9ced16fd8 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -62,7 +62,7 @@ bool Mob::AttackAnimation(SkillType &skillinuse, int Hand, const ItemInst* weapo const Item_Struct* item = weapon->GetItem(); #if EQDEBUG >= 11 LogFile->write(EQEMuLog::Debug, "Weapon skill:%i", item->ItemType); -#endif +#endif switch (item->ItemType) { case ItemType1HS: // 1H Slashing @@ -165,11 +165,11 @@ bool Mob::AttackAnimation(SkillType &skillinuse, int Hand, const ItemInst* weapo skillinuse = HAND_TO_HAND; type = animHand2Hand; } - + // If we're attacking with the secondary hand, play the dual wield anim if (Hand == 14) // DW anim type = animDualWield; - + DoAnim(type); return true; } @@ -202,9 +202,9 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc bool pvpmode = false; if(IsClient() && other->IsClient()) pvpmode = true; - + float bonus; - + //////////////////////////////////////////////////////// // To hit calcs go here //////////////////////////////////////////////////////// @@ -238,7 +238,7 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc } else { - chancetohit += (RuleR(Combat,HitBonusPerLevel) * level_difference); + chancetohit += (RuleR(Combat,HitBonusPerLevel) * level_difference); } mlog(COMBAT__TOHIT, "Chance to hit after level diff calc %.2f", chancetohit); @@ -268,17 +268,17 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc chancetohit += attacker->itembonuses.MeleeSkillCheck; mlog(COMBAT__TOHIT, "Applied item melee skill bonus %d, yeilding %.2f", attacker->spellbonuses.MeleeSkillCheck, chancetohit); } - + //subtract off avoidance by the defender. (Live AA - Combat Agility) bonus = defender->spellbonuses.AvoidMeleeChance + defender->itembonuses.AvoidMeleeChance + (defender->aabonuses.AvoidMeleeChance * 10); - + //AA Live - Elemental Agility if (IsPet()) { Mob *owner = defender->GetOwner(); if (!owner)return false; bonus += (owner->aabonuses.PetAvoidance + owner->spellbonuses.PetAvoidance + owner->itembonuses.PetAvoidance)*10; } - + if(bonus > 0) { chancetohit -= ((bonus * chancetohit) / 1000); mlog(COMBAT__TOHIT, "Applied avoidance chance %.2f/10, yeilding %.2f", bonus, chancetohit); @@ -295,18 +295,18 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc /* Kayen: Unknown if the HitChance and Accuracy effect's should modify 'chancetohit' - cumulatively or successively. For now all hitBonuses are cumulative. + cumulatively or successively. For now all hitBonuses are cumulative. */ - hitBonus += attacker->itembonuses.HitChanceEffect[skillinuse] + + hitBonus += attacker->itembonuses.HitChanceEffect[skillinuse] + attacker->spellbonuses.HitChanceEffect[skillinuse]+ - attacker->itembonuses.HitChanceEffect[HIGHEST_SKILL+1] + + attacker->itembonuses.HitChanceEffect[HIGHEST_SKILL+1] + attacker->spellbonuses.HitChanceEffect[HIGHEST_SKILL+1]; //Accuracy = Spell Effect , HitChance = 'Accuracy' from Item Effect //Only AA derived accuracy can be skill limited. ie (Precision of the Pathfinder, Dead Aim) - hitBonus += (attacker->itembonuses.Accuracy[HIGHEST_SKILL+1] + - attacker->spellbonuses.Accuracy[HIGHEST_SKILL+1] + + hitBonus += (attacker->itembonuses.Accuracy[HIGHEST_SKILL+1] + + attacker->spellbonuses.Accuracy[HIGHEST_SKILL+1] + attacker->aabonuses.Accuracy[HIGHEST_SKILL+1] + attacker->aabonuses.Accuracy[skillinuse] + attacker->itembonuses.HitChance) / 15.0f; @@ -323,18 +323,18 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc // Chance to hit; Max 95%, Min 30% if(chancetohit > 1000) { //if chance to hit is crazy high, that means a discipline is in use, and let it stay there - } + } else if(chancetohit > 95) { chancetohit = 95; - } + } else if(chancetohit < 5) { chancetohit = 5; } - + //I dont know the best way to handle a garunteed hit discipline being used //agains a garunteed riposte (for example) discipline... for now, garunteed hit wins - - + + #if EQDEBUG>=11 LogFile->write(EQEMuLog::Debug, "3 FINAL calculated chance to hit is: %5.2f", chancetohit); #endif @@ -344,9 +344,9 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc // float tohit_roll = MakeRandomFloat(0, 100); - + mlog(COMBAT__TOHIT, "Final hit chance: %.2f%%. Hit roll %.2f", chancetohit, tohit_roll); - + return(tohit_roll <= chancetohit); } @@ -355,13 +355,13 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) { /* solar: called when a mob is attacked, does the checks to see if it's a hit * and does other mitigation checks. 'this' is the mob being attacked. - * + * * special return values: * -1 - block * -2 - parry * -3 - riposte * -4 - dodge - * + * */ float skill; float bonus; @@ -374,7 +374,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) bool ghit = false; if((attacker->spellbonuses.MeleeSkillCheck + attacker->itembonuses.MeleeSkillCheck) > 500) ghit = true; - + ////////////////////////////////////////////////////////// // make enrage same as riposte ///////////////////////////////////////////////////////// @@ -394,7 +394,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (IsClient()) { CastToClient()->CheckIncreaseSkill(RIPOSTE, other, -10); } - + if (!ghit) { //if they are not using a garunteed hit discipline bonus = 2.0 + skill/60.0 + (GetDEX()/200); bonus *= riposte_chance; @@ -402,14 +402,14 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) RollTable[0] = bonus + (itembonuses.HeroicDEX / 25); // 25 heroic = 1%, applies to ripo, parry, block } } - - /////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////// // block /////////////////////////////////////////////////////// bool bBlockFromRear = false; bool bShieldBlockFromRear = false; - + if (this->IsClient()) { int aaChance = 0; @@ -434,7 +434,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (IsClient()) { CastToClient()->CheckIncreaseSkill(BLOCKSKILL, other, -10); } - + if (!ghit) { //if they are not using a garunteed hit discipline bonus = 2.0 + skill/35.0 + (GetDEX()/200); bonus = mod_block_chance(bonus, attacker); @@ -445,7 +445,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) RollTable[1] = RollTable[0]; } - if(damage > 0 && (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock) + if(damage > 0 && (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock) && (!other->BehindMob(this, other->GetX(), other->GetY()) || bShieldBlockFromRear)) { bool equiped = CastToClient()->m_inv.GetItem(14); if(equiped) { @@ -460,7 +460,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) } } - if(damage > 0 && (aabonuses.TwoHandBluntBlock || spellbonuses.TwoHandBluntBlock || itembonuses.TwoHandBluntBlock) + if(damage > 0 && (aabonuses.TwoHandBluntBlock || spellbonuses.TwoHandBluntBlock || itembonuses.TwoHandBluntBlock) && (!other->BehindMob(this, other->GetX(), other->GetY()) || bShieldBlockFromRear)) { bool equiped2 = CastToClient()->m_inv.GetItem(13); if(equiped2) { @@ -473,8 +473,8 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) } } } - - ////////////////////////////////////////////////////// + + ////////////////////////////////////////////////////// // parry ////////////////////////////////////////////////////// float parry_chance = 0.0f; @@ -483,9 +483,9 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) parry_chance = (100.0f + (float)defender->spellbonuses.ParryChance + (float)defender->itembonuses.ParryChance) / 100.0f; skill = CastToClient()->GetSkill(PARRY); if (IsClient()) { - CastToClient()->CheckIncreaseSkill(PARRY, other, -10); + CastToClient()->CheckIncreaseSkill(PARRY, other, -10); } - + if (!ghit) { //if they are not using a garunteed hit discipline bonus = 2.0 + skill/60.0 + (GetDEX()/200); bonus *= parry_chance; @@ -496,7 +496,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) else{ RollTable[2] = RollTable[1]; } - + //////////////////////////////////////////////////////// // dodge //////////////////////////////////////////////////////// @@ -508,7 +508,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (IsClient()) { CastToClient()->CheckIncreaseSkill(DODGE, other, -10); } - + if (!ghit) { //if they are not using a garunteed hit discipline bonus = 2.0 + skill/60.0 + (GetAGI()/200); bonus *= dodge_chance; @@ -538,7 +538,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) } mlog(COMBAT__DAMAGE, "Final damage after all avoidances: %d", damage); - + if (damage < 0) return true; return false; @@ -575,7 +575,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) { armor = CastToNPC()->GetRawAC(); - if(!IsPet()) + if(!IsPet()) { armor = (armor / RuleR(Combat, NPCACFactor)); } @@ -603,7 +603,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) { softcap = RuleI(Combat, PlateACSoftcap); } - + softcap += shield_ac; armor += shield_ac; softcap += (softcap * (aa_mit * RuleR(Combat, AAMitigationACFactor))); @@ -726,16 +726,16 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) acreduction=atof(tmp); if (acreduction>100) acreduction=100; } - + if (database.GetVariable("ACrandom", tmp, 9)) { acrandom = (int) ((atof(tmp)+1) * 100); if (acrandom>10100) acrandom=10100; } - + if (acreduction>0) { damage -= (int) (GetAC() * acreduction/100.0f); - } + } if (acrandom>0) { damage -= (myac * MakeRandomInt(0, acrandom) / 10000); } @@ -775,7 +775,7 @@ int Mob::GetWeaponDamage(Mob *against, const Item_Struct *weapon_item) { if(against->GetInvul() || against->SpecAttacks[IMMUNE_MELEE]){ return 0; } - + //check to see if our weapons or fists are magical. if(against->SpecAttacks[IMMUNE_MELEE_NONMAGICAL]){ if(weapon_item){ @@ -796,7 +796,7 @@ int Mob::GetWeaponDamage(Mob *against, const Item_Struct *weapon_item) { else if(GetOwner() && GetLevel() >= RuleI(Combat, PetAttackMagicLevel)){ //pets wouldn't actually use this but... //it gives us an idea if we can hit due to the dual nature of this function - dmg = 1; + dmg = 1; } else if(SpecAttacks[SPECATK_MAGICAL]) { @@ -821,7 +821,7 @@ int Mob::GetWeaponDamage(Mob *against, const Item_Struct *weapon_item) { } } } - + int eledmg = 0; if(!against->SpecAttacks[IMMUNE_MAGIC]){ if(weapon_item && weapon_item->ElemDmgAmt){ @@ -903,13 +903,13 @@ int Mob::GetWeaponDamage(Mob *against, const ItemInst *weapon_item, uint32 *hate if(weapon_item){ // check to see if the weapon is magic bool MagicWeapon = false; - if(weapon_item->GetItem() && weapon_item->GetItem()->Magic) + if(weapon_item->GetItem() && weapon_item->GetItem()->Magic) MagicWeapon = true; - else { + else { if(spellbonuses.MagicWeapon || itembonuses.MagicWeapon) MagicWeapon = true; } - + if(MagicWeapon) { if(IsClient() && GetLevel() < weapon_item->GetItem()->RecLevel){ @@ -1103,12 +1103,12 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b LogFile->write(EQEMuLog::Error, "A null Mob object was passed to Client::Attack() for evaluation!"); return false; } - + if(!GetTarget()) SetTarget(other); - + mlog(COMBAT__ATTACKS, "Attacking %s with hand %d %s", other?other->GetName():"(nullptr)", Hand, bRiposte?"(this is a riposte)":""); - + //SetAttackTimer(); if ( (IsCasting() && GetClass() != BARD && !IsFromSpell) @@ -1129,7 +1129,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if (GetFeigned()) return false; // Rogean: How can you attack while feigned? Moved up from Aggro Code. - + ItemInst* weapon; if (Hand == 14){ // Kaiyodo - Pick weapon from the attacking hand weapon = GetInv().GetItem(SLOT_SECONDARY); @@ -1149,13 +1149,13 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b } else { mlog(COMBAT__ATTACKS, "Attacking without a weapon."); } - + // calculate attack_skill and skillinuse depending on hand and weapon // also send Packet to near clients SkillType skillinuse; AttackAnimation(skillinuse, Hand, weapon); mlog(COMBAT__ATTACKS, "Attacking with %s in slot %d using skill %d", weapon?weapon->GetItem()->Name:"Fist", Hand, skillinuse); - + /// Now figure out damage int damage = 0; uint8 mylevel = GetLevel() ? GetLevel() : 1; @@ -1163,11 +1163,11 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if (weapon) hate = weapon->GetItem()->Damage + weapon->GetItem()->ElemDmgAmt; int weapon_damage = GetWeaponDamage(other, weapon, &hate); if (hate == 0 && weapon_damage > 1) hate = weapon_damage; - + //if weapon damage > 0 then we know we can hit the target with this weapon //otherwise we cannot and we set the damage to -5 later on if(weapon_damage > 0){ - + //Berserker Berserk damage bonus if(berserk && GetClass() == BERSERKER){ int bonus = 3 + GetLevel()/10; //unverified @@ -1178,7 +1178,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b //try a finishing blow.. if successful end the attack if(TryFinishingBlow(other, skillinuse)) return (true); - + int min_hit = 1; int max_hit = (2*weapon_damage*GetDamageTable(skillinuse)) / 100; @@ -1220,7 +1220,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b //Live AA - Sinister Strikes *Adds weapon damage bonus to offhand weapon. if (Hand==14) { if (aabonuses.SecondaryDmgInc || itembonuses.SecondaryDmgInc || spellbonuses.SecondaryDmgInc){ - + ucDamageBonus = GetWeaponDamageBonus( weapon ? weapon->GetItem() : (const Item_Struct*) nullptr ); min_hit += (int) ucDamageBonus; @@ -1265,20 +1265,20 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if (bRiposte) return false; else { if (Hand == 14) {// Do we even have it & was attack with mainhand? If not, don't bother with other calculations - //Live AA - SlipperyAttacks + //Live AA - SlipperyAttacks //This spell effect most likely directly modifies the actual riposte chance when using offhand attack. int16 OffhandRiposteFail = aabonuses.OffhandRiposteFail + itembonuses.OffhandRiposteFail + spellbonuses.OffhandRiposteFail; OffhandRiposteFail *= -1; //Live uses a negative value for this. - if (OffhandRiposteFail && + if (OffhandRiposteFail && (OffhandRiposteFail > 99 || (MakeRandomInt(0, 100) < OffhandRiposteFail))) { damage = 0; // Counts as a miss slippery_attack = true; - } else + } else DoRiposte(other); if (IsDead()) return false; } - else + else DoRiposte(other); if (IsDead()) return false; } @@ -1286,7 +1286,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if (((damage < 0) || slippery_attack) && !bRiposte && !IsStrikethrough) { // Hack to still allow Strikethrough chance w/ Slippery Attacks AA int16 bonusStrikeThrough = itembonuses.StrikeThrough + spellbonuses.StrikeThrough + aabonuses.StrikeThrough; - + if(bonusStrikeThrough && (MakeRandomInt(0, 100) < bonusStrikeThrough)) { Message_StringID(MT_StrikeThrough, STRIKETHROUGH_STRING); // You strike through your opponents defenses! Attack(other, Hand, false, true); // Strikethrough only gives another attempted hit @@ -1303,7 +1303,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b // If we are this far, this means we are atleast making a swing. if (!bRiposte) // Ripostes never generate any aggro. other->AddToHateList(this, hate); - + /////////////////////////////////////////////////////////// ////// Send Attack Damage /////////////////////////////////////////////////////////// @@ -1322,11 +1322,11 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b mlog(COMBAT__DAMAGE, "Melee lifetap healing for %d damage.", damage); //heal self for damage done.. HealDamage(lifetap_amt); - + if (spellbonuses.MeleeLifetap) CheckHitsRemaining(0, false,false, SE_MeleeLifetap); } - + //break invis when you attack if(invisible) { mlog(COMBAT__ATTACKS, "Removing invisibility due to melee attack."); @@ -1379,7 +1379,7 @@ void Client::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_ { if(dead || IsCorpse()) return; - + if(spell_id==0) spell_id = SPELL_UNKNOWN; @@ -1391,9 +1391,9 @@ void Client::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_ damage = ((float)damage * npcspellscale) / (float)100; } } - + // cut all PVP spell damage to 2/3 -solar - // EverHood - Blasting ourselfs is considered PvP + // EverHood - Blasting ourselfs is considered PvP //Don't do PvP mitigation if the caster is damaging himself if(other && other->IsClient() && (other != this) && damage > 0) { int PvPMitigation = 100; @@ -1403,13 +1403,13 @@ void Client::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_ PvPMitigation = 67; damage = (damage * PvPMitigation) / 100; } - + if(!ClientFinishedLoading()) damage = -5; //do a majority of the work... CommonDamage(other, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic); - + if (damage > 0) { if (spell_id == SPELL_UNKNOWN) @@ -1426,17 +1426,17 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ return; //cant die more than once... int exploss; - + mlog(COMBAT__HITS, "Fatal blow dealt by %s with %d damage, spell %d, skill %d", killerMob ? killerMob->GetName() : "Unknown", damage, spell, attack_skill); - + // // #1: Send death packet to everyone // uint8 killed_level = GetLevel(); if(!spell) spell = SPELL_UNKNOWN; - + SendLogoutPackets(); - + //make our become corpse packet, and queue to ourself before OP_Death. EQApplicationPacket app2(OP_BecomeCorpse, sizeof(BecomeCorpse_Struct)); BecomeCorpse_Struct* bc = (BecomeCorpse_Struct*)app2.pBuffer; @@ -1445,7 +1445,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ bc->y = GetY(); bc->z = GetZ(); QueuePacket(&app2); - + // make death packet EQApplicationPacket app(OP_Death, sizeof(Death_Struct)); Death_Struct* d = (Death_Struct*)app.pBuffer; @@ -1486,7 +1486,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ killerMob->CastToNPC()->DoNPCEmote(KILLEDPC,emoteid); killerMob->TrySpellOnKill(killed_level,spell); } - + if(killerMob->IsClient() && (IsDueling() || killerMob->CastToClient()->IsDueling())) { SetDueling(false); SetDuelTarget(0); @@ -1513,8 +1513,8 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ entity_list.RemoveFromTargets(this); hate_list.RemoveEnt(this); RemoveAutoXTargets(); - - + + //remove ourself from all proximities ClearAllProximities(); @@ -1589,7 +1589,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ UnmemSpellAll(true); else UnmemSpellAll(false); - + if(RuleB(Character, LeaveCorpses) && GetLevel() >= RuleI(Character, DeathItemLossLevel) || RuleB(Character, LeaveNakedCorpses)) { // creating the corpse takes the cash/items off the player too @@ -1615,11 +1615,11 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ new_corpse->SetPKItem(0); if(killerMob->CastToClient()->isgrouped) { Group* group = entity_list.GetGroupByClient(killerMob->CastToClient()); - if(group != 0) + if(group != 0) { - for(int i=0;i<6;i++) + for(int i=0;i<6;i++) { - if(group->members[i] != nullptr) + if(group->members[i] != nullptr) { new_corpse->AllowMobLoot(group->members[i],i); } @@ -1627,10 +1627,10 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ } } } - + entity_list.AddCorpse(new_corpse, GetID()); SetID(0); - + //send the become corpse packet to everybody else in the zone. entity_list.QueueClients(this, &app2, true); @@ -1703,7 +1703,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ if(g) g->MemberZoned(this); } - + Raid* r = entity_list.GetRaidByClient(this); if(r) @@ -1714,9 +1714,9 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ m_pp.zone_id = m_pp.binds[0].zoneId; m_pp.zoneInstance = 0; database.MoveCharacterToZone(this->CharacterID(), database.GetZoneName(m_pp.zone_id)); - + Save(); - + GoToDeath(); } } @@ -1725,20 +1725,20 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool { _ZP(NPC_Attack); int damage = 0; - + if (!other) { SetTarget(nullptr); LogFile->write(EQEMuLog::Error, "A null Mob object was passed to NPC::Attack() for evaluation!"); return false; } - + if(DivineAura()) return(false); - + if(!GetTarget()) SetTarget(other); - //Check that we can attack before we calc heading and face our target + //Check that we can attack before we calc heading and face our target if (!IsAttackAllowed(other)) { if (this->GetOwnerID()) this->Say_StringID(NOT_LEGAL_TARGET); @@ -1750,9 +1750,9 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool } return false; } - + FaceTarget(GetTarget()); - + SkillType skillinuse = HAND_TO_HAND; if (Hand == 13) { skillinuse = static_cast(GetPrimSkill()); @@ -1769,12 +1769,12 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool weapon = database.GetItem(equipment[SLOT_PRIMARY]); else if (equipment[SLOT_SECONDARY]) weapon = database.GetItem(equipment[SLOT_SECONDARY]); - + //We dont factor much from the weapon into the attack. //Just the skill type so it doesn't look silly using punching animations and stuff while wielding weapons if(weapon) { mlog(COMBAT__ATTACKS, "Attacking with weapon: %s (%d) (too bad im not using it for much)", weapon->Name, weapon->ID); - + if(Hand == 14 && weapon->ItemType == ItemTypeShield){ mlog(COMBAT__ATTACKS, "Attack with shield canceled."); return false; @@ -1809,9 +1809,9 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool break; } } - + int weapon_damage = GetWeaponDamage(other, weapon); - + //do attack animation regardless of whether or not we can hit below int16 charges = 0; ItemInst weapon_inst(weapon, charges); @@ -1841,19 +1841,19 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool eleBane += (weapon->ElemDmgAmt * other->ResistSpell(weapon->ElemDmgType, 0, this) / 100); } } - + if(!RuleB(NPC, UseItemBonusesForNonPets)){ if(!GetOwner()){ eleBane = 0; } } - + uint8 otherlevel = other->GetLevel(); uint8 mylevel = this->GetLevel(); - + otherlevel = otherlevel ? otherlevel : 1; mylevel = mylevel ? mylevel : 1; - + //instead of calcing damage in floats lets just go straight to ints if(RuleB(Combat, UseIntervalAC)) damage = (max_dmg+eleBane); @@ -1908,9 +1908,9 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool other->AddToHateList(this, 0); } } - + mlog(COMBAT__DAMAGE, "Final damage against %s: %d", other->GetName(), damage); - + if(other->IsClient() && IsPet() && GetOwner()->IsClient()) { //pets do half damage to clients in pvp damage=damage/2; @@ -1918,7 +1918,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool } else damage = -5; - + //cant riposte a riposte if (bRiposte && damage == -3) { mlog(COMBAT__DAMAGE, "Riposte of riposte canceled."); @@ -1932,10 +1932,10 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool other->Damage(this, damage, SPELL_UNKNOWN, skillinuse, false); // Not avoidable client already had thier chance to Avoid } else return false; - + if (HasDied()) //killed by damage shield ect return false; - + //break invis when you attack if(invisible) { mlog(COMBAT__ATTACKS, "Removing invisibility due to melee attack."); @@ -1979,7 +1979,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool } TriggerDefensiveProcs(nullptr, other, Hand, damage); - + // now check ripostes if (damage == -3) { // riposting DoRiposte(other); @@ -1987,7 +1987,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool if (damage > 0) return true; - + else return false; } @@ -1995,21 +1995,21 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic) { if(spell_id==0) spell_id = SPELL_UNKNOWN; - + //handle EVENT_ATTACK. Resets after we have not been attacked for 12 seconds - if(attacked_timer.Check()) + if(attacked_timer.Check()) { mlog(COMBAT__HITS, "Triggering EVENT_ATTACK due to attack by %s", other->GetName()); parse->EventNPC(EVENT_ATTACK, this, other, "", 0); } attacked_timer.Start(CombatEventTimer_expire); - + if (!IsEngaged()) zone->AddAggroMob(); - - if(GetClass() == LDON_TREASURE) + + if(GetClass() == LDON_TREASURE) { - if(IsLDoNLocked() && GetLDoNLockedSkill() != LDoNTypeMechanical) + if(IsLDoNLocked() && GetLDoNLockedSkill() != LDoNTypeMechanical) { damage = -5; } @@ -2028,7 +2028,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_ski //do a majority of the work... CommonDamage(other, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic); - + if(damage > 0) { //see if we are gunna start fleeing if(!IsPet()) CheckFlee(); @@ -2038,7 +2038,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_ski void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_skill) { _ZP(NPC_Death); mlog(COMBAT__HITS, "Fatal blow dealt by %s with %d damage, spell %d, skill %d", killerMob->GetName(), damage, spell, attack_skill); - + if (this->IsEngaged()) { zone->DelAggroMob(); @@ -2049,7 +2049,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski SetHP(0); SetPet(0); Mob* killer = GetHateDamageTop(this); - + entity_list.RemoveFromTargets(this, p_depop); if(p_depop == true) @@ -2069,7 +2069,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski d->damage = damage; app->priority = 6; entity_list.QueueClients(killerMob, app, false); - + if(respawn2) { respawn2->DeathReset(1); } @@ -2080,7 +2080,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski } safe_delete(app); - + Mob *give_exp = hate_list.GetDamageTop(this); if(give_exp == nullptr) @@ -2089,8 +2089,8 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski if(give_exp && give_exp->HasOwner()) { bool ownerInGroup = false; - if((give_exp->HasGroup() && give_exp->GetGroup()->IsGroupMember(give_exp->GetUltimateOwner())) - || (give_exp->IsPet() && (give_exp->GetOwner()->IsClient() + if((give_exp->HasGroup() && give_exp->GetGroup()->IsGroupMember(give_exp->GetUltimateOwner())) + || (give_exp->IsPet() && (give_exp->GetOwner()->IsClient() || ( give_exp->GetOwner()->HasGroup() && give_exp->GetOwner()->GetGroup()->IsGroupMember(give_exp->GetOwner()->GetUltimateOwner()))))) ownerInGroup = true; @@ -2108,7 +2108,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski Client *give_exp_client = nullptr; if(give_exp && give_exp->IsClient()) give_exp_client = give_exp->CastToClient(); - + bool IsLdonTreasure = (this->GetClass() == LDON_TREASURE); if (give_exp_client && !IsCorpse() && MerchantType == 0) { @@ -2151,7 +2151,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski } } worldserver.SendPacket(pack); // Send Packet to World - safe_delete(pack); + safe_delete(pack); } // End QueryServ Logging @@ -2178,7 +2178,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski PlayerCount++; } } - + // QueryServ Logging - Group Kills if(RuleB(QueryServ, PlayerLogNPCKills)){ ServerPacket* pack = new ServerPacket(ServerOP_QSPlayerLogNPCKills, sizeof(QSPlayerLogNPCKill_Struct) + (sizeof(QSPlayerLogNPCKillsPlayers_Struct) * PlayerCount)); @@ -2195,7 +2195,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski } } worldserver.SendPacket(pack); // Send Packet to World - safe_delete(pack); + safe_delete(pack); } // End QueryServ Logging } @@ -2233,19 +2233,19 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski QS->Chars[0].char_id = c->CharacterID(); PlayerCount++; worldserver.SendPacket(pack); // Send Packet to World - safe_delete(pack); + safe_delete(pack); } // End QueryServ Logging } } - + //do faction hits even if we are a merchant, so long as a player killed us if(give_exp_client) hate_list.DoFactionHits(GetNPCFactionID()); if (!HasOwner() && !IsMerc() && class_ != MERCHANT && class_ != ADVENTUREMERCHANT && !GetSwarmInfo() && MerchantType == 0 && killer && (killer->IsClient() || (killer->HasOwner() && killer->GetUltimateOwner()->IsClient()) || - (killer->IsNPC() && killer->CastToNPC()->GetSwarmInfo() && killer->CastToNPC()->GetSwarmInfo()->GetOwner() && killer->CastToNPC()->GetSwarmInfo()->GetOwner()->IsClient()))) + (killer->IsNPC() && killer->CastToNPC()->GetSwarmInfo() && killer->CastToNPC()->GetSwarmInfo()->GetOwner() && killer->CastToNPC()->GetSwarmInfo()->GetOwner()->IsClient()))) { if(killer != 0) { @@ -2344,7 +2344,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski } else entity_list.RemoveFromXTargets(this); - + // Parse quests even if we're killed by an NPC if(killerMob) { Mob *oos = killerMob->GetOwnerOrSelf(); @@ -2364,7 +2364,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski killerMob->TrySpellOnKill(killed_level,spell); } } - + this->WipeHateList(); p_depop = true; if(killerMob && killerMob->GetTarget() == this) //we can kill things without having them targeted @@ -2387,7 +2387,7 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, Mob* mypet = this->GetPet(); Mob* myowner = this->GetOwner(); Mob* targetmob = this->GetTarget(); - + if(other){ AddRampage(other); int hatemod = 100 + other->spellbonuses.hatemod + other->itembonuses.hatemod + other->aabonuses.hatemod; @@ -2395,9 +2395,9 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, hatemod = 1; hate = ((hate * (hatemod))/100); } - + if(IsPet() && GetOwner() && GetOwner()->GetAA(aaPetDiscipline) && IsHeld() && !IsFocused()) { //ignore aggro if hold and !focus - return; + return; } if(IsPet() && GetOwner() && GetOwner()->GetAA(aaPetDiscipline) && IsHeld() && GetOwner()->GetAA(aaAdvancedPetDiscipline) >= 1 && IsFocused()) { @@ -2409,7 +2409,7 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, return; if(IsFamiliar() || SpecAttacks[IMMUNE_AGGRO]) - return; + return; if (other == myowner) return; @@ -2430,7 +2430,7 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, } } // first add self - + // The damage on the hate list is used to award XP to the killer. This check is to prevent Killstealing. // e.g. Mob has 5000 hit points, Player A melees it down to 500 hp, Player B executes a headshot (10000 damage). // If we add 10000 damage, Player B would get the kill credit, so we only award damage credit to player B of the @@ -2457,7 +2457,7 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, } #endif //BOTS - + // if other is a merc, add the merc client to the hate list if(other->IsMerc()) { if(other->CastToMerc()->GetMercOwner() && other->CastToMerc()->GetMercOwner()->CastToClient()->GetFeigned()) { @@ -2485,8 +2485,8 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, owner->CastToClient()->AddAutoXTarget(this); } } - } - + } + if (mypet && (!(GetAA(aaPetDiscipline) && mypet->IsHeld()))) { // I have a pet, add other to it if(!mypet->IsFamiliar() && !mypet->SpecAttacks[IMMUNE_AGGRO]) mypet->hate_list.Add(other, 0, 0, bFrenzy); @@ -2494,15 +2494,15 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, if (myowner->IsAIControlled() && !myowner->SpecAttacks[IMMUNE_AGGRO]) myowner->hate_list.Add(other, 0, 0, bFrenzy); } - if (!wasengaged) { + if (!wasengaged) { if(IsNPC() && other->IsClient() && other->CastToClient()) parse->EventNPC(EVENT_AGGRO, this->CastToNPC(), other, "", 0); - AI_Event_Engaged(other, iYellForHelp); + AI_Event_Engaged(other, iYellForHelp); adverrorinfo = 8293; } } -// solar: this is called from Damage() when 'this' is attacked by 'other. +// solar: this is called from Damage() when 'this' is attacked by 'other. // 'this' is the one being attacked // 'other' is the attacker // a damage shield causes damage (or healing) to whoever attacks the wearer @@ -2512,45 +2512,45 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, //a damage shield on a spell is a negative value but on an item it's a positive value so add the spell value and subtract the item value to get the end ds value void Mob::DamageShield(Mob* attacker, bool spell_ds) { - if(!attacker || this == attacker) + if(!attacker || this == attacker) return; - + int DS = 0; int rev_ds = 0; uint16 spellid = 0; - - if(!spell_ds) + + if(!spell_ds) { DS = spellbonuses.DamageShield; rev_ds = attacker->spellbonuses.ReverseDamageShield; - + if(spellbonuses.DamageShieldSpellID != 0 && spellbonuses.DamageShieldSpellID != SPELL_UNKNOWN) spellid = spellbonuses.DamageShieldSpellID; } - else { + else { DS = spellbonuses.SpellDamageShield; rev_ds = 0; // This ID returns "you are burned", seemed most appropriate for spell DS spellid = 2166; } - + if(DS == 0 && rev_ds == 0) return; - + mlog(COMBAT__HITS, "Applying Damage Shield of value %d to %s", DS, attacker->GetName()); - + //invert DS... spells yield negative values for a true damage shield if(DS < 0) { if(!spell_ds) { DS += aabonuses.DamageShield; //Live AA - coat of thistles. (negative value) DS -= itembonuses.DamageShield; //+Damage Shield should only work when you already have a DS spell - + //Spell data for damage shield mitigation shows a negative value for spells for clients and positive //value for spells that effect pets. Unclear as to why. For now will convert all positive to be consistent. if (attacker->IsOffHandAtk()){ - int16 mitigation = attacker->itembonuses.DSMitigationOffHand + - attacker->spellbonuses.DSMitigationOffHand + + int16 mitigation = attacker->itembonuses.DSMitigationOffHand + + attacker->spellbonuses.DSMitigationOffHand + attacker->aabonuses.DSMitigationOffHand; DS -= DS*mitigation/100; } @@ -2661,7 +2661,7 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) // // The code below is a hybrid between a pure formulaic approach and a pure, brute-force // lookup table. In cases where a formula is the best bet, I use a formula. In other places - // where a formula would be ugly, I use a lookup table in the interests of speed. + // where a formula would be ugly, I use a lookup table in the interests of speed. if( Weapon->Delay <= 27 ) @@ -2778,7 +2778,7 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) } else { - // Delay is 60+ + // Delay is 60+ const static uint8 ucDelayOver59Levels66to80[6][15] = { @@ -2917,7 +2917,7 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) // Player is in the level range 53 - 64 // Calculating damage bonus for 2H weapons with a delay between 40 and 59 (inclusive) involves, unforunately, a brute-force matrix lookup. - static const uint8 ucDelay40to59Levels53to64[20][37] = + static const uint8 ucDelay40to59Levels53to64[20][37] = { /* Level: */ /* 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64 */ @@ -3024,7 +3024,7 @@ int Mob::GetMonkHandToHandDamage(void) 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11, 12,12,12,12,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14, 14,14,15,15,15,15 }; - + // Have a look to see if we have epic fists on if (IsClient() && CastToClient()->GetItemIDAt(12) == 10652) @@ -3055,7 +3055,7 @@ int Mob::GetMonkHandToHandDelay(void) 36,36,36,36,36,36,36,36,36,36,35,35,35,35,35,34,34,34,34,34, 33,33,33,33,33,32,32,32,32,32,31,31,31,30,30,30,29,29,29,28, 27,24,22,20,20,20 }; - + // Have a look to see if we have epic fists on if (IsClient() && CastToClient()->GetItemIDAt(12) == 10652) return(16); @@ -3122,30 +3122,30 @@ int32 Mob::ReduceDamage(int32 damage) if(damage < 1) return -6; - + if (HasRune()) damage = RuneAbsorb(damage, SE_Rune); if(damage < 1) return -6; - + if (spellbonuses.ManaAbsorbPercentDamage[0]){ slot = spellbonuses.ManaAbsorbPercentDamage[1]; if(GetMana() > damage * spellbonuses.ManaAbsorbPercentDamage[0] / 100) { damage -= (damage * spellbonuses.ManaAbsorbPercentDamage[0] / 100); SetMana(GetMana() - damage); CheckHitsRemaining(slot); - } + } } return(damage); } - -int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker) + +int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker) { if(damage <= 0) return damage; - + int32 slot = -1; // See if we block the spell outright first @@ -3156,17 +3156,17 @@ int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTi return 0; } } - + // If this is a DoT, use DoT Shielding... if(iBuffTic) damage -= (damage * itembonuses.DoTShielding / 100); - + // This must be a DD then so lets apply Spell Shielding and runes. - else + else { // Reduce damage by the Spell Shielding first so that the runes don't take the raw damage. damage -= (damage * itembonuses.SpellShield / 100); - + // Do runes now. if (spellbonuses.MitigateSpellRune[0]){ slot = spellbonuses.MitigateSpellRune[1]; @@ -3196,7 +3196,7 @@ int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTi if(damage < 1) return 0; - + if (HasSpellRune()) damage = RuneAbsorb(damage, SE_AbsorbMagicAtt); @@ -3210,7 +3210,7 @@ int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTi damage -= (damage * spellbonuses.ManaAbsorbPercentDamage[0] / 100); SetMana(GetMana() - damage); CheckHitsRemaining(slot); - } + } } } return damage; @@ -3255,9 +3255,9 @@ bool Client::CheckDoubleAttack(bool tripleAttack) { if(!HasSkill(DOUBLE_ATTACK) && !bonusGiveDA) return false; - + float chance = 0.0f; - + uint16 skill = GetSkill(DOUBLE_ATTACK); int16 bonusDA = aabonuses.DoubleAttackChance + spellbonuses.DoubleAttackChance + itembonuses.DoubleAttackChance; @@ -3265,7 +3265,7 @@ bool Client::CheckDoubleAttack(bool tripleAttack) { //Use skill calculations otherwise, if you only have AA applied GiveDoubleAttack chance then use that value as the base. if (skill) chance = (float(skill+GetLevel()) * (float(100.0f+bonusDA+bonusGiveDA) /100.0f)) /500.0f; - else + else chance = (float(bonusGiveDA) * (float(100.0f+bonusDA)/100.0f) ) /100.0f; //Live now uses a static Triple Attack skill (lv 46 = 2% lv 60 = 20%) - We do not have this skill on EMU ATM. @@ -3281,30 +3281,30 @@ bool Client::CheckDoubleAttack(bool tripleAttack) { if((MakeRandomFloat(0, 1) < chance)) return true; - + return false; } void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, const SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic) { - // This method is called with skill_used=ABJURE for Damage Shield damage. + // This method is called with skill_used=ABJURE for Damage Shield damage. bool FromDamageShield = (skill_used == ABJURE); mlog(COMBAT__HITS, "Applying damage %d done by %s with skill %d and spell %d, avoidable? %s, is %sa buff tic in slot %d", damage, attacker?attacker->GetName():"NOBODY", skill_used, spell_id, avoidable?"yes":"no", iBuffTic?"":"not ", buffslot); - + if (GetInvul() || DivineAura()) { mlog(COMBAT__DAMAGE, "Avoiding %d damage due to invulnerability.", damage); damage = -5; } - + if( spell_id != SPELL_UNKNOWN || attacker == nullptr ) avoidable = false; - + // only apply DS if physical damage (no spell damage) // damage shield calls this function with spell_id set, so its unavoidable if (attacker && damage > 0 && spell_id == SPELL_UNKNOWN && skill_used != ARCHERY && skill_used != THROWING) { DamageShield(attacker); - + if (spellbonuses.DamageShield) CheckHitsRemaining(0, false, false, SE_DamageShield); } @@ -3324,7 +3324,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons else AddToHateList(attacker, 0, damage, true, false, iBuffTic); } - + if(damage > 0) { //if there is some damage being done and theres an attacker involved if(attacker) { @@ -3340,7 +3340,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons if (spell_id != SPELL_UNKNOWN && IsLifetapSpell( spell_id )) { int healed = damage; - healed = attacker->GetActSpellHealing(spell_id, healed); + healed = attacker->GetActSpellHealing(spell_id, healed); mlog(COMBAT__DAMAGE, "Applying lifetap heal of %d to %s", healed, attacker->GetName()); attacker->HealDamage(healed); @@ -3351,7 +3351,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons } //end `if there is some damage being done and theres anattacker person involved` Mob *pet = GetPet(); - if (pet && !pet->IsFamiliar() && !pet->SpecAttacks[IMMUNE_AGGRO] && !pet->IsEngaged() && attacker && attacker != this && !attacker->IsCorpse()) + if (pet && !pet->IsFamiliar() && !pet->SpecAttacks[IMMUNE_AGGRO] && !pet->IsEngaged() && attacker && attacker != this && !attacker->IsCorpse()) { if (!pet->IsHeld()) { mlog(PETS__AGGRO, "Sending pet %s into battle due to attack.", pet->GetName()); @@ -3359,8 +3359,8 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons pet->SetTarget(attacker); Message_StringID(10, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName()); } - } - + } + //see if any runes want to reduce this damage if(spell_id == SPELL_UNKNOWN) { damage = ReduceDamage(damage); @@ -3373,12 +3373,12 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons attacker->Message(15, "The Spellshield absorbed %d of %d points of damage", origdmg - damage, origdmg); } if (damage == 0 && attacker && origdmg != damage && IsClient()) { - //Kayen: Probably need to add a filter for this - Not sure if this msg is correct but there should be a message for spell negate/runes. + //Kayen: Probably need to add a filter for this - Not sure if this msg is correct but there should be a message for spell negate/runes. Message(263, "%s tries to cast on you, but YOUR magical skin absorbs the spell.",attacker->GetCleanName()); } } - + if(IsClient() && CastToClient()->sneaking){ CastToClient()->sneaking = false; @@ -3389,7 +3389,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons attacker->SendAppearancePacket(AT_Sneak, 0); } //final damage has been determined. - + /* //check for death conditions if(IsClient()) { @@ -3406,13 +3406,13 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons } } */ - + SetHP(GetHP() - damage); if(HasDied()) { bool IsSaved = false; - if(TryDivineSave()) + if(TryDivineSave()) IsSaved = true; if(!IsSaved && !TrySpellOnDeath()) { @@ -3429,7 +3429,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons } else{ - if(GetHPRatio() < 16) + if(GetHPRatio() < 16) TryDeathSave(); } @@ -3438,7 +3438,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons mlog(COMBAT__HITS, "Breaking mez due to attack."); BuffFadeByEffect(SE_Mez); } - + //check stun chances if bashing if (damage > 0 && ((skill_used == BASH || skill_used == KICK) && attacker)) { @@ -3450,30 +3450,30 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons { int stun_resist = itembonuses.StunResist+spellbonuses.StunResist; int frontal_stun_resist = itembonuses.FrontalStunResist+spellbonuses.FrontalStunResist; - + if(IsClient()){ stun_resist += aabonuses.StunResist; frontal_stun_resist += aabonuses.FrontalStunResist; } - if( (GetBaseRace() == OGRE && IsClient() || - (frontal_stun_resist && ((frontal_stun_resist >= 100) || (MakeRandomInt(0,100) <= frontal_stun_resist)))) - && !attacker->BehindMob(this, attacker->GetX(), attacker->GetY())) + if( (GetBaseRace() == OGRE && IsClient() || + (frontal_stun_resist && ((frontal_stun_resist >= 100) || (MakeRandomInt(0,100) <= frontal_stun_resist)))) + && !attacker->BehindMob(this, attacker->GetX(), attacker->GetY())) { mlog(COMBAT__HITS, "Stun Resisted. Ogres are immune to frontal melee stuns."); } - else + else { - if(stun_resist <= 0 || MakeRandomInt(0,99) >= stun_resist) + if(stun_resist <= 0 || MakeRandomInt(0,99) >= stun_resist) { mlog(COMBAT__HITS, "Stunned. We had %d percent resist chance."); Stun(0); - } - else + } + else { if(IsClient()) Message_StringID(MT_Stun, SHAKE_OFF_STUN); - + mlog(COMBAT__HITS, "Stun Resisted. We had %dpercent resist chance."); } } @@ -3484,13 +3484,13 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons if(spell_id != SPELL_UNKNOWN && !iBuffTic) { //see if root will break if (IsRooted() && !FromDamageShield) { // neotoyko: only spells cancel root - + /*Dev Quote 2010: http://forums.station.sony.com/eq/posts/list.m?topic_id=161443 The Viscid Roots AA does the following: Reduces the chance for root to break by X percent. - There is no distinction of any kind between the caster inflicted damage, or anyone - else's damage. There is also no distinction between Direct and DOT damage in the root code. - There is however, a provision that if the damage inflicted is greater than 500 per hit, the - chance to break root is increased. My guess is when this code was put in place, the devs at + There is no distinction of any kind between the caster inflicted damage, or anyone + else's damage. There is also no distinction between Direct and DOT damage in the root code. + There is however, a provision that if the damage inflicted is greater than 500 per hit, the + chance to break root is increased. My guess is when this code was put in place, the devs at the time couldn't imagine DOT damage getting that high. */ int BreakChance = RuleI(Spells, RootBreakFromSpells); @@ -3505,7 +3505,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons } else { mlog(COMBAT__HITS, "Spell did not break root. BreakChance percent chance"); } - } + } } else if(spell_id == SPELL_UNKNOWN) { @@ -3515,12 +3515,12 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons mlog(COMBAT__HITS, "Melee attack while casting. Attack count %d", attacked_count); } } - + //send an HP update if we are hurt if(GetHP() < GetMaxHP()) SendHPUpdate(); } //end `if damage was done` - + //send damage packet... if(!iBuffTic) { //buff ticks do not send damage, instead they just call SendHPUpdate(), which is done below EQApplicationPacket* outapp = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); @@ -3538,7 +3538,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons // a->spellid = SPELL_UNKNOWN; // else a->spellid = spell_id; - + //Note: if players can become pets, they will not receive damage messages of their own //this was done to simplify the code here (since we can only effectively skip one mob on queue) eqFilterType filter; @@ -3581,7 +3581,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons { attacker->Message_StringID(MT_DS,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1)); } - } + } else entity_list.MessageClose_StringID(this, true, 100, MT_NonMelee,HIT_NON_MELEE,attacker->GetCleanName(),GetCleanName(),ConvertArray(damage,val1)); } else { @@ -3600,7 +3600,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons } skip = attacker; } - + //send damage to all clients around except the specified skip mob (attacker or the attacker's owner) and ourself if(damage > 0) { if(spell_id != SPELL_UNKNOWN) @@ -3615,7 +3615,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons //this call will send the packet to `this` as well (using the wrong filter) (will not happen until PC charm works) //LogFile->write(EQEMuLog::Debug, "Queue damage to all except %s with filter %d (%d), type %d", skip->GetName(), filter, IsClient()?CastToClient()->GetFilter(filter):-1, a->type); // - // If this is Damage Shield damage, the correct OP_Damage packets will be sent from Mob::DamageShield, so + // If this is Damage Shield damage, the correct OP_Damage packets will be sent from Mob::DamageShield, so // we don't send them here. if(!FromDamageShield) { entity_list.QueueCloseClients(this, outapp, true, 200, skip, true, filter); @@ -3625,7 +3625,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons CastToClient()->QueuePacket(outapp); } } - + safe_delete(outapp); } else { //else, it is a buff tic... @@ -3663,7 +3663,7 @@ void Mob::HealDamage(uint32 amount, Mob* caster) { char *TempString = nullptr; MakeAnyLenString(&TempString, "%d", acthealed); - + if(acthealed > 100){ if(caster){ Message_StringID(MT_NonMelee, YOU_HEALED, caster->GetCleanName(), TempString); @@ -3673,9 +3673,9 @@ void Mob::HealDamage(uint32 amount, Mob* caster) { } else{ Message(MT_NonMelee, "You have been healed for %d points of damage.", acthealed); - } - } - + } + } + if (curhp < maxhp) { if ((curhp+amount)>maxhp) curhp=maxhp; @@ -3712,7 +3712,7 @@ float Mob::GetProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_spe break; } - + //calculate the weapon speed in ms, so we can use the rule to compare against. if(weapon_speed < RuleI(Combat, MinHastedDelay)) // fast as a client can swing, so should be the floor of the proc chance @@ -3740,7 +3740,7 @@ float Mob::GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 w int myagi = GetAGI(); ProcBonus = 0; ProcChance = 0; - + switch(hand){ case 13: weapon_speed = attack_timer.GetDuration(); @@ -3762,7 +3762,7 @@ float Mob::GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 w else PermaHaste = 1.0f; */ - + //calculate the weapon speed in ms, so we can use the rule to compare against. //weapon_speed = ((int)(weapon_speed*(100.0f+attack_speed)*PermaHaste)); if(weapon_speed < RuleI(Combat, MinHastedDelay)) // fast as a client can swing, so should be the floor of the proc chance @@ -3771,7 +3771,7 @@ float Mob::GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 w ProcChance = ((float)weapon_speed * RuleR(Combat, AvgDefProcsPerMinute) / 60000.0f); // compensate for weapon_speed being in ms ProcBonus += float(myagi) * RuleR(Combat, DefProcPerMinAgiContrib) / 100.0f; ProcChance = ProcChance + (ProcChance * ProcBonus); - + mlog(COMBAT__PROCS, "Defensive Proc chance %.2f (%.2f from bonuses)", ProcChance, ProcBonus); return ProcChance; } @@ -3799,8 +3799,8 @@ void Mob::TryDefensiveProc(const ItemInst* weapon, Mob *on, uint16 hand, int dam else on->GetDefensiveProcChances(ProcBonus, ProcChance); if(hand != 13) - ProcChance /= 2; - + ProcChance /= 2; + if (bDefensiveProc){ for (int i = 0; i < MAX_PROCS; i++) { if (DefensiveProcs[i].spellID != SPELL_UNKNOWN) { @@ -3814,7 +3814,7 @@ void Mob::TryDefensiveProc(const ItemInst* weapon, Mob *on, uint16 hand, int dam } if (bSkillProc && damage < 0){ - + if (damage == -1) TrySkillProc(on, BLOCKSKILL, ProcChance); @@ -3846,11 +3846,11 @@ void Mob::TryWeaponProc(const ItemInst* weapon_g, Mob *on, uint16 hand) { TryWeaponProc((const Item_Struct*) nullptr, on, hand); return; } - + //do main procs TryWeaponProc(weapon_g->GetItem(), on, hand); - - + + //we have to calculate these again, oh well int ourlevel = GetLevel(); float ProcChance, ProcBonus; @@ -3859,7 +3859,7 @@ void Mob::TryWeaponProc(const ItemInst* weapon_g, Mob *on, uint16 hand) { { ProcChance /= 2; } - + //do augment procs int r; for(r = 0; r < MAX_AUGMENT_SLOTS; r++) { @@ -3869,7 +3869,7 @@ void Mob::TryWeaponProc(const ItemInst* weapon_g, Mob *on, uint16 hand) { const Item_Struct* aug = aug_i->GetItem(); if(!aug) continue; - + if (aug->Proc.Type == ET_CombatProc) { ProcChance = ProcChance*(100+aug->ProcRate)/100; if (MakeRandomFloat(0, 1) < ProcChance) { @@ -3897,9 +3897,9 @@ void Mob::TryWeaponProc(const Item_Struct* weapon, Mob *on, uint16 hand) { GetProcChances(ProcBonus, ProcChance, weapon->Delay, hand); else GetProcChances(ProcBonus, ProcChance); - + if(hand != 13) //Is Archery intended to proc at 50% rate? - ProcChance /= 2; + ProcChance /= 2; //give weapon a chance to proc first. if(weapon != nullptr) { @@ -3924,7 +3924,7 @@ void Mob::TryWeaponProc(const Item_Struct* weapon, Mob *on, uint16 hand) { } } } - + if(ProcBonus == -1) { LogFile->write(EQEMuLog::Error, "ProcBonus was -1 value!"); return; @@ -3998,10 +3998,10 @@ void Mob::TryPetCriticalHit(Mob *defender, uint16 skill, int32 &damage) if(damage < 1) return; - //Allows pets to perform critical hits. - //Each rank adds an additional 1% chance for any melee hit (primary, secondary, kick, bash, etc) to critical, + //Allows pets to perform critical hits. + //Each rank adds an additional 1% chance for any melee hit (primary, secondary, kick, bash, etc) to critical, //dealing up to 63% more damage. http://www.magecompendium.com/aa-short-library.html - + Mob *owner = nullptr; float critChance = 0.0f; critChance += RuleI(Combat, MeleeBaseCritChance); @@ -4030,9 +4030,9 @@ void Mob::TryPetCriticalHit(Mob *defender, uint16 skill, int32 &damage) } if(critChance > 0){ - + critChance /= 100; - + if(MakeRandomFloat(0, 1) < critChance) { critMod += GetCritDmgMob(skill) * 2; // To account for base crit mod being 200 not 100 @@ -4064,9 +4064,9 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) float critChance = 0.0f; - //1: Try Slay Undead + //1: Try Slay Undead if(defender && defender->GetBodyType() == BT_Undead || defender->GetBodyType() == BT_SummonedUndead || defender->GetBodyType() == BT_Vampire){ - + int16 SlayRateBonus = aabonuses.SlayUndead[0] + itembonuses.SlayUndead[0] + spellbonuses.SlayUndead[0]; if (SlayRateBonus) { @@ -4081,7 +4081,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) return; } } - } + } //2: Try Melee Critical @@ -4089,13 +4089,13 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) //by item,spell and AA bonuses allowing you a chance to critical hit. If the following rules //are defined you will have an innate chance to hit at Level 1 regardless of bonuses. //Warning: Do not define these rules if you want live like critical hits. - critChance += RuleI(Combat, MeleeBaseCritChance); - + critChance += RuleI(Combat, MeleeBaseCritChance); + if(IsClient()) critChance += RuleI(Combat, ClientBaseCritChance); - + bool IsBerserk = false; - if(((GetClass() == WARRIOR || GetClass() == BERSERKER) && GetLevel() >= 12 && IsClient())) + if(((GetClass() == WARRIOR || GetClass() == BERSERKER) && GetLevel() >= 12 && IsClient())) { if(CastToClient()->berserk){ critChance += RuleI(Combat, BerserkBaseCritChance); @@ -4105,13 +4105,13 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) else critChance += RuleI(Combat, WarBerBaseCritChance); } - + if(skill == ARCHERY && GetClass() == RANGER && GetSkill(ARCHERY) >= 65) critChance += 6; if(skill == THROWING && GetClass() == ROGUE && GetSkill(THROWING) >= 65) critChance += 6; - + int CritChanceBonus = GetCriticalChanceBonus(skill); if (CritChanceBonus || critChance) { @@ -4119,12 +4119,12 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) //Get Base CritChance from Dex. (200 = ~1.6%, 255 = ~2.0%, 355 = ~2.20%) Fall off rate > 255 //http://giline.versus.jp/shiden/su.htm , http://giline.versus.jp/shiden/damage_e.htm if (GetDEX() <= 255) - critChance += (float(GetDEX()) / 125.0f); + critChance += (float(GetDEX()) / 125.0f); else if (GetDEX() > 255) critChance += (float(GetDEX()-255)/ 500.0f) + 2.0f; critChance += critChance*(float)CritChanceBonus /100.0f; } - + if(critChance > 0){ critChance /= 100; @@ -4134,7 +4134,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) uint16 critMod = 200; bool crip_success = false; int16 CripplingBlowChance = GetCrippBlowChance(); - + //Crippling Blow Chance: The percent value of the effect is applied //to the your Chance to Critical. (ie You have 10% chance to critical and you //have a 200% Chance to Critical Blow effect, therefore you have a 20% Chance to Critical Blow. @@ -4153,11 +4153,11 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage) if(IsBerserk || crip_success) { entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, CRIPPLING_BLOW, GetCleanName(), itoa(damage)); - // Crippling blows also have a chance to stun + // Crippling blows also have a chance to stun //Kayen: Crippling Blow would cause a chance to interrupt for npcs < 55, with a staggers message. if (defender->GetLevel() <= 55 && !defender->SpecAttacks[IMMUNE_STUN]){ defender->Emote("staggers."); - defender->Stun(0); + defender->Stun(0); } } @@ -4175,7 +4175,7 @@ bool Mob::TryFinishingBlow(Mob *defender, SkillType skillinuse) if (!defender) return false; - + if (aabonuses.FinishingBlow[1] && !defender->IsClient() && defender->GetHPRatio() < 10){ uint32 chance = aabonuses.FinishingBlow[0]/10; //500 = 5% chance. @@ -4206,10 +4206,10 @@ void Mob::DoRiposte(Mob* defender) { defender->Attack(this, SLOT_PRIMARY, true); if (HasDied()) return; - int16 DoubleRipChance = defender->aabonuses.GiveDoubleRiposte[0] + - defender->spellbonuses.GiveDoubleRiposte[0] + + int16 DoubleRipChance = defender->aabonuses.GiveDoubleRiposte[0] + + defender->spellbonuses.GiveDoubleRiposte[0] + defender->itembonuses.GiveDoubleRiposte[0]; - + //Live AA - Double Riposte if(DoubleRipChance && (DoubleRipChance >= MakeRandomInt(0, 100))) { mlog(COMBAT__ATTACKS, "Preforming a double riposed (%d percent chance)", DoubleRipChance); @@ -4219,8 +4219,8 @@ void Mob::DoRiposte(Mob* defender) { //Double Riposte effect, allows for a chance to do RIPOSTE with a skill specfic special attack (ie Return Kick). //Coded narrowly: Limit to one per client. Limit AA only. [1 = Skill Attack Chance, 2 = Skill] - DoubleRipChance = defender->aabonuses.GiveDoubleRiposte[1]; - + DoubleRipChance = defender->aabonuses.GiveDoubleRiposte[1]; + if(DoubleRipChance && (DoubleRipChance >= MakeRandomInt(0, 100))) { mlog(COMBAT__ATTACKS, "Preforming a return SPECIAL ATTACK (%d percent chance)", DoubleRipChance); @@ -4230,7 +4230,7 @@ void Mob::DoRiposte(Mob* defender) { defender->CastToClient()->DoClassAttacks(this,defender->aabonuses.GiveDoubleRiposte[2], true); } } - + void Mob::ApplyMeleeDamageBonus(uint16 skill, int32 &damage){ if(!RuleB(Combat, UseIntervalAC)){ @@ -4243,9 +4243,9 @@ void Mob::ApplyMeleeDamageBonus(uint16 skill, int32 &damage){ damage += (damage*dmgbonusmod/10000); } } - + damage += damage * GetMeleeDamageMod_SE(skill) / 100; - + //Rogue sneak attack disciplines make use of this, they are active for one hit if (spellbonuses.HitChanceEffect[HIGHEST_SKILL+1] || spellbonuses.HitChanceEffect[skill]) CheckHitsRemaining(0, false, false, SE_HitChance,0,true,skill); @@ -4290,14 +4290,14 @@ uint16 Mob::GetDamageTable(SkillType skillinuse) } else { - uint16 dmg_table[] = { + uint16 dmg_table[] = { 275, 275, 275, 275, 275, 280, 280, 280, 280, 285, 285, 285, 290, 290, 295, - 295, 300, 300, 300, 305, + 295, 300, 300, 300, 305, 305, 305, 310, 310, 315, 315, 320, 320, 320, 325, - 325, 325, 330, 330, 335, + 325, 325, 330, 330, 335, 335, 340, 340, 340, }; if(GetClass() == MONK) @@ -4330,7 +4330,7 @@ void Mob::TrySkillProc(Mob *on, uint16 skill, float chance) } int32 Mob::RuneAbsorb(int32 damage, uint16 type) -{ +{ uint32 buff_max = GetMaxTotalSlots(); if (type == SE_Rune){ for(uint32 slot = 0; slot < buff_max; slot++) { diff --git a/zone/basic_functions.h b/zone/basic_functions.h index 83400fde8..5f8e30d6c 100644 --- a/zone/basic_functions.h +++ b/zone/basic_functions.h @@ -113,7 +113,7 @@ int GetArgs(char * string) //strcpy(buffer,com_list); //#else //strncpy(buffer,com_list,sizeof(buffer)-1); - //#endif + //#endif int i=0; while (*buffer) { diff --git a/zone/beacon.cpp b/zone/beacon.cpp index 5ed82f8a8..433f99627 100644 --- a/zone/beacon.cpp +++ b/zone/beacon.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -122,7 +122,7 @@ void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 resist_adj { if(!IsValidSpell(cast_spell_id) || !caster) return; - + caster_id = caster->GetID(); spell_id = cast_spell_id; this->resist_adjust = resist_adjust; diff --git a/zone/beacon.h b/zone/beacon.h index db605ebff..d7ef43fd6 100644 --- a/zone/beacon.h +++ b/zone/beacon.h @@ -29,7 +29,7 @@ class Beacon : public Mob public: Beacon(Mob *at_mob, int lifetime); ~Beacon(); - + //abstract virtual function implementations requird by base abstract class virtual void Death(Mob* killerMob, int32 damage, uint16 spell_id, SkillType attack_skill) { return; } virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false) { return; } diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index a50e15c56..c72fae7e9 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -37,12 +37,12 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) #include "StringIDs.h" void Mob::CalcBonuses() -{ +{ CalcSpellBonuses(&spellbonuses); CalcMaxHP(); CalcMaxMana(); SetAttackTimer(); - + rooted = FindType(SE_Root); } @@ -72,19 +72,19 @@ void Client::CalcBonuses() memset(&itembonuses, 0, sizeof(StatBonuses)); CalcItemBonuses(&itembonuses); CalcEdibleBonuses(&itembonuses); - + CalcSpellBonuses(&spellbonuses); _log(AA__BONUSES, "Calculating AA Bonuses for %s.", this->GetCleanName()); CalcAABonuses(&aabonuses); //we're not quite ready for this _log(AA__BONUSES, "Finished calculating AA Bonuses for %s.", this->GetCleanName()); - + RecalcWeight(); - + CalcAC(); CalcATK(); CalcHaste(); - + CalcSTR(); CalcSTA(); CalcDEX(); @@ -92,18 +92,18 @@ void Client::CalcBonuses() CalcINT(); CalcWIS(); CalcCHA(); - + CalcMR(); CalcFR(); CalcDR(); CalcPR(); CalcCR(); CalcCorrup(); - + CalcMaxHP(); CalcMaxMana(); CalcMaxEndurance(); - + rooted = FindType(SE_Root); XPRate = 100 + spellbonuses.XPRateMod; @@ -114,7 +114,7 @@ int Client::CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat) if( (reclevel > 0) && (level < reclevel) ) { int32 statmod = (level * 10000 / reclevel) * basestat; - + if( statmod < 0 ) { statmod -= 5000; @@ -132,7 +132,7 @@ int Client::CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat) void Client::CalcItemBonuses(StatBonuses* newbon) { //memset assumed to be done by caller. - + // Clear item faction mods ClearItemFactionBonuses(); @@ -144,7 +144,7 @@ void Client::CalcItemBonuses(StatBonuses* newbon) { continue; AddItemBonuses(inst, newbon); } - + //Power Source Slot if (GetClientVersion() >= EQClientSoF) { @@ -166,13 +166,13 @@ void Client::CalcItemBonuses(StatBonuses* newbon) { if(newbon->ManaRegen > CalcManaRegenCap()) newbon->ManaRegen = CalcManaRegenCap(); - + if(newbon->EnduranceRegen > CalcEnduranceRegenCap()) newbon->EnduranceRegen = CalcEnduranceRegenCap(); - + SetAttackTimer(); } - + void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAug, bool isTribute) { if(!inst || !inst->IsType(ItemClassCommon)) { @@ -210,7 +210,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu newbon->INT += (item->AInt + item->HeroicInt); newbon->WIS += (item->AWis + item->HeroicWis); newbon->CHA += (item->ACha + item->HeroicCha); - + newbon->MR += (item->MR + item->HeroicMR); newbon->FR += (item->FR + item->HeroicFR); newbon->CR += (item->CR + item->HeroicCR); @@ -299,7 +299,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu newbon->HeroicDR += CalcRecommendedLevelBonus( lvl, reclvl, item->HeroicDR ); newbon->HeroicCorrup += CalcRecommendedLevelBonus( lvl, reclvl, item->HeroicSVCorrup ); } - + //FatherNitwit: New style haste, shields, and regens if(newbon->haste < (int16)item->Haste) { newbon->haste = item->Haste; @@ -309,14 +309,14 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu if(item->ManaRegen > 0) newbon->ManaRegen += item->ManaRegen; - + if(item->EnduranceRegen > 0) newbon->EnduranceRegen += item->EnduranceRegen; if(item->Attack > 0) { - + int cap = RuleI(Character, ItemATKCap); - cap += itembonuses.ItemATKCap + spellbonuses.ItemATKCap + aabonuses.ItemATKCap; + cap += itembonuses.ItemATKCap + spellbonuses.ItemATKCap + aabonuses.ItemATKCap; if((newbon->ATK + item->Attack) > cap) newbon->ATK = RuleI(Character, ItemATKCap); @@ -377,7 +377,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu else newbon->DoTShielding += item->DotShielding; } - + if(item->HealAmt > 0) { if((newbon->HealAmt + item->HealAmt) > RuleI(Character, ItemHealAmtCap)) newbon->HealAmt = RuleI(Character, ItemHealAmtCap); @@ -396,7 +396,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu else newbon->Clairvoyance += item->Clairvoyance; } - + if(item->DSMitigation > 0) { if((newbon->DSMitigation + item->DSMitigation) > RuleI(Character, ItemDSMitigationCap)) newbon->DSMitigation = RuleI(Character, ItemDSMitigationCap); @@ -458,7 +458,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu break; } } - + if (item->SkillModValue != 0 && item->SkillModType <= HIGHEST_SKILL){ if ((item->SkillModValue > 0 && newbon->skillmod[item->SkillModType] < item->SkillModValue) || (item->SkillModValue < 0 && newbon->skillmod[item->SkillModType] > item->SkillModValue)) @@ -512,7 +512,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu AddItemFactionBonus(item->FactionMod4, item->FactionAmt4); } } - + if (item->ExtraDmgSkill != 0 && item->ExtraDmgSkill <= HIGHEST_SKILL) { if((newbon->SkillDamageAmount[item->ExtraDmgSkill] + item->ExtraDmgAmt) > RuleI(Character, ItemExtraDmgCap)) newbon->SkillDamageAmount[item->ExtraDmgSkill] = RuleI(Character, ItemExtraDmgCap); @@ -536,7 +536,7 @@ void Client::CalcEdibleBonuses(StatBonuses* newbon) { #endif // Search player slots for skill=14(food) and skill=15(drink) uint32 i; - + bool food = false; bool drink = false; for (i = 22; i <= 29; i++) @@ -595,10 +595,10 @@ void Client::CalcAABonuses(StatBonuses* newbon) { } -//A lot of the normal spell functions (IsBlankSpellEffect, etc) are set for just spells (in common/spdat.h). +//A lot of the normal spell functions (IsBlankSpellEffect, etc) are set for just spells (in common/spdat.h). //For now, we'll just put them directly into the code and comment with the corresponding normal function //Maybe we'll fix it later? :-D -void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) +void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) { if(slots == 0) //sanity check. why bother if no slots to fill? return; @@ -650,7 +650,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) case SE_CurrentHP: //regens newbon->HPRegen += base1; break; - case SE_CurrentEndurance: + case SE_CurrentEndurance: newbon->EnduranceRegen += base1; break; case SE_MovementSpeed: @@ -803,7 +803,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) newbon->SkillReuseTime[base2] += base1; break; case SE_Fearless: - newbon->Fearless = true; + newbon->Fearless = true; break; case SE_PersistantCasting: newbon->PersistantCasting += base1; @@ -827,7 +827,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) newbon->SeeInvis = base1; break; case SE_BaseMovementSpeed: - newbon->BaseMovementSpeed += base1; + newbon->BaseMovementSpeed += base1; break; case SE_IncreaseRunSpeedCap: newbon->IncreaseRunSpeedCap += base1; @@ -955,7 +955,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) //base1 = chance, base2 = SpellID to be triggered, base3 = min npc level newbon->SpellOnKill[i] = base2; newbon->SpellOnKill[i+1] = base1; - + if (GetLevel() > 15) newbon->SpellOnKill[i+2] = GetLevel() - 15; //AA specifiy "non-trivial" else @@ -965,7 +965,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) } } break; - + case SE_SpellOnDeath: for(int i = 0; i < MAX_SPELL_TRIGGER*2; i+=2) { @@ -980,7 +980,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) break; case SE_TriggerOnCast: - + for(int i = 0; i < MAX_SPELL_TRIGGER; i++) { if (newbon->SpellTriggers[i] == aaid) @@ -994,7 +994,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) } } break; - + case SE_CriticalHitChance: { if(base2 == -1) @@ -1017,10 +1017,10 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) case SE_CriticalSpellChance: { newbon->CriticalSpellChance += base1; - + if (base2 > 100) newbon->SpellCritDmgIncrease += (base2 - 100); - + break; } @@ -1028,7 +1028,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) { if(base1 == 100) // If we reach 100% in a single spell/item then we should be immune to negative fear resist effects until our immunity is over newbon->Fearless = true; - + newbon->ResistFearChance += base1; // these should stack break; } @@ -1143,7 +1143,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) case SE_FinishingBlow: { - + //base1 = chance, base2 = damage if (newbon->FinishingBlow[1] < base2){ newbon->FinishingBlow[0] = base1; @@ -1194,10 +1194,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne { int i, effect_value; Mob *caster = nullptr; - + if(!IsValidSpell(spell_id)) return; - + if(casterId > 0) caster = entity_list.GetMob(casterId); @@ -1212,7 +1212,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->FocusEffects[focus] = spells[spell_id].effectid[i]; continue; } - + effect_value = CalcSpellEffectValue(spell_id, i, casterlevel, caster, ticsremaining); switch (spells[spell_id].effectid[i]) @@ -1223,10 +1223,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne } break; - case SE_CurrentEndurance: + case SE_CurrentEndurance: newbon->EnduranceRegen += effect_value; break; - + case SE_ChangeFrenzyRad: { // redundant to have level check here @@ -1256,7 +1256,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne if ((effect_value - 100) > newbon->haste) { newbon->haste = effect_value - 100; } - } + } else if ((effect_value - 100) < 0) { // Slow //Slow Mitigation works by taking the amount that would be slowed, and adding a multiplied version of the difference. int real_slow_value = (100 - effect_value) * -1; @@ -1268,7 +1268,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne } } else { - if (real_slow_value < newbon->haste) + if (real_slow_value < newbon->haste) newbon->haste = real_slow_value; } } @@ -1284,7 +1284,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne } break; } - + case SE_AttackSpeed3: { if (effect_value > 0) { // Haste V3 - Stacks and Overcaps @@ -1317,7 +1317,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->HP += effect_value; break; } - + case SE_ManaRegen_v2: case SE_CurrentMana: { @@ -1336,8 +1336,8 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->EnduranceReduction += effect_value; break; } - - case SE_ACv2: + + case SE_ACv2: case SE_ArmorClass: { newbon->AC += effect_value; @@ -1451,7 +1451,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->Corrup += effect_value; break; } - + case SE_RaiseStatCap: { switch(spells[spell_id].base2[i]) @@ -1510,7 +1510,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_MovementSpeed: newbon->movementspeed += effect_value; break; - + case SE_SpellDamageShield: newbon->SpellDamageShield += effect_value; break; @@ -1522,7 +1522,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DamageShieldType = GetDamageShieldType(spell_id); break; } - + case SE_ReverseDS: { newbon->ReverseDamageShield += effect_value; @@ -1541,7 +1541,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->singingMod = effect_value; break; } - + case SE_ChangeAggro: newbon->hatemod += effect_value; break; @@ -1550,7 +1550,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne //for some reason... this value is negative for increased mitigation newbon->MeleeMitigation -= effect_value; break; - + case SE_CriticalHitChance: { @@ -1560,9 +1560,9 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne else newbon->CriticalHitChance[spells[spell_id].base2[i]] += effect_value; } - + else if(effect_value < 0) { - + if(spells[spell_id].base2[i] == -1 && newbon->CriticalHitChance[HIGHEST_SKILL+1] > effect_value) newbon->CriticalHitChance[HIGHEST_SKILL+1] = effect_value; else if(spells[spell_id].base2[i] != -1 && newbon->CriticalHitChance[spells[spell_id].base2[i]] > effect_value) @@ -1576,10 +1576,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->CriticalHitChance[spells[spell_id].base2[i]] = effect_value; break; } - + case SE_CrippBlowChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->CrippBlowChance += effect_value; else if((effect_value < 0) && (newbon->CrippBlowChance > effect_value)) @@ -1587,41 +1587,41 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne else if(newbon->CrippBlowChance < effect_value) newbon->CrippBlowChance = effect_value; - + break; } - + case SE_AvoidMeleeChance: { //multiplier is to be compatible with item effects, watching for overflow too effect_value = effect_value<3000? effect_value * 10 : 30000; - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->AvoidMeleeChance += effect_value; else if((effect_value < 0) && (newbon->AvoidMeleeChance > effect_value)) newbon->AvoidMeleeChance = effect_value; - + else if(newbon->AvoidMeleeChance < effect_value) newbon->AvoidMeleeChance = effect_value; break; } - + case SE_RiposteChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->RiposteChance += effect_value; else if((effect_value < 0) && (newbon->RiposteChance > effect_value)) newbon->RiposteChance = effect_value; - + else if(newbon->RiposteChance < effect_value) newbon->RiposteChance = effect_value; break; } - + case SE_DodgeChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->DodgeChance += effect_value; else if((effect_value < 0) && (newbon->DodgeChance > effect_value)) @@ -1631,10 +1631,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DodgeChance = effect_value; break; } - + case SE_ParryChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->ParryChance += effect_value; else if((effect_value < 0) && (newbon->ParryChance > effect_value)) @@ -1644,10 +1644,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->ParryChance = effect_value; break; } - + case SE_DualWieldChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->DualWieldChance += effect_value; else if((effect_value < 0) && (newbon->DualWieldChance > effect_value)) @@ -1657,11 +1657,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DualWieldChance = effect_value; break; } - + case SE_DoubleAttackChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->DoubleAttackChance += effect_value; else if((effect_value < 0) && (newbon->DoubleAttackChance > effect_value)) @@ -1675,7 +1675,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_TripleAttackChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->TripleAttackChance += effect_value; else if((effect_value < 0) && (newbon->TripleAttackChance > effect_value)) @@ -1685,20 +1685,20 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->TripleAttackChance = effect_value; break; } - + case SE_MeleeLifetap: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->MeleeLifetap += spells[spell_id].base[i]; else if((effect_value < 0) && (newbon->MeleeLifetap > effect_value)) newbon->MeleeLifetap = spells[spell_id].base[i]; - + if(newbon->MeleeLifetap < spells[spell_id].base[i]) newbon->MeleeLifetap = spells[spell_id].base[i]; break; } - + case SE_AllInstrumentMod: { if(effect_value > newbon->singingMod) @@ -1713,7 +1713,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->stringedMod = effect_value; break; } - + case SE_ResistSpellChance: newbon->ResistSpellChance += effect_value; break; @@ -1722,18 +1722,18 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne { if(effect_value == 100) // If we reach 100% in a single spell/item then we should be immune to negative fear resist effects until our immunity is over newbon->Fearless = true; - + newbon->ResistFearChance += effect_value; // these should stack break; } - + case SE_Fearless: - newbon->Fearless = true; + newbon->Fearless = true; break; case SE_HundredHands: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->HundredHands += spells[spell_id].base[i]; if (effect_value > 0 && effect_value > newbon->HundredHands) @@ -1742,7 +1742,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->HundredHands = effect_value; //Decrease Weapon Delay break; } - + case SE_MeleeSkillCheck: { if(newbon->MeleeSkillCheck < effect_value) { @@ -1751,11 +1751,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne } break; } - + case SE_HitChance: { - if (RuleB(Spells, AdditiveBonusValues) && item_bonus){ + if (RuleB(Spells, AdditiveBonusValues) && item_bonus){ if(spells[spell_id].base2[i] == -1) newbon->HitChanceEffect[HIGHEST_SKILL+1] += effect_value; else @@ -1767,25 +1767,25 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne if ((effect_value < 0) && (newbon->HitChanceEffect[HIGHEST_SKILL+1] > effect_value)) newbon->HitChanceEffect[HIGHEST_SKILL+1] = effect_value; - else if (!newbon->HitChanceEffect[HIGHEST_SKILL+1] || + else if (!newbon->HitChanceEffect[HIGHEST_SKILL+1] || ((newbon->HitChanceEffect[HIGHEST_SKILL+1] > 0) && (newbon->HitChanceEffect[HIGHEST_SKILL+1] < effect_value))) newbon->HitChanceEffect[HIGHEST_SKILL+1] = effect_value; } - + else { if ((effect_value < 0) && (newbon->HitChanceEffect[spells[spell_id].base2[i]] > effect_value)) newbon->HitChanceEffect[spells[spell_id].base2[i]] = effect_value; - else if (!newbon->HitChanceEffect[spells[spell_id].base2[i]] || + else if (!newbon->HitChanceEffect[spells[spell_id].base2[i]] || ((newbon->HitChanceEffect[spells[spell_id].base2[i]] > 0) && (newbon->HitChanceEffect[spells[spell_id].base2[i]] < effect_value))) newbon->HitChanceEffect[spells[spell_id].base2[i]] = effect_value; } break; - + } - + case SE_DamageModifier: { if(spells[spell_id].base2[i] == -1) @@ -1794,7 +1794,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DamageModifier[spells[spell_id].base2[i]] += effect_value; break; } - + case SE_MinDamageModifier: { if(spells[spell_id].base2[i] == -1) @@ -1803,20 +1803,20 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->MinDamageModifier[spells[spell_id].base2[i]] += effect_value; break; } - + case SE_StunResist: { if(newbon->StunResist < effect_value) newbon->StunResist = effect_value; break; } - + case SE_ProcChance: { //multiplier is to be compatible with item effects,watching for overflow too effect_value = effect_value<3000? effect_value : 3000; - if (RuleB(Spells, AdditiveBonusValues) && item_bonus) + if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->ProcChance += effect_value; else if((effect_value < 0) && (newbon->DoubleAttackChance > effect_value)) @@ -1827,11 +1827,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne break; } - + case SE_ExtraAttackChance: newbon->ExtraAttackChance += effect_value; break; - + case SE_PercentXPIncrease: { if(newbon->XPRateMod < effect_value) @@ -1844,7 +1844,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne if(newbon->DeathSave[0] < effect_value) { newbon->DeathSave[0] = effect_value; //1='Partial' 2='Full' - newbon->DeathSave[1] = buffslot; + newbon->DeathSave[1] = buffslot; //These are used in later expansion spell effects. newbon->DeathSave[2] = spells[spell_id].base2[i];//Min level for HealAmt newbon->DeathSave[3] = spells[spell_id].max[i];//HealAmt @@ -1877,7 +1877,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne if ((effect_value < 0) && (newbon->Accuracy[HIGHEST_SKILL+1] > effect_value)) newbon->Accuracy[HIGHEST_SKILL+1] = effect_value; - else if (!newbon->Accuracy[HIGHEST_SKILL+1] || + else if (!newbon->Accuracy[HIGHEST_SKILL+1] || ((newbon->Accuracy[HIGHEST_SKILL+1] > 0) && (newbon->Accuracy[HIGHEST_SKILL+1] < effect_value))) newbon->Accuracy[HIGHEST_SKILL+1] = effect_value; break; @@ -1903,7 +1903,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->SkillDmgTaken[spells[spell_id].base2[i]] += effect_value; break; } - + case SE_TriggerOnCast: { for(int e = 0; e < MAX_SPELL_TRIGGER; e++) @@ -1920,7 +1920,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_SpellCritChance: newbon->CriticalSpellChance += effect_value; break; - + case SE_CriticalSpellChance: { newbon->CriticalSpellChance += effect_value; @@ -1941,25 +1941,25 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_CriticalHealChance: newbon->CriticalHealChance += effect_value; break; - + case SE_CriticalHealOverTime2: case SE_CriticalHealOverTime: newbon->CriticalHealOverTime += effect_value; break; - + case SE_MitigateDamageShield: { if (effect_value < 0) effect_value = effect_value*-1; - + newbon->DSMitigationOffHand += effect_value; break; } - + case SE_CriticalDoTChance: newbon->CriticalDoTChance += effect_value; break; - + case SE_SpellOnKill: { for(int e = 0; e < MAX_SPELL_TRIGGER*3; e+=3) @@ -1975,7 +1975,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne } break; } - + case SE_SpellOnDeath: { for(int e = 0; e < MAX_SPELL_TRIGGER; e+=2) @@ -2042,7 +2042,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->HPPercCap = effect_value; else if(newbon->HPPercCap == 0) newbon->HPPercCap = effect_value; - + break; } case SE_LimitManaPercent: @@ -2083,7 +2083,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_SpellProcChance: newbon->SpellProcChance += effect_value; break; - + case SE_CharmBreakChance: newbon->CharmBreakChance += effect_value; break; @@ -2091,11 +2091,11 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_BardSongRange: newbon->SongRange += effect_value; break; - + case SE_HPToMana: { //Lower the ratio the more favorable - if((!newbon->HPToManaConvert) || (newbon->HPToManaConvert >= effect_value)) + if((!newbon->HPToManaConvert) || (newbon->HPToManaConvert >= effect_value)) newbon->HPToManaConvert = spells[spell_id].base[i]; break; } @@ -2154,7 +2154,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne break; case SE_Fear: - newbon->IsFeared = true; + newbon->IsFeared = true; break; //AA bonuses - implemented broadly into spell/item effects @@ -2171,7 +2171,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne break; case SE_BaseMovementSpeed: - newbon->BaseMovementSpeed += effect_value; + newbon->BaseMovementSpeed += effect_value; break; case SE_IncreaseRunSpeedCap: @@ -2181,19 +2181,19 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_DoubleSpecialAttack: newbon->DoubleSpecialAttack += effect_value; break; - + case SE_TripleBackstab: newbon->TripleBackstab += effect_value; break; - + case SE_FrontalBackstabMinDmg: newbon->FrontalBackstabMinDmg = true; break; - + case SE_FrontalBackstabChance: newbon->FrontalBackstabChance += effect_value; break; - + case SE_ConsumeProjectile: newbon->ConsumeProjectile += effect_value; break; @@ -2215,13 +2215,13 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne break; case SE_StrikeThrough2: - newbon->StrikeThrough += effect_value; + newbon->StrikeThrough += effect_value; break; case SE_GiveDoubleAttack: newbon->GiveDoubleAttack += effect_value; break; - + case SE_PetCriticalHit: newbon->PetCriticalHit += effect_value; break; @@ -2245,7 +2245,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_PetFlurry: newbon->PetFlurry += effect_value; break; - + case SE_GivePetGroupTarget: newbon->GivePetGroupTarget = true; break; @@ -2253,24 +2253,24 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_RootBreakChance: newbon->RootBreakChance += effect_value; break; - + case SE_ChannelChanceItems: newbon->ChannelChanceItems += effect_value; break; - + case SE_ChannelChanceSpells: newbon->ChannelChanceSpells += effect_value; break; - + case SE_UnfailingDivinity: newbon->UnfailingDivinity += effect_value; break; - + case SE_ItemHPRegenCapIncrease: newbon->ItemHPRegenCap += effect_value; break; - + case SE_OffhandRiposteFail: newbon->OffhandRiposteFail += effect_value; break; @@ -2278,7 +2278,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne case SE_ItemAttackCapIncrease: newbon->ItemATKCap += effect_value; break; - + case SE_TwoHandBluntBlock: newbon->TwoHandBluntBlock += effect_value; break; @@ -2287,7 +2287,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne { for(int e = 0; e < MAX_RESISTABLE_EFFECTS*2; e+=2) { - if(!newbon->SEResist[e] && + if(!newbon->SEResist[e] && ((newbon->SEResist[e] = spells[spell_id].base2[i]) && (newbon->SEResist[e+1] < effect_value)) ){ newbon->SEResist[e] = spells[spell_id].base2[i]; newbon->SEResist[e+1] = effect_value; @@ -2394,7 +2394,7 @@ void NPC::CalcItemBonuses(StatBonuses *newbon) newbon->haste = cur->Haste; } } - + } } @@ -2435,7 +2435,7 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y, bool login) const ItemInst* inst = m_inv[i]; if(inst == 0) continue; - + bool update_slot = false; if(inst->IsScaling()) { @@ -2455,7 +2455,7 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y, bool login) } //iterate all augments - for(int x = 0; x < MAX_AUGMENT_SLOTS; ++x) + for(int x = 0; x < MAX_AUGMENT_SLOTS; ++x) { ItemInst * a_inst = inst->GetAugment(x); if(!a_inst) @@ -2471,7 +2471,7 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y, bool login) } parse->EventItem(EVENT_SCALE_CALC, this, e_inst, e_inst->GetID(), 0); - if (e_inst->GetExp() != oldexp) + if (e_inst->GetExp() != oldexp) { e_inst->ScaleItem(); changed = true; @@ -2566,7 +2566,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) return; int effect_value = 0; - + for (int i = 0; i < EFFECT_COUNT; i++) { if (spells[spell_id].effectid[i] == SE_NegateSpellEffect){ @@ -2584,7 +2584,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) //Negate bonuses switch (spells[spell_id].base2[i]) { - case SE_CurrentHP: + case SE_CurrentHP: if(spells[spell_id].base[i] == 1) { spellbonuses.HPRegen = effect_value; aabonuses.HPRegen = effect_value; @@ -2592,12 +2592,12 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } break; - case SE_CurrentEndurance: + case SE_CurrentEndurance: spellbonuses.EnduranceRegen = effect_value; aabonuses.EnduranceRegen = effect_value; itembonuses.EnduranceRegen = effect_value; break; - + case SE_ChangeFrenzyRad: spellbonuses.AggroRange = effect_value; aabonuses.AggroRange = effect_value; @@ -2628,11 +2628,11 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) spellbonuses.hastetype3 = effect_value; aabonuses.hastetype3 = effect_value; itembonuses.hastetype3 = effect_value; - + } break; } - + case SE_AttackSpeed4: spellbonuses.inhibitmelee = effect_value; aabonuses.inhibitmelee = effect_value; @@ -2644,7 +2644,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.HP = effect_value; itembonuses.HP = effect_value; break; - + case SE_ManaRegen_v2: case SE_CurrentMana: spellbonuses.ManaRegen = effect_value; @@ -2664,7 +2664,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.EnduranceReduction = effect_value; break; - case SE_ACv2: + case SE_ACv2: case SE_ArmorClass: spellbonuses.AC = effect_value; aabonuses.AC = effect_value; @@ -2804,7 +2804,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) itembonuses.Corrup = effect_value; aabonuses.Corrup = effect_value; break; - + case SE_CastingLevel2: case SE_CastingLevel: // Brilliance of Ro spellbonuses.effective_casting_level = effect_value; @@ -2818,19 +2818,19 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.movementspeed = effect_value; itembonuses.movementspeed = effect_value; break; - + case SE_SpellDamageShield: spellbonuses.SpellDamageShield = effect_value; aabonuses.SpellDamageShield = effect_value; itembonuses.SpellDamageShield = effect_value; break; - + case SE_DamageShield: spellbonuses.DamageShield = effect_value; aabonuses.DamageShield = effect_value; itembonuses.DamageShield = effect_value; break; - + case SE_ReverseDS: spellbonuses.ReverseDamageShield = effect_value; aabonuses.ReverseDamageShield = effect_value; @@ -2848,13 +2848,13 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) itembonuses.singingMod = effect_value; aabonuses.singingMod = effect_value; break; - + case SE_ChangeAggro: spellbonuses.hatemod = effect_value; itembonuses.hatemod = effect_value; aabonuses.hatemod = effect_value; break; - + case SE_MeleeMitigation: spellbonuses.MeleeMitigation = effect_value; itembonuses.MeleeMitigation = effect_value; @@ -2870,43 +2870,43 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) itembonuses.CriticalHitChance[e] = effect_value; } } - + case SE_CrippBlowChance: spellbonuses.CrippBlowChance = effect_value; aabonuses.CrippBlowChance = effect_value; itembonuses.CrippBlowChance = effect_value; break; - + case SE_AvoidMeleeChance: spellbonuses.AvoidMeleeChance = effect_value; aabonuses.AvoidMeleeChance = effect_value; itembonuses.AvoidMeleeChance = effect_value; break; - + case SE_RiposteChance: spellbonuses.RiposteChance = effect_value; aabonuses.RiposteChance = effect_value; itembonuses.RiposteChance = effect_value; break; - + case SE_DodgeChance: spellbonuses.DodgeChance = effect_value; aabonuses.DodgeChance = effect_value; itembonuses.DodgeChance = effect_value; break; - + case SE_ParryChance: spellbonuses.ParryChance = effect_value; aabonuses.ParryChance = effect_value; itembonuses.ParryChance = effect_value; break; - + case SE_DualWieldChance: spellbonuses.DualWieldChance = effect_value; aabonuses.DualWieldChance = effect_value; itembonuses.DualWieldChance = effect_value; break; - + case SE_DoubleAttackChance: spellbonuses.DoubleAttackChance = effect_value; aabonuses.DoubleAttackChance = effect_value; @@ -2924,7 +2924,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.MeleeLifetap = effect_value; itembonuses.MeleeLifetap = effect_value; break; - + case SE_AllInstrumentMod: { spellbonuses.singingMod = effect_value; @@ -2946,7 +2946,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.stringedMod = effect_value; break; } - + case SE_ResistSpellChance: spellbonuses.ResistSpellChance = effect_value; aabonuses.ResistSpellChance = effect_value; @@ -2962,8 +2962,8 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_Fearless: spellbonuses.Fearless = false; - aabonuses.Fearless = false; - itembonuses.Fearless = false; + aabonuses.Fearless = false; + itembonuses.Fearless = false; break; case SE_HundredHands: @@ -2971,14 +2971,14 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.HundredHands = effect_value; itembonuses.HundredHands = effect_value; break; - + case SE_MeleeSkillCheck: { spellbonuses.MeleeSkillCheck = effect_value; spellbonuses.MeleeSkillCheckSkill = effect_value; break; } - + case SE_HitChance: { for(int e = 0; e < HIGHEST_SKILL+1; e++) @@ -2989,7 +2989,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } break; } - + case SE_DamageModifier: { for(int e = 0; e < HIGHEST_SKILL+1; e++) @@ -3000,7 +3000,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } break; } - + case SE_MinDamageModifier: { for(int e = 0; e < HIGHEST_SKILL+1; e++) @@ -3011,19 +3011,19 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } break; } - + case SE_StunResist: spellbonuses.StunResist = effect_value; aabonuses.StunResist = effect_value; itembonuses.StunResist = effect_value; break; - + case SE_ProcChance: spellbonuses.ProcChance = effect_value; aabonuses.ProcChance = effect_value; itembonuses.ProcChance = effect_value; break; - + case SE_ExtraAttackChance: spellbonuses.ExtraAttackChance = effect_value; aabonuses.ExtraAttackChance = effect_value; @@ -3065,13 +3065,13 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.Endurance = effect_value; itembonuses.Endurance = effect_value; break; - + case SE_HealRate: spellbonuses.HealRate = effect_value; aabonuses.HealRate = effect_value; itembonuses.HealRate = effect_value; break; - + case SE_SkillDamageTaken: { for(int e = 0; e < HIGHEST_SKILL+1; e++) @@ -3079,7 +3079,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) spellbonuses.SkillDmgTaken[e] = effect_value; aabonuses.SkillDmgTaken[e] = effect_value; itembonuses.SkillDmgTaken[e] = effect_value; - + } break; } @@ -3100,7 +3100,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.CriticalSpellChance = effect_value; itembonuses.CriticalSpellChance = effect_value; break; - + case SE_CriticalSpellChance: spellbonuses.CriticalSpellChance = effect_value; spellbonuses.SpellCritDmgIncrease = effect_value; @@ -3128,20 +3128,20 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.CriticalHealChance = effect_value; itembonuses.CriticalHealChance = effect_value; break; - + case SE_CriticalHealOverTime2: case SE_CriticalHealOverTime: spellbonuses.CriticalHealOverTime = effect_value; aabonuses.CriticalHealOverTime = effect_value; itembonuses.CriticalHealOverTime = effect_value; break; - + case SE_MitigateDamageShield: spellbonuses.DSMitigationOffHand = effect_value; itembonuses.DSMitigationOffHand = effect_value; aabonuses.DSMitigationOffHand = effect_value; break; - + case SE_CriticalDoTChance: spellbonuses.CriticalDoTChance = effect_value; aabonuses.CriticalDoTChance = effect_value; @@ -3166,7 +3166,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } break; } - + /* case SE_SpellOnDeath: { @@ -3200,7 +3200,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } break; } - + case SE_IncreaseBlockChance: spellbonuses.IncreaseBlockChance = effect_value; aabonuses.IncreaseBlockChance = effect_value; @@ -3212,7 +3212,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) itembonuses.PersistantCasting = effect_value; aabonuses.PersistantCasting = effect_value; break; - + case SE_ImmuneFleeing: spellbonuses.ImmuneToFlee = false; break; @@ -3228,13 +3228,13 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) itembonuses.SpellProcChance = effect_value; aabonuses.SpellProcChance = effect_value; break; - + case SE_CharmBreakChance: spellbonuses.CharmBreakChance = effect_value; aabonuses.CharmBreakChance = effect_value; itembonuses.CharmBreakChance = effect_value; break; - + case SE_BardSongRange: spellbonuses.SongRange = effect_value; aabonuses.SongRange = effect_value; @@ -3271,7 +3271,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) spellbonuses.ManaAbsorbPercentDamage[0] = effect_value; spellbonuses.ManaAbsorbPercentDamage[1] = -1; break; - + case SE_ShieldBlock: spellbonuses.ShieldBlock = effect_value; aabonuses.ShieldBlock = effect_value; @@ -3284,7 +3284,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) break; case SE_Fear: - spellbonuses.IsFeared = false; + spellbonuses.IsFeared = false; break; case SE_FrontalStunResist: @@ -3307,8 +3307,8 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_BaseMovementSpeed: spellbonuses.BaseMovementSpeed = effect_value; - aabonuses.BaseMovementSpeed = effect_value; - itembonuses.BaseMovementSpeed = effect_value; + aabonuses.BaseMovementSpeed = effect_value; + itembonuses.BaseMovementSpeed = effect_value; break; case SE_IncreaseRunSpeedCap: @@ -3322,23 +3322,23 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.DoubleSpecialAttack = effect_value; itembonuses.DoubleSpecialAttack = effect_value; break; - + case SE_TripleBackstab: spellbonuses.TripleBackstab = effect_value; aabonuses.TripleBackstab = effect_value; itembonuses.TripleBackstab = effect_value; break; - + case SE_FrontalBackstabMinDmg: spellbonuses.FrontalBackstabMinDmg = false; break; - + case SE_FrontalBackstabChance: spellbonuses.FrontalBackstabChance = effect_value; aabonuses.FrontalBackstabChance = effect_value; itembonuses.FrontalBackstabChance = effect_value; break; - + case SE_ConsumeProjectile: spellbonuses.ConsumeProjectile = effect_value; aabonuses.ConsumeProjectile = effect_value; @@ -3380,7 +3380,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.GiveDoubleAttack = effect_value; itembonuses.GiveDoubleAttack = effect_value; break; - + case SE_PetCriticalHit: spellbonuses.PetCriticalHit = effect_value; aabonuses.PetCriticalHit = effect_value; @@ -3416,7 +3416,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.PetFlurry = effect_value; itembonuses.PetFlurry = effect_value; break; - + case SE_GivePetGroupTarget: spellbonuses.GivePetGroupTarget = false; aabonuses.GivePetGroupTarget = false; @@ -3428,31 +3428,31 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.RootBreakChance = effect_value; itembonuses.RootBreakChance = effect_value; break; - + case SE_ChannelChanceItems: spellbonuses.ChannelChanceItems = effect_value; aabonuses.ChannelChanceItems = effect_value; itembonuses.ChannelChanceItems = effect_value; break; - + case SE_ChannelChanceSpells: spellbonuses.ChannelChanceSpells = effect_value; aabonuses.ChannelChanceSpells = effect_value; itembonuses.ChannelChanceSpells = effect_value; break; - + case SE_UnfailingDivinity: spellbonuses.UnfailingDivinity = effect_value; aabonuses.UnfailingDivinity = effect_value; itembonuses.UnfailingDivinity = effect_value; break; - + case SE_ItemHPRegenCapIncrease: spellbonuses.ItemHPRegenCap = effect_value; aabonuses.ItemHPRegenCap = effect_value; itembonuses.ItemHPRegenCap = effect_value; break; - + case SE_OffhandRiposteFail: spellbonuses.OffhandRiposteFail = effect_value; aabonuses.OffhandRiposteFail = effect_value; @@ -3480,7 +3480,7 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) aabonuses.MasteryofPast = effect_value; itembonuses.MasteryofPast = effect_value; break; - + case SE_GiveDoubleRiposte: spellbonuses.GiveDoubleRiposte[0] = effect_value; itembonuses.GiveDoubleRiposte[0] = effect_value; @@ -3489,11 +3489,11 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) case SE_SlayUndead: spellbonuses.SlayUndead[0] = effect_value; - spellbonuses.SlayUndead[1] = effect_value; + spellbonuses.SlayUndead[1] = effect_value; itembonuses.SlayUndead[0] = effect_value; - itembonuses.SlayUndead[1] = effect_value; + itembonuses.SlayUndead[1] = effect_value; aabonuses.SlayUndead[0] = effect_value; - aabonuses.SlayUndead[1] = effect_value; + aabonuses.SlayUndead[1] = effect_value; break; } diff --git a/zone/bot.cpp b/zone/bot.cpp index f6bdd6667..a2ffd5850 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -3577,7 +3577,7 @@ void Bot::AI_Process() { if(!IsEngaged()) { if(GetFollowID()) { - if(BotOwner && BotOwner->GetTarget() && BotOwner->GetTarget()->IsNPC() && (BotOwner->GetTarget()->GetHateAmount(BotOwner) + if(BotOwner && BotOwner->GetTarget() && BotOwner->GetTarget()->IsNPC() && (BotOwner->GetTarget()->GetHateAmount(BotOwner) || BotOwner->CastToClient()->AutoAttackEnabled()) && IsAttackAllowed(BotOwner->GetTarget())) { AddToHateList(BotOwner->GetTarget(), 1); @@ -6361,8 +6361,8 @@ void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, SkillType attack_skil SendHPUpdate(); - if(this == from) { - return; + if(this == from) { + return; } // Aggro the bot's group members diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index 5bae0b60b..36662e38b 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -17,7 +17,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { return false; } } - + if(tar->GetAppearance() == eaDead) { if((tar->IsClient() && tar->CastToClient()->GetFeigned()) || tar->IsBot()) { // do nothing @@ -45,10 +45,10 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } - + //TODO //Check if single target or AoE mez is best //if (TARGETS ON MT IS => 3 THEN botSpell = AoEMez) @@ -67,17 +67,17 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!(!addMob->IsImmuneToSpell(botSpell.SpellId, this) && addMob->CanBuffStack(botSpell.SpellId, botLevel, true) >= 0)) break; - + castedSpell = AIDoSpellCast(botSpell.SpellIndex, addMob, botSpell.ManaCost); if(castedSpell) { char* gmsg = 0; - + MakeAnyLenString(&gmsg, "Attempting to mez %s.", addMob->GetCleanName()); if(gmsg && GetGroupMessagesOn()) BotGroupSay(this, gmsg); - } + } } break; } @@ -86,7 +86,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { uint8 hpr = (uint8)tar->GetHPRatio(); bool hasAggro = false; bool isPrimaryHealer = false; - + if(HasGroup()) { isPrimaryHealer = IsGroupPrimaryHealer(); } @@ -192,12 +192,12 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { hpRatioToCast = isPrimaryHealer?100.0f:0.0f; break; } - + //If we're at specified mana % or below, don't heal as hybrid if(tar->GetHPRatio() <= hpRatioToCast) botSpell = GetBestBotSpellForRegularSingleTargetHeal(this); } - + if(botSpell.SpellId == 0) botSpell = GetBestBotSpellForRegularSingleTargetHeal(this); @@ -230,7 +230,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { // TODO: Replace this code with logic that calculates the delay based on number of clerics in rotation // and ignores heals for anyone except the main tank if(!IsHealOverTimeSpell(botSpell.SpellId)) { - if(IsCompleteHealSpell(botSpell.SpellId)) { + if(IsCompleteHealSpell(botSpell.SpellId)) { // Complete Heal 4 second rotation tar->SetDontHealMeBefore(Timer::GetCurrentTime() + 4000); } @@ -274,7 +274,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } @@ -289,9 +289,9 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { break; uint32 TempDontRootMeBefore = tar->DontRootMeBefore(); - + castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost, &TempDontRootMeBefore); - + if(TempDontRootMeBefore != tar->DontRootMeBefore()) tar->SetDontRootMeBefore(TempDontRootMeBefore); } @@ -321,7 +321,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { // Validate target - if(!((spells[selectedBotSpell.SpellId].targettype == ST_Target || spells[selectedBotSpell.SpellId].targettype == ST_Pet || tar == this || + if(!((spells[selectedBotSpell.SpellId].targettype == ST_Target || spells[selectedBotSpell.SpellId].targettype == ST_Pet || tar == this || spells[selectedBotSpell.SpellId].targettype == ST_Group || spells[selectedBotSpell.SpellId].targettype == ST_GroupTeleport || (botClass == BARD && spells[selectedBotSpell.SpellId].targettype == ST_AEBard)) && !tar->IsImmuneToSpell(selectedBotSpell.SpellId, this) @@ -362,7 +362,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(botClass == ENCHANTER && IsEffectInSpell(selectedBotSpell.SpellId, SE_Rune)) { float manaRatioToCast = 75.0f; - + switch(this->GetBotStance()) { case BotStanceEfficient: @@ -381,7 +381,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { manaRatioToCast = 75.0f; break; } - + //If we're at specified mana % or below, don't rune as enchanter if(this->GetManaRatio() <= manaRatioToCast) break; @@ -407,13 +407,13 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { case SpellType_Escape: { uint8 hpr = (uint8)GetHPRatio(); bool mayGetAggro = false; - -#ifdef IPC + +#ifdef IPC if (hpr <= 5 || (IsNPC() && CastToNPC()->IsInteractive() && tar != this) ) #else if(hpr > 15 && ((botClass == WIZARD) || (botClass == ENCHANTER) || (botClass == RANGER))) mayGetAggro = HasOrMayGetAggro(); //classes have hate reducing spells - + if (hpr <= 15 || mayGetAggro) #endif { @@ -421,10 +421,10 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(botSpell.SpellId == 0) break; - + if(IsInvulnerabilitySpell(botSpell.SpellId)) tar = this; //target self for invul type spells - + castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost); } break; @@ -435,14 +435,14 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } if(botClass == CLERIC || botClass == ENCHANTER) { float manaRatioToCast = 75.0f; - + switch(this->GetBotStance()) { case BotStanceEfficient: @@ -463,7 +463,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { manaRatioToCast = 50.0f; break; } - + //If we're at specified mana % or below, don't nuke as cleric or enchanter if(this->GetManaRatio() <= manaRatioToCast) break; @@ -479,7 +479,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(botClass == PALADIN || botClass == DRUID || botClass == CLERIC || botClass == ENCHANTER || botClass == WIZARD) { if(botSpell.SpellId == 0) { uint8 stunChance = (tar->IsCasting() ? 30: 15); - + if(botClass == PALADIN) stunChance = 50; @@ -501,8 +501,8 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!(!tar->IsImmuneToSpell(botSpell.SpellId, this) && (tar->CanBuffStack(botSpell.SpellId, botLevel, true) >= 0))) break; - - if(IsFearSpell(botSpell.SpellId)) { + + if(IsFearSpell(botSpell.SpellId)) { // don't let fear cast if the npc isn't snared or rooted if(tar->GetSnaredAmount() == -1) { if(!tar->IsRooted()) @@ -519,10 +519,10 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } - + botSpell = GetFirstBotSpellBySpellType(this, iSpellTypes); if(botSpell.SpellId == 0) @@ -546,13 +546,13 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(botSpell.SpellId == 0) break; - + castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost); } break; } case SpellType_InCombatBuff: { - + if(botClass == SHAMAN) { checked_los = true; @@ -589,7 +589,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } @@ -610,7 +610,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } @@ -623,9 +623,9 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { break; uint32 TempDontSnareMeBefore = tar->DontSnareMeBefore(); - + castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost, &TempDontSnareMeBefore); - + if(TempDontSnareMeBefore != tar->DontSnareMeBefore()) tar->SetDontSnareMeBefore(TempDontSnareMeBefore); } @@ -679,19 +679,19 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } - + switch (botClass) { case ENCHANTER: { botSpell = GetBestBotSpellForMagicBasedSlow(this); break; } - case SHAMAN: + case SHAMAN: case BEASTLORD: { botSpell = GetBestBotSpellForDiseaseBasedSlow(this); - + if(botSpell.SpellId == 0 || ((tar->GetMR() - 50) < (tar->GetDR() + spells[botSpell.SpellId].ResistDiff))) botSpell = GetBestBotSpellForMagicBasedSlow(this); break; @@ -703,12 +703,12 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!(!tar->IsImmuneToSpell(botSpell.SpellId, this) && tar->CanBuffStack(botSpell.SpellId, botLevel, true) >= 0)) break; - + castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost); if(castedSpell) { char* gmsg = 0; - + MakeAnyLenString(&gmsg, "Attempting to slow %s.", tar->GetCleanName()); if(gmsg && GetGroupMessagesOn()) @@ -723,10 +723,10 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(!checked_los) { if(!CheckLosFN(tar)) break; //cannot see target... we assume that no spell is going to work since we will only be casting detrimental spells in this call - + checked_los = true; } - + botSpell = GetBestBotSpellForResistDebuff(this, tar); if(botSpell.SpellId == 0) @@ -749,7 +749,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(botSpell.SpellId == 0) break; - + uint32 TempDontCureMeBeforeTime = tar->DontCureMeBefore(); castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost, &TempDontCureMeBeforeTime); @@ -758,7 +758,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if(botClass != BARD) { if(IsGroupSpell(botSpell.SpellId)){ Group *g; - + if(this->HasGroup()) { Group *g = this->GetGroup(); @@ -814,8 +814,8 @@ bool Bot::AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain float dist2 = 0; if (AIspells[i].type & SpellType_Escape) { - dist2 = 0; - } else + dist2 = 0; + } else dist2 = DistNoRoot(*tar); if (((((spells[AIspells[i].spellid].targettype==ST_GroupTeleport && AIspells[i].type==2) @@ -853,14 +853,14 @@ bool Bot::AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain bool Bot::AI_PursueCastCheck() { bool result = false; - + if (AIautocastspell_timer->Check(false)) { _ZP(Bot_AI_Process_pursue_cast); - + AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. - + mlog(AI__SPELLS, "Bot Engaged (pursuing) autocast check triggered. Trying to cast offensive spells."); - + if(!AICastSpell(GetTarget(), 100, SpellType_Snare)) { if(!AICastSpell(GetTarget(), 100, SpellType_Lifetap)) { if(!AICastSpell(GetTarget(), 100, SpellType_Nuke)) { @@ -873,12 +873,12 @@ bool Bot::AI_PursueCastCheck() { } result = true; - } - + } + if(!AIautocastspell_timer->Enabled()) AIautocastspell_timer->Start(RandomTimer(100, 250), false); } - + return result; } @@ -892,10 +892,10 @@ bool Bot::AI_IdleCastCheck() { #endif AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. - //Ok, IdleCastCheck depends of class. + //Ok, IdleCastCheck depends of class. // Healers WITHOUT pets will check if a heal is needed before buffing. uint8 botClass = GetClass(); - + if(botClass == CLERIC || botClass == PALADIN || botClass == RANGER) { if(!entity_list.Bot_AICheckCloseBeneficialSpells(this, 100, BotAISpellRange, SpellType_Cure)) { if (!AICastSpell(this, 100, SpellType_Heal)) { @@ -912,7 +912,7 @@ bool Bot::AI_IdleCastCheck() { result = true; } // Pets class will first cast their pet, then buffs - else if(botClass == DRUID || botClass == MAGICIAN || botClass == SHADOWKNIGHT || botClass == SHAMAN || botClass == NECROMANCER || botClass == ENCHANTER || botClass == BEASTLORD || botClass == WIZARD) { + else if(botClass == DRUID || botClass == MAGICIAN || botClass == SHADOWKNIGHT || botClass == SHAMAN || botClass == NECROMANCER || botClass == ENCHANTER || botClass == BEASTLORD || botClass == WIZARD) { if(!entity_list.Bot_AICheckCloseBeneficialSpells(this, 100, BotAISpellRange, SpellType_Cure)) { if (!AICastSpell(this, 100, SpellType_Pet)) { if (!AICastSpell(this, 100, SpellType_Heal)) { @@ -930,24 +930,24 @@ bool Bot::AI_IdleCastCheck() { } result = true; - } + } else if(botClass == BARD) { // bard bots if(!AICastSpell(this, 100, SpellType_Cure)) { if(!AICastSpell(this, 100, SpellType_Heal)) { if(!AICastSpell(this, 100, SpellType_Buff)) { - // + // } } } - + result = true; } if(!AIautocastspell_timer->Enabled()) AIautocastspell_timer->Start(RandomTimer(1000, 5000), false); } - + return result; } @@ -1148,7 +1148,7 @@ bool Bot::AI_EngagedCastCheck() { failedToCast = true; } } - } + } } } } @@ -1172,7 +1172,7 @@ bool Bot::AIHealRotation(Mob* tar, bool useFastHeals) { if(!AI_HasSpells()) return false; - + if(tar->GetAppearance() == eaDead) { if((tar->IsClient() && tar->CastToClient()->GetFeigned()) || tar->IsBot()) { // do nothing @@ -1321,7 +1321,7 @@ std::list Bot::GetBotSpellsBySpellType(Bot* botCaster, uint16 spellTyp BotSpell Bot::GetFirstBotSpellBySpellType(Bot* botCaster, uint16 spellType) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1340,7 +1340,7 @@ BotSpell Bot::GetFirstBotSpellBySpellType(Bot* botCaster, uint16 spellType) { result.SpellId = botSpellList[i].spellid; result.SpellIndex = i; result.ManaCost = botSpellList[i].manacost; - + break; } } @@ -1351,7 +1351,7 @@ BotSpell Bot::GetFirstBotSpellBySpellType(Bot* botCaster, uint16 spellType) { BotSpell Bot::GetBestBotSpellForFastHeal(Bot *botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1376,7 +1376,7 @@ BotSpell Bot::GetBestBotSpellForFastHeal(Bot *botCaster) { BotSpell Bot::GetBestBotSpellForHealOverTime(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1413,7 +1413,7 @@ BotSpell Bot::GetBestBotSpellForHealOverTime(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForPercentageHeal(Bot *botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1432,7 +1432,7 @@ BotSpell Bot::GetBestBotSpellForPercentageHeal(Bot *botCaster) { result.SpellId = botSpellList[i].spellid; result.SpellIndex = i; result.ManaCost = botSpellList[i].manacost; - + break; } } @@ -1443,7 +1443,7 @@ BotSpell Bot::GetBestBotSpellForPercentageHeal(Bot *botCaster) { BotSpell Bot::GetBestBotSpellForRegularSingleTargetHeal(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1468,7 +1468,7 @@ BotSpell Bot::GetBestBotSpellForRegularSingleTargetHeal(Bot* botCaster) { BotSpell Bot::GetFirstBotSpellForSingleTargetHeal(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1493,7 +1493,7 @@ BotSpell Bot::GetFirstBotSpellForSingleTargetHeal(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1507,7 +1507,7 @@ BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* botCaster) { result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - + break; } } @@ -1518,7 +1518,7 @@ BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForGroupHealOverTime(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1555,7 +1555,7 @@ BotSpell Bot::GetBestBotSpellForGroupHealOverTime(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1569,7 +1569,7 @@ BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* botCaster) { result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - + break; } } @@ -1580,7 +1580,7 @@ BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForMez(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1594,7 +1594,7 @@ BotSpell Bot::GetBestBotSpellForMez(Bot* botCaster) { result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - + break; } } @@ -1605,7 +1605,7 @@ BotSpell Bot::GetBestBotSpellForMez(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForMagicBasedSlow(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1619,7 +1619,7 @@ BotSpell Bot::GetBestBotSpellForMagicBasedSlow(Bot* botCaster) { result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - + break; } } @@ -1630,7 +1630,7 @@ BotSpell Bot::GetBestBotSpellForMagicBasedSlow(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForDiseaseBasedSlow(Bot* botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1644,7 +1644,7 @@ BotSpell Bot::GetBestBotSpellForDiseaseBasedSlow(Bot* botCaster) { result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - + break; } } @@ -1660,7 +1660,7 @@ Mob* Bot::GetFirstIncomingMobToMez(Bot* botCaster, BotSpell botSpell) { std::list npc_list; entity_list.GetNPCList(npc_list); - + for(std::list::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) { NPC* npc = *itr; @@ -1691,7 +1691,7 @@ Mob* Bot::GetFirstIncomingMobToMez(Bot* botCaster, BotSpell botSpell) { BotSpell Bot::GetBestBotMagicianPetSpell(Bot *botCaster) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1753,7 +1753,7 @@ std::string Bot::GetBotMagicianPetType(Bot* botCaster) { else if(botCaster->GetLevel() < 30) { // Under level 30 int counter = MakeRandomInt(0, 3); - + switch(counter) { case 0: result = std::string("SumWater"); @@ -1775,7 +1775,7 @@ std::string Bot::GetBotMagicianPetType(Bot* botCaster) { else { // Over level 30 int counter = MakeRandomInt(0, 4); - + switch(counter) { case 0: result = std::string("SumWater"); @@ -1802,7 +1802,7 @@ std::string Bot::GetBotMagicianPetType(Bot* botCaster) { BotSpell Bot::GetBestBotSpellForNukeByTargetType(Bot* botCaster, SpellTargetType targetType) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1816,7 +1816,7 @@ BotSpell Bot::GetBestBotSpellForNukeByTargetType(Bot* botCaster, SpellTargetType result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - + break; } } @@ -1855,7 +1855,7 @@ BotSpell Bot::GetBestBotSpellForStunByTargetType(Bot* botCaster, SpellTargetType BotSpell Bot::GetBestBotWizardNukeSpellByTargetResists(Bot* botCaster, Mob* target) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1867,7 +1867,7 @@ BotSpell Bot::GetBestBotWizardNukeSpellByTargetResists(Bot* botCaster, Mob* targ if((target->GetMR() > maxTargetResistValue) && (target->GetCR() > maxTargetResistValue) && (target->GetFR() > maxTargetResistValue)) selectLureNuke = true; - + std::list botSpellList = GetBotSpellsForSpellEffectAndTargetType(botCaster, SE_CurrentHP, ST_Target); @@ -1885,18 +1885,18 @@ BotSpell Bot::GetBestBotWizardNukeSpellByTargetResists(Bot* botCaster, Mob* targ spellSelected = true; } else if(IsPureNukeSpell(botSpellListItr->SpellId)) { - if(((target->GetMR() < target->GetCR()) || (target->GetMR() < target->GetFR())) && (GetSpellResistType(botSpellListItr->SpellId) == RESIST_MAGIC) + if(((target->GetMR() < target->GetCR()) || (target->GetMR() < target->GetFR())) && (GetSpellResistType(botSpellListItr->SpellId) == RESIST_MAGIC) && (spells[botSpellListItr->SpellId].ResistDiff > lureResisValue)) { spellSelected = true; } - else if(((target->GetCR() < target->GetMR()) || (target->GetCR() < target->GetFR())) && (GetSpellResistType(botSpellListItr->SpellId) == RESIST_COLD) - && (spells[botSpellListItr->SpellId].ResistDiff > lureResisValue)) + else if(((target->GetCR() < target->GetMR()) || (target->GetCR() < target->GetFR())) && (GetSpellResistType(botSpellListItr->SpellId) == RESIST_COLD) + && (spells[botSpellListItr->SpellId].ResistDiff > lureResisValue)) { spellSelected = true; } else if(((target->GetFR() < target->GetCR()) || (target->GetFR() < target->GetMR())) && (GetSpellResistType(botSpellListItr->SpellId) == RESIST_FIRE) - && (spells[botSpellListItr->SpellId].ResistDiff > lureResisValue)) + && (spells[botSpellListItr->SpellId].ResistDiff > lureResisValue)) { spellSelected = true; } @@ -1927,7 +1927,7 @@ BotSpell Bot::GetBestBotWizardNukeSpellByTargetResists(Bot* botCaster, Mob* targ BotSpell Bot::GetDebuffBotSpell(Bot* botCaster, Mob *tar) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; @@ -1945,14 +1945,14 @@ BotSpell Bot::GetDebuffBotSpell(Bot* botCaster, Mob *tar) { continue; } - if(((botSpellList[i].type & SpellType_Debuff) || IsDebuffSpell(botSpellList[i].spellid)) - && (!tar->IsImmuneToSpell(botSpellList[i].spellid, botCaster) - && tar->CanBuffStack(botSpellList[i].spellid, botCaster->GetLevel(), true) >= 0) + if(((botSpellList[i].type & SpellType_Debuff) || IsDebuffSpell(botSpellList[i].spellid)) + && (!tar->IsImmuneToSpell(botSpellList[i].spellid, botCaster) + && tar->CanBuffStack(botSpellList[i].spellid, botCaster->GetLevel(), true) >= 0) && CheckSpellRecastTimers(botCaster, i)) { result.SpellId = botSpellList[i].spellid; result.SpellIndex = i; result.ManaCost = botSpellList[i].manacost; - + break; } } @@ -1963,14 +1963,14 @@ BotSpell Bot::GetDebuffBotSpell(Bot* botCaster, Mob *tar) { BotSpell Bot::GetBestBotSpellForResistDebuff(Bot* botCaster, Mob *tar) { BotSpell result; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; - + if(!tar) return result; - + int level_mod = (tar->GetLevel() - botCaster->GetLevel())* (tar->GetLevel() - botCaster->GetLevel()) / 2; if(tar->GetLevel() - botCaster->GetLevel() < 0) { @@ -1981,7 +1981,7 @@ BotSpell Bot::GetBestBotSpellForResistDebuff(Bot* botCaster, Mob *tar) { bool needsFireResistDebuff = (tar->GetFR() + level_mod) > 100 ? true: false; bool needsPoisonResistDebuff = (tar->GetPR() + level_mod) > 100 ? true: false; bool needsDiseaseResistDebuff = (tar->GetDR() + level_mod) > 100 ? true: false; - + if(botCaster && botCaster->AI_HasSpells()) { std::vector botSpellList = botCaster->GetBotSpells(); @@ -1992,19 +1992,19 @@ BotSpell Bot::GetBestBotSpellForResistDebuff(Bot* botCaster, Mob *tar) { continue; } - if(((botSpellList[i].type & SpellType_Debuff) || IsResistDebuffSpell(botSpellList[i].spellid)) - && ((needsMagicResistDebuff && (IsEffectInSpell(botSpellList[i].spellid, SE_ResistMagic)) || IsEffectInSpell(botSpellList[i].spellid, SE_ResistAll)) + if(((botSpellList[i].type & SpellType_Debuff) || IsResistDebuffSpell(botSpellList[i].spellid)) + && ((needsMagicResistDebuff && (IsEffectInSpell(botSpellList[i].spellid, SE_ResistMagic)) || IsEffectInSpell(botSpellList[i].spellid, SE_ResistAll)) || (needsColdResistDebuff && (IsEffectInSpell(botSpellList[i].spellid, SE_ResistCold)) || IsEffectInSpell(botSpellList[i].spellid, SE_ResistAll)) || (needsFireResistDebuff && (IsEffectInSpell(botSpellList[i].spellid, SE_ResistFire)) || IsEffectInSpell(botSpellList[i].spellid, SE_ResistAll)) || (needsPoisonResistDebuff && (IsEffectInSpell(botSpellList[i].spellid, SE_ResistPoison)) || IsEffectInSpell(botSpellList[i].spellid, SE_ResistAll)) || (needsDiseaseResistDebuff && (IsEffectInSpell(botSpellList[i].spellid, SE_ResistDisease)) || IsEffectInSpell(botSpellList[i].spellid, SE_ResistAll))) - && (!tar->IsImmuneToSpell(botSpellList[i].spellid, botCaster) - && tar->CanBuffStack(botSpellList[i].spellid, botCaster->GetLevel(), true) >= 0) + && (!tar->IsImmuneToSpell(botSpellList[i].spellid, botCaster) + && tar->CanBuffStack(botSpellList[i].spellid, botCaster->GetLevel(), true) >= 0) && CheckSpellRecastTimers(botCaster, i)) { result.SpellId = botSpellList[i].spellid; result.SpellIndex = i; result.ManaCost = botSpellList[i].manacost; - + break; } } @@ -2016,14 +2016,14 @@ BotSpell Bot::GetBestBotSpellForResistDebuff(Bot* botCaster, Mob *tar) { BotSpell Bot::GetBestBotSpellForCure(Bot* botCaster, Mob *tar) { BotSpell result; bool spellSelected = false; - + result.SpellId = 0; result.SpellIndex = 0; result.ManaCost = 0; - + if(!tar) return result; - + int countNeedsCured = 0; bool isPoisoned = tar->FindType(SE_PoisonCounter); bool isDiseased = tar->FindType(SE_DiseaseCounter); @@ -2032,7 +2032,7 @@ BotSpell Bot::GetBestBotSpellForCure(Bot* botCaster, Mob *tar) { if(botCaster && botCaster->AI_HasSpells()) { std::list cureList = GetBotSpellsBySpellType(botCaster, SpellType_Cure); - + if(tar->HasGroup()) { Group *g = tar->GetGroup(); @@ -2045,12 +2045,12 @@ BotSpell Bot::GetBestBotSpellForCure(Bot* botCaster, Mob *tar) { } } } - + //Check for group cure first if(countNeedsCured > 2) { for(list::iterator itr = cureList.begin(); itr != cureList.end(); itr++) { BotSpell selectedBotSpell = *itr; - + if(IsGroupSpell(itr->SpellId) && CheckSpellRecastTimers(botCaster, itr->SpellIndex)) { if(selectedBotSpell.SpellId == 0) continue; @@ -2087,7 +2087,7 @@ BotSpell Bot::GetBestBotSpellForCure(Bot* botCaster, Mob *tar) { if(!spellSelected) { for(list::iterator itr = cureList.begin(); itr != cureList.end(); itr++) { BotSpell selectedBotSpell = *itr; - + if(CheckSpellRecastTimers(botCaster, itr->SpellIndex)) { if(selectedBotSpell.SpellId == 0) continue; @@ -2195,17 +2195,17 @@ void Bot::CalcChanceToCast() { _spellCastingChances[i][j] = 0; } } - + BotStanceType botStance = GetBotStance(); uint8 botClass = GetClass(); bool isPrimaryHealer = false; bool isPrimarySlower = false; - + if(HasGroup()) { isPrimaryHealer = IsGroupPrimaryHealer(); isPrimarySlower = IsGroupPrimarySlower(); } - + //Nuke switch(botClass) { @@ -3187,7 +3187,7 @@ uint8 Bot::GetChanceToCastBySpellType(uint16 spellType) { if(GetBotStance() >= MaxStances) return 0; - + switch (spellType) { case SpellType_Nuke: { index = SpellType_NukeIndex; @@ -3217,7 +3217,7 @@ uint8 Bot::GetChanceToCastBySpellType(uint16 spellType) { index = SpellType_LifetapIndex; break; } - case SpellType_Snare: { + case SpellType_Snare: { index = SpellType_SnareIndex; break; } @@ -3257,7 +3257,7 @@ uint8 Bot::GetChanceToCastBySpellType(uint16 spellType) { if(index >= MaxSpellTypes) return 0; - + chance = _spellCastingChances[botStance][index]; return chance; diff --git a/zone/client.cpp b/zone/client.cpp index 1f96a2122..27554cdde 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -324,7 +324,7 @@ Client::Client(EQStreamInterface* ieqs) XTargets[i].ID = 0; XTargets[i].Name[0] = 0; } - MaxXTargets = 5; + MaxXTargets = 5; XTargetAutoAddHaters = true; LoadAccountFlags(); } @@ -505,7 +505,7 @@ bool Client::Save(uint8 iCommitNow) { m_pp.z = z_pos; m_pp.guildrank=guildrank; m_pp.heading = heading; - + // Temp Hack for signed values until we get the root of the problem changed over to signed... if (m_pp.copper < 0) { m_pp.copper = 0; } if (m_pp.silver < 0) { m_pp.silver = 0; } @@ -520,7 +520,7 @@ bool Client::Save(uint8 iCommitNow) { int spentpoints=0; for(int a=0;a < MAX_PP_AA_ARRAY;a++) { uint32 points = aa[a]->value; - if(points > HIGHEST_AA_VALUE) // Unifying this + if(points > HIGHEST_AA_VALUE) // Unifying this { aa[a]->value = HIGHEST_AA_VALUE; points = HIGHEST_AA_VALUE; @@ -530,7 +530,7 @@ bool Client::Save(uint8 iCommitNow) { SendAA_Struct* curAA = zone->FindAA(aa[a]->AA-aa[a]->value+1); if(curAA) { - for (int rank=0; rank::iterator RequiredLevel = AARequiredLevelAndCost.find(aa[a]->AA-aa[a]->value + 1 + rank); @@ -790,8 +790,8 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } uint32 AllowedMessages = RuleI(Chat, MinimumMessagesPerInterval) + TotalKarma; - AllowedMessages = AllowedMessages > RuleI(Chat, MaximumMessagesPerInterval) ? RuleI(Chat, MaximumMessagesPerInterval) : AllowedMessages; - + AllowedMessages = AllowedMessages > RuleI(Chat, MaximumMessagesPerInterval) ? RuleI(Chat, MaximumMessagesPerInterval) : AllowedMessages; + if(RuleI(Chat, MinStatusToBypassAntiSpam) <= Admin()) AllowedMessages = 10000; @@ -805,7 +805,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } if(GlobalChatLimiterTimer) { - Message(0, "You have been rate limited, you can send more messages in %i seconds.", + Message(0, "You have been rate limited, you can send more messages in %i seconds.", GlobalChatLimiterTimer->GetRemainingTime() / 1000); return; } @@ -823,18 +823,18 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if(RuleB(QueryServ, PlayerChatLogging)) { ServerPacket* pack = new ServerPacket(ServerOP_Speech, sizeof(Server_Speech_Struct) + strlen(message) + 1); Server_Speech_Struct* sem = (Server_Speech_Struct*) pack->pBuffer; - + if(chan_num == 0) sem->guilddbid = GuildID(); else sem->guilddbid = 0; - + strcpy(sem->message, message); sem->minstatus = this->Admin(); sem->type = chan_num; if(targetname != 0) strcpy(sem->to, targetname); - + if(GetName() != 0) strcpy(sem->from, GetName()); @@ -961,7 +961,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s return; } } - + if (!worldserver.SendChannelMessage(this, 0, 5, 0, language, message)) { Message(0, "Error: World server disconnected"); @@ -1028,7 +1028,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } } target_name[x] = '\0'; - } + } if(!worldserver.SendChannelMessage(this, target_name, chan_num, 0, language, message)) Message(0, "Error: World server disconnected"); @@ -1053,7 +1053,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s printf("Message: %s\n",message); entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); - if(parse->PlayerHasQuestSub("EVENT_SAY")) + if(parse->PlayerHasQuestSub("EVENT_SAY")) { parse->EventPlayer(EVENT_SAY, this, message, language); } @@ -1075,7 +1075,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s GetTarget()->CastToNPC()->PauseWandering(RuleI(NPC, SayPauseTimeInSec)); parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, message, language); } - } + } if (RuleB(TaskSystem, EnableTaskSystem) && DistNoRootNoZ(*GetTarget()) <= 200) { @@ -1095,7 +1095,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if (DistNoRootNoZ(*GetTarget()) <= 200) { parse->EventNPC(EVENT_AGGRO_SAY, GetTarget()->CastToNPC(), this, message, language); } - } + } } } @@ -1159,9 +1159,9 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num strcpy(cm->targetname, m_pp.name); else cm->targetname[0] = 0; - + uint8 ListenerSkill; - + if (language < MAX_PP_LANGUAGE) { ListenerSkill = m_pp.languages[language]; if (ListenerSkill == 0) { @@ -1186,13 +1186,13 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num if (ListenerSkill < 100) { GarbleMessage(buffer, (100 - ListenerSkill)); } - + cm->chan_num = chan_num; strcpy(&cm->message[0], buffer); QueuePacket(&app); if ((chan_num == 2) && (ListenerSkill < 100)) { // group message in unmastered language, check for skill up - if ((m_pp.languages[language] <= lang_skill) && (from != this->GetName())) + if ((m_pp.languages[language] <= lang_skill) && (from != this->GetName())) CheckLanguageSkillIncrease(language, lang_skill); } } @@ -1433,7 +1433,7 @@ void Client::SetSkill(SkillType skillid, uint16 value) { safe_delete(outapp); } -void Client::IncreaseLanguageSkill(int skill_id, int value) { +void Client::IncreaseLanguageSkill(int skill_id, int value) { if (skill_id >= MAX_PP_LANGUAGE) return; //Invalid lang id @@ -1566,7 +1566,7 @@ void Client::FriendsWho(char *FriendsString) { safe_delete(pack); } } - + void Client::UpdateAdmin(bool iFromDB) { int16 tmp = admin; @@ -1804,7 +1804,7 @@ void Client::SendManaUpdatePacket() { MobEnduranceUpdate_Struct *meus = (MobEnduranceUpdate_Struct *)outapp2->pBuffer; mmus->spawn_id = meus->spawn_id = GetID(); - + mmus->mana = GetManaPercent(); meus->endurance = GetEndurancePercent(); @@ -1830,7 +1830,7 @@ void Client::SendManaUpdatePacket() { void Client::SendManaUpdate() { EQApplicationPacket* mana_app = new EQApplicationPacket(OP_ManaUpdate,sizeof(ManaUpdate_Struct)); - ManaUpdate_Struct* mus = (ManaUpdate_Struct*)mana_app->pBuffer; + ManaUpdate_Struct* mus = (ManaUpdate_Struct*)mana_app->pBuffer; mus->cur_mana = GetMana(); mus->max_mana = GetMaxMana(); mus->spawn_id = GetID(); @@ -1843,7 +1843,7 @@ void Client::SendManaUpdate() void Client::SendEnduranceUpdate() { EQApplicationPacket* end_app = new EQApplicationPacket(OP_EnduranceUpdate,sizeof(EnduranceUpdate_Struct)); - EnduranceUpdate_Struct* eus = (EnduranceUpdate_Struct*)end_app->pBuffer; + EnduranceUpdate_Struct* eus = (EnduranceUpdate_Struct*)end_app->pBuffer; eus->cur_end = GetEndurance(); eus->max_end = GetMaxEndurance(); eus->spawn_id = GetID(); @@ -2075,7 +2075,7 @@ void Client::ReadBook(BookRequest_Struct *book) { } void Client::QuestReadBook(const char* text, uint8 type) { - string booktxt2 = text; + string booktxt2 = text; int length = booktxt2.length(); if (booktxt2[0] != '\0') { EQApplicationPacket* outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct)); @@ -2251,21 +2251,21 @@ void Client::AddMoneyToPP(uint64 copper, bool updateclient){ } void Client::AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold, uint32 platinum, bool updateclient){ - + int32 new_value = m_pp.platinum + platinum; - if(new_value >= 0 && new_value > m_pp.platinum) + if(new_value >= 0 && new_value > m_pp.platinum) m_pp.platinum += platinum; new_value = m_pp.gold + gold; - if(new_value >= 0 && new_value > m_pp.gold) + if(new_value >= 0 && new_value > m_pp.gold) m_pp.gold += gold; new_value = m_pp.silver + silver; - if(new_value >= 0 && new_value > m_pp.silver) + if(new_value >= 0 && new_value > m_pp.silver) m_pp.silver += silver; new_value = m_pp.copper + copper; - if(new_value >= 0 && new_value > m_pp.copper) + if(new_value >= 0 && new_value > m_pp.copper) m_pp.copper += copper; if(updateclient) @@ -2339,8 +2339,8 @@ bool Client::CheckIncreaseSkill(SkillType skillid, Mob *against_who, int chancem if(against_who) { - if( against_who->SpecAttacks[IMMUNE_AGGRO] || against_who->IsClient() || - GetLevelCon(against_who->GetLevel()) == CON_GREEN ) + if(against_who->SpecAttacks[IMMUNE_AGGRO] || against_who->IsClient() || + GetLevelCon(against_who->GetLevel()) == CON_GREEN) { //false by default return mod_can_increase_skill(skillid, against_who); @@ -2385,7 +2385,7 @@ void Client::CheckLanguageSkillIncrease(uint8 langid, uint8 TeacherSkill) { if(MakeRandomFloat(0,100) < Chance) { // if they make the roll IncreaseLanguageSkill(langid); // increase the language skill by 1 _log(SKILLS__GAIN, "Language %d at value %d successfully gain with %.4f%%chance", langid, LangSkill, Chance); - } + } else _log(SKILLS__GAIN, "Language %d at value %d failed to gain with %.4f%%chance", langid, LangSkill, Chance); } @@ -2485,7 +2485,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(SkillType skillid, uint16 max SetSkill((SkillType)i, 1); Save(); - + LogFile->write(EQEMuLog::Normal, "Reset %s's caster specialization skills to 1. " "Too many specializations skills were above 50.", GetCleanName()); } @@ -2581,12 +2581,12 @@ void Client::LogMerchant(Client* player, Mob* merchant, uint32 quantity, uint32 char Buffer[255]; memset(Buffer, 0, sizeof(Buffer)); - snprintf(Buffer, sizeof(Buffer)-1, "%3i", quantity); + snprintf(Buffer, sizeof(Buffer)-1, "%3i", quantity); LogText += Buffer; - snprintf(Buffer, sizeof(Buffer)-1, "%10i", price); + snprintf(Buffer, sizeof(Buffer)-1, "%10i", price); LogText += " TotalValue: "; LogText += Buffer; - snprintf(Buffer, sizeof(Buffer)-1, " ItemID: %7i", item->ID); + snprintf(Buffer, sizeof(Buffer)-1, " ItemID: %7i", item->ID); LogText += Buffer; LogText += " "; snprintf(Buffer, sizeof(Buffer)-1, " %s", item->Name); @@ -2916,7 +2916,7 @@ void Client::Message_StringID(uint32 type, uint32 string_id, uint32 distance) sms->string_id=string_id; sms->unknown8=0; - + if(distance>0) entity_list.QueueCloseClients(this,outapp,false,distance); else @@ -2982,7 +2982,7 @@ void Client::Message_StringID(uint32 type, uint32 string_id, const char* messag bufptr += strlen(message_arg[i]) + 1; } - + if(distance>0) entity_list.QueueCloseClients(this,outapp,false,distance); else @@ -3156,7 +3156,7 @@ float Client::CalcPriceMod(Mob* other, bool reverse) int factionlvl = GetFactionLevel(CharacterID(), other->CastToNPC()->GetNPCTypeID(), GetRace(), GetClass(), GetDeity(), other->CastToNPC()->GetPrimaryFaction(), other); if (factionlvl >= FACTION_APPREHENSIVE) // Apprehensive or worse. { - if (GetCHA() > 103) + if (GetCHA() > 103) { chaformula = (GetCHA() - 103)*((-(RuleR(Merchant, ChaBonusMod))/100)*(RuleI(Merchant, PriceBonusPct))); // This will max out price bonus. if (chaformula < -1*(RuleI(Merchant, PriceBonusPct))) @@ -3165,22 +3165,22 @@ float Client::CalcPriceMod(Mob* other, bool reverse) else if (GetCHA() < 103) { chaformula = (103 - GetCHA())*(((RuleR(Merchant, ChaPenaltyMod))/100)*(RuleI(Merchant, PricePenaltyPct))); // This will bottom out price penalty. - if (chaformula > 1*(RuleI(Merchant, PricePenaltyPct))) + if (chaformula > 1*(RuleI(Merchant, PricePenaltyPct))) chaformula = 1*(RuleI(Merchant, PricePenaltyPct)); } } if (factionlvl <= FACTION_INDIFFERENT) // Indifferent or better. { - if (GetCHA() > 75) + if (GetCHA() > 75) { chaformula = (GetCHA() - 75)*((-(RuleR(Merchant, ChaBonusMod))/100)*(RuleI(Merchant, PriceBonusPct))); // This will max out price bonus. if (chaformula < -1*(RuleI(Merchant, PriceBonusPct))) chaformula = -1*(RuleI(Merchant, PriceBonusPct)); } - else if (GetCHA() < 75) + else if (GetCHA() < 75) { chaformula = (75 - GetCHA())*(((RuleR(Merchant, ChaPenaltyMod))/100)*(RuleI(Merchant, PricePenaltyPct))); // Faction modifier keeps up from reaching bottom price penalty. - if (chaformula > 1*(RuleI(Merchant, PricePenaltyPct))) + if (chaformula > 1*(RuleI(Merchant, PricePenaltyPct))) chaformula = 1*(RuleI(Merchant, PricePenaltyPct)); } } @@ -3799,13 +3799,13 @@ void Client::SendWindow(uint32 PopupID, uint32 NegativeID, uint32 Buttons, const EQApplicationPacket* app = new EQApplicationPacket(OP_OnLevelMessage, sizeof(OnLevelMessage_Struct)); OnLevelMessage_Struct* olms=(OnLevelMessage_Struct*)app->pBuffer; - + if(strlen(Text) > (sizeof(olms->Text)-1)) return; - if(!target) + if(!target) title_type = 0; - + switch (title_type) { case 1: { @@ -3835,7 +3835,7 @@ void Client::SendWindow(uint32 PopupID, uint32 NegativeID, uint32 Buttons, const break; } } - + memcpy(olms->Text, buffer, len+1); olms->Buttons = Buttons; @@ -3847,10 +3847,10 @@ void Client::SendWindow(uint32 PopupID, uint32 NegativeID, uint32 Buttons, const olms->Duration = Duration * 1000; else olms->Duration = 0xffffffff; - + olms->PopupID = PopupID; olms->NegativeID = NegativeID; - + FastQueuePacket(&app); } @@ -3934,7 +3934,7 @@ bool Client::IsDiscovered(uint32 itemid) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT count(*) FROM discovered_items WHERE item_id = '%lu'", itemid), errbuf, &result)) { row = mysql_fetch_row(result); @@ -3996,7 +3996,7 @@ void Client::UpdateLFP() { if(g) { // Fill the LFPMembers array with the rest of the group members, excluding ourself - // We don't fill in the class, level or zone, because we may not be able to determine + // We don't fill in the class, level or zone, because we may not be able to determine // them if the other group members are not in this zone. World will fill in this information // for us, if it can. int NextFreeSlot = 1; @@ -4012,7 +4012,7 @@ uint16 Client::GetPrimarySkillValue() { SkillType skill = HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill bool equiped = m_inv.GetItem(13); - + if (!equiped) skill = HAND_TO_HAND; @@ -4082,7 +4082,7 @@ uint16 Client::GetTotalATK() } else AttackRating = GetATK(); - + AttackRating += spellbonuses.ATK; return AttackRating; @@ -4106,7 +4106,7 @@ void Client::VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber) { switch(Type) { - case VoiceMacroGroup: { + case VoiceMacroGroup: { Group* g = GetGroup(); @@ -4118,7 +4118,7 @@ void Client::VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber) { break; } - case VoiceMacroRaid: { + case VoiceMacroRaid: { Raid* r = GetRaid(); @@ -4149,7 +4149,7 @@ void Client::ClearGroupAAs() { } void Client::UpdateGroupAAs(int32 points, uint32 type) { - + switch(type) { case 0: @@ -4224,7 +4224,7 @@ void Client::DecrementAggroCount() { // It checks whether any other mob is aggro on the player, and if not, starts the rest timer. // For SoF, the opcode to start the rest state countdown timer in the UI is sent. // - + // If we didn't have aggro before, this method should not have been called. if(!AggroCount) return; @@ -4366,14 +4366,14 @@ void Client::HandleLDoNOpen(NPC *target) { if(target->GetClass() != LDON_TREASURE) { - LogFile->write(EQEMuLog::Debug, "%s tried to open %s but %s was not a treasure chest.", + LogFile->write(EQEMuLog::Debug, "%s tried to open %s but %s was not a treasure chest.", GetName(), target->GetName(), target->GetName()); return; } if(DistNoRootNoZ(*target) > RuleI(Adventure, LDoNTrapDistanceUse)) { - LogFile->write(EQEMuLog::Debug, "%s tried to open %s but %s was out of range", + LogFile->write(EQEMuLog::Debug, "%s tried to open %s but %s was out of range", GetName(), target->GetName(), target->GetName()); Message(13, "Treasure chest out of range."); return; @@ -4396,7 +4396,7 @@ void Client::HandleLDoNOpen(NPC *target) target->SetLDoNTrapDetected(false); } } - + if(target->IsLDoNLocked()) { Message_StringID(MT_Skills, LDON_STILL_LOCKED, target->GetCleanName()); @@ -4697,14 +4697,14 @@ void Client::BuryPlayerCorpses() void Client::NotifyNewTitlesAvailable() { EQApplicationPacket *outapp = new EQApplicationPacket(OP_NewTitlesAvailable, 0); - + QueuePacket(outapp); safe_delete(outapp); } -void Client::SetStartZone(uint32 zoneid, float x, float y, float z) +void Client::SetStartZone(uint32 zoneid, float x, float y, float z) { // setting city to zero allows the player to use /setstartcity to set the city themselves if(zoneid == 0) { @@ -4712,14 +4712,14 @@ void Client::SetStartZone(uint32 zoneid, float x, float y, float z) this->Message(15,"Your starting city has been reset. Use /setstartcity to choose a new one"); return; } - + // check to make sure the zone is valid const char *target_zone_name = database.GetZoneName(zoneid); if(target_zone_name == nullptr) return; m_pp.binds[4].zoneId = zoneid; - if (x == 0 && y == 0 && z ==0) + if (x == 0 && y == 0 && z ==0) database.GetSafePoints(m_pp.binds[4].zoneId, 0, &m_pp.binds[4].x, &m_pp.binds[4].y, &m_pp.binds[4].z); else { m_pp.binds[4].x = x; @@ -4733,7 +4733,7 @@ uint32 Client::GetStartZone() return m_pp.binds[4].zoneId; } -void Client::ShowSkillsWindow() +void Client::ShowSkillsWindow() { const char *WindowTitle = "Skills"; string WindowText; @@ -4752,7 +4752,7 @@ void Client::ShowSkillsWindow() "Pottery","Percussion Instruments","Intimidation","Berserking","Taunt","Frenzy"}; for(int i = 0; i <= (int)HIGHEST_SKILL; i++) Skills[SkillName[i]] = (SkillType)i; - + // print out all available skills for(it = Skills.begin(); it != Skills.end(); it++) { if(GetSkill(it->second) > 0 || MaxSkill(it->second) > 0) { @@ -4772,7 +4772,7 @@ void Client::ShowSkillsWindow() } -void Client::SetShadowStepExemption(bool v) +void Client::SetShadowStepExemption(bool v) { if(v == true) { @@ -4796,7 +4796,7 @@ void Client::SetShadowStepExemption(bool v) } else if(IsKnockBackExempted()) { - //still potential to trigger this if you're knocked back off a + //still potential to trigger this if you're knocked back off a //HUGE fall that takes > 2.5 seconds if(speed > 30.0f) { @@ -4826,10 +4826,10 @@ void Client::SetShadowStepExemption(bool v) m_TimeSinceLastPositionCheck = cur_time; m_DistanceSinceLastPositionCheck = 0.0f; } - m_ShadowStepExemption = v; + m_ShadowStepExemption = v; } -void Client::SetKnockBackExemption(bool v) +void Client::SetKnockBackExemption(bool v) { if(v == true) { @@ -4853,7 +4853,7 @@ void Client::SetKnockBackExemption(bool v) } else if(IsKnockBackExempted()) { - //still potential to trigger this if you're knocked back off a + //still potential to trigger this if you're knocked back off a //HUGE fall that takes > 2.5 seconds if(speed > 30.0f) { @@ -4883,10 +4883,10 @@ void Client::SetKnockBackExemption(bool v) m_TimeSinceLastPositionCheck = cur_time; m_DistanceSinceLastPositionCheck = 0.0f; } - m_KnockBackExemption = v; + m_KnockBackExemption = v; } -void Client::SetPortExemption(bool v) +void Client::SetPortExemption(bool v) { if(v == true) { @@ -4910,7 +4910,7 @@ void Client::SetPortExemption(bool v) } else if(IsKnockBackExempted()) { - //still potential to trigger this if you're knocked back off a + //still potential to trigger this if you're knocked back off a //HUGE fall that takes > 2.5 seconds if(speed > 30.0f) { @@ -4940,7 +4940,7 @@ void Client::SetPortExemption(bool v) m_TimeSinceLastPositionCheck = cur_time; m_DistanceSinceLastPositionCheck = 0.0f; } - m_PortExemption = v; + m_PortExemption = v; } void Client::Signal(uint32 data) @@ -5021,14 +5021,14 @@ const bool Client::IsMQExemptedArea(uint32 zoneID, float x, float y, float z) co case 114: case 209: { - //The portals are so common in paineel/felwitheb that checking - //distances wouldn't be worth it cause unless you're porting to the + //The portals are so common in paineel/felwitheb that checking + //distances wouldn't be worth it cause unless you're porting to the //start field you're going to be triggering this and that's a level of //accuracy I'm willing to sacrifice return true; break; } - + case 24: { float delta = (x-(-183.0)); @@ -5113,9 +5113,9 @@ void Client::SendRewards() if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT reward_id, amount FROM" " account_rewards WHERE account_id=%i ORDER by reward_id", AccountID()), - errbuf,&result)) + errbuf,&result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { ClientReward cr; cr.id = atoi(row[0]); @@ -5203,7 +5203,7 @@ bool Client::TryReward(uint32 claim_id) if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT amount FROM" " account_rewards WHERE account_id=%i AND reward_id=%i", AccountID(), claim_id), - errbuf,&result)) + errbuf,&result)) { row = mysql_fetch_row(result); if(row) @@ -5250,7 +5250,7 @@ bool Client::TryReward(uint32 claim_id) { if(!database.RunQuery(query,MakeAnyLenString(&query,"DELETE FROM" " account_rewards WHERE account_id=%i AND reward_id=%i", AccountID(), claim_id), - errbuf)) + errbuf)) { LogFile->write(EQEMuLog::Error, "Error in Client::TryReward(): %s (%s)", query, errbuf); safe_delete_array(query); @@ -5264,7 +5264,7 @@ bool Client::TryReward(uint32 claim_id) { if(!database.RunQuery(query,MakeAnyLenString(&query,"UPDATE account_rewards SET amount=(amount-1)" " WHERE account_id=%i AND reward_id=%i", AccountID(), claim_id), - errbuf)) + errbuf)) { LogFile->write(EQEMuLog::Error, "Error in Client::TryReward(): %s (%s)", query, errbuf); safe_delete_array(query); @@ -5430,7 +5430,7 @@ void Client::UpdateLDoNLosses(uint32 t, int32 n) void Client::SuspendMinion() { NPC *CurrentPet = GetPet()->CastToNPC(); - + int AALevel = GetAA(aaSuspendedMinion); if(AALevel == 0) @@ -5438,7 +5438,7 @@ void Client::SuspendMinion() if(GetLevel() < 62) return; - + if(!CurrentPet) { if(m_suspendedminion.SpellID > 0) @@ -5467,7 +5467,7 @@ void Client::SuspendMinion() CurrentPet->SetMana(m_suspendedminion.Mana); Message_StringID(clientMessageTell, SUSPEND_MINION_UNSUSPEND, CurrentPet->GetCleanName()); - + memset(&m_suspendedminion, 0, sizeof(struct PetInfo)); } else @@ -5656,8 +5656,8 @@ void Client::SendGroupCreatePacket() VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); // Null Leader name - - VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // Member 0 + + VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // Member 0 VARSTRUCT_ENCODE_STRING(Buffer, GetName()); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); @@ -5674,7 +5674,7 @@ void Client::SendGroupCreatePacket() void Client::SendGroupLeaderChangePacket(const char *LeaderName) { // For SoD and later, send name of Group Leader to this client - + EQApplicationPacket *outapp=new EQApplicationPacket(OP_GroupLeaderChange, sizeof(GroupLeaderChange_Struct)); GroupLeaderChange_Struct *glcs = (GroupLeaderChange_Struct*)outapp->pBuffer; @@ -5710,7 +5710,7 @@ void Client::SendAdventureDetails() arr->unknown2080 = 0x0A; arr->risk = ad->risk; strcpy(arr->text, ad->text); - + if(ad->time_to_enter != 0) { arr->timetoenter = ad->time_to_enter; @@ -5719,7 +5719,7 @@ void Client::SendAdventureDetails() { arr->timeleft = ad->time_left; } - + if(ad->zone_in_id == zone->GetZoneID()) { arr->y = ad->x; @@ -5893,7 +5893,7 @@ void Client::CheckLDoNHail(Mob *target) target->SetOwnerID(GetID()); target->Say("Wonderful! Someone to set me free! I feared for my life for so long," " never knowing when they might choose to end my life. Now that you're here though" - " I can rest easy. Please help me find my way out of here as soon as you can" + " I can rest easy. Please help me find my way out of here as soon as you can" " I'll stay close behind you!"); } @@ -5902,8 +5902,8 @@ void Client::CheckEmoteHail(Mob *target, const char* message) if( (message[0] != 'H' && message[0] != 'h') || - message[1] != 'a' || - message[2] != 'i' || + message[1] != 'a' || + message[2] != 'i' || message[3] != 'l'){ return; } @@ -6064,7 +6064,7 @@ void Client::DragCorpses() for(std::list::iterator Iterator = DraggedCorpses.begin(); Iterator != DraggedCorpses.end(); ++Iterator) { Mob* corpse = entity_list.GetMob((*Iterator).c_str()); - + if(corpse && corpse->IsPlayerCorpse() && (DistNoRootNoZ(*corpse) <= RuleR(Character, DragCorpseDistance))) continue; @@ -6079,7 +6079,7 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid { if(!target || !IsValidSpell(spell_id) || this->GetID() == target->GetID()) return; - + PetRecord record; if(!database.GetPetEntry(spells[spell_id].teleport_zone, &record)) { @@ -6087,14 +6087,14 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid Message(13, "Unable to find data for pet %s", spells[spell_id].teleport_zone); return; } - + AA_SwarmPet pet; pet.count = pet_count; pet.duration = pet_duration; pet.npc_id = record.npc_type; NPCType *made_npc = nullptr; - + const NPCType *npc_type = database.GetNPCType(pet.npc_id); if(npc_type == nullptr) { LogFile->write(EQEMuLog::Error, "Unknown npc type for doppelganger spell id: %d", spell_id); @@ -6102,11 +6102,11 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid return; } // make a custom NPC type for this - made_npc = new NPCType; + made_npc = new NPCType; memcpy(made_npc, npc_type, sizeof(NPCType)); - + strcpy(made_npc->name, name_override); - made_npc->level = GetLevel(); + made_npc->level = GetLevel(); made_npc->race = GetRace(); made_npc->gender = GetGender(); made_npc->size = GetSize(); @@ -6140,30 +6140,30 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid made_npc->armor_tint[i] = GetEquipmentColor(i); } made_npc->loottable_id = 0; - + npc_type = made_npc; - + int summon_count = 0; summon_count = pet.count; - + if(summon_count > MAX_SWARM_PETS) summon_count = MAX_SWARM_PETS; - + static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, 10, -10, 10, -10, 8, -8, 8, -8 }; static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, 10, 10, -10, -10, 8, 8, -8, -8 }; TempPets(true); - + while(summon_count > 0) { NPCType *npc_dup = nullptr; if(made_npc != nullptr) { npc_dup = new NPCType; memcpy(npc_dup, made_npc, sizeof(NPCType)); } - + NPC* npca = new NPC( (npc_dup!=nullptr)?npc_dup:npc_type, //make sure we give the NPC the correct data pointer - 0, - GetX()+swarm_pet_x[summon_count], GetY()+swarm_pet_y[summon_count], + 0, + GetX()+swarm_pet_x[summon_count], GetY()+swarm_pet_y[summon_count], GetZ(), GetHeading(), FlyMode3); if(!npca->GetSwarmInfo()){ @@ -6181,11 +6181,11 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid target->AddToHateList(npca, (target->GetHateAmount(this) + 100), (target->GetDamageAmount(this) + 100)); npca->AddToHateList(target, 1000, 1000); npca->GetSwarmInfo()->target = target->GetID(); - + //we allocated a new NPC type object, give the NPC ownership of that memory if(npc_dup != nullptr) npca->GiveNPCTypeData(npc_dup); - + entity_list.AddNPC(npca); summon_count--; } @@ -6204,23 +6204,23 @@ void Client::SendStatsWindow(Client* client, bool use_window) std::string indM = "                          "; std::string indL = "                                 "; std::string div = " | "; - + std::string color_red = ""; std::string color_blue = ""; std::string color_green = ""; std::string bright_green = ""; std::string bright_red = ""; std::string heroic_color = " +"; - - // Set Class + + // Set Class std::string class_Name = itoa(GetClass()); std::string class_List[] = { "WAR", "CLR", "PAL", "RNG", "SK", "DRU", "MNK", "BRD", "ROG", "SHM", "NEC", "WIZ", "MAG", "ENC", "BST", "BER" }; - + if(GetClass() < 17 && GetClass() > 0) { class_Name = class_List[GetClass()-1]; } - + // Race std::string race_Name = itoa(GetRace()); - switch(GetRace()) + switch(GetRace()) { case 1: race_Name = "Human"; break; case 2: race_Name = "Barbarian"; break; @@ -6243,7 +6243,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ H/M/E String - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string HME_row = ""; //Loop Variables @@ -6257,7 +6257,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) int hme_rows = 3; // Rows in display int max_HME_value_len = 9; // 9 digits in the displayed value - for(int hme_row_counter = 0; hme_row_counter < hme_rows; hme_row_counter++) + for(int hme_row_counter = 0; hme_row_counter < hme_rows; hme_row_counter++) { switch(hme_row_counter) { case 0: { @@ -6273,7 +6273,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) total_field = itoa(CalcMaxMana()); } else { continue; } - + break; } case 2: { @@ -6286,16 +6286,16 @@ void Client::SendStatsWindow(Client* client, bool use_window) } if(cur_field.compare(total_field) == 0) { cur_color = bright_green; } else { cur_color = bright_red; } - + cur_spacing.clear(); for(int a = cur_field.size(); a < max_HME_value_len; a++) { cur_spacing += " ."; } - + HME_row += indM + cur_name + cur_spacing + cur_color + cur_field + " / " + total_field + "
"; } /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Regen String - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string regen_string; //Loop Variables @@ -6316,14 +6316,14 @@ void Client::SendStatsWindow(Client* client, bool use_window) int regen_rows = 3; // Number of rows int max_regen_value_len = 5; // 5 digits in the displayed value(larger values will not get cut off, this is just a baseline) - for(int regen_row_counter = 0; regen_row_counter < regen_rows; regen_row_counter++) + for(int regen_row_counter = 0; regen_row_counter < regen_rows; regen_row_counter++) { switch(regen_row_counter) { case 0: { regen_row_header = "H: "; regen_row_color = color_red; - + base_regen_field = itoa(LevelRegen()); item_regen_field = itoa(itembonuses.HPRegen); cap_regen_field = itoa(CalcHPRegenCap()); @@ -6336,7 +6336,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) if(CalcMaxMana() > 0) { regen_row_header = "M: "; regen_row_color = color_blue; - + base_regen_field = itoa(CalcBaseManaRegen()); item_regen_field = itoa(itembonuses.ManaRegen); cap_regen_field = itoa(CalcManaRegenCap()); @@ -6350,7 +6350,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) case 2: { regen_row_header = "E: "; regen_row_color = color_green; - + base_regen_field = itoa(((GetLevel() * 4 / 10) + 2)); item_regen_field = itoa(itembonuses.EnduranceRegen); cap_regen_field = itoa(CalcEnduranceRegenCap()); @@ -6361,7 +6361,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) } default: { break; } } - + base_regen_spacing.clear(); item_regen_spacing.clear(); cap_regen_spacing.clear(); @@ -6371,9 +6371,9 @@ void Client::SendStatsWindow(Client* client, bool use_window) for(int b = base_regen_field.size(); b < max_regen_value_len; b++) { base_regen_spacing += " ."; } for(int b = item_regen_field.size(); b < max_regen_value_len; b++) { item_regen_spacing += " ."; } for(int b = cap_regen_field.size(); b < max_regen_value_len; b++) { cap_regen_spacing += " ."; } - for(int b = spell_regen_field.size(); b < max_regen_value_len; b++) { spell_regen_spacing += " ."; } + for(int b = spell_regen_field.size(); b < max_regen_value_len; b++) { spell_regen_spacing += " ."; } for(int b = aa_regen_field.size(); b < max_regen_value_len; b++) { aa_regen_spacing += " ."; } - + regen_string += indS + regen_row_color + regen_row_header + base_regen_spacing + base_regen_field; regen_string += div + item_regen_spacing + item_regen_field + " (" + cap_regen_field; regen_string += ") " + cap_regen_spacing + div + spell_regen_spacing + spell_regen_field; @@ -6382,7 +6382,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Stat String - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string stat_field = ""; //Loop Variables @@ -6400,11 +6400,11 @@ void Client::SendStatsWindow(Client* client, bool use_window) std::string a_resist_spacing = ""; //fourth field(heroic resist) std::string h_resist_field = ""; - + int stat_rows = 7; // Number of rows int max_stat_value_len = 3; // 3 digits in the displayed value - for(int stat_row_counter = 0; stat_row_counter < stat_rows; stat_row_counter++) + for(int stat_row_counter = 0; stat_row_counter < stat_rows; stat_row_counter++) { switch(stat_row_counter) { case 0: { @@ -6469,24 +6469,24 @@ void Client::SendStatsWindow(Client* client, bool use_window) } default: { break; } } - + a_stat_spacing.clear(); h_stat_spacing.clear(); a_resist_spacing.clear(); - + for(int a = a_stat.size(); a < max_stat_value_len; a++) { a_stat_spacing += " . "; } for(int h = h_stat.size(); h < 20; h++) { h_stat_spacing += " . "; } for(int h = a_resist.size(); h < max_stat_value_len; h++) { a_resist_spacing += " . "; } - - stat_field += indP + a_stat_name + a_stat_spacing + a_stat + heroic_color + h_stat + ""; + + stat_field += indP + a_stat_name + a_stat_spacing + a_stat + heroic_color + h_stat + ""; if(stat_row_counter < 6) { - stat_field += h_stat_spacing + a_resist_name + a_resist_spacing + a_resist + heroic_color + h_resist_field + "
"; + stat_field += h_stat_spacing + a_resist_name + a_resist_spacing + a_resist + heroic_color + h_resist_field + "
"; } } /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Mod2 String - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string mod2_field = ""; //Loop Variables @@ -6502,11 +6502,11 @@ void Client::SendStatsWindow(Client* client, bool use_window) std::string mod2b_cap = ""; int mod2a_space_count; int mod2b_space_count; - + int mod2_rows = 4; int max_mod2_value_len = 3; // 3 digits in the displayed value - for(int mod2_row_counter = 0; mod2_row_counter < mod2_rows; mod2_row_counter++) + for(int mod2_row_counter = 0; mod2_row_counter < mod2_rows; mod2_row_counter++) { switch (mod2_row_counter) { @@ -6555,19 +6555,19 @@ void Client::SendStatsWindow(Client* client, bool use_window) break; } } - + mod2a_spacing.clear(); mod_row_spacing.clear(); mod2b_spacing.clear(); - + for(int a = mod2a.size(); a < (max_mod2_value_len + mod2a_space_count); a++) { mod2a_spacing += " . "; } for(int a = mod2a_cap.size(); a < 6 ; a++) { mod_row_spacing += " . "; } for(int a = mod2b.size(); a < (max_mod2_value_len + mod2b_space_count); a++) { mod2b_spacing += " . "; } - + mod2_field += indP + mod2a_name + mod2a_spacing + mod2a + " / " + mod2a_cap + mod_row_spacing; mod2_field += mod2b_name + mod2b_spacing + mod2b + " / " + mod2b_cap + "
"; } - + uint32 rune_number = 0; uint32 magic_rune_number = 0; uint32 buff_count = GetMaxTotalSlots(); @@ -6578,18 +6578,18 @@ void Client::SendStatsWindow(Client* client, bool use_window) if ((HasSpellRune() || HasPartialSpellRune()) && buffs[i].magic_rune > 0) { magic_rune_number += buffs[i].magic_rune; } } } - + int shield_ac = 0; GetRawACNoShield(shield_ac); - - std::string skill_list[] = { + + std::string skill_list[] = { "1H Blunt","1H Slashing","2H Blunt","2H Slashing","Abjuration","Alteration","Apply Poison","Archery","Backstab","Bind Wound","Bash","Block","Brass Instruments","Channeling","Conjuration", "Defense","Disarm","Disarm Traps","Divination","Dodge","Double Attack","Dragon Punch","Dual Wield","Eagle Strike","Evocation","Feign Death","Flying Kick","Forage","Hand To Hand","Hide","Kick", "Meditate","Mend","Offense","Parry","Pick Lock","Piercing","Riposte","Round Kick","Safe Fall","Sense Heading","Singing","Sneak","Specialize Abjuration","Specialize Alteration","Specialize Conjuration", "Specialize Divination","Specialize Evocation","Pick Pockets","Stringed_Instruments","Swimming","Throwing","Tiger Claw","Tracking","Wind Instruments","Fishing","Make Poison","Tinkering","Research","Alchemy", - "Baking","Tailoring","Sense Traps","Blacksmithing","Fletching","Brewing","Alcohol_Tolerance","Begging","Jewelry Making","Pottery","Percussion Instruments","Intimidation","Berserking","Taunt","Frenzy" + "Baking","Tailoring","Sense Traps","Blacksmithing","Fletching","Brewing","Alcohol_Tolerance","Begging","Jewelry Making","Pottery","Percussion Instruments","Intimidation","Berserking","Taunt","Frenzy" }; - + std::string skill_mods = ""; for(int j = 0; j <= HIGHEST_SKILL; j++) { if(itembonuses.skillmod[j] > 0) @@ -6597,7 +6597,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) else if(itembonuses.skillmod[j] < 0) skill_mods += indP + skill_list[j] + " : -" + itoa(itembonuses.skillmod[j]) + "%
"; } - + std::string skill_dmgs = ""; for(int j = 0; j <= HIGHEST_SKILL; j++) { if((itembonuses.SkillDamageAmount[j] + spellbonuses.SkillDamageAmount[j]) > 0) @@ -6605,19 +6605,19 @@ void Client::SendStatsWindow(Client* client, bool use_window) else if((itembonuses.SkillDamageAmount[j] + spellbonuses.SkillDamageAmount[j]) < 0) skill_dmgs += indP + skill_list[j] + " : -" + itoa(itembonuses.SkillDamageAmount[j] + spellbonuses.SkillDamageAmount[j]) + "
"; } - + std::string faction_item_string = ""; char faction_buf[256]; - + for(std::map ::iterator iter = item_faction_bonuses.begin(); iter != item_faction_bonuses.end(); iter++) { memset(&faction_buf, 0, sizeof(faction_buf)); - + if(!database.GetFactionName((int32)((*iter).first), faction_buf, sizeof(faction_buf))) strcpy(faction_buf, "Not in DB"); - + if((*iter).second > 0) { faction_item_string += indP + faction_buf + " : +" + itoa((*iter).second) + "
"; } @@ -6625,7 +6625,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) faction_item_string += indP + faction_buf + " : -" + itoa((*iter).second) + "
"; } } - + std::string bard_info = ""; if(GetClass() == BARD) { bard_info = indP + "Singing: " + itoa(GetSingMod()) + "
" + @@ -6634,11 +6634,11 @@ void Client::SendStatsWindow(Client* client, bool use_window) indP + "Percussion: " + itoa(GetPercMod()) + "
" + indP + "Wind: " + itoa(GetWindMod()) + "
"; } - + std::string final_stats = "" + /* C/L/R */ indP + "Class: " + class_Name + indS + "Level: " + itoa(GetLevel()) + indS + "Race: " + race_Name + "
" + /* Runes */ indP + "Rune: " + itoa(rune_number) + indL + indS + "Spell Rune: " + itoa(magic_rune_number) + "
" + - /* HP/M/E */ HME_row + + /* HP/M/E */ HME_row + /* DS */ indP + "DS: " + itoa(itembonuses.DamageShield + spellbonuses.DamageShield*-1) + " (Spell: " + itoa(spellbonuses.DamageShield*-1) + " + Item: " + itoa(itembonuses.DamageShield) + " / " + itoa(RuleI(Character, ItemDamageShieldCap)) + ")
" + /* Atk */ indP + "ATK: " + itoa(GetTotalATK()) + "
" + /* Atk2 */ indP + "- Base: " + itoa(GetATKRating()) + " | Item: " + itoa(itembonuses.ATK) + " (" + itoa(RuleI(Character, ItemATKCap)) + ")~Used: " + itoa((itembonuses.ATK * 1.342)) + " | Spell: " + itoa(spellbonuses.ATK) + "
" + @@ -6654,16 +6654,16 @@ void Client::SendStatsWindow(Client* client, bool use_window) /* SpellDmg*/ indP + "Spell Dmg: " + itoa(GetSpellDmg()) + " / " + itoa(RuleI(Character, ItemSpellDmgCap)) + "
" + /* Clair */ indP + "Clairvoyance: " + itoa(GetClair()) + " / " + itoa(RuleI(Character, ItemClairvoyanceCap)) + "
" + /* DSMit */ indP + "Dmg Shld Mit: " + itoa(GetDSMit()) + " / " + itoa(RuleI(Character, ItemDSMitigationCap)) + "

"; - if(GetClass() == BARD) + if(GetClass() == BARD) final_stats += bard_info + "
"; - if(skill_mods.size() > 0) + if(skill_mods.size() > 0) final_stats += skill_mods + "
"; if(skill_dmgs.size() > 0) final_stats += skill_dmgs + "
"; if(faction_item_string.size() > 0) final_stats += faction_item_string; - - + + if(use_window) { if(final_stats.size() < 4096) { @@ -6680,7 +6680,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) client->Message(0, " Level: %i Class: %i Race: %i DS: %i/%i Size: %1.1f Weight: %.1f/%d ", GetLevel(), GetClass(), GetRace(), GetDS(), RuleI(Character, ItemDamageShieldCap), GetSize(), (float)CalcCurrentWeight() / 10.0f, GetSTR()); client->Message(0, " HP: %i/%i HP Regen: %i/%i",GetHP(), GetMaxHP(), CalcHPRegen(), CalcHPRegenCap()); client->Message(0, " AC: %i ( Mit.: %i + Avoid.: %i + Spell: %i ) | Shield AC: %i", CalcAC(), GetACMit(), GetACAvoid(), spellbonuses.AC, shield_ac); - if(CalcMaxMana() > 0) + if(CalcMaxMana() > 0) client->Message(0, " Mana: %i/%i Mana Regen: %i/%i", GetMana(), GetMaxMana(), CalcManaRegen(), CalcManaRegenCap()); client->Message(0, " End.: %i/%i End. Regen: %i/%i",GetEndurance(), GetMaxEndurance(), CalcEnduranceRegen(), CalcEnduranceRegenCap()); client->Message(0, " ATK: %i Worn/Spell ATK %i/%i Server Side ATK: %i", GetTotalATK(), RuleI(Character, ItemATKCap), GetATKBonus(), GetATK()); @@ -6695,7 +6695,7 @@ void Client::SendStatsWindow(Client* client, bool use_window) client->Message(0, " Singing: %i Brass: %i String: %i Percussion: %i Wind: %i", GetSingMod(), GetBrassMod(), GetStringMod(), GetPercMod(), GetWindMod()); Extra_Info: - + client->Message(0, " BaseRace: %i Gender: %i BaseGender: %i Texture: %i HelmTexture: %i", GetBaseRace(), GetGender(), GetBaseGender(), GetTexture(), GetHelmTexture()); if (client->Admin() >= 100) { client->Message(0, " CharID: %i EntityID: %i PetID: %i OwnerID: %i AIControlled: %i Targetted: %i", CharacterID(), GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted); @@ -6709,7 +6709,7 @@ void Client::SendAltCurrencies() { return; } - EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, + EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(AltCurrencyPopulate_Struct) + sizeof(AltCurrencyPopulateEntry_Struct) * count); AltCurrencyPopulate_Struct *altc = (AltCurrencyPopulate_Struct*)outapp->pBuffer; altc->opcode = ALT_CURRENCY_OP_POPULATE; @@ -6806,7 +6806,7 @@ uint32 Client::GetAlternateCurrencyValue(uint32 currency_id) const void Client::OpenLFGuildWindow() { EQApplicationPacket *outapp = new EQApplicationPacket(OP_LFGuild, 8); - + outapp->WriteUInt32(6); FastQueuePacket(&outapp); @@ -7246,10 +7246,10 @@ void Client::SendMercPersonalInfo() mml->Mercs[i].MercID = mercData->MercTemplateID; mml->Mercs[i].MercType = mercData->MercType; mml->Mercs[i].MercSubType = mercData->MercSubType; - mml->Mercs[i].PurchaseCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), 0): 0; - mml->Mercs[i].UpkeepCost = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercData->MercTemplateID, GetLevel(), 0): 0; - mml->Mercs[i].Status = 0; - mml->Mercs[i].AltCurrencyCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), altCurrentType): 0; + mml->Mercs[i].PurchaseCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), 0): 0; + mml->Mercs[i].UpkeepCost = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercData->MercTemplateID, GetLevel(), 0): 0; + mml->Mercs[i].Status = 0; + mml->Mercs[i].AltCurrencyCost = RuleB(Mercs, ChargeMercPurchaseCost) ? Merc::CalcPurchaseCost(mercData->MercTemplateID, GetLevel(), altCurrentType): 0; mml->Mercs[i].AltCurrencyUpkeep = RuleB(Mercs, ChargeMercUpkeepCost) ? Merc::CalcUpkeepCost(mercData->MercTemplateID, GetLevel(), altCurrentType): 0; mml->Mercs[i].AltCurrencyType = altCurrentType; mml->Mercs[i].MercUnk01 = 0; @@ -7320,7 +7320,7 @@ void Client::DuplicateLoreMessage(uint32 ItemID) } const Item_Struct *item = database.GetItem(ItemID); - + if(!item) return; @@ -7346,12 +7346,12 @@ FACTION_VALUE Client::GetReverseFactionCon(Mob* iOther) { if (GetOwnerID()) { return GetOwnerOrSelf()->GetReverseFactionCon(iOther); } - + iOther = iOther->GetOwnerOrSelf(); - + if (iOther->GetPrimaryFaction() < 0) return GetSpecialFactionCon(iOther); - + if (iOther->GetPrimaryFaction() == 0) return FACTION_INDIFFERENT; @@ -7366,7 +7366,7 @@ FACTION_VALUE Client::GetReverseFactionCon(Mob* iOther) { //| Will return Indifferent on failure. //o-------------------------------------------------------------- FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction, Mob* tnpc) -{ +{ _ZP(Client_GetFactionLevel); if (pFaction < 0) @@ -7443,17 +7443,17 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, u { if(faction_id[i] <= 0) continue; - + // Get the faction modifiers if(database.GetFactionData(&fm,char_class,char_race,char_deity,faction_id[i])) { // Get the characters current value with that faction current_value = GetCharacterFactionLevel(faction_id[i]); - + if(this->itembonuses.HeroicCHA) { int faction_mod = itembonuses.HeroicCHA / 5; // If our result isn't truncated, then just do that - if(npc_value[i] * faction_mod / 100 != 0) + if(npc_value[i] * faction_mod / 100 != 0) npc_value[i] += npc_value[i] * faction_mod / 100; // If our result is truncated, then double a mob's value every once and a while to equal what they would have got else { @@ -7467,16 +7467,16 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, u mod = MAX_FACTION; else if(mod < MIN_FACTION) mod = MIN_FACTION; - + // Calculate the faction if(npc_value[i] != 0) { tmpValue = current_value + mod + npc_value[i]; - + // Make sure faction hits don't go to GMs... if (m_pp.gm==1 && (tmpValue < current_value)) { tmpValue = current_value; } - + // Make sure we dont go over the min/max faction limits if(tmpValue >= MAX_FACTION) { @@ -7553,7 +7553,7 @@ int32 Client::GetCharacterFactionLevel(int32 faction_id) int32 Client::GetModCharacterFactionLevel(int32 faction_id) { int32 Modded = GetCharacterFactionLevel(faction_id); FactionMods fm; - if(database.GetFactionData(&fm,GetClass(),GetRace(),GetDeity(),faction_id)) + if(database.GetFactionData(&fm,GetClass(),GetRace(),GetDeity(),faction_id)) Modded += fm.base + fm.class_mod + fm.race_mod + fm.deity_mod; if (Modded > MAX_FACTION) Modded = MAX_FACTION; @@ -7563,7 +7563,7 @@ int32 Client::GetModCharacterFactionLevel(int32 faction_id) { bool Client::HatedByClass(uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction) { - + bool Result = false; _ZP(Client_GetFactionLevel); diff --git a/zone/client.h b/zone/client.h index 7cc606dba..949a6658d 100644 --- a/zone/client.h +++ b/zone/client.h @@ -129,7 +129,7 @@ enum { HideCorpseNPC = 5 }; -typedef enum +typedef enum { Empty = 0, Auto = 1, @@ -167,8 +167,8 @@ struct XTarget_Struct uint16 ID; char Name[65]; }; - - + + const uint32 POPUPID_UPDATE_SHOWSTATSWINDOW = 1000000; struct ClientReward @@ -389,7 +389,7 @@ public: inline virtual int16 GetPR() const { return PR; } inline virtual int16 GetCR() const { return CR; } inline virtual int16 GetCorrup() const { return Corrup; } - + int16 GetMaxStat() const; int16 GetMaxResist() const; int16 GetMaxSTR() const; @@ -442,15 +442,15 @@ public: inline virtual int16 GetSpellDmg() const { return itembonuses.SpellDmg; } inline virtual int16 GetClair() const { return itembonuses.Clairvoyance; } inline virtual int16 GetDSMit() const { return itembonuses.DSMitigation; } - + inline virtual int16 GetSingMod() const { return itembonuses.singingMod; } inline virtual int16 GetBrassMod() const { return itembonuses.brassMod; } inline virtual int16 GetPercMod() const { return itembonuses.percussionMod; } inline virtual int16 GetStringMod() const { return itembonuses.stringedMod; } inline virtual int16 GetWindMod() const { return itembonuses.windMod; } - + inline virtual int16 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath + 11; } - + int32 Additional_SpellDmg(uint16 spell_id, bool bufftick = false); int32 Additional_Heal(uint16 spell_id); float GetActSpellRange(uint16 spell_id, float range, bool IsBard = false); @@ -489,7 +489,7 @@ public: int32 CalcEnduranceRegen(); //Calculates endurance regen used in DoEnduranceRegen() int32 GetEndurance() const {return cur_end;} //This gets our current endurance int32 GetMaxEndurance() const {return max_end;} //This gets our endurance from the last CalcMaxEndurance() call - int32 CalcEnduranceRegenCap(); + int32 CalcEnduranceRegenCap(); int32 CalcHPRegenCap(); inline uint8 GetEndurancePercent() { return (uint8)((float)cur_end / (float)max_end * 100.0f); } void SetEndurance(int32 newEnd); //This sets the current endurance to the new value @@ -744,7 +744,7 @@ public: int16 acmod(); // Item methods - uint32 NukeItem(uint32 itemnum, uint8 where_to_check = + uint32 NukeItem(uint32 itemnum, uint8 where_to_check = (invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor)); void SetTint(int16 slot_id, uint32 color); void SetTint(int16 slot_id, Color_Struct& color); @@ -967,7 +967,7 @@ public: inline int GetTaskActivityDoneCount(int ClientTaskIndex, int ActivityID) { return (taskstate ? taskstate->GetTaskActivityDoneCount(ClientTaskIndex, ActivityID) :0); } - + inline int GetTaskActivityDoneCountFromTaskID(int TaskID, int ActivityID) { return (taskstate ? taskstate->GetTaskActivityDoneCountFromTaskID(TaskID, ActivityID) :0); } @@ -1170,12 +1170,12 @@ protected: int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); void CalcEdibleBonuses(StatBonuses* newbon); void CalcAABonuses(StatBonuses* newbon); - void ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon); + void ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon); void MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message = true); bool client_data_loaded; int16 GetFocusEffect(focusType type, uint16 spell_id); - int16 GetSympatheticFocusEffect(focusType type, uint16 spell_id); + int16 GetSympatheticFocusEffect(focusType type, uint16 spell_id); Mob* bind_sight_target; @@ -1298,7 +1298,7 @@ private: uint16 CustomerID; uint32 account_creation; uint8 firstlogon; - uint32 mercid; // current merc + uint32 mercid; // current merc uint8 mercSlot; // selected merc slot bool Trader; bool Buyer; diff --git a/zone/client_logs.cpp b/zone/client_logs.cpp index ac1dcdf83..4b0bd3f89 100644 --- a/zone/client_logs.cpp +++ b/zone/client_logs.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -32,9 +32,9 @@ void ClientLogs::subscribe(EQEMuLog::LogIDs id, Client *c) { return; if(c == nullptr) return; - + //make sure they arnt allready subscribed. - + vector::iterator cur,end; cur = entries[id].begin(); end = entries[id].end(); @@ -44,7 +44,7 @@ void ClientLogs::subscribe(EQEMuLog::LogIDs id, Client *c) { return; } } - + printf("%s has been subscribed to %d\n", c->GetName(), id); entries[id].push_back(c); } @@ -54,7 +54,7 @@ void ClientLogs::unsubscribe(EQEMuLog::LogIDs id, Client *c) { return; if(c == nullptr) return; - + vector::iterator cur,end; cur = entries[id].begin(); end = entries[id].end(); diff --git a/zone/client_logs.h b/zone/client_logs.h index 374cc00ff..8cbc3c88b 100644 --- a/zone/client_logs.h +++ b/zone/client_logs.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -39,19 +39,19 @@ public: static void EQEmuIO_buf(EQEMuLog::LogIDs id, const char *buf, uint8 size, uint32 count); static void EQEmuIO_fmt(EQEMuLog::LogIDs id, const char *fmt, va_list ap); static void EQEmuIO_pva(EQEMuLog::LogIDs id, const char *prefix, const char *fmt, va_list ap); - + void subscribe(EQEMuLog::LogIDs id, Client *c); void unsubscribe(EQEMuLog::LogIDs id, Client *c); void subscribeAll(Client *c); void unsubscribeAll(Client *c); void clear(); //unsubscribes everybody - + void msg(EQEMuLog::LogIDs id, const char *buf); - + protected: - + vector entries[EQEMuLog::MaxLogID]; - + static char _buffer[MAX_CLIENT_LOG_MESSAGE_LENGTH+1]; }; diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index cf7b8f3f9..29676ae01 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -39,9 +39,9 @@ int16 Client::GetMaxStat() const { return (RuleI(Character, StatCap)); int level = GetLevel(); - + int16 base = 0; - + if (level < 61) { base = 255; } @@ -54,16 +54,16 @@ int16 Client::GetMaxStat() const { else { base = 330; } - + return(base); } -int16 Client::GetMaxResist() const +int16 Client::GetMaxResist() const { int level = GetLevel(); int16 base = 500; - + if(level > 60) base += ((level - 60) * 5); @@ -229,7 +229,7 @@ int32 Client::CalcHPRegenCap() int cap = RuleI(Character, ItemHealthRegenCap) + itembonuses.HeroicSTA/25; cap += aabonuses.ItemHPRegenCap + spellbonuses.ItemHPRegenCap + itembonuses.ItemHPRegenCap; - + return (cap * RuleI(Character, HPRegenMultiplier) / 100); } @@ -247,19 +247,19 @@ int32 Client::CalcMaxHP() { max_hp += spellbonuses.HP + aabonuses.HP; max_hp += GroupLeadershipAAHealthEnhancement(); - + max_hp += max_hp * (spellbonuses.MaxHPChange + itembonuses.MaxHPChange) / 10000; - + if (cur_hp > max_hp) cur_hp = max_hp; - + int hp_perc_cap = spellbonuses.HPPercCap; if(hp_perc_cap) { int curHP_cap = (max_hp * hp_perc_cap) / 100; if (cur_hp > curHP_cap) cur_hp = curHP_cap; } - + return max_hp; } @@ -283,7 +283,7 @@ uint16 Mob::GetClassLevelFactor(){ multiplier = 290; else if (mlevel < 70) multiplier = 300; - else + else multiplier = 311; break; } @@ -379,19 +379,19 @@ int32 Client::CalcBaseHP() SoDPost255 = 0; int hp_factor = GetClassHPFactor(); - + if (level < 41) { - base_hp = (5 + (GetLevel() * hp_factor / 12) + + base_hp = (5 + (GetLevel() * hp_factor / 12) + ((NormalSTA - SoDPost255) * GetLevel() * hp_factor / 3600)); } else if (level < 81) { - base_hp = (5 + (40 * hp_factor / 12) + ((GetLevel() - 40) * hp_factor / 6) + - ((NormalSTA - SoDPost255) * hp_factor / 90) + + base_hp = (5 + (40 * hp_factor / 12) + ((GetLevel() - 40) * hp_factor / 6) + + ((NormalSTA - SoDPost255) * hp_factor / 90) + ((NormalSTA - SoDPost255) * (GetLevel() - 40) * hp_factor / 1800)); } - else { - base_hp = (5 + (80 * hp_factor / 8) + ((GetLevel() - 80) * hp_factor / 10) + - ((NormalSTA - SoDPost255) * hp_factor / 90) + + else { + base_hp = (5 + (80 * hp_factor / 8) + ((GetLevel() - 80) * hp_factor / 10) + + ((NormalSTA - SoDPost255) * hp_factor / 90) + ((NormalSTA - SoDPost255) * hp_factor / 45)); } @@ -405,7 +405,7 @@ int32 Client::CalcBaseHP() Post255 = (GetSTA()-255)/2; else Post255 = 0; - + base_hp = (5)+(GetLevel()*lm/10) + (((GetSTA()-Post255)*GetLevel()*lm/3000)) + ((Post255*GetLevel())*lm/6000); } return base_hp; @@ -420,7 +420,7 @@ uint32 Client::GetClassHPFactor() { // Base HP over level 80 is factor / 10 // HP per STA point per level is factor / 30 for level 80+ // HP per STA under level 40 is the level 80 HP Per STA / 120, and for over 40 it is / 60. - + switch(GetClass()) { case DRUID: @@ -461,14 +461,14 @@ uint32 Client::GetClassHPFactor() { // This should return the combined AC of all the items the player is wearing. int16 Client::GetRawItemAC() { int16 Total = 0; - + for (int16 slot_id=0; slot_id<21; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if (inst && inst->IsType(ItemClassCommon)) { Total += inst->GetItem()->AC; } } - + return Total; } @@ -477,7 +477,7 @@ int16 Client::acmod() { int level = GetLevel(); if(agility < 1 || level < 1) return(0); - + if (agility <=74){ if (agility == 1) return -24; @@ -602,7 +602,7 @@ int16 Client::acmod() { return 27; else if (level <= 39) return 37; - else + else return 44; } else if (agility == 100 && level >= 7){ @@ -872,7 +872,7 @@ int16 Client::CalcAC() { } int displayed = 0; displayed += ((avoidance+mitigation)*1000)/847; //natural AC - + //Iksar AC, untested if (GetRace() == IKSAR) { displayed += 12; @@ -883,20 +883,20 @@ int16 Client::CalcAC() { if (iksarlevel > 0) displayed += iksarlevel * 12 / 10; } - + // Shield AC bonus for HeroicSTR if(itembonuses.HeroicSTR) { bool equiped = CastToClient()->m_inv.GetItem(14); if(equiped) { uint8 shield = CastToClient()->m_inv.GetItem(14)->GetItem()->ItemType; - if(shield == ItemTypeShield) + if(shield == ItemTypeShield) displayed += itembonuses.HeroicSTR/2; } } - + //spell AC bonuses are added directly to natural total displayed += spellbonuses.AC; - + AC = displayed; return(AC); } @@ -907,19 +907,19 @@ int16 Client::GetACMit() { if (m_pp.class_ == WIZARD || m_pp.class_ == MAGICIAN || m_pp.class_ == NECROMANCER || m_pp.class_ == ENCHANTER) { mitigation = (GetSkill(DEFENSE) + itembonuses.HeroicAGI/10)/4 + (itembonuses.AC+1); mitigation -= 4; - } + } else { mitigation = (GetSkill(DEFENSE) + itembonuses.HeroicAGI/10)/3 + ((itembonuses.AC*4)/3); if(m_pp.class_ == MONK) mitigation += GetLevel() * 13/10; //the 13/10 might be wrong, but it is close... } - + // Shield AC bonus for HeroicSTR if(itembonuses.HeroicSTR) { bool equiped = CastToClient()->m_inv.GetItem(14); if(equiped) { uint8 shield = CastToClient()->m_inv.GetItem(14)->GetItem()->ItemType; - if(shield == ItemTypeShield) + if(shield == ItemTypeShield) mitigation += itembonuses.HeroicSTR/2; } } @@ -932,7 +932,7 @@ int16 Client::GetACAvoid() { int avoidance = (acmod() + ((GetSkill(DEFENSE) + itembonuses.HeroicAGI/10)*16)/9); if (avoidance < 0) avoidance = 0; - + return(avoidance*1000/847); } @@ -940,7 +940,7 @@ int32 Client::CalcMaxMana() { switch(GetCasterClass()) { - case 'I': + case 'I': case 'W': { max_mana = (CalcBaseMana() + itembonuses.Mana + spellbonuses.Mana + GroupLeadershipAAManaEnhancement()); break; @@ -958,18 +958,18 @@ int32 Client::CalcMaxMana() if (max_mana < 0) { max_mana = 0; } - + if (cur_mana > max_mana) { cur_mana = max_mana; } - + int mana_perc_cap = spellbonuses.ManaPercCap; if(mana_perc_cap) { int curMana_cap = (max_mana * mana_perc_cap) / 100; if (cur_mana > curMana_cap) cur_mana = curMana_cap; } - + #if EQDEBUG >= 11 LogFile->write(EQEMuLog::Debug, "Client::CalcMaxMana() called for %s - returning %d", GetName(), max_mana); #endif @@ -986,11 +986,11 @@ int32 Client::CalcBaseMana() int ConvertedWisInt = 0; switch(GetCasterClass()) { - case 'I': + case 'I': WisInt = GetINT(); if (GetClientVersion() >= EQClientSoD && RuleB(Character, SoDClientUseSoDHPManaEnd)) { - + if (WisInt > 100) { ConvertedWisInt = (((WisInt - 100) * 5 / 2) + 100); if (WisInt > 201) { @@ -1001,7 +1001,7 @@ int32 Client::CalcBaseMana() ConvertedWisInt = WisInt; } - if (GetLevel() < 41) { + if (GetLevel() < 41) { wisint_mana = (GetLevel() * 75 * ConvertedWisInt / 1000); base_mana = (GetLevel() * 15); } @@ -1045,7 +1045,7 @@ int32 Client::CalcBaseMana() ConvertedWisInt = WisInt; } - if (GetLevel() < 41) { + if (GetLevel() < 41) { wisint_mana = (GetLevel() * 75 * ConvertedWisInt / 1000); base_mana = (GetLevel() * 15); } @@ -1073,7 +1073,7 @@ int32 Client::CalcBaseMana() max_m = (((5 * (MindFactor + 200)) / 2) * 3 * GetLevel() / 100); } break; - + case 'N': { max_m = 0; break; @@ -1091,11 +1091,11 @@ int32 Client::CalcBaseMana() return max_m; } -int32 Client::CalcBaseManaRegen() +int32 Client::CalcBaseManaRegen() { uint8 clevel = GetLevel(); int32 regen = 0; - if (IsSitting() || (GetHorseId() != 0)) + if (IsSitting() || (GetHorseId() != 0)) { if(HasSkill(MEDITATE)) regen = (((GetSkill(MEDITATE) / 10) + (clevel - (clevel / 4))) / 4) + 4; @@ -1108,12 +1108,12 @@ int32 Client::CalcBaseManaRegen() return regen; } -int32 Client::CalcManaRegen() +int32 Client::CalcManaRegen() { uint8 clevel = GetLevel(); int32 regen = 0; //this should be changed so we dont med while camping, etc... - if (IsSitting() || (GetHorseId() != 0)) + if (IsSitting() || (GetHorseId() != 0)) { BuffFadeBySitModifier(); if(HasSkill(MEDITATE)) { @@ -1129,7 +1129,7 @@ int32 Client::CalcManaRegen() this->medding = false; regen = 2 + spellbonuses.ManaRegen + itembonuses.ManaRegen; } - + //AAs regen += aabonuses.ManaRegen; @@ -1141,10 +1141,10 @@ int32 Client::CalcManaRegenCap() int32 cap = RuleI(Character, ItemManaRegenCap) + aabonuses.ItemManaRegenCap; switch(GetCasterClass()) { - case 'I': + case 'I': cap += (itembonuses.HeroicINT / 25); break; - case 'W': + case 'W': cap += (itembonuses.HeroicWIS / 25); break; } @@ -1225,39 +1225,39 @@ int16 Client::CalcAlcoholPhysicalEffect() int16 Client::CalcSTR() { int16 val = m_pp.STR + itembonuses.STR + spellbonuses.STR + CalcAlcoholPhysicalEffect(); - + int16 mod = aabonuses.STR; - + if(val>255 && GetLevel() <= 60) val = 255; STR = val + mod; - + if(STR < 1) STR = 1; int m = GetMaxSTR(); if(STR > m) STR = m; - + return(STR); } int16 Client::CalcSTA() { int16 val = m_pp.STA + itembonuses.STA + spellbonuses.STA + CalcAlcoholPhysicalEffect();; - + int16 mod = aabonuses.STA; - + if(val>255 && GetLevel() <= 60) val = 255; STA = val + mod; - + if(STA < 1) STA = 1; int m = GetMaxSTA(); if(STA > m) STA = m; - + return(STA); } @@ -1269,7 +1269,7 @@ int16 Client::CalcAGI() { val = 255; int16 str = GetSTR(); - + //Encumbered penalty if(weight > (str * 10)) { //AGI is halved when we double our weight, zeroed (defaults to 1) when we triple it. this includes AGI from AAs @@ -1285,26 +1285,26 @@ int16 Client::CalcAGI() { int m = GetMaxAGI(); if(AGI > m) AGI = m; - + return(AGI); } int16 Client::CalcDEX() { int16 val = m_pp.DEX + itembonuses.DEX + spellbonuses.DEX - CalcAlcoholPhysicalEffect();; - + int16 mod = aabonuses.DEX; - + if(val>255 && GetLevel() <= 60) val = 255; DEX = val + mod; - + if(DEX < 1) DEX = 1; int m = GetMaxDEX(); if(DEX > m) DEX = m; - + return(DEX); } @@ -1312,11 +1312,11 @@ int16 Client::CalcINT() { int16 val = m_pp.INT + itembonuses.INT + spellbonuses.INT; int16 mod = aabonuses.INT; - + if(val>255 && GetLevel() <= 60) val = 255; INT = val + mod; - + if(m_pp.intoxication) { int16 AlcINT = INT - (int16)((float)m_pp.intoxication / 200.0f * (float)INT) - 1; @@ -1333,15 +1333,15 @@ int16 Client::CalcINT() { int m = GetMaxINT(); if(INT > m) INT = m; - + return(INT); } int16 Client::CalcWIS() { int16 val = m_pp.WIS + itembonuses.WIS + spellbonuses.WIS; - + int16 mod = aabonuses.WIS; - + if(val>255 && GetLevel() <= 60) val = 255; WIS = val + mod; @@ -1362,26 +1362,26 @@ int16 Client::CalcWIS() { int m = GetMaxWIS(); if(WIS > m) WIS = m; - + return(WIS); } int16 Client::CalcCHA() { int16 val = m_pp.CHA + itembonuses.CHA + spellbonuses.CHA; - + int16 mod = aabonuses.CHA; - + if(val>255 && GetLevel() <= 60) val = 255; CHA = val + mod; - + if(CHA < 1) CHA = 1; int m = GetMaxCHA(); if(CHA > m) CHA = m; - + return(CHA); } @@ -1409,7 +1409,7 @@ int Client::CalcHaste() { } else { cap = RuleI(Character, HasteCap); } - + if(h > cap) h = cap; h += spellbonuses.hastetype3; @@ -1419,14 +1419,14 @@ int Client::CalcHaste() { if (spellbonuses.inhibitmelee){ if (h >= 0) - h -= spellbonuses.inhibitmelee; - - else + h -= spellbonuses.inhibitmelee; + + else h -=((100+h)*spellbonuses.inhibitmelee/100); } - + Haste = h; - return(Haste); + return(Haste); } //The AA multipliers are set to be 5, but were 2 on WR @@ -1487,12 +1487,12 @@ int16 Client::CalcMR() default: MR = 20; } - + MR += itembonuses.MR + spellbonuses.MR + aabonuses.MR; - + if(GetClass() == WARRIOR) MR += GetLevel() / 2; - + if(MR < 1) MR = 1; @@ -1557,21 +1557,21 @@ int16 Client::CalcFR() default: FR = 20; } - + int c = GetClass(); if(c == RANGER) { FR += 4; - + int l = GetLevel(); if(l > 49) FR += l - 49; } - + FR += itembonuses.FR + spellbonuses.FR + aabonuses.FR; - + if(FR < 1) FR = 1; - + if(FR > GetMaxFR()) FR = GetMaxFR(); @@ -1633,25 +1633,25 @@ int16 Client::CalcDR() default: DR = 15; } - + int c = GetClass(); if(c == PALADIN) { DR += 8; - + int l = GetLevel(); if(l > 49) DR += l - 49; } else if(c == SHADOWKNIGHT) { DR += 4; - + int l = GetLevel(); if(l > 49) DR += l - 49; } - + DR += itembonuses.DR + spellbonuses.DR + aabonuses.DR; - + if(DR < 1) DR = 1; @@ -1716,25 +1716,25 @@ int16 Client::CalcPR() default: PR = 15; } - + int c = GetClass(); if(c == ROGUE) { PR += 8; - + int l = GetLevel(); if(l > 49) PR += l - 49; } else if(c == SHADOWKNIGHT) { PR += 4; - + int l = GetLevel(); if(l > 49) PR += l - 49; } - + PR += itembonuses.PR + spellbonuses.PR + aabonuses.PR; - + if(PR < 1) PR = 1; @@ -1799,18 +1799,18 @@ int16 Client::CalcCR() default: CR = 25; } - + int c = GetClass(); if(c == RANGER) { CR += 4; - + int l = GetLevel(); if(l > 49) CR += l - 49; } - + CR += itembonuses.CR + spellbonuses.CR + aabonuses.CR; - + if(CR < 1) CR = 1; @@ -1823,7 +1823,7 @@ int16 Client::CalcCR() int16 Client::CalcCorrup() { Corrup = GetBaseCorrup() + itembonuses.Corrup + spellbonuses.Corrup + aabonuses.Corrup; - + if(Corrup > GetMaxCorrup()) Corrup = GetMaxCorrup(); @@ -1838,13 +1838,13 @@ int16 Client::CalcATK() { uint16 Mob::GetInstrumentMod(uint16 spell_id) const { if(GetClass() != BARD) return(10); - + uint16 effectmod = 10; - + //this should never use spell modifiers... //if a spell grants better modifers, they are copied into the item mods //because the spells are supposed to act just like having the intrument. - + //item mods are in 10ths of percent increases switch(spells[spell_id].skill) { case PERCUSSION_INSTRUMENTS: @@ -1899,7 +1899,7 @@ uint16 Mob::GetInstrumentMod(uint16 spell_id) const { effectmod = 10; break; } - + if(spells[spell_id].skill == SINGING) { effectmod += 2*GetAA(aaSingingMastery); @@ -1916,24 +1916,24 @@ uint16 Mob::GetInstrumentMod(uint16 spell_id) const { if(effectmod < 10) effectmod = 10; - + _log(SPELLS__BARDS, "%s::GetInstrumentMod() spell=%d mod=%d\n", GetName(), spell_id, effectmod); - + return(effectmod); } void Client::CalcMaxEndurance() { max_end = CalcBaseEndurance() + spellbonuses.Endurance + itembonuses.Endurance; - + if (max_end < 0) { max_end = 0; } - + if (cur_end > max_end) { cur_end = max_end; } - + int end_perc_cap = spellbonuses.EndPercCap; if(end_perc_cap) { int curEnd_cap = (max_end * end_perc_cap) / 100; @@ -1966,7 +1966,7 @@ int32 Client::CalcBaseEndurance() ConvertedStats = Stats; } - if (GetLevel() < 41) { + if (GetLevel() < 41) { sta_end = (GetLevel() * 75 * ConvertedStats / 1000); base_endurance = (GetLevel() * 15); } @@ -1988,24 +1988,24 @@ int32 Client::CalcBaseEndurance() int at_most_800 = Stats; if(at_most_800 > 800) at_most_800 = 800; - + int Bonus400to800 = 0; int HalfBonus400to800 = 0; int Bonus800plus = 0; int HalfBonus800plus = 0; - + int BonusUpto800 = int( at_most_800 / 4 ) ; if(Stats > 400) { Bonus400to800 = int( (at_most_800 - 400) / 4 ); HalfBonus400to800 = int( max( ( at_most_800 - 400 ), 0 ) / 8 ); - + if(Stats > 800) { Bonus800plus = int( (Stats - 800) / 8 ) * 2; HalfBonus800plus = int( (Stats - 800) / 16 ); } } int bonus_sum = BonusUpto800 + Bonus400to800 + HalfBonus400to800 + Bonus800plus + HalfBonus800plus; - + base_end = LevelBase; //take all of the sums from above, then multiply by level*0.075 @@ -2023,7 +2023,7 @@ int32 Client::CalcEnduranceRegen() { int32 Client::CalcEnduranceRegenCap() { int cap = (RuleI(Character, ItemEnduranceRegenCap) + itembonuses.HeroicSTR/25 + itembonuses.HeroicDEX/25 + itembonuses.HeroicAGI/25 + itembonuses.HeroicSTA/25); - + return (cap * RuleI(Character, EnduranceRegenMultiplier) / 100); } diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 9724dec22..28a3f77bb 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -4824,7 +4824,7 @@ void Client::Handle_OP_InstillDoubt(const EQApplicationPacket *app) void Client::Handle_OP_RezzAnswer(const EQApplicationPacket *app) { VERIFY_PACKET_LENGTH(OP_RezzAnswer, app, Resurrect_Struct); - + const Resurrect_Struct* ra = (const Resurrect_Struct*) app->pBuffer; _log(SPELLS__REZ, "Received OP_RezzAnswer from client. Pendingrezzexp is %i, action is %s", @@ -6742,7 +6742,7 @@ void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app) memberToDisband->CastToMerc()->Suspend(); } } - else { + else { // ...but other members can only remove themselves group->DelMember(this,false); @@ -13774,7 +13774,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app) std::list mercStanceList = zone->merc_stance_list[merc->GetMercTemplateID()]; list::iterator iter = mercStanceList.begin(); while(iter != mercStanceList.end()) { - numStances++; + numStances++; iter++; } diff --git a/zone/client_packet.h b/zone/client_packet.h index 0156405d9..63145391b 100644 --- a/zone/client_packet.h +++ b/zone/client_packet.h @@ -228,7 +228,7 @@ void Handle_OP_AcceptNewTask(const EQApplicationPacket *app); void Handle_OP_CancelTask(const EQApplicationPacket *app); void Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app); - void Handle_OP_KeyRing(const EQApplicationPacket *app); + void Handle_OP_KeyRing(const EQApplicationPacket *app); void Handle_OP_FriendsWho(const EQApplicationPacket *app); void Handle_OP_Bandolier(const EQApplicationPacket *app); void Handle_OP_PopupResponse(const EQApplicationPacket *app); @@ -247,7 +247,7 @@ void Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket *app); void Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app); void Handle_OP_AdventureStatsRequest(const EQApplicationPacket *app); - void Handle_OP_AdventureLeaderboardRequest(const EQApplicationPacket *app); + void Handle_OP_AdventureLeaderboardRequest(const EQApplicationPacket *app); void Handle_OP_RespawnWindow(const EQApplicationPacket *app); void Handle_OP_GroupUpdate(const EQApplicationPacket *app); void Handle_OP_SetStartCity(const EQApplicationPacket *app); diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 1a68970ac..1e49c2f30 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -1,20 +1,20 @@ /* EQEMu: Everquest Server Emulator Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + client_process.cpp: Handles client login sequence and packets sent from client to zone */ @@ -87,7 +87,7 @@ bool Client::Process() { if(!IsLD() && zoneinpacket_timer.Check()){ SendAllPackets(); } - + #ifdef PACKET_UPDATE_MANAGER update_manager.Process(); #endif @@ -146,12 +146,12 @@ bool Client::Process() { if(RespawnFromHoverTimer.Check()) HandleRespawnFromHover(0); } - + if(IsTracking() && (GetClientVersion() >= EQClientSoD) && TrackingTimer.Check()) DoTracking(); if(hpupdate_timer.Check()) - SendHPUpdate(); + SendHPUpdate(); if(mana_timer.Check()) SendManaUpdatePacket(); @@ -163,7 +163,7 @@ bool Client::Process() { m_pp.y = m_pp.binds[0].y; m_pp.z = m_pp.binds[0].z; Save(); - + Group *mygroup = GetGroup(); if (mygroup) // && zone.GetZoneID() != m_pp.binds[0].zoneId { @@ -177,7 +177,7 @@ bool Client::Process() { } return(false); } - + if(charm_update_timer.Check()) { CalcItemScale(); @@ -212,12 +212,12 @@ bool Client::Process() { } instalog = true; } - + if (IsStunned() && stunned_timer.Check()) { this->stunned = false; this->stunned_timer.Disable(); } - + if(!m_CheatDetectMoved) { m_TimeSinceLastPositionCheck = Timer::GetCurrentTime(); @@ -232,7 +232,7 @@ bool Client::Process() { } else { song_target = entity_list.GetMob(bardsong_target_id); } - + if (song_target == nullptr) { InterruptSpell(SONG_ENDS_ABRUPTLY, 0x121, bardsong); } else { @@ -253,10 +253,10 @@ bool Client::Process() { CheckMercSuspendTimer(); } } - + if(IsAIControlled()) AI_Process(); - + if (bindwound_timer.Check() && bindwound_target != 0) { BindWound(bindwound_target, false); } @@ -277,7 +277,7 @@ bool Client::Process() { qGlobals->PurgeExpiredGlobals(); } } - + bool may_use_attacks = false; /* Things which prevent us from attacking: @@ -290,11 +290,11 @@ bool Client::Process() { */ if(auto_attack) { if(!IsAIControlled() && !dead - && !(spellend_timer.Enabled() && (spells[casting_spell_id].classes[7] < 1 && spells[casting_spell_id].classes[7] > 65)) + && !(spellend_timer.Enabled() && (spells[casting_spell_id].classes[7] < 1 && spells[casting_spell_id].classes[7] > 65)) && !IsStunned() && !IsFeared() && !IsMezzed() && GetAppearance() != eaDead && !IsMeleeDisabled() ) may_use_attacks = true; - + if(may_use_attacks && ranged_timer.Enabled()) { //if the range timer is enabled, we need to consider it if(!ranged_timer.Check(false)) { @@ -342,13 +342,13 @@ bool Client::Process() { } else ranged_timer.Start(); - } + } } } } Mob *auto_attack_target = GetTarget(); - if (auto_attack && auto_attack_target != nullptr && may_use_attacks && attack_timer.Check()) + if (auto_attack && auto_attack_target != nullptr && may_use_attacks && attack_timer.Check()) { //check if change //only check on primary attack.. sorry offhand you gotta wait! @@ -390,18 +390,18 @@ bool Client::Process() { los_status = false; } - if (!CombatRange(auto_attack_target)) + if (!CombatRange(auto_attack_target)) { //duplicate message not wanting to see it. //Message_StringID(MT_TooFarAway,TARGET_TOO_FAR); } - else if (auto_attack_target == this) + else if (auto_attack_target == this) { Message_StringID(MT_TooFarAway,TRY_ATTACKING_SOMEONE); } else if (!los_status) { - //you can't see your target + //you can't see your target } else if (auto_attack_target->GetHP() > -10) // -10 so we can watch people bleed in PvP { @@ -413,10 +413,10 @@ bool Client::Process() { } ItemInst *wpn = GetInv().GetItem(SLOT_PRIMARY); TryWeaponProc(wpn, auto_attack_target, 13); - + bool tripleAttackSuccess = false; if( auto_attack_target && CanThisClassDoubleAttack() ) { - + CheckIncreaseSkill(DOUBLE_ATTACK, auto_attack_target, -10); if(CheckDoubleAttack()) { //should we allow rampage on double attack? @@ -426,7 +426,7 @@ bool Client::Process() { Attack(auto_attack_target, 13, false); } } - + //triple attack: rangers, monks, warriors, berserkers over level 60 if((((GetClass() == MONK || GetClass() == WARRIOR || GetClass() == RANGER || GetClass() == BERSERKER) && GetLevel() >= 60) || SpecAttacks[SPECATK_TRIPLE]) @@ -435,33 +435,33 @@ bool Client::Process() { tripleAttackSuccess = true; Attack(auto_attack_target, 13, false); } - + //quad attack, does this belong here?? - if(SpecAttacks[SPECATK_QUAD] && CheckDoubleAttack(true)) + if(SpecAttacks[SPECATK_QUAD] && CheckDoubleAttack(true)) { Attack(auto_attack_target, 13, false); } } - + //Live AA - Flurry, Rapid Strikes ect (Flurry does not require Triple Attack). int16 flurrychance = aabonuses.FlurryChance + spellbonuses.FlurryChance + itembonuses.FlurryChance; if (auto_attack_target && flurrychance) { - if(MakeRandomInt(0, 100) < flurrychance) + if(MakeRandomInt(0, 100) < flurrychance) { Message_StringID(MT_NPCFlurry, 128); Attack(auto_attack_target, 13, false); Attack(auto_attack_target, 13, false); } } - + int16 ExtraAttackChanceBonus = spellbonuses.ExtraAttackChance + itembonuses.ExtraAttackChance + aabonuses.ExtraAttackChance; if (auto_attack_target && ExtraAttackChanceBonus) { ItemInst *wpn = GetInv().GetItem(SLOT_PRIMARY); if(wpn){ - if(wpn->GetItem()->ItemType == ItemType2HS || + if(wpn->GetItem()->ItemType == ItemType2HS || wpn->GetItem()->ItemType == ItemType2HB || wpn->GetItem()->ItemType == ItemType2HPierce ) { @@ -474,7 +474,7 @@ bool Client::Process() { } } } - + if (GetClass() == WARRIOR || GetClass() == BERSERKER) { if(!dead && !berserk && this->GetHPRatio() < 30) { entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName()); @@ -485,10 +485,10 @@ bool Client::Process() { this->berserk = false; } } - + if(auto_attack && may_use_attacks && auto_attack_target != nullptr - && CanThisClassDualWield() && attack_dw_timer.Check()) - { + && CanThisClassDualWield() && attack_dw_timer.Check()) + { // Range check if(!CombatRange(auto_attack_target)) { // this is a duplicate message don't use it. @@ -500,11 +500,11 @@ bool Client::Process() { } else if (!los_status) { - //you can't see your target + //you can't see your target } else if(auto_attack_target->GetHP() > -10) { float DualWieldProbability = 0.0f; - + int16 Ambidexterity = aabonuses.Ambidexterity + spellbonuses.Ambidexterity + itembonuses.Ambidexterity; DualWieldProbability = (GetSkill(DUAL_WIELD) + GetLevel() + Ambidexterity) / 400.0f; // 78.0 max int16 DWBonus = spellbonuses.DualWieldChance + itembonuses.DualWieldChance; @@ -520,7 +520,7 @@ bool Client::Process() { } ItemInst *wpn = GetInv().GetItem(SLOT_SECONDARY); TryWeaponProc(wpn, auto_attack_target, 14); - + if( CanThisClassDoubleAttack() && CheckDoubleAttack()) { if(CheckAAEffect(aaEffectRampage)) { entity_list.AEAttack(this, 30, 14); @@ -532,7 +532,7 @@ bool Client::Process() { } } } - + adverrorinfo = 2; if (position_timer.Check()) { if (IsAIControlled()) @@ -548,7 +548,7 @@ bool Client::Process() { SendPosUpdate(2); } } - + // Send a position packet every 8 seconds - if not done, other clients // see this char disappear after 10-12 seconds of inactivity if (position_timer_counter >= 36) { // Approx. 4 ticks per second @@ -562,7 +562,7 @@ bool Client::Process() { position_timer_counter++; } } - + if(HasVirus()) { if(viral_timer.Check()) { viral_timer_counter++; @@ -577,7 +577,7 @@ bool Client::Process() { if(viral_timer_counter > 999) viral_timer_counter = 0; } - + if(spellbonuses.GravityEffect == 1) { if(gravity_timer.Check()) DoGravityEffect(); @@ -608,7 +608,7 @@ bool Client::Process() { shield_timer.Disable(); } } - + adverrorinfo = 3; SpellProcess(); adverrorinfo = 4; @@ -627,15 +627,15 @@ bool Client::Process() { DoEnduranceRegen(); BuffProcess(); DoStaminaUpdate(); - + if(tribute_timer.Check()) { ToggleTribute(true); //re-activate the tribute. } - + if (fishing_timer.Check()) { GoFish(); } - + if (autosave_timer.Check()) { Save(0); } @@ -652,27 +652,27 @@ bool Client::Process() { } } } - + if (client_state == CLIENT_KICKED) { Save(); OnDisconnect(true); cout << "Client disconnected (cs=k): " << GetName() << endl; return false; } - + if (client_state == DISCONNECTED) { OnDisconnect(true); cout << "Client disconnected (cs=d): " << GetName() << endl; database.SetMQDetectionFlag(this->AccountName(), GetName(), "/MQInstantCamp: Possible instant camp disconnect.", zone->GetShortName()); return false; } - + if (client_state == CLIENT_ERROR) { OnDisconnect(true); cout << "Client disconnected (cs=e): " << GetName() << endl; return false; } - + if (client_state != CLIENT_LINKDEAD && !eqs->CheckState(ESTABLISHED)) { OnDisconnect(true); cout << "Client linkdead: " << name << endl; @@ -696,14 +696,14 @@ bool Client::Process() { /************ Get all packets from packet manager out queue and process them ************/ adverrorinfo = 5; - + EQApplicationPacket *app = 0; // if(eqs->GetState()==CLOSING && eqs->CheckActive()) if(eqs->CheckState(CLOSING)) { //eqs->Close(); //return false; - //handled below + //handled below } else { while(ret && (app = (EQApplicationPacket *)eqs->PopPacket())) { if(app) @@ -711,7 +711,7 @@ bool Client::Process() { safe_delete(app); } } - + #ifdef REVERSE_AGGRO //At this point, we are still connected, everything important has taken //place, now check to see if anybody wants to aggro us. @@ -719,8 +719,8 @@ bool Client::Process() { if(ret && !GetFeigned() && scanarea_timer.Check()) { entity_list.CheckClientAggro(this); } -#endif - +#endif + if (client_state != CLIENT_LINKDEAD && (client_state == CLIENT_ERROR || client_state == DISCONNECTED || client_state == CLIENT_KICKED || !eqs->CheckState(ESTABLISHED))) { //client logged out or errored out //ResetTrade(); @@ -747,7 +747,7 @@ bool Client::Process() { entity_list.MessageGroup(this,true,15,"%s left the zone.",GetName()); mygroup->MemberZoned(this); } - + adverrorinfo = 813; } Raid *myraid = entity_list.GetRaidByClient(this); @@ -778,7 +778,7 @@ bool Client::Process() { entity_list.ClearZoneFeignAggro(this); Message(0,"Your enemies have forgotten you!"); } - + return ret; } @@ -819,10 +819,10 @@ void Client::OnDisconnect(bool hard_disconnect) { //remove ourself from all proximities ClearAllProximities(); - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_LogoutReply); FastQueuePacket(&outapp); - + Disconnect(); } @@ -851,7 +851,7 @@ void Client::BulkSendInventoryItems() { // Where are cursor buffer items processed? They need to be validated as well... -U - bool deletenorent = database.NoRentExpired(GetName()); + bool deletenorent = database.NoRentExpired(GetName()); if(deletenorent){ RemoveNoRent(false); } //client was offline for more than 30 minutes, delete no rent items RemoveDuplicateLore(false); @@ -893,7 +893,7 @@ void Client::BulkSendInventoryItems() { } // Power Source - if(GetClientVersion() >= EQClientSoF) { + if(GetClientVersion() >= EQClientSoF) { const ItemInst* inst = m_inv[9999]; if(inst) { string packet = inst->Serialize(9999); @@ -957,7 +957,7 @@ void Client::BulkSendInventoryItems() SendItemPacket(slot_id, inst, ItemPacketCharInventory); } } - + // Shared Bank items for (slot_id=2500; slot_id<=2501; slot_id++) { const ItemInst* inst = m_inv[slot_id]; @@ -965,7 +965,7 @@ void Client::BulkSendInventoryItems() SendItemPacket(slot_id, inst, ItemPacketCharInventory); } } - + // LINKDEAD TRADE ITEMS // If player went LD during a trade, they have items in the trade inventory // slots. These items are now being put into their inventory (then queue up on cursor) @@ -1008,9 +1008,9 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { continue; } - + handychance = MakeRandomInt(0, merlist.size() + tmp_merlist.size() - 1 ); - + item = database.GetItem(ml.item); if(item) { if(handychance==0) @@ -1101,15 +1101,15 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { greet_id=MERCHANT_HANDY_ITEM4; } sprintf(handy_id,"%i",greet_id); - + if(greet_id!=MERCHANT_GREETING) Message_StringID(10,GENERIC_STRINGID_SAY,merch->GetCleanName(),handy_id,this->GetName(),handyitem->Name); else Message_StringID(10,GENERIC_STRINGID_SAY,merch->GetCleanName(),handy_id,this->GetName()); - + merch->CastToNPC()->FaceTarget(this->CastToMob()); } - + // safe_delete_array(cpi); } @@ -1149,10 +1149,10 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I if (Action == 1) { - // Mark the corpse as rezzed in the database, just in case the corpse has buried, or the zone the + // Mark the corpse as rezzed in the database, just in case the corpse has buried, or the zone the // corpse is in has shutdown since the rez spell was cast. database.MarkCorpseAsRezzed(PendingRezzDBID); - _log(SPELLS__REZ, "Player %s got a %i Rezz, spellid %i in zone%i, instance id %i", + _log(SPELLS__REZ, "Player %s got a %i Rezz, spellid %i in zone%i, instance id %i", this->name, (uint16)spells[SpellID].base[0], SpellID, ZoneID, InstanceID); @@ -1168,7 +1168,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I SetMana(GetMaxMana()); SetHP(GetMaxHP()); } - if(spells[SpellID].base[0] < 100 && spells[SpellID].base[0] > 0 && PendingRezzXP > 0) + if(spells[SpellID].base[0] < 100 && spells[SpellID].base[0] > 0 && PendingRezzXP > 0) { SetEXP(((int)(GetEXP()+((float)((PendingRezzXP / 100) * spells[SpellID].base[0])))), GetAAXP(),true); @@ -1177,7 +1177,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I SetEXP((GetEXP() + PendingRezzXP), GetAAXP(), true); } - //Was sending the packet back to initiate client zone... + //Was sending the packet back to initiate client zone... //but that could be abusable, so lets go through proper channels MovePC(ZoneID, InstanceID, x, y, z, GetHeading(), 0, ZoneSolicited); entity_list.RefreshClientXTargets(this); @@ -1206,9 +1206,9 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app) DumpPacket(app); return; } - + const MemorizeSpell_Struct* memspell = (const MemorizeSpell_Struct*) app->pBuffer; - + if(!IsValidSpell(memspell->spell_id)) { Message(13, "Unexpected error: spell id out of range"); @@ -1235,13 +1235,13 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app) if(inst && inst->IsType(ItemClassCommon)) { const Item_Struct* item = inst->GetItem(); - + if(item && item->Scroll.Effect == (int32)(memspell->spell_id)) { ScribeSpell(memspell->spell_id, memspell->slot); DeleteItemInInventory(SLOT_CURSOR, 1, true); } - else + else Message(0,"Scribing spell: inst exists but item does not or spell ids do not match."); } else @@ -1333,7 +1333,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) { case -1: // destroy { - // I don't think you can move coin from the void, + // I don't think you can move coin from the void, // but need to check this break; } @@ -1374,7 +1374,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) if(!banker || distance > USE_NPC_RANGE2) { char *hacked_string = nullptr; - MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(coin move) but %s is non-existant or too far away (%u units).", + MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(coin move) but %s is non-existant or too far away (%u units).", banker ? banker->GetName() : "UNKNOWN NPC", distance); database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName()); safe_delete_array(hacked_string); @@ -1406,7 +1406,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) if(!banker || distance > USE_NPC_RANGE2) { char *hacked_string = nullptr; - MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(shared coin move) but %s is non-existant or too far away (%u units).", + MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(shared coin move) but %s is non-existant or too far away (%u units).", banker ? banker->GetName() : "UNKNOWN NPC", distance); database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName()); safe_delete_array(hacked_string); @@ -1462,7 +1462,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) if(!banker || distance > USE_NPC_RANGE2) { char *hacked_string = nullptr; - MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(coin move) but %s is non-existant or too far away (%u units).", + MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(coin move) but %s is non-existant or too far away (%u units).", banker ? banker->GetName() : "UNKNOWN NPC", distance); database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName()); safe_delete_array(hacked_string); @@ -1506,7 +1506,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) if(!banker || distance > USE_NPC_RANGE2) { char *hacked_string = nullptr; - MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(shared coin move) but %s is non-existant or too far away (%u units).", + MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(shared coin move) but %s is non-existant or too far away (%u units).", banker ? banker->GetName() : "UNKNOWN NPC", distance); database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName()); safe_delete_array(hacked_string); @@ -1555,7 +1555,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) { if (to_bucket == &m_pp.platinum_shared || from_bucket == &m_pp.platinum_shared) { - if (from_bucket == &m_pp.platinum_shared) + if (from_bucket == &m_pp.platinum_shared) amount_to_add = 0 - amount_to_take; database.SetSharedPlatinum(AccountID(),amount_to_add); @@ -1572,7 +1572,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) Mob* with = trade->With(); if (with) with->trade->state = Trading; - + Client* recipient = trader->CastToClient(); recipient->Message(15, "%s adds some coins to the trade.", GetName()); recipient->Message(15, "The total trade is: %i PP, %i GP, %i SP, %i CP", @@ -1604,12 +1604,12 @@ void Client::OPGMTraining(const EQApplicationPacket *app) if(!pTrainer || !pTrainer->IsNPC() || pTrainer->GetClass() < WARRIORGM || pTrainer->GetClass() > BERSERKERGM) return; - + //you can only use your own trainer, client enforces this, but why trust it int trains_class = pTrainer->GetClass() - (WARRIORGM - WARRIOR); if(GetClass() != trains_class) return; - + //you have to be somewhat close to a trainer to be properly using them if(DistNoRoot(*pTrainer) > USE_NPC_RANGE2) return; @@ -1619,12 +1619,12 @@ void Client::OPGMTraining(const EQApplicationPacket *app) if(sk == TINKERING && GetRace() != GNOME) { gmtrain->skills[sk] = 0; //Non gnomes can't tinker! } else { - gmtrain->skills[sk] = GetMaxSkillAfterSpecializationRules(sk, MaxSkill(sk, GetClass(), RuleI(Character, MaxLevel))); + gmtrain->skills[sk] = GetMaxSkillAfterSpecializationRules(sk, MaxSkill(sk, GetClass(), RuleI(Character, MaxLevel))); //this is the highest level that the trainer can train you to, this is enforced clientside so we can't just //Set it to 1 with CanHaveSkill or you wont be able to train past 1. } } - + uchar ending[]={0x34,0x87,0x8a,0x3F,0x01 ,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9 ,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9,0xC9 @@ -1649,7 +1649,7 @@ void Client::OPGMEndTraining(const EQApplicationPacket *app) Mob* pTrainer = entity_list.GetMob(p->npcid); if(!pTrainer || !pTrainer->IsNPC() || pTrainer->GetClass() < WARRIORGM || pTrainer->GetClass() > BERSERKERGM) return; - + //you can only use your own trainer, client enforces this, but why trust it int trains_class = pTrainer->GetClass() - (WARRIORGM - WARRIOR); if(GetClass() != trains_class) @@ -1658,7 +1658,7 @@ void Client::OPGMEndTraining(const EQApplicationPacket *app) //you have to be somewhat close to a trainer to be properly using them if(DistNoRoot(*pTrainer) > USE_NPC_RANGE2) return; - + // goodbye message if (pTrainer->IsNPC()) { @@ -1759,7 +1759,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) default: break; } - + int MaxSkillValue = MaxSkill(skill); if (skilllevel >= MaxSkillValue) { @@ -1767,7 +1767,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app) Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName()); return; } - + if(gmskill->skill_id >= SPECIALIZE_ABJURE && gmskill->skill_id <= SPECIALIZE_EVOCATION) { int MaxSpecSkill = GetMaxSkillAfterSpecializationRules(skill, MaxSkillValue); @@ -1886,16 +1886,16 @@ void Client::DoHPRegen() { void Client::DoManaRegen() { if (GetMana() >= max_mana) return; - + SetMana(GetMana() + CalcManaRegen() + RestRegenMana); SendManaUpdatePacket(); } -void Client::DoStaminaUpdate() { +void Client::DoStaminaUpdate() { if(!stamina_timer.Check()) return; - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; @@ -1948,7 +1948,7 @@ void Client::DoEnduranceUpkeep() { } } } - + if(upkeep_sum != 0) SetEndurance(GetEndurance() - upkeep_sum); } @@ -1982,7 +1982,7 @@ void Client::CalcRestState() { RestRegenHP = (GetMaxHP() * RuleI(Character, RestRegenPercent) / 100); RestRegenMana = (GetMaxMana() * RuleI(Character, RestRegenPercent) / 100); - + if(RuleB(Character, RestRegenEndurance)) RestRegenEndurance = (GetMaxEndurance() * RuleI(Character, RestRegenPercent) / 100); } @@ -2066,7 +2066,7 @@ void Client::HandleRespawnFromHover(uint32 Option) EQApplicationPacket* outapp = new EQApplicationPacket(OP_ZonePlayerToBind, sizeof(ZonePlayerToBind_Struct) + 10); ZonePlayerToBind_Struct* gmg = (ZonePlayerToBind_Struct*) outapp->pBuffer; - + gmg->bind_zone_id = zone->GetZoneID(); gmg->bind_instance_id = zone->GetInstanceID(); gmg->x = GetX(); @@ -2101,7 +2101,7 @@ void Client::HandleRespawnFromHover(uint32 Option) EQApplicationPacket* outapp = new EQApplicationPacket(OP_ZonePlayerToBind, sizeof(ZonePlayerToBind_Struct) + 14); ZonePlayerToBind_Struct* gmg = (ZonePlayerToBind_Struct*) outapp->pBuffer; - + gmg->bind_zone_id = m_pp.binds[0].zoneId; gmg->x = m_pp.binds[0].x; gmg->y = m_pp.binds[0].y; @@ -2133,7 +2133,7 @@ void Client::HandleRespawnFromHover(uint32 Option) if(g) g->MemberZoned(this); } - + Raid* r = entity_list.GetRaidByClient(this); if(r) @@ -2142,9 +2142,9 @@ void Client::HandleRespawnFromHover(uint32 Option) m_pp.zone_id = m_pp.binds[0].zoneId; m_pp.zoneInstance = 0; database.MoveCharacterToZone(this->CharacterID(), database.GetZoneName(m_pp.zone_id)); - + Save(); - + GoToDeath(); } } @@ -2161,7 +2161,7 @@ void Client::ClearHover() sze->player.spawn.NPC = 0; sze->player.spawn.z += 6; //arbitrary lift, seems to help spawning under zone. - + entity_list.QueueClients(this, outapp, false); safe_delete(outapp); @@ -2302,7 +2302,7 @@ void Client::HandleLFGuildResponse(ServerPacket *pack) LFGuild_GuildToggle_Struct *gts = (LFGuild_GuildToggle_Struct *)outapp->pBuffer; gts->Command = 1; - strcpy(gts->Comment, Comments); + strcpy(gts->Comment, Comments); gts->FromLevel = FromLevel; gts->ToLevel = ToLevel; gts->Classes = Classes; @@ -2348,7 +2348,7 @@ void Client::SendGuildLFGuildStatus() pack->WriteUInt32(QSG_LFGuild); pack->WriteUInt32(QSG_LFGuild_RequestGuildInfo); pack->WriteString(guild_mgr.GetGuildName(GuildID())); - + worldserver.SendPacket(pack); safe_delete(pack); } diff --git a/zone/command.cpp b/zone/command.cpp index 276caf8da..042950477 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -17,9 +17,9 @@ */ /* - + To add a new command 3 things must be done: - + 1. At the bottom of command.h you must add a prototype for it. 2. Add the function in this file. 3. In the command_init function you must add a call to command_add @@ -64,7 +64,7 @@ #include "../common/patches/patches.h" // these should be in the headers... -extern WorldServer worldserver; +extern WorldServer worldserver; extern TaskManager *taskmanager; void CatchSignal(int sig_num); @@ -177,7 +177,7 @@ int command_init(void) { command_add("npcloot","[show/money/add/remove] [itemid/all/money: pp gp sp cp] - Manipulate the loot an NPC is carrying",80,command_npcloot) || command_add("log","- Search character event log",80,command_log) || command_add("gm","- Turn player target's or your GM flag on or off",80,command_gm) || - command_add("summon","[charname] - Summons your player/npc/corpse target, or charname if specified",80,command_summon) || + command_add("summon","[charname] - Summons your player/npc/corpse target, or charname if specified",80,command_summon) || command_add("zone","[zonename] [x] [y] [z] - Go to specified zone (coords optional)",50,command_zone) || command_add("zoneinstance","[instanceid] [x] [y] [z] - Go to specified instance zone (coords optional)",50,command_zone_instance) || command_add("peqzone","[zonename] - Go to specified zone, if you have > 75% health",0,command_peqzone) || @@ -369,14 +369,14 @@ int command_init(void) { command_add("finditem",nullptr,10,command_itemsearch) || command_add("fi",nullptr,10,command_itemsearch) || #ifdef PACKET_PROFILER - command_add("packetprofile","- Dump packet profile for target or self.",250,command_packetprofile) || + command_add("packetprofile","- Dump packet profile for target or self.",250,command_packetprofile) || #endif #ifdef EQPROFILE - command_add("profiledump","- Dump profiling info to logs",250,command_profiledump) || - command_add("profilereset","- Reset profiling info",250,command_profilereset) || + command_add("profiledump","- Dump profiling info to logs",250,command_profiledump) || + command_add("profilereset","- Reset profiling info",250,command_profilereset) || #endif - command_add("opcode","- opcode management",250,command_opcode) || + command_add("opcode","- opcode management",250,command_opcode) || command_add("logs","[status|normal|error|debug|quest|all] - Subscribe to a log type",250,command_logs) || command_add("nologs","[status|normal|error|debug|quest|all] - Unsubscribe to a log type",250,command_nologs) || command_add("ban","[name] - Ban by character name",150,command_ban) || @@ -430,7 +430,7 @@ int command_init(void) { command_add("modifynpcstat","- Modifys a NPC's stats",150,command_modifynpcstat) || command_add("undyeme","- Remove dye from all of your armor slots",0,command_undyeme) || command_add("instance","- Modify Instances",200,command_instance) || - command_add("setstartzone","[zoneid] - Set target's starting zone. Set to zero to allow the player to use /setstartcity",80,command_setstartzone) || + command_add("setstartzone","[zoneid] - Set target's starting zone. Set to zero to allow the player to use /setstartcity",80,command_setstartzone) || command_add("netstats","- Gets the network stats for a stream.",200,command_netstats) || command_add("object","List|Add|Edit|Move|Rotate|Copy|Save|Undo|Delete - Manipulate static and tradeskill objects within the zone",100,command_object) || command_add("raidloot","LEADER|GROUPLEADER|SELECTED|ALL - Sets your raid loot settings if you have permission to do so.",0,command_raidloot) || @@ -453,13 +453,13 @@ int command_init(void) { command_add("printquestitems","Returns available quest items for multiquesting currently on the target npc.",200,command_printquestitems) || command_add("clearquestitems","Clears quest items for multiquesting currently on the target npc.",200,command_clearquestitems) || command_add("zopp", "Troubleshooting command - Sends a fake item packet to you. No server reference is created.", 250, command_zopp) || - command_add("augmentitem", "Force augments an item. Must have the augment item window open.", 250, command_augmentitem) + command_add("augmentitem", "Force augments an item. Must have the augment item window open.", 250, command_augmentitem) ) { command_deinit(); return -1; } - + map::iterator cur,end; cur = commandlist.begin(); end = commandlist.end(); @@ -482,7 +482,7 @@ int command_init(void) { #endif } } - + command_dispatch = command_realdispatch; return commandcount; @@ -505,7 +505,7 @@ void command_deinit(void) cur.Advance(); } */ commandlist.clear(); - + command_dispatch = command_notavail; commandcount = 0; } @@ -525,14 +525,14 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun { if(function == nullptr) return(-1); - + string cstr(command_string); - + if(commandlist.count(cstr) != 0) { LogFile->write(EQEMuLog::Error, "command_add() - Command '%s' is a duplicate - check command.cpp." , command_string); return(-1); } - + //look for aliases... map::iterator cur,end,del; cur = commandlist.begin(); @@ -550,7 +550,7 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun return(0); } } - + CommandRecord *c = new CommandRecord; cleanup_commandlist.Append(c); c->desc = desc; @@ -558,9 +558,9 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun c->function = function; memset(c->command, 0, sizeof(c->command)); c->command[0] = command_string; - + commandlist[cstr] = c; - + commandcount++; return 0; } @@ -583,7 +583,7 @@ int command_add_perl(const char *command_string, const char *desc, int access) { if(commandlist.count(cstr) != 0) { #ifdef COMMANDS_PERL_OVERRIDE //print a warning so people dont get too confused when this happens - LogFile->write(EQEMuLog::Status, "command_add_perl() - Perl Command '%s' is overriding the compiled command." , command_string); + LogFile->write(EQEMuLog::Status, "command_add_perl() - Perl Command '%s' is overriding the compiled command." , command_string); CommandRecord *tmp = commandlist[cstr]; safe_delete(tmp); #else @@ -591,14 +591,14 @@ int command_add_perl(const char *command_string, const char *desc, int access) { return(-1); #endif } - + CommandRecord *c = new CommandRecord; c->desc = desc; c->access = access; c->function = nullptr; - + commandlist[cstr] = c; - + commandcount++; return 0; @@ -638,30 +638,30 @@ void command_clear_perl() { int command_realdispatch(Client *c, const char *message) { _ZP(command_realdispatch); - - + + Seperator sep(message, ' ', 10, 100, true); // "three word argument" should be considered 1 arg - + command_logcommand(c, message); - + string cstr(sep.arg[0]+1); - + if(commandlist.count(cstr) != 1) { return(-2); } - + CommandRecord *cur = commandlist[cstr]; if(c->Admin() < cur->access){ c->Message(13,"Your access level is not high enough to use this command."); return(-1); } - + #ifdef COMMANDS_LOGGING if(cur->access >= COMMANDS_LOGGING_MIN_STATUS) { LogFile->write(EQEMuLog::Commands, "%s (%s) used command: %s (target=%s)", c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE"); } #endif - + if(cur->function == nullptr) { #ifdef EMBPERL_COMMANDS //todo reimplement this stuff @@ -677,7 +677,7 @@ int command_realdispatch(Client *c, const char *message) cur->function(c, &sep); // dispatch command } return 0; - + } void command_logcommand(Client *c, const char *message) @@ -731,7 +731,7 @@ void command_logcommand(Client *c, const char *message) break; } } - + if (continueevents) database.logevents( c->AccountName(), @@ -862,7 +862,7 @@ void command_sendop(Client *c,const Seperator *sep){ else c->Message(15,"Invalid opcode!"); */ - + } void command_optest(Client *c, const Seperator *sep) @@ -904,7 +904,7 @@ void command_optest(Client *c, const Seperator *sep) break; } default: - { + { break; } } @@ -916,25 +916,25 @@ void command_help(Client *c, const Seperator *sep) int commands_shown=0; c->Message(0, "Available EQEMu commands:"); - + map::iterator cur,end; cur = commandlist.begin(); end = commandlist.end(); - + for(; cur != end; cur++) { - if(sep->arg[1][0]) { + if(sep->arg[1][0]) { if(cur->first.find(sep->arg[1]) == string::npos) { continue; } } - + if(c->Admin() < cur->second->access) continue; commands_shown++; c->Message(0, " %c%s %s", COMMAND_CHAR, cur->first.c_str(), cur->second->desc == nullptr?"":cur->second->desc); } c->Message(0, "%d command%s listed.", commands_shown, commands_shown!=1?"s":""); - + } void command_version(Client *c, const Seperator *sep) @@ -1043,7 +1043,7 @@ void command_wc(Client *c, const Seperator *sep) wearslot = 1; } } - + } /* // Leaving here to add color option to the #wc command eventually @@ -1358,7 +1358,7 @@ void command_summon(Client *c, const Seperator *sep) Client* client = entity_list.GetClientByName(sep->arg[1]); if (client != 0) // found player in zone t=client->CastToMob(); - else + else { if (!worldserver.Connected()) c->Message(0, "Error: World server disconnected."); @@ -1428,9 +1428,9 @@ void command_zone(Client *c, const Seperator *sep) c->Message(0, "Your status is not high enough to zone to specific coordinates."); return; } - + uint16 zoneid = 0; - + if (sep->IsNumber(1)) { if(atoi(sep->arg[1])==26 && (c->Admin() < commandZoneToSpecials)){ //cshome @@ -1453,20 +1453,20 @@ void command_zone(Client *c, const Seperator *sep) c->Message(0, "Only Guides and above can goto that zone."); return; } - + zoneid = database.GetZoneID(sep->arg[1]); if(zoneid == 0) { c->Message(0, "Unable to locate zone '%s'", sep->arg[1]); return; } } - + #ifdef BOTS // This block is necessary to clean up any bot objects owned by a Client if(zoneid != c->GetZoneID()) Bot::ProcessClientZoneChange(c); #endif - + if (sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4)){ //zone to specific coords c->MovePC(zoneid, (float)atof(sep->arg[2]), atof(sep->arg[3]), atof(sep->arg[4]), 0.0f, 0); @@ -1491,7 +1491,7 @@ void command_zone_instance(Client *c, const Seperator *sep) c->Message(0, "Optional Usage: #zoneinstance [instance id] y x z"); return; } - + uint16 zoneid = 0; uint16 instanceid = 0; @@ -1572,7 +1572,7 @@ void command_peqzone(Client *c, const Seperator *sep) destzone = database.GetPEQZone(zoneid, 0); if(destzone == 0){ c->Message(13, "You cannot use this command to enter that zone!"); - return; + return; } if(zoneid == zone->GetZoneID()) { c->Message(13, "You cannot use this command on the zone you are in!"); @@ -1593,13 +1593,13 @@ void command_peqzone(Client *c, const Seperator *sep) } if(destzone == 0){ c->Message(13, "You cannot use this command to enter that zone!"); - return; + return; } if(zoneid == zone->GetZoneID()) { c->Message(13, "You cannot use this command on the zone you are in!"); return; } - } + } if(RuleB (Zone, UsePEQZoneDebuffs)){ c->SpellOnTarget(RuleI(Zone, PEQZoneDebuff1), c); c->SpellOnTarget(RuleI(Zone, PEQZoneDebuff2), c); @@ -1846,7 +1846,7 @@ void command_fov(Client *c, const Seperator *sep) void command_manastat(Client *c, const Seperator *sep) { Mob *target=c->GetTarget()?c->GetTarget():c; - + c->Message(0, "Mana for %s:", target->GetName()); c->Message(0, " Current Mana: %d",target->GetMana()); c->Message(0, " Max Mana: %d",target->GetMaxMana()); @@ -1912,7 +1912,7 @@ void command_npccast(Client *c, const Seperator *sep) } else if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->IsNumber(1) && sep->IsNumber(2) ) { Mob* spelltar = entity_list.GetMob(atoi(sep->arg[1])); - if (spelltar) + if (spelltar) c->GetTarget()->CastSpell(atoi(sep->arg[2]), spelltar->GetID()); else c->Message(0, "Error: target ID %i not found", atoi(sep->arg[1])); @@ -1934,10 +1934,10 @@ void command_zstats(Client *c, const Seperator *sep) void command_permaclass(Client *c, const Seperator *sep) { Client *t=c; - + if(c->GetTarget() && c->GetTarget()->IsClient()) t=c->GetTarget()->CastToClient(); - + if(sep->arg[1][0]==0) { c->Message(0,"Usage: #permaclass "); } @@ -1955,10 +1955,10 @@ void command_permaclass(Client *c, const Seperator *sep) void command_permarace(Client *c, const Seperator *sep) { Client *t=c; - + if(c->GetTarget() && c->GetTarget()->IsClient()) t=c->GetTarget()->CastToClient(); - + if(sep->arg[1][0]==0) { c->Message(0,"Usage: #permarace "); c->Message(0,"NOTE: Not all models are global. If a model is not global, it will appear as a human on character select and in zones without the model."); @@ -1979,10 +1979,10 @@ void command_permarace(Client *c, const Seperator *sep) void command_permagender(Client *c, const Seperator *sep) { Client *t=c; - + if(c->GetTarget() && c->GetTarget()->IsClient()) t=c->GetTarget()->CastToClient(); - + if(sep->arg[1][0]==0) { c->Message(0,"Usage: #permagender "); c->Message(0,"Gender Numbers: 0=Male, 1=Female, 2=Neuter"); @@ -2074,7 +2074,7 @@ void command_zheader(Client *c, const Seperator *sep) else if(database.GetZoneID(sep->argplus[1])==0) c->Message(0, "Invalid Zone Name: %s", sep->argplus[1]); else { - + if (zone->LoadZoneCFG(sep->argplus[1], true)) c->Message(0, "Successfully loaded zone header for %s from database.", sep->argplus[1]); else @@ -2148,10 +2148,10 @@ void command_itemtest(Client *c, const Seperator *sep) c->Message(13, "Error: Could not open c:\\EQEMUcvs\\ItemDump.txt"); return; } - + fread(chBuffer, sizeof(chBuffer), sizeof(char), f); fclose(f); - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_ItemLinkResponse, strlen(chBuffer)+5); memcpy(&outapp->pBuffer[4], chBuffer, strlen(chBuffer)); c->QueuePacket(outapp); @@ -2286,7 +2286,7 @@ void command_worldshutdown(Client *c, const Seperator *sep) c->Message(0, "Sending shutdown packet"); ServerPacket* pack = new ServerPacket; pack->opcode = ServerOP_ShutdownAll; - pack->size=0; + pack->size=0; worldserver.SendPacket(pack); safe_delete(pack); } @@ -2501,7 +2501,7 @@ void command_size(Client *c, const Seperator *sep) void command_mana(Client *c, const Seperator *sep) { Mob *t; - + t = c->GetTarget() ? c->GetTarget() : c; if(t->IsClient()) @@ -2597,7 +2597,7 @@ void command_castspell(Client *c, const Seperator *sep) (spellid == 3716) || (spellid == 911) || (spellid == 3014) || (spellid == 982) || (spellid == 905) || (spellid == 2079) || (spellid == 1218) || (spellid == 819) || ((spellid >= 780) && (spellid <= 785)) || ((spellid >= 1200) && (spellid <= 1205)) || - ((spellid >= 1342) && (spellid <= 1348)) || (spellid == 1923) || (spellid == 1924) || + ((spellid >= 1342) && (spellid <= 1348)) || (spellid == 1923) || (spellid == 1924) || (spellid == 3355)) && c->Admin() < commandCastSpecials) c->Message(13, "Unable to cast spell."); @@ -2617,7 +2617,7 @@ void command_castspell(Client *c, const Seperator *sep) } } -void command_setlanguage(Client *c, const Seperator *sep) +void command_setlanguage(Client *c, const Seperator *sep) { if ( strcasecmp( sep->arg[1], "list" ) == 0 ) { @@ -2684,7 +2684,7 @@ void command_setskill(Client *c, const Seperator *sep) else if (!c->GetTarget()->IsClient()) { c->Message(0, "Error: #setskill: Target must be a client."); } - else if ( + else if ( !sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > HIGHEST_SKILL || !sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > HIGHEST_CAN_SET_SKILL ) @@ -2790,7 +2790,7 @@ void command_spawn(Client *c, const Seperator *sep) #if EQDEBUG >= 11 LogFile->write(EQEMuLog::Debug,"#spawn Spawning:"); #endif - + NPC* npc = NPC::SpawnNPC(sep->argplus[1], c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(), c); if (!npc) { c->Message(0, "Format: #spawn name race level material hp gender class priweapon secweapon merchantid bodytype - spawns a npc those parameters."); @@ -2801,12 +2801,12 @@ void command_spawn(Client *c, const Seperator *sep) void command_texture(Client *c, const Seperator *sep) { - + uint16 texture; if (sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 255) { texture = atoi(sep->arg[1]); uint8 helm = 0xFF; - + // Player Races Wear Armor, so Wearchange is sent instead int i; if (!c->GetTarget()) @@ -2815,7 +2815,7 @@ void command_texture(Client *c, const Seperator *sep) c->SendTextureWC(i, texture); } else if ((c->GetTarget()->GetRace() > 0 && c->GetTarget()->GetRace() <= 12) || - c->GetTarget()->GetRace() == 128 || c->GetTarget()->GetRace() == 130 || + c->GetTarget()->GetRace() == 128 || c->GetTarget()->GetRace() == 130 || c->GetTarget()->GetRace() == 330 || c->GetTarget()->GetRace() == 522) { for (i = 0; i < 7; i++) { @@ -2902,7 +2902,7 @@ void command_charbackup(Client *c, const Seperator *sep) else database.GetAccountIDByChar(sep->arg[2], &charid); if (charid) { - if (database.RunQuery(query, MakeAnyLenString(&query, + if (database.RunQuery(query, MakeAnyLenString(&query, "Select id, backupreason, charid, account_id, zoneid, DATE_FORMAT(ts, '%%m/%%d/%%Y %%H:%%i:%%s') " " from character_backup where charid=%u", charid), errbuf, &result)) { safe_delete(query); @@ -2928,13 +2928,13 @@ void command_charbackup(Client *c, const Seperator *sep) charid = atoi(sep->arg[2]); else database.GetAccountIDByChar(sep->arg[2], &charid); - + if (charid && sep->IsNumber(3)) { uint32 cbid = atoi(sep->arg[3]); - if (database.RunQuery(query, MakeAnyLenString(&query, + if (database.RunQuery(query, MakeAnyLenString(&query, "Insert into character_backup (backupreason, charid, account_id, name, profile, level, class, x, y, z, zoneid, alt_adv) " " select 1, id, account_id, name, profile, level, class, x, y, z, zoneid, alt_adv from character_ where id=%u", charid), errbuf)) { - if (database.RunQuery(query, MakeAnyLenString(&query, + if (database.RunQuery(query, MakeAnyLenString(&query, "update character_ inner join character_backup on character_.id = character_backup.charid " " set character_.name = character_backup.name, " " character_.profile = character_backup.profile, " @@ -2988,13 +2988,13 @@ void command_peekinv(Client *c, const Seperator *sep) c->Message(0, "You must have a PC target selected for this command"); return; } - + bool bAll = (strcasecmp(sep->arg[1], "all") == 0); bool bFound = false; Client* client = c->GetTarget()->CastToClient(); const Item_Struct* item = nullptr; c->Message(0, "Displaying inventory for %s...", client->GetName()); - + if (bAll || (strcasecmp(sep->arg[1], "worn")==0)) { // Worn items bFound = true; @@ -3037,7 +3037,7 @@ void command_peekinv(Client *c, const Seperator *sep) ((item==0)?"null":item->Name), 0x12, ((item==0)?0:inst->GetCharges())); } - + if (inst && inst->IsType(ItemClassContainer)) { for (uint8 j=0; j<10; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); @@ -3110,7 +3110,7 @@ void command_peekinv(Client *c, const Seperator *sep) ((item==0)?"null":item->Name), 0x12, ((item==0)?0:inst->GetCharges())); } - + if (inst && inst->IsType(ItemClassContainer) && i==0) { // 'CSD 1' - only display contents of slot 30[0] container..higher ones don't exist for (uint8 j=0; j<10; j++) { const ItemInst* instbag = client->GetInv().GetItem(SLOT_CURSOR, j); @@ -3159,7 +3159,7 @@ void command_peekinv(Client *c, const Seperator *sep) } } } - + if (bAll || (strcasecmp(sep->arg[1], "bank")==0)) { // Bank and shared bank items bFound = true; @@ -3181,7 +3181,7 @@ void command_peekinv(Client *c, const Seperator *sep) ((item==0)?"null":item->Name), 0x12, ((item==0)?0:inst->GetCharges())); } - + if (inst && inst->IsType(ItemClassContainer)) { for (uint8 j=0; j<10; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); @@ -3222,7 +3222,7 @@ void command_peekinv(Client *c, const Seperator *sep) ((item==0)?"null":item->Name), 0x12, ((item==0)?0:inst->GetCharges())); } - + if (inst && inst->IsType(ItemClassContainer)) { for (uint8 j=0; j<10; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); @@ -3267,7 +3267,7 @@ void command_peekinv(Client *c, const Seperator *sep) ((item==0)?"null":item->Name), 0x12, ((item==0)?0:inst->GetCharges())); } - + if (inst && inst->IsType(ItemClassContainer)) { for (uint8 j=0; j<10; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); @@ -3288,12 +3288,12 @@ void command_peekinv(Client *c, const Seperator *sep) ((item==0)?"null":item->Name), 0x12, ((item==0)?0:inst->GetCharges())); } - + } } } } - + if (!bFound) { c->Message(0, "Usage: #peekinv [worn|cursor|inv|bank|trade|trib|all]"); @@ -3421,7 +3421,7 @@ void command_findzone(Client *c, const Seperator *sep) else { c->Message (0, "Error querying database."); - c->Message (0, query); + c->Message (0, query); } safe_delete_array(query); @@ -3648,7 +3648,7 @@ void command_equipitem(Client *c, const Seperator *sep) mi->from_slot = SLOT_CURSOR; mi->to_slot = slot_id; // mi->number_in_stack = from_inst->GetCharges(); // replaced with con check for stacking - + // crude stackable check to only 'move' the difference count on client instead of entire stack when applicable if (to_inst && to_inst->IsStackable() && (to_inst->GetItem()->ID == from_inst->GetItem()->ID) && @@ -3890,11 +3890,11 @@ void command_fixmob(Client *c, const Seperator *sep) c->Message(0,"Error: this command requires a target"); else { - + uint32 Adjustment = 1; // Previous or Next char codeMove; - if (sep->arg[2]) + if (sep->arg[2]) { char* command2 = sep->arg[2]; codeMove = (command2[0] | 0x20); // First character, lower-cased @@ -3903,7 +3903,7 @@ void command_fixmob(Client *c, const Seperator *sep) else if (codeMove == 'p') Adjustment = -1; } - + uint16 Race = target->GetRace(); uint8 Gender = target->GetGender(); uint8 Texture = 0xFF; @@ -3922,9 +3922,9 @@ void command_fixmob(Client *c, const Seperator *sep) const char* ChangeType = nullptr; // If it's still nullptr after processing, they didn't send a valid command uint32 ChangeSetting; char* command = sep->arg[1]; - + if (strcasecmp(command, "race") == 0) - { + { if (Race == 1 && codeMove == 'p') Race = 724; else if (Race >= 724 && codeMove != 'p') @@ -3948,7 +3948,7 @@ void command_fixmob(Client *c, const Seperator *sep) else if (strcasecmp(command, "texture") == 0) { Texture = target->GetTexture(); - + if (Texture == 0 && codeMove == 'p') Texture = 25; else if (Texture >= 25 && codeMove != 'p') @@ -4096,7 +4096,7 @@ void command_fixmob(Client *c, const Seperator *sep) target->SendIllusionPacket(Race, Gender, Texture, HelmTexture, HairColor, BeardColor, EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF, DrakkinHeritage, DrakkinTattoo, DrakkinDetails); - + c->Message(0, "%s=%i", ChangeType, ChangeSetting); } } @@ -4138,7 +4138,7 @@ void command_title(Client *c, const Seperator *sep) c->Message(13, "Title must be 31 characters or less."); return; } - + bool removed = false; if(!strcasecmp(sep->arg[1], "remove")) { t->SetAATitle(""); @@ -4154,7 +4154,7 @@ void command_title(Client *c, const Seperator *sep) } t->Save(); - + if(removed) { c->Message(13, "%s's title has been removed.", t->GetName(), sep->arg[1]); if(t != c) @@ -4188,7 +4188,7 @@ void command_titlesuffix(Client *c, const Seperator *sep) c->Message(13, "Title suffix must be 31 characters or less."); return; } - + bool removed = false; if(!strcasecmp(sep->arg[1], "remove")) { t->SetTitleSuffix(""); @@ -4205,7 +4205,7 @@ void command_titlesuffix(Client *c, const Seperator *sep) } t->Save(); - + if(removed) { c->Message(13, "%s's title suffix has been removed.", t->GetName(), sep->arg[1]); if(t != c) @@ -4387,16 +4387,16 @@ void command_repop(Client *c, const Seperator *sep) int timearg = 1; if (sep->arg[1] && strcasecmp(sep->arg[1], "force") == 0) { timearg++; - + LinkedListIterator iterator(zone->spawn2_list); iterator.Reset(); - while (iterator.MoreElements()) + while (iterator.MoreElements()) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM respawn_times WHERE id=%lu" + database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM respawn_times WHERE id=%lu" " AND instance_id=%lu",(unsigned long)iterator.GetData()->GetID(), (unsigned long)zone->GetInstanceID()), errbuf); - safe_delete_array(query); + safe_delete_array(query); iterator.Advance(); } c->Message(0, "Zone depop: Force resetting spawn timers."); @@ -4571,7 +4571,7 @@ void command_setpvppoints(Client *c, const Seperator *sep) void command_name(Client *c, const Seperator *sep) { Client *target; - + if( (strlen(sep->arg[1]) == 0) || (!(c->GetTarget() && c->GetTarget()->IsClient())) ) c->Message(0, "Usage: #name newname (requires player target)"); else @@ -4667,7 +4667,7 @@ void command_zonespawn(Client *c, const Seperator *sep) { c->Message(0, "This command is not yet implemented."); return; - + /* this was kept from client.cpp verbatim (it was commented out) */ // if (target && target->IsNPC()) { // Message(0, "Inside main if."); @@ -4779,13 +4779,13 @@ void command_spawnfix(Client *c, const Seperator *sep) { } safe_delete_array(query); } - } + } } void command_loc(Client *c, const Seperator *sep) { Mob *t=c->GetTarget()?c->GetTarget():c->CastToMob(); - + c->Message(0, "%s's Location (XYZ): %1.1f, %1.1f, %1.1f; heading=%1.1f", t->GetName(), t->GetX(), t->GetY(), t->GetZ(), t->GetHeading()); } @@ -4803,7 +4803,7 @@ void command_goto(Client *c, const Seperator *sep) void command_iteminfo(Client *c, const Seperator *sep) { const ItemInst* inst = c->GetInv()[SLOT_CURSOR]; - + if (!inst) c->Message(13, "Error: You need an item on your cursor for this command"); else { @@ -4838,7 +4838,7 @@ void command_uptime(Client *c, const Seperator *sep) ServerPacket* pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct)); ServerUptime_Struct* sus = (ServerUptime_Struct*) pack->pBuffer; strcpy(sus->adminname, c->GetName()); - if (sep->IsNumber(1) && atoi(sep->arg[1]) > 0) + if (sep->IsNumber(1) && atoi(sep->arg[1]) > 0) sus->zoneserverid = atoi(sep->arg[1]); worldserver.SendPacket(pack); safe_delete(pack); @@ -4971,7 +4971,7 @@ void command_guild(Client *c, const Seperator *sep) tmp = c->GuildID(); else if (admin >= minStatusToEditOtherGuilds) tmp = atoi(sep->arg[2]); - + if(tmp != GUILD_NONE) guild_mgr.DescribeGuild(c, tmp); } @@ -5033,26 +5033,26 @@ void command_guild(Client *c, const Seperator *sep) c->Message(0, "Usage: #guild set charname guildgbid (0 = clear guildtag)"); else { uint32 guild_id = atoi(sep->arg[3]); - + if(guild_id == 0) guild_id = GUILD_NONE; else if(!guild_mgr.GuildExists(guild_id)) { c->Message(13, "Guild %d does not exist.", guild_id); return; } - + uint32 charid = database.GetCharacterID(sep->arg[2]); if(charid == 0) { c->Message(13, "Unable to find character '%s'", charid); return; } - + //we could do the checking we need for guild_mgr.CheckGMStatus, but im lazy right now if(admin < minStatusToEditOtherGuilds) { c->Message(13, "Access denied."); return; } - + if(guild_id == GUILD_NONE) { _log(GUILDS__ACTIONS, "%s: Removing %s (%d) from guild with GM command.", c->GetName(), sep->arg[2], charid); @@ -5061,7 +5061,7 @@ void command_guild(Client *c, const Seperator *sep) sep->arg[2], charid, guild_mgr.GetGuildName(guild_id), guild_id); } - + if(!guild_mgr.SetGuild(charid, guild_id, GUILD_MEMBER)) { c->Message(13, "Error putting '%s' into guild %d", sep->arg[2], guild_id); } else { @@ -5099,16 +5099,16 @@ void command_guild(Client *c, const Seperator *sep) c->Message(13, "Unable to find character '%s'", charid); return; } - + //we could do the checking we need for guild_mgr.CheckGMStatus, but im lazy right now if(admin < minStatusToEditOtherGuilds) { c->Message(13, "Access denied."); return; } - + _log(GUILDS__ACTIONS, "%s: Setting %s (%d)'s guild rank to %d with GM command.", c->GetName(), sep->arg[2], charid, rank); - + if(!guild_mgr.SetGuildRank(charid, rank)) c->Message(13, "Error while setting rank %d on '%s'.", rank, sep->arg[2]); else @@ -5140,26 +5140,26 @@ void command_guild(Client *c, const Seperator *sep) c->Message(0, "Error: %s already is the leader of DB# %i '%s'.", sep->arg[2], tmp, guild_mgr.GetGuildName(tmp)); } else { - + if(admin < minStatusToEditOtherGuilds) { c->Message(13, "Access denied."); return; } - + uint32 id = guild_mgr.CreateGuild(sep->argplus[3], leader); - + _log(GUILDS__ACTIONS, "%s: Creating guild %s with leader %d with GM command. It was given id %lu.", c->GetName(), sep->argplus[3], leader, (unsigned long)id); - + if (id == GUILD_NONE) c->Message(0, "Guild creation failed."); else { c->Message(0, "Guild created: Leader: %i, number %i: %s", leader, id, sep->argplus[3]); - + if(!guild_mgr.SetGuild(leader, id, GUILD_LEADER)) c->Message(0, "Unable to set guild leader's guild in the database. Your going to have to run #guild set"); } - + } } } @@ -5170,12 +5170,12 @@ void command_guild(Client *c, const Seperator *sep) c->Message(0, "Error: World server dirconnected"); else { uint32 id = atoi(sep->arg[2]); - + if(!guild_mgr.GuildExists(id)) { c->Message(0, "Guild %d does not exist!", id); return; } - + if(admin < minStatusToEditOtherGuilds) { //this person is not allowed to just edit any guild, check this guild's min status. if(c->GuildID() != id) { @@ -5187,9 +5187,9 @@ void command_guild(Client *c, const Seperator *sep) } } - _log(GUILDS__ACTIONS, "%s: Deleting guild %s (%d) with GM command.", c->GetName(), + _log(GUILDS__ACTIONS, "%s: Deleting guild %s (%d) with GM command.", c->GetName(), guild_mgr.GetGuildName(id), id); - + if (!guild_mgr.DeleteGuild(id)) c->Message(0, "Guild delete failed."); else { @@ -5204,12 +5204,12 @@ void command_guild(Client *c, const Seperator *sep) c->Message(0, "Error: World server dirconnected"); else { uint32 id = atoi(sep->arg[2]); - + if(!guild_mgr.GuildExists(id)) { c->Message(0, "Guild %d does not exist!", id); return; } - + if(admin < minStatusToEditOtherGuilds) { //this person is not allowed to just edit any guild, check this guild's min status. if(c->GuildID() != id) { @@ -5221,9 +5221,9 @@ void command_guild(Client *c, const Seperator *sep) } } - _log(GUILDS__ACTIONS, "%s: Renaming guild %s (%d) to '%s' with GM command.", c->GetName(), + _log(GUILDS__ACTIONS, "%s: Renaming guild %s (%d) to '%s' with GM command.", c->GetName(), guild_mgr.GetGuildName(id), id, sep->argplus[3]); - + if (!guild_mgr.RenameGuild(id, sep->argplus[3])) c->Message(0, "Guild rename failed."); else { @@ -5255,12 +5255,12 @@ void command_guild(Client *c, const Seperator *sep) } else { uint32 id = atoi(sep->arg[2]); - + if(!guild_mgr.GuildExists(id)) { c->Message(0, "Guild %d does not exist!", id); return; } - + if(admin < minStatusToEditOtherGuilds) { //this person is not allowed to just edit any guild, check this guild's min status. if(c->GuildID() != id) { @@ -5271,10 +5271,10 @@ void command_guild(Client *c, const Seperator *sep) return; } } - - _log(GUILDS__ACTIONS, "%s: Setting leader of guild %s (%d) to %d with GM command.", c->GetName(), + + _log(GUILDS__ACTIONS, "%s: Setting leader of guild %s (%d) to %d with GM command.", c->GetName(), guild_mgr.GetGuildName(id), id, leader); - + if(!guild_mgr.SetGuildLeader(id, leader)) c->Message(0, "Guild leader change failed."); else { @@ -5457,7 +5457,7 @@ void command_randomfeatures(Client *c, const Seperator *sep) { uint16 Race = target->GetRace(); if (Race <= 12 || Race == 128 || Race == 130 || Race == 330 || Race == 522) { - + uint8 Gender = target->GetGender(); uint8 Texture = 0xFF; uint8 HelmTexture = 0xFF; @@ -5471,12 +5471,12 @@ void command_randomfeatures(Client *c, const Seperator *sep) uint32 DrakkinHeritage = 0xFFFFFFFF; uint32 DrakkinTattoo = 0xFFFFFFFF; uint32 DrakkinDetails = 0xFFFFFFFF; - + // Set some common feature settings EyeColor1 = MakeRandomInt(0, 9); EyeColor2 = MakeRandomInt(0, 9); LuclinFace = MakeRandomInt(0, 7); - + // Adjust all settings based on the min and max for each feature of each race and gender switch (Race) { @@ -6077,7 +6077,7 @@ void command_unscribespells(Client *c, const Seperator *sep) if(c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) t=c->GetTarget()->CastToClient(); - + t->UnscribeSpellAll(); } @@ -6089,7 +6089,7 @@ void command_wpinfo(Client *c, const Seperator *sep) c->Message(0,"You must target an NPC to use this."); return; } - + NPC *n = t->CastToNPC(); n->DisplayWaypointInfo(c); } @@ -6111,7 +6111,7 @@ void command_wpadd(Client *c, const Seperator *sep) c->Message(0,"#wpadd FAILED -- Can't determine which spawn record in the database this mob came from!"); return; } - + if (sep->arg[1][0]) { if (atoi(sep->arg[1]) >= 0) @@ -6234,13 +6234,13 @@ void command_givemoney(Client *c, const Seperator *sep) { if (!sep->IsNumber(1)) { //as long as the first one is a number, we'll just let atoi convert the rest to 0 or a number c->Message(13, "Usage: #Usage: #givemoney [pp] [gp] [sp] [cp]"); - } + } else if(c->GetTarget() == nullptr) { c->Message(13, "You must target a player to give money to."); - } + } else if(!c->GetTarget()->IsClient()) { c->Message(13, "You can only give money to players with this command."); - } + } else { //TODO: update this to the client, otherwise the client doesn't show any weight change until you zone, move an item, etc c->GetTarget()->CastToClient()->AddMoneyToPP(atoi(sep->arg[4]), atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[1]), true); @@ -6320,7 +6320,7 @@ void command_setaaxp(Client *c, const Seperator *sep) if(c->GetTarget() && c->GetTarget()->IsClient()) t=c->GetTarget()->CastToClient(); - + if (sep->IsNumber(1)) { t->SetEXP(t->GetEXP(), atoi(sep->arg[1]), false); if(sep->IsNumber(2) && sep->IsNumber(3)) { @@ -6545,7 +6545,7 @@ void command_ban(Client *c, const Seperator *sep) mysql_free_result(result); } - else + else { c->Message(13,"Character does not exist."); } @@ -6609,7 +6609,7 @@ void command_suspend(Client *c, const Seperator *sep) } else c->Message(13,"Character does not exist."); - + safe_delete_array(EscName); } } @@ -6632,7 +6632,7 @@ void command_revoke(Client *c, const Seperator *sep) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) { c->Message(0, "Usage: #revoke [charname] [1/0]"); @@ -6716,12 +6716,12 @@ void command_set_adventure_points(Client *c, const Seperator *sep) c->Message(0, "Usage: #setadventurepoints [points] [theme]"); return; } - + if(!sep->IsNumber(1) || !sep->IsNumber(2)) { c->Message(0, "Usage: #setadventurepoints [points] [theme]"); return; - } + } c->Message(0, "Updating adventure points for %s", t->GetName()); t->UpdateLDoNPoints(atoi(sep->arg[1]), atoi(sep->arg[2])); @@ -6757,12 +6757,12 @@ void command_timers(Client *c, const Seperator *sep) { return; } Client *them = c->GetTarget()->CastToClient(); - + vector< pair > res; them->GetPTimers().ToVector(res); - + c->Message(0,"Timers for target:"); - + int r; int l = res.size(); for(r = 0; r < l; r++) { @@ -6821,8 +6821,8 @@ void command_npcedit(Client *c, const Seperator *sep) c->Message(0, "#npcedit FR - Sets an NPCs fire resistance"); c->Message(0, "#npcedit CR - Sets an NPCs cold resistance"); c->Message(0, "#npcedit Corrup - Sets an NPCs corruption resistance"); - c->Message(0, "#npcedit Seeinvis - Sets an NPCs ability to see invis"); - c->Message(0, "#npcedit Seeinvisundead - Sets an NPCs ability to see through invis vs. undead"); + c->Message(0, "#npcedit Seeinvis - Sets an NPCs ability to see invis"); + c->Message(0, "#npcedit Seeinvisundead - Sets an NPCs ability to see through invis vs. undead"); c->Message(0, "#npcedit Seehide - Sets an NPCs ability to see through hide"); c->Message(0, "#npcedit Seeimprovedhide - Sets an NPCs ability to see through improved hide"); c->Message(0, "#npcedit AC - Sets an NPCs armor class"); @@ -6836,7 +6836,7 @@ void command_npcedit(Client *c, const Seperator *sep) c->Message(0, "#npcedit featuresave - Saves all current facial features to the database"); c->Message(0, "#npcedit armortint_id - Set NPC Armor tint ID"); c->Message(0, "#npcedit setanimation - Set NPC's animation on spawn (Stored in spawn2 table)"); - + } else if ( strcasecmp( sep->arg[1], "name" ) == 0 ) { @@ -7240,7 +7240,7 @@ void command_npcedit(Client *c, const Seperator *sep) safe_delete_array(query); } - + else if ( strcasecmp( sep->arg[1], "armortint_id" ) == 0 ) { char errbuf[MYSQL_ERRMSG_SIZE]; @@ -7286,7 +7286,7 @@ void command_npcedit(Client *c, const Seperator *sep) } else if((sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*")==0) || ((c->GetTarget()==0) || (c->GetTarget()->IsClient()))) - { + { c->Message(0, "Type #npcedit help for more info"); } } @@ -7335,7 +7335,7 @@ void command_logs(Client *c, const Seperator *sep) if(c->GetTarget() && c->GetTarget()->IsClient()) { t = c->GetTarget()->CastToClient(); } - + if(!strcasecmp( sep->arg[1], "status" ) ) client_logs.subscribe(EQEMuLog::Status, t); else if(!strcasecmp( sep->arg[1], "normal" ) ) @@ -7367,7 +7367,7 @@ void command_nologs(Client *c, const Seperator *sep) if(c->GetTarget() && c->GetTarget()->IsClient()) { t = c; } - + if(!strcasecmp( sep->arg[1], "status" ) ) client_logs.unsubscribe(EQEMuLog::Status, t); else if(!strcasecmp( sep->arg[1], "normal" ) ) @@ -7384,7 +7384,7 @@ void command_nologs(Client *c, const Seperator *sep) c->Message(0, "Usage: #logs [status|normal|error|debug|quest|all]"); return; } - + c->Message(0, "You have been unsubscribed from %s logs.", sep->arg[1]); #else c->Message(0, "Client logs are disabled in this server's build."); @@ -7466,13 +7466,13 @@ void command_fear(Client *c, const Seperator *sep) { // c->Message(0, "...stop - Stops fear on your target"); return; } - + if(!strcasecmp(sep->arg[1], "view")) { if(zone->pathing == nullptr) { c->Message(13, "There is no fear grid file loaded for this zone."); return; } - + uint32 count = zone->pathing->CountNodes(); uint32 r; char buf[128]; @@ -7489,23 +7489,23 @@ void command_fear(Client *c, const Seperator *sep) { c->Message(13, "There is no fear grid file loaded for this zone."); return; } - + int dist = atoi(sep->arg[2]); char buf[128]; - + FindPerson_Point it; vector pts; pts.reserve(dist+2); bool path_mode = (strcasecmp(sep->arg[3], "npc") != 0); - + MobFearState fs; - + sprintf(buf, "Close_Fear_Link%d_ 3", dist); if(!zone->pathing->FindNearestFear(&fs, c->GetX(), c->GetY(), c->GetZ())) { c->Message(13, "Unable to locate a closest fear path."); return; } - + if(path_mode) { it.x = c->GetX(); it.y = c->GetY(); @@ -7520,14 +7520,14 @@ void command_fear(Client *c, const Seperator *sep) { if(npc == nullptr) c->Message(13, "Unable to spawn new NPC marker."); } - + for(dist--; dist > 0; dist--) { sprintf(buf, "Close_Fear_Link%d_ 3", dist); if(!zone->pathing->NextFearPath(&fs)) { c->Message(13, "Unable to locate next fear path."); return; } - + if(path_mode) { it.x = fs.x; it.y = fs.y; @@ -7537,42 +7537,42 @@ void command_fear(Client *c, const Seperator *sep) { NPC::SpawnNPC(buf, fs.x, fs.y, fs.z, c->GetHeading(), nullptr); } } - + if(path_mode) { c->SendPathPacket(pts); } - + } else if(!strcasecmp(sep->arg[1], "close")) { if(zone->pathing == nullptr) { c->Message(13, "There is no fear grid file loaded for this zone."); return; } MobFearState fs; - + if(!zone->pathing->FindNearestFear(&fs, c->GetX(), c->GetY(), c->GetZ())) { c->Message(13, "Unable to locate a closest fear path."); return; } - + NPC* npc = NPC::SpawnNPC("Close_Fear_Point 2", fs.x, fs.y, fs.z, c->GetHeading(), nullptr); if(npc == nullptr) c->Message(13, "Unable to spawn new NPC marker."); - + } else if(!strcasecmp(sep->arg[1], "see")) { - + vector points; - + Mob* target = c->GetTarget(); - + if(target == nullptr) { //empty length packet == not found. EQApplicationPacket outapp(OP_FindPersonReply, 0); c->QueuePacket(&outapp); return; } - + c->Message(13, "Found NPC '%s'\n", target->GetName()); - + //fill in the path array... points.resize(4); points[0].x = c->GetX(); @@ -7587,20 +7587,20 @@ void command_fear(Client *c, const Seperator *sep) { points[3].x = 0; points[3].y = 0; points[3].z = 0; - - - + + + if(points.size() == 0) { //empty length packet == not found. EQApplicationPacket outapp(OP_FindPersonReply, 0); c->QueuePacket(&outapp); return; } - + int len = sizeof(FindPersonResult_Struct) + points.size() * sizeof(FindPerson_Point); EQApplicationPacket *outapp = new EQApplicationPacket(OP_FindPersonReply, len); FindPersonResult_Struct* fpr=(FindPersonResult_Struct*)outapp->pBuffer; - + vector::iterator cur, end; cur = points.begin(); end = points.end(); @@ -7610,7 +7610,7 @@ void command_fear(Client *c, const Seperator *sep) { } cur--; //last element. fpr->dest = *cur; - + c->FastQueuePacket(&outapp); } else { c->Message(15, "Invalid action specified. use '#fear help' for help"); @@ -7627,7 +7627,7 @@ void command_path(Client *c, const Seperator *sep) c->Message(0, "#path dump file_name: Dumps the current zone->pathing to a file of your naming."); c->Message(0, "#path add [requested_id]: Adds a node at your current location will try to take the requested id if possible."); c->Message(0, "#path connect connect_to_id [is_teleport] [door_id]: Connects the currently targeted node to connect_to_id's node and connects that node back (requires shownode target)."); - c->Message(0, "#path sconnect connect_to_id [is_teleport] [door_id]: Connects the currently targeted node to connect_to_id's node (requires shownode target)."); + c->Message(0, "#path sconnect connect_to_id [is_teleport] [door_id]: Connects the currently targeted node to connect_to_id's node (requires shownode target)."); c->Message(0, "#path qconnect [set]: short cut connect, connects the targeted node to the node you set with #path qconnect set (requires shownode target)."); c->Message(0, "#path disconnect [all]/disconnect_from_id: Disconnects the currently targeted node to disconnect from disconnect from id's node (requires shownode target), if passed all as the second argument it will disconnect this node from every other node."); c->Message(0, "#path move: Moves your targeted node to your current position"); @@ -7835,7 +7835,7 @@ void command_path(Client *c, const Seperator *sep) { if(c && c->GetTarget()) { - if(zone->pathing->NoHazardsAccurate(VERTEX(c->GetX(),c->GetY(),c->GetZ()), + if(zone->pathing->NoHazardsAccurate(VERTEX(c->GetX(),c->GetY(),c->GetZ()), VERTEX(c->GetTarget()->GetX(),c->GetTarget()->GetY(),c->GetTarget()->GetZ()))) { c->Message(0, "No hazards."); @@ -7976,9 +7976,9 @@ void command_ginfo(Client *c, const Seperator *sep) c->Message(0, "This client is not in a group"); return; } - + c->Message(0, "Player: %s is in Group #%lu: with %i members", t->GetName(), (unsigned long)g->GetID(), g->GroupCount()); - + uint32 r; for(r = 0; r < MAX_GROUP_MEMBERS; r++) { if(g->members[r] == nullptr) { @@ -8019,7 +8019,7 @@ void command_aggro(Client *c, const Seperator *sep) if(sep->arg[2][0] == '-' && sep->arg[2][1] == 'v' && sep->arg[2][2] == '\0') { verbose = true; } - + entity_list.DescribeAggro(c, c->GetTarget()->CastToNPC(), d, verbose); } @@ -8044,7 +8044,7 @@ void command_bestz(Client *c, const Seperator *sep) { c->Message(0,"Maps deactivated in this zone."); return; } - + NodeRef pnode; if(c->GetTarget()) { pnode = zone->zonemap->SeekNode( zone->zonemap->GetRoot(), c->GetTarget()->GetX(), c->GetTarget()->GetY() ); @@ -8055,7 +8055,7 @@ void command_bestz(Client *c, const Seperator *sep) { c->Message(0,"Unable to find your node."); return; } - + VERTEX me; me.x = c->GetX(); me.y = c->GetY(); @@ -8063,14 +8063,14 @@ void command_bestz(Client *c, const Seperator *sep) { VERTEX hit; VERTEX bme(me); bme.z -= 500; - + float best_z = zone->zonemap->FindBestZ(pnode, me, &hit, nullptr); - + float best_z2 = -999990; if(zone->zonemap->LineIntersectsNode(pnode, me, bme, &hit, nullptr)) { best_z2 = hit.z; } - + if (best_z != -999999) { c->Message(0,"Z is %.3f or %.3f at (%.3f, %.3f).", best_z, best_z2, me.x, me.y); @@ -8085,28 +8085,28 @@ void command_bestz(Client *c, const Seperator *sep) { } else { WaterRegionType RegionType; float z; - + if(c->GetTarget()) { z=c->GetTarget()->GetZ(); RegionType = zone->watermap->BSPReturnRegionType(1, c->GetTarget()->GetX(), c->GetTarget()->GetY(), z); c->Message(0,"InWater returns %d", zone->watermap->InWater(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z)); c->Message(0,"InLava returns %d", zone->watermap->InLava(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z)); - + } else { z=c->GetZ(); RegionType = zone->watermap->BSPReturnRegionType(1, c->GetX(), c->GetY(),z); c->Message(0,"InWater returns %d", zone->watermap->InWater(c->GetX(), c->GetY(), z)); c->Message(0,"InLava returns %d", zone->watermap->InLava(c->GetX(), c->GetY(), z)); - + } - + switch(RegionType) { case RegionTypeNormal: { c->Message(0,"There is nothing special about the region you are in!"); break; } case RegionTypeWater: { c->Message(0,"You/your target are in Water."); break; } case RegionTypeLava: { c->Message(0,"You/your target are in Lava."); break; } case RegionTypeVWater: { c->Message(0,"You/your target are in VWater (Icy Water?)."); break; } - default: c->Message(0,"You/your target are in an unknown region type."); + default: c->Message(0,"You/your target are in an unknown region type."); } } @@ -8121,13 +8121,13 @@ void command_reloadstatic(Client *c, const Seperator *sep) { void command_flags(Client *c, const Seperator *sep) { Client *t = c; - + if(c->Admin() >= minStatusToSeeOthersZoneFlags) { Mob *tgt = c->GetTarget(); if(tgt != nullptr && tgt->IsClient()) t = tgt->CastToClient(); } - + t->SendZoneFlagInfo(c); } @@ -8145,7 +8145,7 @@ void command_flagedit(Client *c, const Seperator *sep) { c->Message(0, "...Note: use #flags to view flags on a person"); return; } - + if(!strcasecmp(sep->arg[1], "lockzone")) { uint32 zoneid = 0; if(sep->arg[2][0] != '\0') { @@ -8158,7 +8158,7 @@ void command_flagedit(Client *c, const Seperator *sep) { c->Message(13, "zone required. see help."); return; } - + char flag_name[128]; if(sep->argplus[3][0] == '\0') { c->Message(13, "flag name required. see help."); @@ -8166,8 +8166,8 @@ void command_flagedit(Client *c, const Seperator *sep) { } database.DoEscapeString(flag_name, sep->argplus[3], 64); flag_name[127] = '\0'; - - if(!database.RunQuery(query, MakeAnyLenString(&query, + + if(!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET flag_needed='%s' WHERE zoneidnumber=%d AND version=%d", flag_name, zoneid, zone->GetInstanceVersion()), errbuf)) { @@ -8189,8 +8189,8 @@ void command_flagedit(Client *c, const Seperator *sep) { c->Message(13, "zone required. see help."); return; } - - if(!database.RunQuery(query, MakeAnyLenString(&query, + + if(!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET flag_needed='' WHERE zoneidnumber=%d AND version=%d", zoneid, zone->GetInstanceVersion()), errbuf)) { @@ -8203,7 +8203,7 @@ void command_flagedit(Client *c, const Seperator *sep) { } else if(!strcasecmp(sep->arg[1], "listzones")) { MYSQL_RES *result; MYSQL_ROW row; - if (database.RunQuery(query, MakeAnyLenString(&query, + if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT zoneidnumber,short_name,long_name,version,flag_needed FROM zone WHERE flag_needed != ''" ), errbuf, &result)) { @@ -8229,13 +8229,13 @@ void command_flagedit(Client *c, const Seperator *sep) { c->Message(13, "zone required. see help."); return; } - + Mob *t = c->GetTarget(); if(t == nullptr || !t->IsClient()) { c->Message(13, "client target required"); return; } - + t->CastToClient()->SetZoneFlag(zoneid); } else if(!strcasecmp(sep->arg[1], "give")) { uint32 zoneid = 0; @@ -8249,13 +8249,13 @@ void command_flagedit(Client *c, const Seperator *sep) { c->Message(13, "zone required. see help."); return; } - + Mob *t = c->GetTarget(); if(t == nullptr || !t->IsClient()) { c->Message(13, "client target required"); return; } - + t->CastToClient()->ClearZoneFlag(zoneid); } else { c->Message(15, "Invalid action specified. use '#flagedit help' for help"); @@ -8283,61 +8283,61 @@ void command_mlog(Client *c, const Seperator *sep) { bool onoff; string on("on"); string off("off"); - + if(!strcasecmp(sep->arg[1], "target")) { if(on == sep->arg[2]) onoff = true; else if(off == sep->arg[2]) onoff = false; else { c->Message(13, "Invalid argument. Expected on/off."); return; } - + Mob *tgt = c->GetTarget(); if(tgt == nullptr) { c->Message(13, "You must have a target for this command."); return; } - + if(onoff) tgt->EnableLogging(); else tgt->DisableLogging(); - + c->Message(0, "Logging has been enabled on %s", tgt->GetName()); } else if(!strcasecmp(sep->arg[1], "all")) { if(on == sep->arg[2]) onoff = true; else if(off == sep->arg[2]) onoff = false; else { c->Message(13, "Invalid argument '%s'. Expected on/off.", sep->arg[2]); return; } - + entity_list.RadialSetLogging(c, onoff, true, true); - + c->Message(0, "Logging has been enabled for all entities"); } else if(!strcasecmp(sep->arg[1], "mobs")) { if(on == sep->arg[2]) onoff = true; else if(off == sep->arg[2]) onoff = false; else { c->Message(13, "Invalid argument '%s'. Expected on/off.", sep->arg[2]); return; } - + entity_list.RadialSetLogging(c, onoff, false, true); - + c->Message(0, "Logging has been enabled for all mobs"); } else if(!strcasecmp(sep->arg[1], "clients")) { if(on == sep->arg[2]) onoff = true; else if(off == sep->arg[2]) onoff = false; else { c->Message(13, "Invalid argument '%s'. Expected on/off.", sep->arg[2]); return; } - + entity_list.RadialSetLogging(c, onoff, true, false); - + c->Message(0, "Logging has been enabled for all clients"); } else if(!strcasecmp(sep->arg[1], "radius")) { if(on == sep->arg[2]) onoff = true; else if(off == sep->arg[2]) onoff = false; else { c->Message(13, "Invalid argument '%s'. Expected on/off.", sep->arg[2]); return; } - + float radius = atof(sep->arg[3]); if(radius <= 0) { c->Message(13, "Invalid radius %f", radius); return; } - + entity_list.RadialSetLogging(c, onoff, false, true, radius); - + c->Message(0, "Logging has been enabled for all entities within %f", radius); } else if(!strcasecmp(sep->arg[1], "list")) { int r; @@ -8368,7 +8368,7 @@ void command_mlog(Client *c, const Seperator *sep) { if(on == sep->arg[3]) onoff = true; else if(off == sep->arg[3]) onoff = false; else { c->Message(13, "Invalid argument %s. Expected on/off.", sep->arg[3]); return; } - + int r; //first we have to find the category ID. for(r = 0; r < NUMBER_OF_LOG_CATEGORIES; r++) { @@ -8379,12 +8379,12 @@ void command_mlog(Client *c, const Seperator *sep) { c->Message(13, "Unable to find category '%s'", sep->arg[2]); return; } - + LogCategory logcat = LogCategory(r); for(r = 0; r < NUMBER_OF_LOG_TYPES; r++) { if(log_type_info[r].category != logcat) continue; - + if(onoff) { log_enable(LogType(r)); c->Message(0, "Log type %s (%d) has been enabled", log_type_info[r].name, r); @@ -8397,7 +8397,7 @@ void command_mlog(Client *c, const Seperator *sep) { if(on == sep->arg[3]) onoff = true; else if(off == sep->arg[3]) onoff = false; else { c->Message(13, "Invalid argument %s. Expected on/off.", sep->arg[3]); return; } - + //first we have to find the category ID. int r; for(r = 0; r < NUMBER_OF_LOG_TYPES; r++) { @@ -8408,7 +8408,7 @@ void command_mlog(Client *c, const Seperator *sep) { c->Message(13, "Unable to find log type %s", sep->arg[2]); return; } - + if(onoff) { log_enable(LogType(r)); c->Message(0, "Log type %s (%d) has been enabled", log_type_info[r].name, r); @@ -8474,7 +8474,7 @@ void command_hatelist(Client *c, const Seperator *sep) { c->Message(0, "Error: you must have a target."); return; } - + c->Message(0, "Display hate list for %s..", target->GetName()); target->PrintHateListToClient(c); } @@ -8503,9 +8503,9 @@ void command_rules(Client *c, const Seperator *sep) { c->Message(0, "...values [catname] - List the value of all rules in the specified category"); return; } - + if(!strcasecmp(sep->arg[1], "current")) { - c->Message(0, "Currently running ruleset '%s' (%d)", RuleManager::Instance()->GetActiveRuleset(), + c->Message(0, "Currently running ruleset '%s' (%d)", RuleManager::Instance()->GetActiveRuleset(), RuleManager::Instance()->GetActiveRulesetID()); } else if(!strcasecmp(sep->arg[1], "listsets")) { std::map sets; @@ -8513,7 +8513,7 @@ void command_rules(Client *c, const Seperator *sep) { c->Message(13, "Failed to list rule sets!"); return; } - + c->Message(0, "Avaliable rule sets:"); std::map::iterator cur, end; cur = sets.begin(); @@ -8523,7 +8523,7 @@ void command_rules(Client *c, const Seperator *sep) { } } else if(!strcasecmp(sep->arg[1], "reload")) { RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset()); - c->Message(0, "The active ruleset (%s (%d)) has been reloaded", RuleManager::Instance()->GetActiveRuleset(), + c->Message(0, "The active ruleset (%s (%d)) has been reloaded", RuleManager::Instance()->GetActiveRuleset(), RuleManager::Instance()->GetActiveRulesetID()); } else if(!strcasecmp(sep->arg[1], "switch")) { //make sure this is a valid rule set.. @@ -8536,10 +8536,10 @@ void command_rules(Client *c, const Seperator *sep) { c->Message(13, "Failed to update variables table to change selected rule set"); return; } - + //TODO: we likely want to reload this ruleset everywhere... RuleManager::Instance()->LoadRules(&database, sep->arg[2]); - + c->Message(0, "The selected ruleset has been changed to (%s (%d)) and reloaded locally", sep->arg[2], rsid); } else if(!strcasecmp(sep->arg[1], "load")) { //make sure this is a valid rule set.. @@ -8684,7 +8684,7 @@ void command_task(Client *c, const Seperator *sep) { } if(!strcasecmp(sep->arg[1], "show")) { - if(c->GetTarget() && c->GetTarget()->IsClient()) + if(c->GetTarget() && c->GetTarget()->IsClient()) c->GetTarget()->CastToClient()->ShowClientTasks(); else c->ShowClientTasks(); @@ -8703,7 +8703,7 @@ void command_task(Client *c, const Seperator *sep) { if(Count <= 0) Count = 1; } - c->Message(15, "Updating Task %i, Activity %i, Count %i", TaskID, ActivityID, Count); + c->Message(15, "Updating Task %i, Activity %i, Count %i", TaskID, ActivityID, Count); c->UpdateTaskActivity(TaskID, ActivityID, Count); } return; @@ -8787,7 +8787,7 @@ void command_altactivate(Client *c, const Seperator *sep){ saa = zone->FindAA(x); c->Message(10, "%d: %s %d", x, saa->name, val); } - } + } } } else if(!strcasecmp(sep->arg[1], "time")){ @@ -8941,7 +8941,7 @@ void command_setgraveyard(Client *c, const Seperator *sep) c->Message(0, "Usage: #setgraveyard [zonename]"); return; } - + zoneid = database.GetZoneID(sep->arg[1]); if(zoneid > 0) { @@ -8972,7 +8972,7 @@ void command_deletegraveyard(Client *c, const Seperator *sep) { uint32 zoneid = 0; uint32 graveyard_id = 0; - + if(!sep->arg[1][0]) { c->Message(0, "Usage: #deletegraveyard [zonename]"); return; @@ -8980,7 +8980,7 @@ void command_deletegraveyard(Client *c, const Seperator *sep) zoneid = database.GetZoneID(sep->arg[1]); graveyard_id = database.GetZoneGraveyardID(zoneid, 0); - + if(zoneid > 0 && graveyard_id > 0) { if(database.DeleteGraveyard(zoneid, graveyard_id)) c->Message(0, "Successfuly deleted graveyard %u for zone %s.", graveyard_id, sep->arg[1]); @@ -9007,7 +9007,7 @@ void command_summonburriedplayercorpse(Client *c, const Seperator *sep) c->Message(0, "You must first select a target!"); return; } - + Corpse* PlayerCorpse = database.SummonBurriedPlayerCorpse(t->CharacterID(), t->GetZoneID(), zone->GetInstanceID(), t->GetX(), t->GetY(), t->GetZ(), t->GetHeading()); if(!PlayerCorpse) @@ -9026,7 +9026,7 @@ void command_getplayerburriedcorpsecount(Client *c, const Seperator *sep) c->Message(0, "You must first select a target!"); return; } - + uint32 CorpseCount = database.GetPlayerBurriedCorpseCount(t->CharacterID()); if(CorpseCount > 0) @@ -9057,7 +9057,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 last_insert_id = 0; - + if (strcasecmp(sep->arg[1], "maketype") == 0){ if(target && target->IsNPC()) { @@ -9069,7 +9069,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) else if (strcasecmp(sep->arg[1], "makegroup") == 0) { if(sep->arg[2]) { - if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawngroup (name,spawn_limit,dist,max_x,min_x,max_y,min_y,delay) VALUES (\"%s\",%i,%f,%f,%f,%f,%f,%i)", sep->arg[2], (sep->arg[3]?atoi(sep->arg[3]):0), (sep->arg[4]?atof(sep->arg[4]):0), (sep->arg[5]?atof(sep->arg[5]):0), (sep->arg[6]?atof(sep->arg[6]):0), (sep->arg[7]?atof(sep->arg[7]):0), (sep->arg[8]?atof(sep->arg[8]):0), (sep->arg[9]?atoi(sep->arg[9]):0)), errbuf, 0, 0, &last_insert_id)) + if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawngroup (name,spawn_limit,dist,max_x,min_x,max_y,min_y,delay) VALUES (\"%s\",%i,%f,%f,%f,%f,%f,%i)", sep->arg[2], (sep->arg[3]?atoi(sep->arg[3]):0), (sep->arg[4]?atof(sep->arg[4]):0), (sep->arg[5]?atof(sep->arg[5]):0), (sep->arg[6]?atof(sep->arg[6]):0), (sep->arg[7]?atof(sep->arg[7]):0), (sep->arg[8]?atof(sep->arg[8]):0), (sep->arg[9]?atoi(sep->arg[9]):0)), errbuf, 0, 0, &last_insert_id)) { c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); c->Message(13, errbuf); @@ -9129,7 +9129,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) else if (strcasecmp(sep->arg[1], "cleargroupbox") == 0) { if(atoi(sep->arg[2])) { - if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawngroup SET dist='0',max_x='0',min_x='0',max_y='0',min_y='0',delay='0' WHERE id='%i'",atoi(sep->arg[2])), errbuf, 0, 0, &last_insert_id)) + if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawngroup SET dist='0',max_x='0',min_x='0',max_y='0',min_y='0',delay='0' WHERE id='%i'",atoi(sep->arg[2])), errbuf, 0, 0, &last_insert_id)) { c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); c->Message(13, errbuf); @@ -9155,7 +9155,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) c->Message(0, "Error: Need an NPC target."); else { Spawn2* s2 = target->CastToNPC()->respawn2; - + if(!s2) { c->Message(0, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from."); } @@ -9174,14 +9174,14 @@ void command_advnpcspawn(Client *c, const Seperator *sep) } safe_delete_array(query); } - } + } } else if (strcasecmp(sep->arg[1], "movespawn") == 0) { if (!target || !target->IsNPC()) c->Message(0, "Error: Need an NPC target."); else { Spawn2* s2 = target->CastToNPC()->respawn2; - + if(!s2) { c->Message(0, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from."); } @@ -9202,7 +9202,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) } safe_delete_array(query); } - } + } } else if (strcasecmp(sep->arg[1], "editrespawn") == 0) { if (!target || !target->IsNPC()) @@ -9226,7 +9226,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) { new_var = atoi(sep->arg[3]); } - + if(!s2) { c->Message(0, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from."); } @@ -9246,7 +9246,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep) } safe_delete_array(query); } - } + } } else if (strcasecmp(sep->arg[1], "setversion") == 0) { int16 Version = 0; @@ -9291,7 +9291,7 @@ void command_aggrozone(Client *c, const Seperator *sep) { if (!m) return; - + int hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything entity_list.AggroZone(m,hate); c->Message(0, "Train to you! Last chance to go invulnerable..."); @@ -9333,10 +9333,10 @@ void command_instance(Client *c, const Seperator *sep) //remove [instance_id] [player_name] //list [player_name] - if(strcasecmp(sep->arg[1], "help") == 0) + if(strcasecmp(sep->arg[1], "help") == 0) { c->Message(0, "#instance usage:"); - c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the " + c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the " "zone with id matching zone_id, will last for duration seconds."); c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id."); c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance " @@ -9350,7 +9350,7 @@ void command_instance(Client *c, const Seperator *sep) { if(!sep->IsNumber(3) || !sep->IsNumber(4)) { - c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the " + c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the " "zone with id matching zone_id, will last for duration seconds."); return; } @@ -9389,7 +9389,7 @@ void command_instance(Client *c, const Seperator *sep) c->Message(0, "Server was unable to create a new instance."); return; } - + c->Message(0, "New instance %s was created with id %lu.", zn, (unsigned long)id); } else if(strcasecmp(sep->arg[1], "destroy") == 0) @@ -9493,7 +9493,7 @@ void command_instance(Client *c, const Seperator *sep) { c->Message(0, "Invalid Argument."); c->Message(0, "#instance usage:"); - c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the " + c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the " "zone with id matching zone_id, will last for duration seconds."); c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id."); c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance " @@ -9516,7 +9516,7 @@ void command_setstartzone(Client *c, const Seperator *sep) c->Message(0, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. A player can select a starting zone using /setstartcity"); return; } - + if(sep->IsNumber(1)) { startzone = atoi(sep->arg[1]); } @@ -9541,10 +9541,10 @@ void command_netstats(Client *c, const Seperator *sep) if(c->GetTarget() && c->GetTarget()->IsClient()) { c->Message(0, "Sent:"); - c->Message(0, "Total: %u, per second: %u", c->GetTarget()->CastToClient()->Connection()->GetBytesSent(), + c->Message(0, "Total: %u, per second: %u", c->GetTarget()->CastToClient()->Connection()->GetBytesSent(), c->GetTarget()->CastToClient()->Connection()->GetBytesSentPerSecond()); c->Message(0, "Recieved:"); - c->Message(0, "Total: %u, per second: %u", c->GetTarget()->CastToClient()->Connection()->GetBytesRecieved(), + c->Message(0, "Total: %u, per second: %u", c->GetTarget()->CastToClient()->Connection()->GetBytesRecieved(), c->GetTarget()->CastToClient()->Connection()->GetBytesRecvPerSecond()); } @@ -9622,7 +9622,7 @@ void command_object(Client *c, const Seperator *sep) return; } - + if ((sep->arg[2][0] & 0xDF) == 'A') { radius = 0; // List All @@ -9631,7 +9631,7 @@ void command_object(Client *c, const Seperator *sep) { radius = 500; // Invalid radius. Default to 500 units. } - + if (radius == 0) { c->Message(0, "Objects within this zone:"); @@ -9640,7 +9640,7 @@ void command_object(Client *c, const Seperator *sep) { c->Message(0, "Objects within %u units of your current location:", radius); } - + if (radius) { len = snprintf(query, sizeof(query), @@ -9760,9 +9760,9 @@ void command_object(Client *c, const Seperator *sep) id = 0; col = 0; } - + memset(&od, 0, sizeof(od)); - + od.object_type = atoi(sep->arg[2 + col]); switch (od.object_type) @@ -9799,7 +9799,7 @@ void command_object(Client *c, const Seperator *sep) } break; } - + od.x = c->GetX(); od.y = c->GetY(); od.z = c->GetZ() - (c->GetSize() * 0.625f); @@ -9808,7 +9808,7 @@ void command_object(Client *c, const Seperator *sep) if (id) { // ID specified. Verify that it doesn't already exist. - + len = snprintf(query, sizeof(query), "SELECT COUNT(*) FROM object WHERE ID=%u", id); // Already in database? @@ -9833,7 +9833,7 @@ void command_object(Client *c, const Seperator *sep) if (entity_list.FindObject(id)) { // Yep, already spawned. - + id = 0; } } @@ -9841,7 +9841,7 @@ void command_object(Client *c, const Seperator *sep) if (id == 0) { c->Message(0, "ERROR: An object already exists with the id %u", atoi(sep->arg[2])); - + return; } } @@ -9897,12 +9897,12 @@ void command_object(Client *c, const Seperator *sep) { // Uh oh, 1337 h4x0r monkeying around! Strip that apostrophe! memcpy(&od.object_name[col], &od.object_name[col + 1], len - col); - + len--; col--; } } - + strupr(od.object_name); // Model names are always upper-case. if ((od.object_name[0] < 'A') || (od.object_name[0] > 'Z')) @@ -9915,7 +9915,7 @@ void command_object(Client *c, const Seperator *sep) if (id == 0) { // No ID specified. Get a best-guess next number from the database - + // If there's a problem retrieving an ID from the database, it'll end up being object # 1. No biggie. strn0cpy(query, "SELECT MAX(id) FROM object", sizeof(query)); @@ -9960,7 +9960,7 @@ void command_object(Client *c, const Seperator *sep) c->MovePC(c->GetX() - x2, c->GetY() - y2, c->GetZ(), c->GetHeading() * 2); c->Message(0, "Spawning object with tentative id %u at location (%.1f, %.1f, %.1f heading %.1f). Use '#object Save' to save to database when satisfied with placement.", id, od.x, od.y, od.z, od.heading); - + if (od.object_type == TempStaticType) // Temporary Static Object { c->Message(0, "- Note: Static Object will act like a tradeskill container and will not reflect size, solidtype, or incline values until you commit with '#object Save', after which it will be unchangeable until you use '#object Edit' and zone back in."); @@ -9988,14 +9988,14 @@ void command_object(Client *c, const Seperator *sep) // Or not. '#object Edit (ObjectID)' called without PropertyName and NewValue c->Message(0, "Note: Object %u already unlocked and ready for changes", id); - + return; } } else { // Object not found in-zone in a modifiable form. Check for valid matching circumstances. - + len = snprintf(query, sizeof(query), "SELECT zoneid, version, type FROM object WHERE id=%u", id); iObjectsFound = 0; @@ -10006,7 +10006,7 @@ void command_object(Client *c, const Seperator *sep) od.zone_id = atoi(row[0]); od.zone_instance = atoi(row[1]); od.object_type = atoi(row[2]); - + iObjectsFound++; } @@ -10020,7 +10020,7 @@ void command_object(Client *c, const Seperator *sep) return; } - + // Object not in this zone? if (od.zone_id != zone->GetZoneID()) { @@ -10075,11 +10075,11 @@ void command_object(Client *c, const Seperator *sep) } } - // If we're here, we have a manipulable object ready for changes. + // If we're here, we have a manipulable object ready for changes. strlwr(sep->arg[3]); // Case insensitive PropertyName strupr(sep->arg[4]); // In case it's model name, which should always be upper-case - + // Read current object info for reference icon = o->GetIcon(); o->GetObjectData(&od); @@ -10275,7 +10275,7 @@ void command_object(Client *c, const Seperator *sep) (sep->arg[3][0] != '-') && (sep->arg[3][0] != '.'))) // Location argument not specified correctly { c->Message(0, "Usage: #object Move (ObjectID) ToMe|(x y z [h])"); - + return; } @@ -10345,7 +10345,7 @@ void command_object(Client *c, const Seperator *sep) od.x = c->GetX(); od.y = c->GetY(); od.z = c->GetZ() - (c->GetSize() * 0.625f); // Compensate for #loc bumping up Z coordinate by 62.5% of character's size. - + o->SetHeading(c->GetHeading() * 2.0f); // Compensate for GetHeading() returning half of actual // Bump player back to avoid getting stuck inside object @@ -10440,7 +10440,7 @@ void command_object(Client *c, const Seperator *sep) od.zone_id = 0; od.zone_instance = 0; od.object_type = 0; - + // If this ID isn't in the database yet, it's a new object bNewObject = true; if (database.RunQuery(query, strlen(query), errbuf, &result)) @@ -10468,7 +10468,7 @@ void command_object(Client *c, const Seperator *sep) return; } - + if (od.zone_id != zone->GetZoneID()) { c->Message(0, "ERROR: Wrong Object ID. %u is not part of this zone.", id); @@ -10498,7 +10498,7 @@ void command_object(Client *c, const Seperator *sep) } c->Message(0, "ERROR: Object %u not found.", id); - + return; } @@ -10506,7 +10506,7 @@ void command_object(Client *c, const Seperator *sep) { // Oops! Another GM already saved an object with our id from another zone. // We'll have to get a new one. - + id = 0; } @@ -10514,7 +10514,7 @@ void command_object(Client *c, const Seperator *sep) { // Oops! Another GM already saved an object with our id from another instance. // We'll have to get a new one. - + id = 0; } @@ -10530,7 +10530,7 @@ void command_object(Client *c, const Seperator *sep) { od.object_type = 0; } - + if (bNewObject) { if (id == 0) @@ -10614,7 +10614,7 @@ void command_object(Client *c, const Seperator *sep) if (od.object_type == 0) { // Static Object - Respawn as nonfunctional door - + app = new EQApplicationPacket(); o->CreateDeSpawnPacket(app); entity_list.QueueClients(0, app); @@ -10641,9 +10641,9 @@ void command_object(Client *c, const Seperator *sep) { door.door_name[len - 9] = '\0'; } - + memcpy(door.dest_zone, "NONE", 5); - + if ((door.size = od.unknown008[0]) == 0) // unknown08 = optional size percentage { door.size = 100; @@ -10737,7 +10737,7 @@ void command_object(Client *c, const Seperator *sep) { // Copy ObjectID id = atoi(sep->arg[2]); - + len = snprintf(query, sizeof(query), "INSERT INTO object (zoneid, version, xpos, ypos, zpos, heading, itemid, objectname, type, icon, unknown08, unknown10, unknown20)" " SELECT zoneid, %u, xpos, ypos, zpos, heading, itemid, objectname, type, icon, unknown08, unknown10, unknown20" @@ -10752,7 +10752,7 @@ void command_object(Client *c, const Seperator *sep) else { // Couldn't copy the object. - + if (errbuf[0] == '\0') { // No database error returned. See if we can figure out why. @@ -10769,7 +10769,7 @@ void command_object(Client *c, const Seperator *sep) mysql_free_result(result); c->Message(0, "ERROR: Object %u is not part of this zone.", id); - + return; } @@ -10779,18 +10779,18 @@ void command_object(Client *c, const Seperator *sep) mysql_free_result(result); c->Message(0, "ERROR: Object %u is not part of this instance version.", id); - + return; } - + // Well, NO clue at this point. Just let 'em know something screwed up. mysql_free_result(result); c->Message(0, "ERROR: Unknown database error copying Object %u to instance version %u", id, od.zone_instance); - + return; } - + mysql_free_result(result); } @@ -10821,14 +10821,14 @@ void command_object(Client *c, const Seperator *sep) app = new EQApplicationPacket(); o->CreateDeSpawnPacket(app); entity_list.QueueClients(nullptr, app); - + entity_list.RemoveObject(o->GetID()); // Verifying ZoneID and Version in case someone else ended up adding an object with our ID // from a different zone/version. Don't want to delete someone else's work. sprintf(query, "DELETE FROM object WHERE (id=%u) AND (zoneid=%u) AND (version=%u) LIMIT 1", id, zone->GetZoneID(), zone->GetInstanceVersion()); database.RunQuery(query, strlen(query)); - + c->Message(0, "Object %u deleted", id); } else @@ -10867,7 +10867,7 @@ void command_object(Client *c, const Seperator *sep) mysql_free_result(result); } - + c->Message(0, "ERROR: Object %u not found in this zone or instance!", id); } break; @@ -11023,13 +11023,13 @@ void command_raidloot(Client *c, const Seperator *sep) void command_emoteview(Client *c, const Seperator *sep) { if(!c->GetTarget() || !c->GetTarget()->IsNPC()) - { + { c->Message(0, "You must target a NPC to view their emotes."); return; } if(c->GetTarget() && c->GetTarget()->IsNPC()) - { + { int count=0; int emoteid = c->GetTarget()->CastToNPC()->GetEmoteID(); @@ -11061,7 +11061,7 @@ void command_emotesearch(Client *c, const Seperator *sep) const char *search_criteria=sep->argplus[1]; int count=0; - if (Seperator::IsNumber(search_criteria)) + if (Seperator::IsNumber(search_criteria)) { uint16 emoteid = atoi(search_criteria); LinkedListIterator iterator(zone->NPCEmoteList); @@ -11097,7 +11097,7 @@ void command_emotesearch(Client *c, const Seperator *sep) strn0cpy(sText, nes->text, sizeof(sText)); strupr(sText); pdest = strstr(sText, sCriteria); - if (pdest != nullptr) + if (pdest != nullptr) { c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s", nes->emoteid, nes->event_, nes->type, nes->text); count++; @@ -11125,7 +11125,7 @@ void command_reloademote(Client *c, const Seperator *sep) void command_globalview(Client *c, const Seperator *sep) { NPC * npcmob = nullptr; - + if(c->GetTarget() && c->GetTarget()->IsNPC()) { npcmob = c->GetTarget()->CastToNPC(); @@ -11323,7 +11323,7 @@ void command_camerashake(Client *c, const Seperator *sep) return; } -void command_disarmtrap(Client *c, const Seperator *sep) +void command_disarmtrap(Client *c, const Seperator *sep) { Mob *target = c->GetTarget(); @@ -11349,7 +11349,7 @@ void command_disarmtrap(Client *c, const Seperator *sep) } } -void command_sensetrap(Client *c, const Seperator *sep) +void command_sensetrap(Client *c, const Seperator *sep) { Mob * target = c->GetTarget(); if(!target) @@ -11374,7 +11374,7 @@ void command_sensetrap(Client *c, const Seperator *sep) } } -void command_picklock(Client *c, const Seperator *sep) +void command_picklock(Client *c, const Seperator *sep) { Mob * target = c->GetTarget(); if(!target) @@ -11399,9 +11399,9 @@ void command_picklock(Client *c, const Seperator *sep) } } -void command_qtest(Client *c, const Seperator *sep) +void command_qtest(Client *c, const Seperator *sep) { - + if(c && sep->arg[1][0]) { @@ -11441,7 +11441,7 @@ void command_mysql(Client *c, const Seperator *sep) switch(sep->arg[argnum][1]){ case 's': Options = true; break; case 'h': Optionh = true; break; - default: c->Message(15, "%s, there is no option '%c'", c->GetName(), sep->arg[argnum][1]); Fail = true; + default: c->Message(15, "%s, there is no option '%c'", c->GetName(), sep->arg[argnum][1]); Fail = true; } ++argnum; } @@ -11455,7 +11455,7 @@ void command_mysql(Client *c, const Seperator *sep) //swap # for % so like queries can work std::replace(QueryText.begin(), QueryText.end(), '#', '%'); - if (database.RunQuery(QueryText.c_str(), QueryText.length(), errbuf, &result)) { + if (database.RunQuery(QueryText.c_str(), QueryText.length(), errbuf, &result)) { //Using sep->arg[2] again, replace # with %% so it doesn't screw up when sent through vsnprintf in Message QueryText = sep->arg[2]; int pos = QueryText.find('#'); @@ -11490,7 +11490,7 @@ void command_mysql(Client *c, const Seperator *sep) LineVec.push_back(LineText.str()); if(Options) { //This provides spacing for the space switch - c->Message(0, " "); + c->Message(0, " "); } if(Optionh) { //This option will highlight every other row HText = 1 - HText; @@ -11503,7 +11503,7 @@ void command_mysql(Client *c, const Seperator *sep) } else { MsgText << "Invalid query: ' " << sep->arg[2] << " ', ' " << errbuf << " '"; - c->Message(0, MsgText.str().c_str()); + c->Message(0, MsgText.str().c_str()); MsgText.str(""); } } @@ -11589,12 +11589,12 @@ void command_zopp(Client *c, const Seperator *sep) int16 charges = sep->argnum == 4 ? atoi(sep->arg[4]) : 1; // defaults to 1 charge if not specified const Item_Struct* FakeItem = database.GetItem(itemid); - + if (!FakeItem) { c->Message(13, "Error: Item [%u] is not a valid item id.", itemid); return; } - + int16 item_status = 0; const Item_Struct* item = database.GetItem(itemid); if(item) { diff --git a/zone/command.h b/zone/command.h index 0696d7b19..d9db1439f 100644 --- a/zone/command.h +++ b/zone/command.h @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -36,7 +36,7 @@ typedef void (*CmdFuncPtr)(Client *,const Seperator *); char *desc; // description of command CmdFuncPtr function; // the function to call int access; // the required 'status' level - + struct cl_struct *next; // linked list }; diff --git a/zone/common.h b/zone/common.h index 1d1aaffba..f95351e83 100644 --- a/zone/common.h +++ b/zone/common.h @@ -66,7 +66,7 @@ typedef enum { //focus types focusTwincast, focusSympatheticProc, focusSpellDamage, - focusFF_Damage_Amount, + focusFF_Damage_Amount, focusSpellDurByTic, focusSwarmPetDuration, focusReduceRecastTime, @@ -277,7 +277,7 @@ struct StatBonuses { int16 ExtraAttackChance; int16 DoTShielding; int16 DivineSaveChance[2]; // Second Chance (base1 = chance, base2 = spell on trigger) - uint16 DeathSave[4]; // Death Pact [0](value = 1 partial 2 = full) [1]=slot [2]=LvLimit [3]=HealAmt + uint16 DeathSave[4]; // Death Pact [0](value = 1 partial 2 = full) [1]=slot [2]=LvLimit [3]=HealAmt int16 FlurryChance; int16 Accuracy[HIGHEST_SKILL+2]; //Accuracy/15 == % increase [Spell Effect: Accuracy) int16 HundredHands; //extra haste, stacks with all other haste i @@ -315,7 +315,7 @@ struct StatBonuses { uint16 CharmBreakChance; // chance to break charm int16 SongRange; // increases range of beneficial bard songs uint16 HPToManaConvert; // Uses HP to cast spells at specific conversion - uint16 FocusEffects[HIGHEST_FOCUS+1]; // Stores the focus effectid for each focustype you have. + uint16 FocusEffects[HIGHEST_FOCUS+1]; // Stores the focus effectid for each focustype you have. bool NegateEffects; // Check if you contain a buff with negate effect. (only spellbonuses) int16 SkillDamageAmount2[HIGHEST_SKILL+2]; // Adds skill specific damage uint16 NegateAttacks[2]; // 0 = bool HasEffect 1 = Buff Slot @@ -326,7 +326,7 @@ struct StatBonuses { int16 BlockBehind; // Chance to Block Behind (with our without shield) //bool AbsorbMagicAtt; // Magic Rune *Need to be implemented for NegateEffect //bool MeleeRune; // Melee Rune *Need to be implemented for NegateEffect - + // AAs int8 Packrat; //weight reduction for items, 1 point = 10% uint8 BuffSlotIncrease; // Increases number of available buff slots @@ -340,7 +340,7 @@ struct StatBonuses { int16 MaxBindWound; // Increase max amount of HP you can bind wound. int16 ChannelChanceSpells; // Modify chance to channel a spell. int16 ChannelChanceItems; // Modify chance to channel a items. - uint8 SeeInvis; // See Invs. + uint8 SeeInvis; // See Invs. uint8 TripleBackstab; // Chance to triple backstab bool FrontalBackstabMinDmg; // Allow frontal backstabs for min damage uint8 FrontalBackstabChance; // Chance to backstab from the front for full damage @@ -363,7 +363,7 @@ struct StatBonuses { bool GivePetGroupTarget; // All pets to recieve group buffs. (Pet Affinity) int16 RootBreakChance; // Chance root will break; int16 UnfailingDivinity; // Improves chance that DI will fire + increase partial heal. - int16 ItemHPRegenCap; // Increase item regen cap. + int16 ItemHPRegenCap; // Increase item regen cap. int16 SEResist[MAX_RESISTABLE_EFFECTS*2]; // Resist chance by specific spell effects. int16 OffhandRiposteFail; // chance for opponent to fail riposte with offhand attack. int16 ItemATKCap; // Raise item attack cap @@ -426,7 +426,7 @@ typedef enum { struct MercType { uint32 Type; - uint32 ClientVersion; + uint32 ClientVersion; }; struct MercData { diff --git a/zone/doors.cpp b/zone/doors.cpp index 2c9b2fd7e..2124a5958 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -224,7 +224,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) return; } } - + // guild doors if(((keyneeded == 0) && (GetLockpick() == 0) && (guild_id == 0)) || (IsDoorOpen() && (opentype == 58)) || @@ -345,15 +345,15 @@ void Doors::HandleClick(Client* sender, uint8 trigger) playerkey = keyneeded; sender->Message(4, "You got it open!"); // more debug spam if(!IsDoorOpen() || (opentype == 58)) - { + { md->action = invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR; - } + } else - { + { md->action = invert_state == 0 ? CLOSE_DOOR : CLOSE_INVDOOR; - } + } } - else + else { sender->Message_StringID(4, DOORS_LOCKED); safe_delete(outapp); @@ -361,7 +361,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) } } } - + entity_list.QueueClients(sender, outapp, false); if(!IsDoorOpen() || (opentype == 58)) { @@ -414,13 +414,13 @@ void Doors::HandleClick(Client* sender, uint8 trigger) } if(((opentype == 57) || (opentype == 58)) && (strncmp(dest_zone, "NONE", strlen("NONE")) != 0)) - { // Teleport door! - if (( strncmp(dest_zone,zone_name,strlen(zone_name)) == 0) && (!keyneeded)) + { // Teleport door! + if (( strncmp(dest_zone,zone_name,strlen(zone_name)) == 0) && (!keyneeded)) { if(!keepoffkeyring) { sender->KeyRingAdd(playerkey); - } + } sender->MovePC(zone->GetZoneID(), zone->GetInstanceID(), dest_x, dest_y, dest_z, dest_heading); } else if (( !IsDoorOpen() || opentype == 58 ) && (keyneeded && ((keyneeded == playerkey) || sender->GetGM()))) @@ -428,7 +428,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) if(!keepoffkeyring) { sender->KeyRingAdd(playerkey); - } + } if(database.GetZoneID(dest_zone) == zone->GetZoneID()) { sender->MovePC(zone->GetZoneID(), zone->GetInstanceID(), dest_x, dest_y, dest_z, dest_heading); @@ -438,7 +438,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) sender->MovePC(database.GetZoneID(dest_zone), dest_instance_id, dest_x, dest_y, dest_z, dest_heading); } } - if (( !IsDoorOpen() || opentype == 58 ) && (!keyneeded)) + if (( !IsDoorOpen() || opentype == 58 ) && (!keyneeded)) { if(database.GetZoneID(dest_zone) == zone->GetZoneID()) { @@ -736,45 +736,45 @@ void Doors::SetLocation(float x, float y, float z) void Doors::SetX(float in) { entity_list.DespawnAllDoors(); - pos_x = in; + pos_x = in; entity_list.RespawnAllDoors(); } -void Doors::SetY(float in) { +void Doors::SetY(float in) { entity_list.DespawnAllDoors(); - pos_y = in; + pos_y = in; entity_list.RespawnAllDoors(); } -void Doors::SetZ(float in) { +void Doors::SetZ(float in) { entity_list.DespawnAllDoors(); - pos_z = in; + pos_z = in; entity_list.RespawnAllDoors(); } -void Doors::SetHeading(float in) { +void Doors::SetHeading(float in) { entity_list.DespawnAllDoors(); - heading = in; + heading = in; entity_list.RespawnAllDoors(); } -void Doors::SetIncline(int in) { +void Doors::SetIncline(int in) { entity_list.DespawnAllDoors(); - incline = in; + incline = in; entity_list.RespawnAllDoors(); } -void Doors::SetOpenType(uint8 in) { +void Doors::SetOpenType(uint8 in) { entity_list.DespawnAllDoors(); - opentype = in; + opentype = in; entity_list.RespawnAllDoors(); } -void Doors::SetDoorName(char* name) { +void Doors::SetDoorName(char* name) { entity_list.DespawnAllDoors(); - memset(door_name, 0, sizeof(door_name)); - strncpy(door_name, name, sizeof(door_name)); + memset(door_name, 0, sizeof(door_name)); + strncpy(door_name, name, sizeof(door_name)); entity_list.RespawnAllDoors(); } -void Doors::SetSize(uint16 in) { +void Doors::SetSize(uint16 in) { entity_list.DespawnAllDoors(); size = in; entity_list.RespawnAllDoors(); diff --git a/zone/doors.h b/zone/doors.h index c99c17949..acdb0dfb3 100644 --- a/zone/doors.h +++ b/zone/doors.h @@ -36,19 +36,19 @@ public: uint8 GetTriggerDoorID() { return trigger_door; } uint8 GetTriggerType() { return trigger_type; } - + uint32 GetKeyItem() { return keyitem; } void SetKeyItem(uint32 in) { keyitem = in; } uint8 GetNoKeyring() { return nokeyring; } void SetNoKeyring(uint8 in) { nokeyring = in; } - uint16 GetLockpick() { return lockpick; } - void SetLockpick(uint16 in) { lockpick = in; } + uint16 GetLockpick() { return lockpick; } + void SetLockpick(uint16 in) { lockpick = in; } uint16 GetSize() { return size; } void SetGuildID(uint32 guild_id) { this->guild_id = guild_id; } uint32 GetEntityID() { return entity_id; } void SetEntityID(uint32 entity) { entity_id = entity; } - + void DumpDoor(); float GetDestX() { return dest_x; } float GetDestY() { return dest_y; } @@ -57,7 +57,7 @@ public: uint8 IsLDoNDoor() { return is_ldon_door; } uint32 GetClientVersionMask() { return client_version_mask; } - + void NPCOpen(NPC* sender, bool alt_mode=false); void ForceOpen(Mob *sender, bool alt_mode=false); void ForceClose(Mob *sender, bool alt_mode=false); @@ -75,7 +75,7 @@ public: void CreateDatabaseEntry(); private: - + uint32 db_id; uint8 door_id; char zone_name[32]; diff --git a/zone/effects.cpp b/zone/effects.cpp index e84959c92..a08c14d39 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -35,16 +35,16 @@ float Client::GetActSpellRange(uint16 spell_id, float range, bool IsBard) float extrange = 100; extrange += GetFocusEffect(focusRange, spell_id); - + return (range * extrange) / 100; } -int32 Client::Additional_SpellDmg(uint16 spell_id, bool bufftick) +int32 Client::Additional_SpellDmg(uint16 spell_id, bool bufftick) { int32 spell_dmg = 0; spell_dmg += GetFocusEffect(focusFF_Damage_Amount, spell_id); - spell_dmg += GetFocusEffect(focusSpellDamage, spell_id); + spell_dmg += GetFocusEffect(focusSpellDamage, spell_id); //For DOTs you need to apply the damage over the duration of the dot to each tick (this is how live did it) if (bufftick){ @@ -61,7 +61,7 @@ int32 Client::Additional_SpellDmg(uint16 spell_id, bool bufftick) //Direct Damage is checked in Mob::SpellEffect [spell_effects.cpp] //DoT Damage is checked in Mob::DoBuffTic [spell_effects.cpp] (This was added for npcs in that routine) int32 NPC::GetActSpellDamage(uint16 spell_id, int32 value) { - + int32 modifier = 100; modifier += SpellFocusDMG; @@ -75,7 +75,7 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { // modifier: modifier to damage (from spells & focus effects?) // ratio: % of the modifier to apply (from AAs & natural bonus?) // chance: critital chance % - + int32 modifier = 100; int16 spell_dmg = 0; @@ -83,8 +83,8 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { //Dunno if this makes sense: if (spells[spell_id].resisttype > 0) modifier += GetFocusEffect((focusType)(0-spells[spell_id].resisttype), spell_id); - - + + int tt = spells[spell_id].targettype; if (tt == ST_UndeadAE || tt == ST_Undead || tt == ST_Summoned) { //undead/summoned spells @@ -95,18 +95,18 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { modifier += GetFocusEffect(focusSpellEffectiveness, spell_id); modifier += GetFocusEffect(focusImprovedDamage2, spell_id); } - + // Need to scale HT damage differently after level 40! It no longer scales by the constant value in the spell file. It scales differently, instead of 10 more damage per level, it does 30 more damage per level. So we multiply the level minus 40 times 20 if they are over level 40. if ( spell_id == SPELL_HARM_TOUCH || spell_id == SPELL_HARM_TOUCH2 || spell_id == SPELL_IMP_HARM_TOUCH ) { if (this->GetLevel() > 40) - value -= (this->GetLevel() - 40) * 20; + value -= (this->GetLevel() - 40) * 20; } //This adds the extra damage from the AA Unholy Touch, 450 per level to the AA Improved Harm TOuch. if (spell_id == SPELL_IMP_HARM_TOUCH) { //Improved Harm Touch value -= GetAA(aaUnholyTouch) * 450; //Unholy Touch } - + // This adds the extra damage for the AA's Consumption of the Soul and Improved Consumption of the Soul, 200 per level to the AA Leech Curse for Shadowknights. if (spell_id == SPELL_LEECH_TOUCH) { //Leech Touch value -= GetAA(aaConsumptionoftheSoul) * 200; //Consumption of the Soul @@ -122,7 +122,7 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { if(spell_dmg > -value) spell_dmg = -value; } - + // Spell-based SpellDmg adds directly but it restricted by focuses. spell_dmg += Additional_SpellDmg(spell_id); @@ -140,12 +140,12 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { if(aabonuses.SpellCritDmgIncrease > 0) // wizards get an additional bonus ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% } - + //Improved Harm Touch is a guaranteed crit if you have at least one level of SCF. if (spell_id == SPELL_IMP_HARM_TOUCH) { if ( (GetAA(aaSpellCastingFury) > 0) && (GetAA(aaUnholyTouch) > 0) ) chance = 100; - } + } /* //Handled in aa_effects will focus spells from 'spellgroup=99'. (SK life tap from buff procs) @@ -172,19 +172,19 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { } } */ - + if (chance > 0) { mlog(SPELLS__CRITS, "Attempting spell crit. Spell: %s (%d), Value: %d, Modifier: %d, Chance: %d, Ratio: %d", spells[spell_id].name, spell_id, value, modifier, chance, ratio); if(MakeRandomInt(0,100) <= chance) { modifier += modifier*ratio/100; spell_dmg *= 2; mlog(SPELLS__CRITS, "Spell crit successful. Final damage modifier: %d, Final Damage: %d", modifier, (value * modifier / 100) - spell_dmg); - entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s delivers a critical blast! (%d)", GetName(), (-value * modifier / 100) + spell_dmg); - } else + entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s delivers a critical blast! (%d)", GetName(), (-value * modifier / 100) + spell_dmg); + } else mlog(SPELLS__CRITS, "Spell crit failed. Final Damage Modifier: %d, Final Damage: %d", modifier, (value * modifier / 100) - spell_dmg); } } - + return ((value * modifier / 100) - spell_dmg); } @@ -199,19 +199,19 @@ int32 Client::GetActDoTDamage(uint16 spell_id, int32 value) { critChance += itembonuses.CriticalDoTChance + spellbonuses.CriticalDoTChance + aabonuses.CriticalDoTChance; ratio += itembonuses.DotCritDmgIncrease + spellbonuses.DotCritDmgIncrease + aabonuses.DotCritDmgIncrease; spell_dmg += Additional_SpellDmg(spell_id,true); - + // since DOTs are the Necromancer forte, give an innate bonus (Kayen: Is this a real bonus?) // however, no chance to crit unless they've trained atleast one level in the AA first if (GetClass() == NECROMANCER && critChance > 0) critChance += 5; - + if (critChance > 0){ if (MakeRandomInt(0, 99) < critChance){ modifier += modifier*ratio/100; return (((value*modifier/100)-spell_dmg)*2); } } - + return ((value*modifier/100)-spell_dmg); } @@ -221,17 +221,17 @@ int32 NPC::GetActSpellHealing(uint16 spell_id, int32 value) { int32 modifier = 100; modifier += SpellFocusHeal; - + // Check for buffs that affect the healrate of the target if(this->GetTarget()) { - value += value * GetHealRate(spell_id) / 100; + value += value * GetHealRate(spell_id) / 100; } return (value * modifier / 100); } -int32 Client::Additional_Heal(uint16 spell_id) +int32 Client::Additional_Heal(uint16 spell_id) { int32 heal_amt = 0; @@ -243,7 +243,7 @@ int32 Client::Additional_Heal(uint16 spell_id) if (duration > 0) return heal_amt /= duration; } - + return heal_amt; } @@ -255,9 +255,9 @@ int32 Client::GetActSpellHealing(uint16 spell_id, int32 value) { modifier += GetFocusEffect(focusSpellEffectiveness, spell_id); heal_amt += Additional_Heal(spell_id); int chance = 0; - - // Instant Heals - if(spells[spell_id].buffduration < 1) + + // Instant Heals + if(spells[spell_id].buffduration < 1) { // Formula = HealAmt * (casttime + recastime) / 7; Cant trigger off spell less than 5 levels below and cant heal more than the spell itself. if(this->itembonuses.HealAmt && spells[spell_id].classes[(GetClass()%16) - 1] >= GetLevel() - 5) { @@ -271,22 +271,22 @@ int32 Client::GetActSpellHealing(uint16 spell_id, int32 value) { value += value * GetHealRate(spell_id) / 100; chance += GetCriticalHealRate(spell_id); } - + //Live AA - Healing Gift, Theft of Life chance += itembonuses.CriticalHealChance + spellbonuses.CriticalHealChance + aabonuses.CriticalHealChance; - + if(MakeRandomInt(0,99) < chance) { - entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s performs an exceptional heal! (%d)", GetName(), ((value * modifier / 50) + heal_amt*2)); + entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s performs an exceptional heal! (%d)", GetName(), ((value * modifier / 50) + heal_amt*2)); return ((value * modifier / 50) + heal_amt*2); } else{ return ((value * modifier / 100) + heal_amt); - } + } } // Hots else { chance += itembonuses.CriticalHealChance + spellbonuses.CriticalHealChance + aabonuses.CriticalHealChance; - if(MakeRandomInt(0,99) < chance) + if(MakeRandomInt(0,99) < chance) return ((value * modifier / 50) + heal_amt*2); } return ((value * modifier / 100) + heal_amt); @@ -301,10 +301,10 @@ int32 Client::GetActSpellCost(uint16 spell_id, int32 cost) // Doesnt generate mana, so best case is a free spell if(mana_back > cost) mana_back = cost; - + cost -= mana_back; } - + // This formula was derived from the following resource: // http://www.eqsummoners.com/eq1/specialization-library.html // WildcardX @@ -373,14 +373,14 @@ int32 Client::GetActSpellCost(uint16 spell_id, int32 cost) for (int buffSlot = 0; buffSlot < buff_max; buffSlot++) { if (buffs[buffSlot].spellid == 0 || buffs[buffSlot].spellid >= SPDAT_RECORDS) continue; - + if(IsEffectInSpell(buffs[buffSlot].spellid, SE_ReduceManaCost)) { if(CalcFocusEffect(focusManaCost, buffs[buffSlot].spellid, spell_id) == 100) cost = 1; } } } - + if(cost < 0) cost = 0; @@ -393,7 +393,7 @@ int32 Client::GetActSpellDuration(uint16 spell_id, int32 duration) increase += GetFocusEffect(focusSpellDuration, spell_id); int tic_inc = 0; tic_inc = GetFocusEffect(focusSpellDurByTic, spell_id); - + if(IsBeneficialSpell(spell_id)) { switch(GetAA(aaSpellCastingReinforcement)) { @@ -414,7 +414,7 @@ int32 Client::GetActSpellDuration(uint16 spell_id, int32 duration) if(IsMezSpell(spell_id)) { tic_inc += GetAA(aaMesmerizationMastery); } - + return (((duration * increase) / 100) + tic_inc); } @@ -426,23 +426,23 @@ int32 Client::GetActSpellCasttime(uint16 spell_id, int32 casttime) //this function loops through the effects of spell_id many times //could easily be consolidated. - if (GetLevel() >= 51 && casttime >= 3000 && !BeneficialSpell(spell_id) - && (GetClass() == SHADOWKNIGHT || GetClass() == RANGER + if (GetLevel() >= 51 && casttime >= 3000 && !BeneficialSpell(spell_id) + && (GetClass() == SHADOWKNIGHT || GetClass() == RANGER || GetClass() == PALADIN || GetClass() == BEASTLORD )) cast_reducer += (GetLevel()-50)*3; - + //LIVE AA SpellCastingDeftness, QuickBuff, QuickSummoning, QuickEvacuation, QuickDamage - + if (cast_reducer > RuleI(Spells, MaxCastTimeReduction)) - cast_reducer = RuleI(Spells, MaxCastTimeReduction); - + cast_reducer = RuleI(Spells, MaxCastTimeReduction); + casttime = (casttime*(100 - cast_reducer)/100); - + return casttime; } bool Client::TrainDiscipline(uint32 itemid) { - + //get the item info const Item_Struct *item = database.GetItem(itemid); if(item == nullptr) { @@ -450,14 +450,14 @@ bool Client::TrainDiscipline(uint32 itemid) { LogFile->write(EQEMuLog::Error, "Unable to find turned in tome id %lu\n", (unsigned long)itemid); return(false); } - + if(item->ItemClass != ItemClassCommon || item->ItemType != ItemTypeSpell) { Message(13, "Invalid item type, you cannot learn from this item."); //summon them the item back... SummonItem(itemid); return(false); } - + //Need a way to determine the difference between a spell and a tome //so they cant turn in a spell and get it as a discipline //this is kinda a hack: @@ -481,7 +481,7 @@ bool Client::TrainDiscipline(uint32 itemid) { SummonItem(itemid); return(false); } - + int myclass = GetClass(); if(myclass == WIZARD || myclass == ENCHANTER || myclass == MAGICIAN || myclass == NECROMANCER) { Message(13, "Your class cannot learn from this tome."); @@ -489,7 +489,7 @@ bool Client::TrainDiscipline(uint32 itemid) { SummonItem(itemid); return(false); } - + //make sure we can train this... //can we use the item? uint32 cbit = 1 << (myclass-1); @@ -499,13 +499,13 @@ bool Client::TrainDiscipline(uint32 itemid) { SummonItem(itemid); return(false); } - + uint32 spell_id = item->Scroll.Effect; if(!IsValidSpell(spell_id)) { Message(13, "This tome contains invalid knowledge."); return(false); } - + //can we use the spell? const SPDat_Spell_Struct &spell = spells[spell_id]; uint8 level_to_use = spell.classes[myclass - 1]; @@ -515,14 +515,14 @@ bool Client::TrainDiscipline(uint32 itemid) { SummonItem(itemid); return(false); } - + if(level_to_use > GetLevel()) { Message(13, "You must be at least level %d to learn this discipline.", level_to_use); //summon them the item back... SummonItem(itemid); return(false); } - + //add it to PP. int r; for(r = 0; r < MAX_PP_DISCIPLINES; r++) { @@ -544,7 +544,7 @@ bool Client::TrainDiscipline(uint32 itemid) { void Client::SendDisciplineUpdate() { //this dosent seem to work right now - + EQApplicationPacket app(OP_DisciplineUpdate, sizeof(Disciplines_Struct)); Disciplines_Struct *d = (Disciplines_Struct*)app.pBuffer; //dunno why I dont just send the one from m_pp @@ -559,7 +559,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { { return(false); } - + //make sure we have the spell... int r; for(r = 0; r < MAX_PP_DISCIPLINES; r++) { @@ -579,13 +579,13 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { Message(0, "You can use this discipline in %d minutes %d seconds.", ((remain)/60), (remain%60)); return(false); } - + //make sure we can use it.. if(!IsValidSpell(spell_id)) { Message(13, "This tome contains invalid knowledge."); return(false); } - + //can we use the spell? const SPDat_Spell_Struct &spell = spells[spell_id]; uint8 level_to_use = spell.classes[GetClass() - 1]; @@ -594,27 +594,27 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { //should summon them a new one... return(false); } - + if(level_to_use > GetLevel()) { Message_StringID(13, DISC_LEVEL_USE_ERROR); //should summon them a new one... return(false); } - + if(GetEndurance() > spell.EndurCost) { SetEndurance(GetEndurance() - spell.EndurCost); } else { Message(11, "You are too fatigued to use this skill right now."); return(false); } - + if(spell.recast_time > 0) { uint32 reduced_recast = spell.recast_time / 1000; reduced_recast -= CastToClient()->GetFocusEffect(focusReduceRecastTime, spell_id); if(reduced_recast < 0) reduced_recast = 0; - + CastSpell(spell_id, target, DISCIPLINE_SPELL_SLOT, -1, -1, 0, -1, (uint32)DiscTimer, reduced_recast); if(spells[spell_id].EndurTimerIndex < MAX_DISCIPLINE_TIMERS) { @@ -624,7 +624,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { dts->Duration = reduced_recast; QueuePacket(outapp); safe_delete(outapp); - } + } } else { @@ -635,13 +635,13 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) { void EntityList::AETaunt(Client* taunter, float range) { LinkedListIterator iterator(npc_list); - + if(range == 0) { range = 100; //arbitrary default... } - + range = range * range; - + iterator.Reset(); while(iterator.MoreElements()) { @@ -652,7 +652,7 @@ void EntityList::AETaunt(Client* taunter, float range) { if (zdiff < 10 && taunter->IsAttackAllowed(them) && taunter->DistNoRootNoZ(*them) <= range) { - + if (taunter->CheckLosFN(them)) { taunter->Taunt(them, true); } @@ -668,15 +668,15 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_ { LinkedListIterator iterator(mob_list); Mob *curmob; - + float dist = caster->GetAOERange(spell_id); float dist2 = dist * dist; - + bool bad = IsDetrimentalSpell(spell_id); bool isnpc = caster->IsNPC(); const int MAX_TARGETS_ALLOWED = 4; int iCounter = 0; - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { curmob = iterator.GetData(); @@ -708,7 +708,7 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_ } //if we get here... cast the spell. - if(IsTargetableAESpell(spell_id) && bad) + if(IsTargetableAESpell(spell_id) && bad) { if(iCounter < MAX_TARGETS_ALLOWED) { @@ -722,17 +722,17 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_ if(!isnpc) //npcs are not target limited... iCounter++; - } + } } void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster) { LinkedListIterator iterator(mob_list); Mob *curmob; - + float dist = caster->GetAOERange(spell_id); float dist2 = dist * dist; - + bool bad = IsDetrimentalSpell(spell_id); for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) @@ -762,13 +762,13 @@ void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool a } } - if(bad) + if(bad) { continue; } caster->SpellOnTarget(spell_id, curmob); - } + } } // solar: causes caster to hit every mob within dist range of center with @@ -778,13 +778,13 @@ void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool aff { LinkedListIterator iterator(mob_list); Mob *curmob; - + float dist = caster->GetAOERange(spell_id); float dist2 = dist * dist; - + bool bad = IsDetrimentalSpell(spell_id); bool isnpc = caster->IsNPC(); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { curmob = iterator.GetData(); @@ -822,28 +822,28 @@ void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool aff //Dook- Rampage and stuff for clients. //NPCs handle it differently in Mob::Rampage void EntityList::AEAttack(Mob *attacker, float dist, int Hand, int count, bool IsFromSpell) { -//Dook- Will need tweaking, currently no pets or players or horses - LinkedListIterator iterator(mob_list); - Mob *curmob; - +//Dook- Will need tweaking, currently no pets or players or horses + LinkedListIterator iterator(mob_list); + Mob *curmob; + float dist2 = dist * dist; - + int hit = 0; - - for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { - curmob = iterator.GetData(); + + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { + curmob = iterator.GetData(); if(curmob->IsNPC() && curmob != attacker //this is not needed unless NPCs can use this &&(attacker->IsAttackAllowed(curmob)) && curmob->GetRace() != 216 && curmob->GetRace() != 472 /* dont attack horses */ && (curmob->DistNoRoot(*attacker) <= dist2) ) { - attacker->Attack(curmob, Hand, false, false, IsFromSpell); + attacker->Attack(curmob, Hand, false, false, IsFromSpell); hit++; if(count != 0 && hit >= count) return; } - } -} + } +} diff --git a/zone/embparser.cpp b/zone/embparser.cpp index d138aff93..b93b3072d 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -248,8 +248,8 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d bool isGlobalNPC = false; bool isItemQuest = false; bool isSpellQuest = false; - if(event == EVENT_SPELL_EFFECT_CLIENT || - event == EVENT_SPELL_EFFECT_NPC || + if(event == EVENT_SPELL_EFFECT_CLIENT || + event == EVENT_SPELL_EFFECT_NPC || event == EVENT_SPELL_EFFECT_BUFF_TIC_CLIENT || event == EVENT_SPELL_EFFECT_BUFF_TIC_NPC || event == EVENT_SPELL_EFFECT_TRANSLOCATE_COMPLETE) @@ -266,7 +266,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d isPlayerQuest = true; } } - else + else isItemQuest = true; } } @@ -281,7 +281,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d }else{ packagename = GetPkgPrefix(objid); - + if(!isloaded(packagename.c_str())) { LoadScript(objid, zone->GetShortName()); @@ -418,7 +418,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d { QGlobalCache::Combine(globalMap, zone_c->GetBucket(), npcmob->GetNPCTypeID(), charid, zone->GetZoneID()); } - + std::list::iterator iter = globalMap.begin(); while(iter != globalMap.end()) { @@ -681,7 +681,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d ExportVar(packagename.c_str(), "target_zone_id", data); break; } - + case EVENT_CAST_ON: case EVENT_CAST:{ ExportVar(packagename.c_str(), "spell_id", data); @@ -717,7 +717,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d } case EVENT_PLAYER_PICKUP:{ ExportVar(packagename.c_str(), "picked_up_id", data); - break; + break; } case EVENT_AGGRO_SAY: { @@ -788,12 +788,12 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d case EVENT_FORAGE_SUCCESS: { ExportVar(packagename.c_str(), "foraged_item", extradata); - break; + break; } case EVENT_FISH_SUCCESS: { ExportVar(packagename.c_str(), "fished_item", extradata); - break; + break; } case EVENT_CLICK_OBJECT: { @@ -1075,7 +1075,7 @@ int PerlembParser::LoadScript(int npcid, const char * zone, Mob* activater) curmode = questTemplateByID; } } - + #endif //QUEST_TEMPLATES_BYNAME #endif //QUEST_SCRIPTS_BYNAME @@ -1086,7 +1086,7 @@ int PerlembParser::LoadScript(int npcid, const char * zone, Mob* activater) fclose(tmpf); filefound = true; } - + // If by ID, Name or Template wasn't found, load /quests/zone/default.pl if(!filefound) { @@ -1103,7 +1103,7 @@ int PerlembParser::LoadScript(int npcid, const char * zone, Mob* activater) fclose(tmpf); filefound = true; } - + // If zone template isn't found look for it globally /quests/template/default.pl if(!filefound) { @@ -1273,9 +1273,9 @@ int PerlembParser::LoadPlayerScript(const char *zone_name) } } - if(perl->SubExists(packagename.c_str(), "EVENT_CAST")) + if(perl->SubExists(packagename.c_str(), "EVENT_CAST")) playerQuestLoaded[zone_name] = pQuestEventCast; - else + else playerQuestLoaded[zone_name] = pQuestLoaded; return 1; } @@ -1307,9 +1307,9 @@ int PerlembParser::LoadGlobalPlayerScript() LogFile->write(EQEMuLog::Quest, "WARNING: error compiling quest file %s: %s", filename.c_str(), err); } - if(perl->SubExists(packagename.c_str(), "EVENT_CAST")) + if(perl->SubExists(packagename.c_str(), "EVENT_CAST")) globalPlayerQuestLoaded = pQuestEventCast; - else + else globalPlayerQuestLoaded = pQuestLoaded; return 1; } @@ -1359,7 +1359,7 @@ int PerlembParser::LoadItemScript(ItemInst* iteminst, string packagename, itemQu return 1; } -int PerlembParser::LoadSpellScript(uint32 id) +int PerlembParser::LoadSpellScript(uint32 id) { if(!perl) return 0; @@ -1463,10 +1463,10 @@ bool PerlembParser::PlayerHasQuestSub(const char *subname) { if(playerQuestLoaded.count(zone->GetShortName()) == 0) LoadPlayerScript(zone->GetShortName()); - + if(subname == "EVENT_CAST") return (playerQuestLoaded[zone->GetShortName()] == pQuestEventCast); - + return(perl->SubExists(packagename.c_str(), subname)); } @@ -1476,21 +1476,21 @@ bool PerlembParser::GlobalPlayerHasQuestSub(const char *subname) { if(globalPlayerQuestLoaded == pQuestReadyToLoad) LoadGlobalPlayerScript(); - + if(subname == "EVENT_CAST") return (globalPlayerQuestLoaded == pQuestEventCast); - + return(perl->SubExists(packagename.c_str(), subname)); } -bool PerlembParser::SpellHasQuestSub(uint32 id, const char *subname) +bool PerlembParser::SpellHasQuestSub(uint32 id, const char *subname) { string packagename = "spell_effect_"; packagename += itoa(id); if(spellQuestLoaded.count(id) == 0) LoadSpellScript(id); - + return(perl->SubExists(packagename.c_str(), subname)); } @@ -1577,7 +1577,7 @@ void PerlembParser::SendCommands(const char * pkgprefix, const char *event, uint sprintf(var,"$quest::cmd_queue[%d]{args}",c); std::string args = perl->getstr(var); size_t num_args = std::count(args.begin(), args.end(), ',') + 1; - + ExCommands(cmd, args, num_args, npcid, other, mob); } diff --git a/zone/embparser.h b/zone/embparser.h index 7b58b5930..668fdb235 100644 --- a/zone/embparser.h +++ b/zone/embparser.h @@ -71,7 +71,7 @@ struct EventRecord { class PerlembParser : public Parser { protected: - + //could prolly get rid of this map now, since I check for the //actual subroutine in the quest package as opposed to just seeing //if they do not have a quest or the default. @@ -84,7 +84,7 @@ protected: queue eventQueue; //for events that happen when perl is in use. bool eventQueueProcessing; - + void HandleQueue(); void EventCommon(QuestEventID event, uint32 objid, const char * data, NPC* npcmob, ItemInst* iteminst, Mob* mob, uint32 extradata, bool global = false); @@ -124,9 +124,9 @@ public: int LoadGlobalPlayerScript(); int LoadItemScript(ItemInst* iteminst, string packagename, itemQuestMode Qtype); int LoadSpellScript(uint32 id); - + //expose a var to the script (probably parallels addvar)) - //i.e. exportvar("qst1234", "name", "somemob"); + //i.e. exportvar("qst1234", "name", "somemob"); //would expose the variable $name='somemob' to the script that handles npc1234 void ExportHash(const char *pkgprefix, const char *hashname, std::map &vals); void ExportVar(const char * pkgprefix, const char * varname, const char * value) const; @@ -136,19 +136,19 @@ public: //I don't escape the strings, so use caution!! //Same as export var, except value is not quoted, and is evaluated as perl void ExportVarComplex(const char * pkgprefix, const char * varname, const char * value) const; - + //get an appropriate namespage/packagename from an npcid std::string GetPkgPrefix(uint32 npcid, bool defaultOK = true); //call the appropriate perl handler. afterwards, parse and dispatch the command queue //SendCommands("qst1234", "EVENT_SAY") would trigger sub EVENT_SAY() from the qst1234.pl file virtual void SendCommands(const char * pkgprefix, const char *event, uint32 npcid, Mob* other, Mob* mob, ItemInst* iteminst); - + int HasQuestFile(uint32 npcid); #ifdef EMBPERL_COMMANDS void ExecCommand(Client *c, Seperator *sep); #endif - + }; #endif //EMBPERL diff --git a/zone/embperl.h b/zone/embperl.h index 0ef7ea62d..4dd9c4242 100644 --- a/zone/embperl.h +++ b/zone/embperl.h @@ -17,7 +17,7 @@ Eglin #include //headers from the Perl distribution -#include +#include #define WIN32IO_IS_STDIO #ifndef WIN32 @@ -69,30 +69,30 @@ private: eval(buffer); return get_sv("scratch::temp", false); } - + //install a perl func void init_eval_file(void); - + bool in_use; //true if perl is executing protected: //the embedded interpreter PerlInterpreter * my_perl; - + void DoInit(); - + public: Embperl(void); //This can throw errors! Buyer beware ~Embperl(void); - + void Reinit(); - + //return the last error msg std::string lasterr(void) const { return errmsg;}; //evaluate an expression. throws string errors on fail void eval(const char * code); //execute a subroutine. throws lasterr on failure void dosub(const char * subname, const std::vector * args = nullptr, int mode = G_SCALAR|G_DISCARD|G_EVAL); - + //Access to perl variables //all varnames here should be of the form package::name //returns the contents of the perl variable named in varname as a c int @@ -104,7 +104,7 @@ public: SV * temp = my_get_sv(varname); return std::string(SvPV_nolen(temp),SvLEN(temp)); } - + //put an integer into a perl varable void seti(const char *varname, int val) const { SV *t = get_sv(varname, true); @@ -134,24 +134,24 @@ public: for (it = vals.begin(); it != vals.end(); it++) { int keylen = static_cast(it->first.length()); - + SV *val = newSVpv(it->second.c_str(), it->second.length()); - + // If val was not added to hash, reset reference count if (hv_store(hv, it->first.c_str(), keylen, val, 0) == nullptr) val->sv_refcnt = 0; } } - + //loads a file and compiles it into our interpreter (assuming it hasn't already been read in) //idea borrowed from perlembed void eval_file(const char * packagename, const char * filename); - + inline bool InUse() const { return(in_use); } - + //check to see if a sub exists in package bool SubExists(const char *package, const char *sub); - + //check to see if a variable exists in package bool VarExists(const char *package, const char *var); }; diff --git a/zone/embxs.cpp b/zone/embxs.cpp index 402bf7c73..ecdf6a80e 100644 --- a/zone/embxs.cpp +++ b/zone/embxs.cpp @@ -4,93 +4,93 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef EMBPERL +#ifdef EMBPERL #include "../common/debug.h" #include "masterentity.h" #include "command.h" #include "embperl.h" -#include "embxs.h" +#include "embxs.h" - -const char *getItemName(unsigned itemid) -{ - const Item_Struct* item = nullptr; - item = database.GetItem(itemid); - if (item) - return item->Name; - else - return nullptr; -} +const char *getItemName(unsigned itemid) +{ + const Item_Struct* item = nullptr; + item = database.GetItem(itemid); -XS(XS_qc_getItemName); /* prototype to pass -Wmissing-prototypes */ -XS(XS_qc_getItemName) -{ - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: quest::getItemName(itemid)"); - { - unsigned itemid = (unsigned)SvUV(ST(0)); - const char * RETVAL; - dXSTARG; - RETVAL = getItemName(itemid); - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; - } - XSRETURN(1); + if (item) + return item->Name; + else + return nullptr; +} + +XS(XS_qc_getItemName); /* prototype to pass -Wmissing-prototypes */ +XS(XS_qc_getItemName) +{ + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: quest::getItemName(itemid)"); + { + unsigned itemid = (unsigned)SvUV(ST(0)); + const char * RETVAL; + dXSTARG; + RETVAL = getItemName(itemid); + sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; + } + XSRETURN(1); } -EXTERN_C XS(boot_qc); /* prototype to pass -Wmissing-prototypes */ -EXTERN_C XS(boot_qc) -{ - dXSARGS; +EXTERN_C XS(boot_qc); /* prototype to pass -Wmissing-prototypes */ +EXTERN_C XS(boot_qc) +{ + dXSARGS; char file[256]; strncpy(file, __FILE__, 256); file[255] = '\0'; if(items != 1) LogFile->write(EQEMuLog::Error, "boot_qc does not take any arguments."); - + char buf[128]; //shouldent have any function names longer than this. - + //add the strcpy stuff to get rid of const warnings.... - XS_VERSION_BOOTCHECK ; + XS_VERSION_BOOTCHECK ; - newXS(strcpy(buf, "quest::getItemName"), XS_qc_getItemName, file); + newXS(strcpy(buf, "quest::getItemName"), XS_qc_getItemName, file); - XSRETURN_YES; + XSRETURN_YES; } #ifdef EMBPERL_IO_CAPTURE -XS(XS_EQEmuIO_PRINT); /* prototype to pass -Wmissing-prototypes */ -XS(XS_EQEmuIO_PRINT) -{ - dXSARGS; +XS(XS_EQEmuIO_PRINT); /* prototype to pass -Wmissing-prototypes */ +XS(XS_EQEmuIO_PRINT) +{ + dXSARGS; if (items < 2) return; -// Perl_croak(aTHX_ "Usage: EQEmuIO::PRINT(@strings)"); +// Perl_croak(aTHX_ "Usage: EQEmuIO::PRINT(@strings)"); int r; for(r = 1; r < items; r++) { char *str = SvPV_nolen(ST(r)); char *cur = str; - + int i; int pos = 0; int len = 0; @@ -107,28 +107,28 @@ XS(XS_EQEmuIO_PRINT) LogFile->writebuf(EQEMuLog::Quest, str + pos, 1, len); } } - - XSRETURN_EMPTY; + + XSRETURN_EMPTY; } #endif //EMBPERL_IO_CAPTURE #ifdef EMBPERL_COMMANDS -XS(XS_command_add); /* prototype to pass -Wmissing-prototypes */ -XS(XS_command_add) -{ - dXSARGS; +XS(XS_command_add); /* prototype to pass -Wmissing-prototypes */ +XS(XS_command_add) +{ + dXSARGS; if (items != 3) - Perl_croak(aTHX_ "Usage: commands::command_add(name, desc, access)"); + Perl_croak(aTHX_ "Usage: commands::command_add(name, desc, access)"); char *name = SvPV_nolen(ST(0)); char *desc = SvPV_nolen(ST(1)); int access = (int)SvIV(ST(2)); - + command_add_perl(name, desc, access); - - XSRETURN_EMPTY; + + XSRETURN_EMPTY; } #endif //EMBPERL_COMMANDS diff --git a/zone/embxs.h b/zone/embxs.h index a82a25141..67a37a6da 100644 --- a/zone/embxs.h +++ b/zone/embxs.h @@ -1,8 +1,8 @@ -#ifndef EMBXS_H -#define EMBXS_H +#ifndef EMBXS_H +#define EMBXS_H //headers from the Perl distribution -#include +#include #define WIN32IO_IS_STDIO #ifndef WIN32 @@ -14,7 +14,7 @@ extern "C" { //the perl headers dont do this for us... }; #endif -const char *getItemName(unsigned itemid); -XS(XS_qc_getItemName); /* prototype to pass -Wmissing-prototypes */ -EXTERN_C XS(boot_qc); /* prototype to pass -Wmissing-prototypes */ +const char *getItemName(unsigned itemid); +XS(XS_qc_getItemName); /* prototype to pass -Wmissing-prototypes */ +EXTERN_C XS(boot_qc); /* prototype to pass -Wmissing-prototypes */ #endif // EMBXS_H diff --git a/zone/entity.cpp b/zone/entity.cpp index e6a350b3b..a4d5889d0 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -99,7 +99,7 @@ Client* Entity::CastToClient() { NPC* Entity::CastToNPC() { #ifdef _EQDEBUG - if(!IsNPC()) { + if(!IsNPC()) { cout << "CastToNPC error" << endl; DebugBreak(); return 0; @@ -110,7 +110,7 @@ NPC* Entity::CastToNPC() { Mob* Entity::CastToMob() { #ifdef _EQDEBUG - if(!IsMob()) { + if(!IsMob()) { cout << "CastToMob error" << endl; DebugBreak(); return 0; @@ -121,7 +121,7 @@ Mob* Entity::CastToMob() { Merc* Entity::CastToMerc() { #ifdef _EQDEBUG - if(!IsMerc()) { + if(!IsMerc()) { cout << "CastToMerc error" << endl; DebugBreak(); return 0; @@ -145,7 +145,7 @@ Trap* Entity::CastToTrap() Corpse* Entity::CastToCorpse() { #ifdef _EQDEBUG - if(!IsCorpse()) { + if(!IsCorpse()) { cout << "CastToCorpse error" << endl; DebugBreak(); return 0; @@ -155,7 +155,7 @@ Corpse* Entity::CastToCorpse() { } Object* Entity::CastToObject() { #ifdef _EQDEBUG - if(!IsObject()) { + if(!IsObject()) { cout << "CastToObject error" << endl; DebugBreak(); return 0; @@ -166,7 +166,7 @@ Object* Entity::CastToObject() { /*Group* Entity::CastToGroup() { #ifdef _EQDEBUG - if(!IsGroup()) { + if(!IsGroup()) { cout << "CastToGroup error" << endl; DebugBreak(); return 0; @@ -204,7 +204,7 @@ const Client* Entity::CastToClient() const { const NPC* Entity::CastToNPC() const { #ifdef _EQDEBUG - if(!IsNPC()) { + if(!IsNPC()) { cout << "CastToNPC error" << endl; DebugBreak(); return 0; @@ -215,7 +215,7 @@ const NPC* Entity::CastToNPC() const { const Mob* Entity::CastToMob() const { #ifdef _EQDEBUG - if(!IsMob()) { + if(!IsMob()) { cout << "CastToMob error" << endl; DebugBreak(); return 0; @@ -226,7 +226,7 @@ const Mob* Entity::CastToMob() const { const Merc* Entity::CastToMerc() const { #ifdef _EQDEBUG - if(!IsMerc()) { + if(!IsMerc()) { cout << "CastToMerc error" << endl; DebugBreak(); return 0; @@ -248,7 +248,7 @@ const Trap* Entity::CastToTrap() const { const Corpse* Entity::CastToCorpse() const { #ifdef _EQDEBUG - if(!IsCorpse()) { + if(!IsCorpse()) { cout << "CastToCorpse error" << endl; DebugBreak(); return 0; @@ -259,7 +259,7 @@ const Corpse* Entity::CastToCorpse() const { const Object* Entity::CastToObject() const { #ifdef _EQDEBUG - if(!IsObject()) { + if(!IsObject()) { cout << "CastToObject error" << endl; DebugBreak(); return 0; @@ -279,7 +279,7 @@ const Beacon* Entity::CastToBeacon() const { #ifdef BOTS Bot* Entity::CastToBot() { #ifdef _EQDEBUG - if(!IsBot()) { + if(!IsBot()) { cout << "CastToBot error" << endl; DebugBreak(); return 0; @@ -558,13 +558,13 @@ void EntityList::BeaconProcess() { void EntityList::AddGroup(Group* group) { if(group == nullptr) //this seems to be happening somehow... return; - + uint32 gid = worldserver.NextGroupID(); if(gid == 0) { LogFile->write(EQEMuLog::Error, "Unable to get new group ID from world server. group is going to be broken."); return; } - + AddGroup(group, gid); #if EQDEBUG >= 5 CheckGroupList (__FILE__, __LINE__); @@ -586,13 +586,13 @@ void EntityList::AddGroup(Group* group, uint32 gid) { void EntityList::AddRaid(Raid* raid) { if(raid == nullptr) return; - + uint32 gid = worldserver.NextGroupID(); if(gid == 0) { LogFile->write(EQEMuLog::Error, "Unable to get new group ID from world server. group is going to be broken."); return; } - + AddRaid(raid, gid); } void EntityList::AddRaid(Raid* raid, uint32 gid) { @@ -606,7 +606,7 @@ void EntityList::AddRaid(Raid* raid, uint32 gid) { void EntityList::AddCorpse(Corpse* corpse, uint32 in_id) { if (corpse == 0) return; - + if (in_id == 0xFFFFFFFF) corpse->SetID(GetFreeID()); else @@ -624,7 +624,7 @@ void EntityList::AddNPC(NPC* npc, bool SendSpawnPacket, bool dontqueue) { uint16 emoteid = npc->GetEmoteID(); if(emoteid != 0) npc->DoNPCEmote(ONSPAWN,emoteid); - + if (SendSpawnPacket) { if (dontqueue) { // aka, SEND IT NOW BITCH! EQApplicationPacket* app = new EQApplicationPacket; @@ -642,7 +642,7 @@ void EntityList::AddNPC(NPC* npc, bool SendSpawnPacket, bool dontqueue) { if(npc->IsFindable()) UpdateFindableNPCState(npc, false); } - + npc_list.Insert(npc); if(!npc_list.dont_delete) npc_list.dont_delete=true; @@ -682,7 +682,7 @@ void EntityList::AddMerc(Merc* merc, bool SendSpawnPacket, bool dontqueue) { } void EntityList::AddObject(Object* obj, bool SendSpawnPacket) { - obj->SetID(GetFreeID()); + obj->SetID(GetFreeID()); if (SendSpawnPacket) { EQApplicationPacket app; obj->CreateSpawnPacket(&app); @@ -733,7 +733,7 @@ void EntityList::CheckSpawnQueue() { //if (NumSpawnsOnQueue <= 5) { LinkedListIterator iterator(SpawnQueue); EQApplicationPacket* outapp = 0; - + iterator.Reset(); while(iterator.MoreElements()) { outapp = new EQApplicationPacket; @@ -752,7 +752,7 @@ void EntityList::CheckSpawnQueue() { BulkZoneSpawnPacket* bzsp = new BulkZoneSpawnPacket(0, spawns_per_pack); LinkedListIterator iterator(SpawnQueue); - + iterator.Reset(); while(iterator.MoreElements()) { bzsp->AddSpawn(iterator.GetData()); @@ -760,7 +760,7 @@ void EntityList::CheckSpawnQueue() { } safe_delete(bzsp); }*/ - + tsFirstSpawnOnQueue = 0xFFFFFFFF; NumSpawnsOnQueue = 0; } @@ -815,7 +815,7 @@ Object* EntityList::FindNearbyObject(float x, float y, float z, float radius) while(iterator.MoreElements()) { Object* object=iterator.GetData(); - + object->GetLocation(&ox, &oy, &oz); ox = (x < ox) ? (ox - x) : (x - ox); @@ -874,11 +874,11 @@ bool EntityList::MakeDoorSpawnPacket(EQApplicationPacket* app, Client *client) nd.heading = door->GetHeading(); nd.incline = door->GetIncline(); nd.size = door->GetSize(); - nd.doorId = door->GetDoorID(); + nd.doorId = door->GetDoorID(); nd.opentype = door->GetOpenType(); nd.state_at_spawn = door->GetInvertState() ? !door->IsDoorOpen() : door->IsDoorOpen(); nd.invert_state = door->GetInvertState(); - nd.door_param = door->GetDoorParam(); + nd.door_param = door->GetDoorParam(); memcpy(ptr, &nd, sizeof(nd)); ptr+=sizeof(nd); *(ptr-1)=0x01; @@ -890,7 +890,7 @@ bool EntityList::MakeDoorSpawnPacket(EQApplicationPacket* app, Client *client) app->SetOpcode(OP_SpawnDoor); app->size = length; app->pBuffer = packet_buffer; - return true; + return true; } Entity* EntityList::GetEntityMob(uint16 id){ LinkedListIterator iterator(mob_list); @@ -924,7 +924,7 @@ Entity* EntityList::GetEntityMob(const char *name) return 0; LinkedListIterator iterator(mob_list); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { if (strcasecmp(iterator.GetData()->GetName(), name) == 0) @@ -966,7 +966,7 @@ Entity* EntityList::GetEntityCorpse(const char *name) return 0; LinkedListIterator iterator(corpse_list); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { if (strcasecmp(iterator.GetData()->GetName(), name) == 0) @@ -1075,7 +1075,7 @@ NPC* EntityList::GetNPCByNPCTypeID(uint32 npc_id) if (npc_id == 0) return 0; LinkedListIterator iterator(npc_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1140,7 +1140,7 @@ Mob* EntityList::GetMobByNpcTypeID(uint32 get_id) if (get_id == 0) return 0; LinkedListIterator iterator(mob_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1288,11 +1288,11 @@ void EntityList::ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 LinkedListIterator iterator(client_list); va_list argptr; char buffer[4096]; - + va_start(argptr, message); vsnprintf(buffer, 4096, message, argptr); va_end(argptr); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1302,7 +1302,7 @@ void EntityList::ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 filter=FilterShouts; else if(chan_num==4) //auction filter=FilterAuctions; - + if (chan_num != 8 || client->Dist(*from) < 200) // Only say is limited in range { if(filter==FilterNone || client->GetFilter(filter)!=FilterHide) @@ -1334,7 +1334,7 @@ void EntityList::ChannelMessageSend(Mob* to, uint8 chan_num, uint8 language, con void EntityList::SendZoneSpawns(Client* client) { LinkedListIterator iterator(mob_list); - + EQApplicationPacket* app; iterator.Reset(); while(iterator.MoreElements()) { @@ -1352,7 +1352,7 @@ void EntityList::SendZoneSpawns(Client* client) client->QueuePacket(app, true, Client::CLIENT_CONNECTED); safe_delete(app); iterator.Advance(); - } + } } void EntityList::SendZoneSpawnsBulk(Client* client) @@ -1386,7 +1386,7 @@ void EntityList::SendZoneSpawnsBulk(Client* client) //this is a hack to handle a broken spawn struct void EntityList::SendZonePVPUpdates(Client *to) { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { Client *c = iterator.GetData(); @@ -1400,7 +1400,7 @@ void EntityList::SendZoneCorpses(Client* client) { EQApplicationPacket* app; LinkedListIterator iterator(corpse_list); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { Corpse *ent = iterator.GetData(); @@ -1408,7 +1408,7 @@ void EntityList::SendZoneCorpses(Client* client) ent->CreateSpawnPacket(app); client->QueuePacket(app, true, Client::CLIENT_CONNECTED); safe_delete(app); - } + } } void EntityList::SendZoneCorpsesBulk(Client* client) { @@ -1421,7 +1421,7 @@ void EntityList::SendZoneCorpsesBulk(Client* client) { //rate = rate > 1.0 ? (rate < 10.0 ? rate : 10.0) : 1.0; //maxspawns = (uint32)rate * SPAWNS_PER_POINT_DATARATE; // FYI > 10240 entities will cause BulkZoneSpawnPacket to throw exception BulkZoneSpawnPacket* bzsp = new BulkZoneSpawnPacket(client, maxspawns); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { spawn = iterator.GetData(); @@ -1451,13 +1451,13 @@ void EntityList::SendZoneObjects(Client* client) void EntityList::Save() { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { iterator.GetData()->Save(); iterator.Advance(); - } + } } void EntityList::ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget) @@ -1465,7 +1465,7 @@ void EntityList::ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget) if(!pNewTarget) return; LinkedListIterator iterator(mob_list); - + iterator.Reset(); while(iterator.MoreElements()) { if (iterator.GetData()->IsAIControlled()) { @@ -1480,7 +1480,7 @@ void EntityList::ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget) void EntityList::RemoveFromTargets(Mob* mob, bool RemoveFromXTargets) { LinkedListIterator iterator(mob_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1499,13 +1499,13 @@ void EntityList::RemoveFromTargets(Mob* mob, bool RemoveFromXTargets) else if(mob->IsClient()) mob->CastToClient()->RemoveXTarget(m, false); - } + } } void EntityList::RemoveFromXTargets(Mob* mob) { LinkedListIterator iterator(mob_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1518,13 +1518,13 @@ void EntityList::RemoveFromXTargets(Mob* mob) if(m->IsClient()) m->CastToClient()->RemoveXTarget(mob, false); - } + } } void EntityList::RemoveFromAutoXTargets(Mob* mob) { LinkedListIterator iterator(mob_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1537,7 +1537,7 @@ void EntityList::RemoveFromAutoXTargets(Mob* mob) if(m->IsClient()) m->CastToClient()->RemoveXTarget(mob, true); - } + } } void EntityList::RefreshAutoXTargets(Client *c) @@ -1546,7 +1546,7 @@ void EntityList::RefreshAutoXTargets(Client *c) return; LinkedListIterator iterator(mob_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1562,7 +1562,7 @@ void EntityList::RefreshAutoXTargets(Client *c) break; } - } + } } void EntityList::RefreshClientXTargets(Client *c) @@ -1571,7 +1571,7 @@ void EntityList::RefreshClientXTargets(Client *c) return; LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1583,14 +1583,14 @@ void EntityList::RefreshClientXTargets(Client *c) if(c2->IsClientXTarget(c)) c2->UpdateClientXTarget(c); - } + } } void EntityList::QueueClientsByTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender, Mob* SkipThisMob, bool ackreq, bool HoTT, uint32 ClientVersionBits) { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) @@ -1617,7 +1617,7 @@ void EntityList::QueueClientsByTarget(Mob* sender, const EQApplicationPacket* ap if(iSendToSender) if(c == sender) Send = true; - + if(c != sender) { if(Target == sender) @@ -1630,16 +1630,16 @@ void EntityList::QueueClientsByTarget(Mob* sender, const EQApplicationPacket* ap Send = true; } } - + if(Send && (c->GetClientVersionBit() & ClientVersionBits)) c->QueuePacket(app, ackreq); - } + } } void EntityList::QueueClientsByXTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender) { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) @@ -1649,13 +1649,13 @@ void EntityList::QueueClientsByXTarget(Mob* sender, const EQApplicationPacket* a iterator.Advance(); if(!c || ((c == sender) && !iSendToSender)) - continue; + continue; if(!c->IsXTarget(sender)) continue; c->QueuePacket(app); - } + } } void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender, float dist, Mob* SkipThisMob, bool ackreq, eqFilterType filter) { @@ -1667,9 +1667,9 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, dist = 600; } float dist2 = dist * dist; //pow(dist, 2); - + LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1677,10 +1677,10 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, if ((!ignore_sender || ent != sender) && (ent != SkipThisMob)) { eqFilterMode filter2 = ent->GetFilter(filter); - if(ent->Connected() && - ( filter==FilterNone - || filter2 == FilterShow - || (filter2 == FilterShowGroupOnly && (sender == ent || + if(ent->Connected() && + ( filter==FilterNone + || filter2 == FilterShow + || (filter2 == FilterShowGroupOnly && (sender == ent || (ent->GetGroup() && ent->GetGroup()->IsGroupMember(sender)))) || (filter2 == FilterShowSelfOnly && ent==sender)) && (ent->DistNoRoot(*sender) <= dist2)) { @@ -1694,7 +1694,7 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, //sender can be null void EntityList::QueueClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender, bool ackreq) { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1720,9 +1720,9 @@ void EntityList::FilterQueueCloseClients(uint8 filter, uint8 required, Mob* send #else float dist2 = dist * dist; //pow(dist, 2); #endif - + LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1765,9 +1765,9 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, float dist2 = dist * dist; //pow(dist, 2); #endif - + LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1775,9 +1775,9 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, if ((!ignore_sender || ent != sender) && (ent != SkipThisMob)) { uint8 filter2=ent->GetFilter(filter); - if(ent->Connected() && - (filter==0 || (filter2==1 || - (filter2==99 && entity_list.GetGroupByClient(ent)!=0 && + if(ent->Connected() && + (filter==0 || (filter2==1 || + (filter2==99 && entity_list.GetGroupByClient(ent)!=0 && entity_list.GetGroupByClient(ent)->IsGroupMember(sender)) || (filter2==98 && ent==sender))) #ifdef PACKET_UPDATE_MANAGER @@ -1799,11 +1799,11 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, void EntityList::QueueClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender, bool ackreq) { LinkedListIterator iterator(client_list); - + #ifdef PACKET_UPDATE_MANAGER EQApplicationPacket* tmp_app = app->Copy(); #endif - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1828,7 +1828,7 @@ void EntityList::QueueClients(Mob* sender, const EQApplicationPacket* app, bool /* void EntityList::QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender, bool ackreq) { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1844,11 +1844,11 @@ void EntityList::QueueManaged(Mob* sender, const EQApplicationPacket* app, bool void EntityList::QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender, bool ackreq) { LinkedListIterator iterator(client_list); - + #ifdef PACKET_UPDATE_MANAGER EQApplicationPacket* tmp_app = app->Copy(); #endif - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1873,7 +1873,7 @@ void EntityList::QueueManaged(Mob* sender, const EQApplicationPacket* app, bool void EntityList::QueueClientsStatus(Mob* sender, const EQApplicationPacket* app, bool ignore_sender, uint8 minstatus, uint8 maxstatus) { LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -1882,7 +1882,7 @@ void EntityList::QueueClientsStatus(Mob* sender, const EQApplicationPacket* app, iterator.GetData()->QueuePacket(app); } iterator.Advance(); - } + } } void EntityList::DuelMessage(Mob* winner, Mob* loser, bool flee) { @@ -1910,53 +1910,53 @@ void EntityList::DuelMessage(Mob* winner, Mob* loser, bool flee) { } Client* EntityList::GetClientByName(const char *checkname) { - LinkedListIterator iterator(client_list); - - iterator.Reset(); - while(iterator.MoreElements()) - { + LinkedListIterator iterator(client_list); + + iterator.Reset(); + while(iterator.MoreElements()) + { if (strcasecmp(iterator.GetData()->GetName(), checkname) == 0) { return iterator.GetData(); } - iterator.Advance(); - } - return 0; + iterator.Advance(); + } + return 0; } Client* EntityList::GetClientByCharID(uint32 iCharID) { - LinkedListIterator iterator(client_list); - - iterator.Reset(); - while(iterator.MoreElements()) { + LinkedListIterator iterator(client_list); + + iterator.Reset(); + while(iterator.MoreElements()) { if (iterator.GetData()->CharacterID() == iCharID) { return iterator.GetData(); } - iterator.Advance(); - } - return 0; + iterator.Advance(); + } + return 0; } Client* EntityList::GetClientByWID(uint32 iWID) { - LinkedListIterator iterator(client_list); - - iterator.Reset(); - while(iterator.MoreElements()) { + LinkedListIterator iterator(client_list); + + iterator.Reset(); + while(iterator.MoreElements()) { if (iterator.GetData()->GetWID() == iWID) { return iterator.GetData(); - } - iterator.Advance(); - } - return 0; + } + iterator.Advance(); + } + return 0; } Client* EntityList::GetRandomClient(float x, float y, float z, float Distance, Client* ExcludeClient) { vector ClientsInRange; - LinkedListIterator iterator(client_list); - - iterator.Reset(); + LinkedListIterator iterator(client_list); + + iterator.Reset(); while(iterator.MoreElements()) { if((iterator.GetData() != ExcludeClient) && (iterator.GetData()->DistNoRoot(x, y, z) <= Distance)) @@ -1974,20 +1974,20 @@ Client* EntityList::GetRandomClient(float x, float y, float z, float Distance, C } Corpse* EntityList::GetCorpseByOwner(Client* client){ - LinkedListIterator iterator(corpse_list); - - iterator.Reset(); - while(iterator.MoreElements()) - { - if (iterator.GetData()->IsPlayerCorpse()) - { + LinkedListIterator iterator(corpse_list); + + iterator.Reset(); + while(iterator.MoreElements()) + { + if (iterator.GetData()->IsPlayerCorpse()) + { if (strcasecmp(iterator.GetData()->GetOwnerName(), client->GetName()) == 0) { return iterator.GetData(); } - } - iterator.Advance(); - } - return 0; + } + iterator.Advance(); + } + return 0; } Corpse* EntityList::GetCorpseByOwnerWithinRange(Client* client, Mob* center, int range){ @@ -2091,23 +2091,23 @@ int EntityList::RezzAllCorpsesByCharID(uint32 charid) return RezzExp; } -Group* EntityList::GetGroupByMob(Mob* mob) -{ +Group* EntityList::GetGroupByMob(Mob* mob) +{ list::iterator iterator; iterator = group_list.begin(); while(iterator != group_list.end()) - { + { if ((*iterator)->IsGroupMember(mob)) { return *iterator; } iterator++; - } + } #if EQDEBUG >= 5 CheckGroupList (__FILE__, __LINE__); #endif - return 0; + return 0; } Group* EntityList::GetGroupByLeaderName(char* leader){ @@ -2116,11 +2116,11 @@ Group* EntityList::GetGroupByLeaderName(char* leader){ iterator = group_list.begin(); while(iterator != group_list.end()) - { + { if (!strcmp((*iterator)->GetLeaderName(), leader)) { return *iterator; } - iterator++; + iterator++; } #if EQDEBUG >= 5 CheckGroupList (__FILE__, __LINE__); @@ -2133,7 +2133,7 @@ Group* EntityList::GetGroupByID(uint32 group_id){ iterator = group_list.begin(); while(iterator != group_list.end()) - { + { if ((*iterator)->GetID() == group_id) { return *iterator; } @@ -2144,24 +2144,24 @@ Group* EntityList::GetGroupByID(uint32 group_id){ #endif return 0; } -Group* EntityList::GetGroupByClient(Client* client) -{ +Group* EntityList::GetGroupByClient(Client* client) +{ list ::iterator iterator; iterator = group_list.begin(); while(iterator != group_list.end()) - { + { if ((*iterator)->IsGroupMember(client->CastToMob())) { return *iterator; } - iterator++; - } + iterator++; + } #if EQDEBUG >= 5 CheckGroupList (__FILE__, __LINE__); #endif - return 0; -} + return 0; +} Raid* EntityList::GetRaidByLeaderName(const char *leader){ list::iterator iterator; @@ -2169,14 +2169,14 @@ Raid* EntityList::GetRaidByLeaderName(const char *leader){ iterator = raid_list.begin(); while(iterator != raid_list.end()) - { + { if((*iterator)->GetLeader()){ if(strcmp((*iterator)->GetLeader()->GetName(), leader) == 0){ return *iterator; - } + } } iterator++; - } + } return 0; } Raid* EntityList::GetRaidByID(uint32 id){ @@ -2185,23 +2185,23 @@ Raid* EntityList::GetRaidByID(uint32 id){ iterator = raid_list.begin(); while(iterator != raid_list.end()) - { + { if ((*iterator)->GetID() == id) { return *iterator; } iterator++; - } + } return 0; } -Raid* EntityList::GetRaidByClient(Client* client) -{ +Raid* EntityList::GetRaidByClient(Client* client) +{ list::iterator iterator; iterator = raid_list.begin(); while(iterator != raid_list.end()) - { + { for(int x = 0; x < MAX_RAID_MEMBERS; x++) { if((*iterator)->members[x].member){ @@ -2210,17 +2210,17 @@ Raid* EntityList::GetRaidByClient(Client* client) } } iterator++; - } - return 0; + } + return 0; } -Raid* EntityList::GetRaidByMob(Mob* mob) { +Raid* EntityList::GetRaidByMob(Mob* mob) { list::iterator iterator; iterator = raid_list.begin(); while(iterator != raid_list.end()) - { + { for(int x = 0; x < MAX_RAID_MEMBERS; x++) { // TODO: Implement support for Mob objects in Raid class @@ -2230,45 +2230,45 @@ Raid* EntityList::GetRaidByMob(Mob* mob) { }*/ } iterator++; - } - return 0; -} + } + return 0; +} -Client* EntityList::GetClientByAccID(uint32 accid) -{ - LinkedListIterator iterator(client_list); - - iterator.Reset(); - while(iterator.MoreElements()) - { +Client* EntityList::GetClientByAccID(uint32 accid) +{ + LinkedListIterator iterator(client_list); + + iterator.Reset(); + while(iterator.MoreElements()) + { if (iterator.GetData()->AccountID() == accid) { return iterator.GetData(); } - iterator.Advance(); - } - return 0; -} -Client* EntityList::GetClientByID(uint16 id) { - LinkedListIterator iterator(client_list); - - iterator.Reset(); - while(iterator.MoreElements()) - { - if (iterator.GetData()) - { + iterator.Advance(); + } + return 0; +} +Client* EntityList::GetClientByID(uint16 id) { + LinkedListIterator iterator(client_list); + + iterator.Reset(); + while(iterator.MoreElements()) + { + if (iterator.GetData()) + { if (iterator.GetData()->GetID() == id) { return iterator.GetData(); } - } - iterator.Advance(); - } - return 0; -} + } + iterator.Advance(); + } + return 0; +} void EntityList::ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guild_id, uint8 language, const char* message) { - + LinkedListIterator iterator(client_list); - + iterator.Reset(); for(; iterator.MoreElements(); iterator.Advance()) { @@ -2291,13 +2291,13 @@ void EntityList::ChannelMessageFromWorld(const char* from, const char* to, uint8 void EntityList::Message(uint32 to_guilddbid, uint32 type, const char* message, ...) { va_list argptr; char buffer[4096]; - + va_start(argptr, message); vsnprintf(buffer, 4096, message, argptr); va_end(argptr); - + LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -2354,13 +2354,13 @@ void EntityList::QueueClientsGuildBankItemUpdate(const GuildBankItemUpdate_Struc void EntityList::MessageStatus(uint32 to_guild_id, int to_minstatus, uint32 type, const char* message, ...) { va_list argptr; char buffer[4096]; - + va_start(argptr, message); vsnprintf(buffer, 4096, message, argptr); va_end(argptr); - + LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { Client* client = iterator.GetData(); @@ -2376,8 +2376,8 @@ void EntityList::MessageClose_StringID(Mob *sender, bool skipsender, float dist, Client *c; LinkedListIterator iterator(client_list); float dist2 = dist * dist; - - + + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { c = iterator.GetData(); @@ -2390,8 +2390,8 @@ void EntityList::Message_StringID(Mob *sender, bool skipsender, uint32 type, uin { Client *c; LinkedListIterator iterator(client_list); - - + + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { c = iterator.GetData(); @@ -2403,15 +2403,15 @@ void EntityList::Message_StringID(Mob *sender, bool skipsender, uint32 type, uin void EntityList::MessageClose(Mob* sender, bool skipsender, float dist, uint32 type, const char* message, ...) { va_list argptr; char buffer[4096]; - + va_start(argptr, message); vsnprintf(buffer, 4095, message, argptr); va_end(argptr); - + float dist2 = dist * dist; - + LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -2721,7 +2721,7 @@ void EntityList::UpdateWho(bool iSendFullUpdate) { pack = new ServerPacket(ServerOP_ClientListKA, sizeof(ServerClientListKeepAlive_Struct) + (tmpNumUpdates * 4)); sclka = (ServerClientListKeepAlive_Struct*) pack->pBuffer; } - + iterator.Reset(); while(iterator.MoreElements()) { if (iterator.GetData()->InZone()) { @@ -2775,7 +2775,7 @@ void EntityList::RemoveEntity(uint16 id) return; #endif //BOTS - else + else entity_list.RemoveObject(id); } @@ -2789,9 +2789,9 @@ void EntityList::CountNPC(uint32* NPCCount, uint32* NPCLootCount, uint32* gmspaw LinkedListIterator iterator(npc_list); *NPCCount = 0; *NPCLootCount = 0; - + iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { (*NPCCount)++; (*NPCLootCount) += iterator.GetData()->CastToNPC()->CountLoot(); @@ -2806,12 +2806,12 @@ void EntityList::DoZoneDump(ZSDump_Spawn2* spawn2_dump, ZSDump_NPC* npc_dump, ZS uint32 NPCindex = 0; uint32 NPCLootindex = 0; uint32 gmspawntype_index = 0; - + if (npc_dump != 0) { LinkedListIterator iterator(npc_list); NPC* npc = 0; iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { npc = iterator.GetData()->CastToNPC(); if (spawn2_dump != 0) @@ -2854,7 +2854,7 @@ void EntityList::DoZoneDump(ZSDump_Spawn2* spawn2_dump, ZSDump_NPC* npc_dump, ZS void EntityList::Depop(bool StartSpawnTimer) { LinkedListIterator iterator(npc_list); - + iterator.Reset(); for(; iterator.MoreElements(); iterator.Advance()) { @@ -2875,7 +2875,7 @@ void EntityList::Depop(bool StartSpawnTimer) { void EntityList::DepopAll(int NPCTypeID, bool StartSpawnTimer) { LinkedListIterator iterator(npc_list); - + iterator.Reset(); for(; iterator.MoreElements(); iterator.Advance()) { @@ -2923,9 +2923,9 @@ void EntityList::RemoveFromHateLists(Mob* mob, bool settoone) { void EntityList::RemoveDebuffs(Mob* caster) { LinkedListIterator iterator(mob_list); - + iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { iterator.GetData()->BuffFadeDetrimentalByCaster(caster); iterator.Advance(); @@ -2939,11 +2939,11 @@ void EntityList::RemoveDebuffs(Mob* caster) void EntityList::SendPositionUpdates(Client* client, uint32 cLastUpdate, float range, Entity* alwayssend, bool iSendEvenIfNotChanged) { range = range * range; LinkedListIterator iterator(mob_list); - + EQApplicationPacket* outapp = 0; PlayerPositionUpdateServer_Struct* ppu = 0; Mob* mob = 0; - + iterator.Reset(); while(iterator.MoreElements()) { if (outapp == 0) { @@ -2952,7 +2952,7 @@ void EntityList::SendPositionUpdates(Client* client, uint32 cLastUpdate, float r } mob = iterator.GetData()->CastToMob(); if (mob && !mob->IsCorpse() && (iterator.GetData() != client) - && (mob->IsClient() || iSendEvenIfNotChanged || (mob->LastChange() >= cLastUpdate)) + && (mob->IsClient() || iSendEvenIfNotChanged || (mob->LastChange() >= cLastUpdate)) && (!iterator.GetData()->IsClient() || !iterator.GetData()->CastToClient()->GMHideMe(client))) { //bool Grouped = client->HasGroup() && mob->IsClient() && (client->GetGroup() == mob->CastToClient()->GetGroup()); @@ -2966,10 +2966,10 @@ void EntityList::SendPositionUpdates(Client* client, uint32 cLastUpdate, float r } } safe_delete(outapp); - outapp = 0; + outapp = 0; iterator.Advance(); } - + safe_delete(outapp); } @@ -3033,7 +3033,7 @@ void EntityList::ListNPCs(Client* client, const char* arg1, const char* arg2, ui uint32 x = 0; uint32 z = 0; char sName[36]; - + iterator.Reset(); client->Message(0, "NPCs in the zone:"); if(searchtype == 0) { @@ -3082,7 +3082,7 @@ void EntityList::ListNPCs(Client* client, const char* arg1, const char* arg2, ui void EntityList::ListNPCCorpses(Client* client) { LinkedListIterator iterator(corpse_list); uint32 x = 0; - + iterator.Reset(); client->Message(0, "NPC Corpses in the zone:"); while(iterator.MoreElements()) { @@ -3098,7 +3098,7 @@ void EntityList::ListNPCCorpses(Client* client) { void EntityList::ListPlayerCorpses(Client* client) { LinkedListIterator iterator(corpse_list); uint32 x = 0; - + iterator.Reset(); client->Message(0, "Player Corpses in the zone:"); while(iterator.MoreElements()) { @@ -3117,7 +3117,7 @@ void EntityList::FindPathsToAllNPCs() return; LinkedListIterator Iterator(npc_list); - + Iterator.Reset(); while(Iterator.MoreElements()) @@ -3141,7 +3141,7 @@ void EntityList::FindPathsToAllNPCs() int32 EntityList::DeleteNPCCorpses() { LinkedListIterator iterator(corpse_list); int32 x = 0; - + iterator.Reset(); while(iterator.MoreElements()) { if (iterator.GetData()->IsNPCCorpse()) { @@ -3157,7 +3157,7 @@ int32 EntityList::DeleteNPCCorpses() { int32 EntityList::DeletePlayerCorpses() { LinkedListIterator iterator(corpse_list); int32 x = 0; - + iterator.Reset(); while(iterator.MoreElements()) { if (iterator.GetData()->IsPlayerCorpse()) { @@ -3189,7 +3189,7 @@ void EntityList::SendPetitionToAdmins(){ } void EntityList::SendPetitionToAdmins(Petition* pet) { LinkedListIterator iterator(client_list); - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_PetitionUpdate,sizeof(PetitionUpdate_Struct)); PetitionUpdate_Struct* pcus = (PetitionUpdate_Struct*) outapp->pBuffer; pcus->petnumber = pet->GetID(); // Petition Number @@ -3288,10 +3288,10 @@ bool BulkZoneSpawnPacket::AddSpawn(NewSpawn_Struct* ns) { void BulkZoneSpawnPacket::SendBuffer() { if (!data) return; - + uint32 tmpBufSize = (index * sizeof(NewSpawn_Struct)); EQApplicationPacket* outapp = new EQApplicationPacket(OP_ZoneSpawns, (unsigned char *)data, tmpBufSize); - + if (pSendTo) { pSendTo->FastQueuePacket(&outapp); } else { @@ -3376,7 +3376,7 @@ void EntityList::ClearFeignAggro(Mob* targ) iterator.GetData()->RemoveFromHateList(targ); // EverHood 6/24/06 - // For client targets if the mob that hated us is 35+ + // For client targets if the mob that hated us is 35+ // there is a 3 outta 5 chance he adds us to feign memory if(targ->IsClient()){ if (iterator.GetData()->GetLevel() >= 35 && (MakeRandomInt(1,100)<=60)){ @@ -3440,26 +3440,26 @@ bool EntityList::MakeTrackPacket(Client* client) else if(client->GetClass() == RANGER) distance = (client->GetSkill(TRACKING)*12); else if(client->GetClass() == BARD) - distance = (client->GetSkill(TRACKING)*7); + distance = (client->GetSkill(TRACKING)*7); if(distance <= 0) return false; if(distance<300) distance=300; - + uint32 spe= 0; bool ret = false; - + spe = mob_list.Count() + 50; uchar* buffer1 = new uchar[sizeof(Track_Struct)]; Track_Struct* track_ent = (Track_Struct*) buffer1; - + uchar* buffer2 = new uchar[sizeof(Track_Struct)*spe]; Tracking_Struct* track_array = (Tracking_Struct*) buffer2; memset(track_array, 0, sizeof(Track_Struct)*spe); - + uint32 array_counter = 0; - + LinkedListIterator iterator(mob_list); iterator.Reset(); @@ -3500,10 +3500,10 @@ bool EntityList::MakeTrackPacket(Client* client) else { LogFile->write(EQEMuLog::Status, "ERROR: Unable to transmit a Tracking_Struct packet. Mobs in zone = %i. Mobs in packet = %i", array_counter, spe); } - + safe_delete_array(buffer1); safe_delete_array(buffer2); - + return ret; } @@ -3557,7 +3557,7 @@ void EntityList::AddHealAggro(Mob* target, Mob* caster, uint16 thedam) while(iterator.MoreElements()) { cur = iterator.GetData(); - + if(!cur->CheckAggro(target)) { iterator.Advance(); @@ -3639,13 +3639,13 @@ void EntityList::OpenDoorsNear(NPC* who) } } -void EntityList::SendAlarm(Trap* trap, Mob* currenttarget, uint8 kos) +void EntityList::SendAlarm(Trap* trap, Mob* currenttarget, uint8 kos) { LinkedListIterator iterator(npc_list); iterator.Reset(); - + float val2 = trap->effectvalue * trap->effectvalue; - + while(iterator.MoreElements()) { NPC *cur = iterator.GetData(); @@ -3656,9 +3656,9 @@ void EntityList::SendAlarm(Trap* trap, Mob* currenttarget, uint8 kos) curdist += tmp*tmp; tmp = cur->GetZ() - trap->z; curdist += tmp*tmp; - if (!cur->GetOwner() && + if (!cur->GetOwner() && /*!cur->CastToMob()->dead && */ - !cur->IsEngaged() && + !cur->IsEngaged() && curdist <= val2 ) { if(kos) @@ -3680,9 +3680,9 @@ void EntityList::SendAlarm(Trap* trap, Mob* currenttarget, uint8 kos) void EntityList::AddProximity(NPC *proximity_for) { RemoveProximity(proximity_for->GetID()); - + proximity_list.Insert(proximity_for); - + proximity_for->proximity = new NPCProximity; } @@ -3715,20 +3715,20 @@ void EntityList::ProcessMove(Client *c, float x, float y, float z) { */ LinkedListIterator iterator(proximity_list); std::list skip_ids; - + float last_x = c->ProximityX(); float last_y = c->ProximityY(); float last_z = c->ProximityZ(); - + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { NPC *d = iterator.GetData(); NPCProximity *l = d->proximity; if(l == nullptr) continue; - //This is done to address the issue of this code not being reentrant + //This is done to address the issue of this code not being reentrant //because perl can call clear_proximity() while we're still iterating through the list - //This causes our list to become invalid but we don't know it. On GCC it's basic heap + //This causes our list to become invalid but we don't know it. On GCC it's basic heap //corruption and it doesn't appear to catch it at all. //MSVC it's a crash with 0xfeeefeee debug address (freed memory off the heap) std::list::iterator iter = skip_ids.begin(); @@ -3747,7 +3747,7 @@ void EntityList::ProcessMove(Client *c, float x, float y, float z) { { continue; } - + //check both bounding boxes, if either coords pairs //cross a boundary, send the event. bool old_in = true; @@ -3762,11 +3762,11 @@ void EntityList::ProcessMove(Client *c, float x, float y, float z) { || z < l->min_z || z > l->max_z ) { new_in = false; } - + if(old_in && !new_in) { //we were in the proximity, we are no longer, send event exit parse->EventNPC(EVENT_EXIT, d, c, "", 0); - + //Reentrant fix iterator.Reset(); skip_ids.push_back(d->GetID()); @@ -3779,7 +3779,7 @@ void EntityList::ProcessMove(Client *c, float x, float y, float z) { skip_ids.push_back(d->GetID()); } } - + } void EntityList::ProcessProximitySay(const char *Message, Client *c, uint8 language) { @@ -3868,20 +3868,20 @@ of NPCs in the entire zone. void EntityList::LimitAddNPC(NPC *npc) { if(!npc) return; - + SpawnLimitRecord r; - + uint16 eid = npc->GetID(); r.spawngroup_id = npc->GetSp2(); r.npc_type = npc->GetNPCTypeID(); - + npc_limit_list[eid] = r; } void EntityList::LimitRemoveNPC(NPC *npc) { if(!npc) return; - + uint16 eid = npc->GetID(); npc_limit_list.erase(eid); } @@ -3891,11 +3891,11 @@ void EntityList::LimitRemoveNPC(NPC *npc) { bool EntityList::LimitCheckType(uint32 npc_type, int count) { if(count < 1) return(true); - + map::iterator cur,end; cur = npc_limit_list.begin(); end = npc_limit_list.end(); - + for(; cur != end; cur++) { if(cur->second.npc_type == npc_type) { count--; @@ -3912,11 +3912,11 @@ bool EntityList::LimitCheckType(uint32 npc_type, int count) { bool EntityList::LimitCheckGroup(uint32 spawngroup_id, int count) { if(count < 1) return(true); - + map::iterator cur,end; cur = npc_limit_list.begin(); end = npc_limit_list.end(); - + for(; cur != end; cur++) { if(cur->second.spawngroup_id == spawngroup_id) { count--; @@ -3934,11 +3934,11 @@ bool EntityList::LimitCheckGroup(uint32 spawngroup_id, int count) { bool EntityList::LimitCheckBoth(uint32 npc_type, uint32 spawngroup_id, int group_count, int type_count) { if(group_count < 1 && type_count < 1) return(true); - + map::iterator cur,end; cur = npc_limit_list.begin(); end = npc_limit_list.end(); - + for(; cur != end; cur++) { if(cur->second.npc_type == npc_type) { type_count--; @@ -3960,7 +3960,7 @@ bool EntityList::LimitCheckName(const char *npc_name) { LinkedListIterator iterator(npc_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { NPC* npc = iterator.GetData(); if(npc) @@ -3977,7 +3977,7 @@ bool EntityList::LimitCheckName(const char *npc_name) void EntityList::RadialSetLogging(Mob *around, bool enabled, bool clients, bool non_clients, float range) { float range2 = range * range; - + LinkedListIterator iterator(mob_list); iterator.Reset(); while(iterator.MoreElements()) { @@ -3992,10 +3992,10 @@ void EntityList::RadialSetLogging(Mob *around, bool enabled, bool clients, bool if(!non_clients) continue; } - + if(around->DistNoRoot(*mob) > range2) continue; - + if(enabled) mob->EnableLogging(); else @@ -4089,7 +4089,7 @@ void EntityList::QuestJournalledSayClose(Mob *sender, Client *QuestInitiator, fl Corpse* EntityList::GetClosestCorpse(Mob* sender, const char* Name) { - if(!sender) + if(!sender) return nullptr; uint32 CurrentDistance, ClosestDistance = 4294967295u; @@ -4105,11 +4105,11 @@ Corpse* EntityList::GetClosestCorpse(Mob* sender, const char* Name) CurrentCorpse = iterator.GetData(); iterator.Advance(); - + if(Name && strcasecmp(CurrentCorpse->GetOwnerName(), Name)) continue; - CurrentDistance = ((CurrentCorpse->GetY() - sender->GetY()) * (CurrentCorpse->GetY() - sender->GetY())) + + CurrentDistance = ((CurrentCorpse->GetY() - sender->GetY()) * (CurrentCorpse->GetY() - sender->GetY())) + ((CurrentCorpse->GetX() - sender->GetX()) * (CurrentCorpse->GetX() - sender->GetX())); if(CurrentDistance < ClosestDistance) @@ -4124,9 +4124,9 @@ Corpse* EntityList::GetClosestCorpse(Mob* sender, const char* Name) } void EntityList::ForceGroupUpdate(uint32 gid) { - LinkedListIterator iterator(client_list); - - iterator.Reset(); + LinkedListIterator iterator(client_list); + + iterator.Reset(); while(iterator.MoreElements()) { if(iterator.GetData()){ Group *g = nullptr; @@ -4138,13 +4138,13 @@ void EntityList::ForceGroupUpdate(uint32 gid) { } } } - iterator.Advance(); - } + iterator.Advance(); + } } void EntityList::SendGroupLeave(uint32 gid, const char *name) { - LinkedListIterator iterator(client_list); - iterator.Reset(); + LinkedListIterator iterator(client_list); + iterator.Reset(); while(iterator.MoreElements()) { Client *c = iterator.GetData(); if(c){ @@ -4154,13 +4154,13 @@ void EntityList::SendGroupLeave(uint32 gid, const char *name) { if(g->GetID() == gid) { EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; + GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; strcpy(gj->membername, name); gj->action = groupActLeave; strcpy(gj->yourname, c->GetName()); Mob *Leader = g->GetLeader(); if(Leader) - Leader->CastToClient()->GetGroupAAs(&gj->leader_aas); + Leader->CastToClient()->GetGroupAAs(&gj->leader_aas); c->QueuePacket(outapp); safe_delete(outapp); g->DelMemberOOZ(name); @@ -4169,13 +4169,13 @@ void EntityList::SendGroupLeave(uint32 gid, const char *name) { } } } - iterator.Advance(); - } + iterator.Advance(); + } } void EntityList::SendGroupJoin(uint32 gid, const char *name) { - LinkedListIterator iterator(client_list); - iterator.Reset(); + LinkedListIterator iterator(client_list); + iterator.Reset(); while(iterator.MoreElements()) { if(iterator.GetData()){ Group *g = nullptr; @@ -4184,27 +4184,27 @@ void EntityList::SendGroupJoin(uint32 gid, const char *name) { if(g->GetID() == gid) { EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; + GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; strcpy(gj->membername, name); gj->action = groupActJoin; strcpy(gj->yourname, iterator.GetData()->GetName()); Mob *Leader = g->GetLeader(); if(Leader) Leader->CastToClient()->GetGroupAAs(&gj->leader_aas); - + iterator.GetData()->QueuePacket(outapp); safe_delete(outapp); } } } - iterator.Advance(); - } + iterator.Advance(); + } } void EntityList::GroupMessage(uint32 gid, const char *from, const char *message) { - LinkedListIterator iterator(client_list); - iterator.Reset(); + LinkedListIterator iterator(client_list); + iterator.Reset(); while(iterator.MoreElements()) { if(iterator.GetData()){ Group *g = nullptr; @@ -4216,8 +4216,8 @@ void EntityList::GroupMessage(uint32 gid, const char *from, const char *message) } } } - iterator.Advance(); - } + iterator.Advance(); + } } uint16 EntityList::CreateGroundObject(uint32 itemid, float x, float y, float z, float heading, uint32 decay_time) @@ -4275,7 +4275,7 @@ Mob* EntityList::GetTargetForMez(Mob* caster) if(!caster) return nullptr; - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); //TODO: make this smarter and not mez targets being damaged by dots while(iterator.MoreElements()) { @@ -4287,7 +4287,7 @@ Mob* EntityList::GetTargetForMez(Mob* caster) } if(caster->GetTarget() == d){ //caster can't pick his target - iterator.Advance(); + iterator.Advance(); continue; } @@ -4301,7 +4301,7 @@ Mob* EntityList::GetTargetForMez(Mob* caster) continue; } - if(!caster->CheckLosFN(d)){ //this is wasteful but can't really think of another way to do it + if(!caster->CheckLosFN(d)){ //this is wasteful but can't really think of another way to do it iterator.Advance(); //that wont have us trying to los the same target every time continue; //it's only in combat so it's impact should be minimal.. but stil. } @@ -4317,7 +4317,7 @@ void EntityList::SendZoneAppearance(Client *c) if(!c) return; - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); while(iterator.MoreElements()) { Mob *cur = iterator.GetData(); @@ -4347,7 +4347,7 @@ void EntityList::SendNimbusEffects(Client *c) if(!c) return; - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); while(iterator.MoreElements()) { Mob *cur = iterator.GetData(); @@ -4381,7 +4381,7 @@ void EntityList::SendUntargetable(Client *c) if(!c) return; - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); while(iterator.MoreElements()) { Mob *cur = iterator.GetData(); @@ -4411,15 +4411,15 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { uint8 WhomLength = strlen(Who->whom); - LinkedListIterator iterator(client_list); - - iterator.Reset(); + LinkedListIterator iterator(client_list); + + iterator.Reset(); while(iterator.MoreElements()) { Client *ClientEntry = iterator.GetData(); - iterator.Advance(); + iterator.Advance(); if(ClientEntry) { @@ -4458,10 +4458,10 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { PacketLength = PacketLength + strlen(ClientEntry->GetName()); - if(strlen(guild_mgr.GetGuildName(ClientEntry->GuildID())) > 0) + if(strlen(guild_mgr.GetGuildName(ClientEntry->GuildID())) > 0) PacketLength = PacketLength + strlen(guild_mgr.GetGuildName(ClientEntry->GuildID())) + 2; } - } + } PacketLength = PacketLength + sizeof(WhoAllReturnStruct) + (47 * Entries); @@ -4480,7 +4480,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { WARS->unknown35 = 0x0a; WARS->unknown36 = 0; - + switch(Entries) { case 0: WARS->playersinzonestring = 5029; @@ -4504,7 +4504,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { Buffer += sizeof(WhoAllReturnStruct); - iterator.Reset(); + iterator.Reset(); while(iterator.MoreElements()) { @@ -4577,7 +4577,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { PlayerLevel = ClientEntry->GetLevel(); PlayerRace = ClientEntry->GetRace(); - } + } WhoAllPlayerPart1* WAPP1 = (WhoAllPlayerPart1*)Buffer; @@ -4641,15 +4641,15 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { safe_delete(outapp); } -void EntityList::UnMarkNPC(uint16 ID) +void EntityList::UnMarkNPC(uint16 ID) { // Designed to be called from the Mob destructor, this method calls Group::UnMarkNPC for // each group to remove the dead mobs entity ID from the groups list of NPCs marked via the // Group Leadership AA Mark NPC ability. // - LinkedListIterator iterator(client_list); + LinkedListIterator iterator(client_list); - iterator.Reset(); + iterator.Reset(); while(iterator.MoreElements()) { @@ -4662,8 +4662,8 @@ void EntityList::UnMarkNPC(uint16 ID) if(g) g->UnMarkNPC(ID); } - iterator.Advance(); - } + iterator.Advance(); + } } uint32 EntityList::CheckNPCsClose(Mob *center) @@ -4722,9 +4722,9 @@ uint32 EntityList::CheckNPCsClose(Mob *center) void EntityList::GateAllClients() { - LinkedListIterator iterator(client_list); + LinkedListIterator iterator(client_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Client *c = iterator.GetData(); if(c) @@ -4737,9 +4737,9 @@ void EntityList::GateAllClients() void EntityList::SignalAllClients(uint32 data) { - LinkedListIterator iterator(client_list); + LinkedListIterator iterator(client_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Client *ent = iterator.GetData(); if(ent) @@ -4753,9 +4753,9 @@ void EntityList::SignalAllClients(uint32 data) void EntityList::GetMobList(list &m_list) { m_list.clear(); - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Mob *ent = iterator.GetData(); m_list.push_back(ent); @@ -4766,9 +4766,9 @@ void EntityList::GetMobList(list &m_list) void EntityList::GetNPCList(list &n_list) { n_list.clear(); - LinkedListIterator iterator(npc_list); + LinkedListIterator iterator(npc_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { NPC *ent = iterator.GetData(); n_list.push_back(ent); @@ -4779,9 +4779,9 @@ void EntityList::GetNPCList(list &n_list) void EntityList::GetClientList(list &c_list) { c_list.clear(); - LinkedListIterator iterator(client_list); + LinkedListIterator iterator(client_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Client *ent = iterator.GetData(); c_list.push_back(ent); @@ -4792,9 +4792,9 @@ void EntityList::GetClientList(list &c_list) void EntityList::GetCorpseList(list &c_list) { c_list.clear(); - LinkedListIterator iterator(corpse_list); + LinkedListIterator iterator(corpse_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Corpse *ent = iterator.GetData(); c_list.push_back(ent); @@ -4805,9 +4805,9 @@ void EntityList::GetCorpseList(list &c_list) void EntityList::GetObjectList(list &o_list) { o_list.clear(); - LinkedListIterator iterator(object_list); + LinkedListIterator iterator(object_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Object *ent = iterator.GetData(); o_list.push_back(ent); @@ -4818,9 +4818,9 @@ void EntityList::GetObjectList(list &o_list) void EntityList::GetDoorsList(list &o_list) { o_list.clear(); - LinkedListIterator iterator(door_list); + LinkedListIterator iterator(door_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Doors *ent = iterator.GetData(); o_list.push_back(ent); @@ -4830,12 +4830,12 @@ void EntityList::GetDoorsList(list &o_list) void EntityList::UpdateQGlobal(uint32 qid, QGlobal newGlobal) { - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Mob *ent = iterator.GetData(); - + if(ent->IsClient()) { QGlobalCache *qgc = ent->CastToClient()->GetQGlobals(); @@ -4867,12 +4867,12 @@ void EntityList::UpdateQGlobal(uint32 qid, QGlobal newGlobal) void EntityList::DeleteQGlobal(std::string name, uint32 npcID, uint32 charID, uint32 zoneID) { - LinkedListIterator iterator(mob_list); + LinkedListIterator iterator(mob_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Mob *ent = iterator.GetData(); - + if(ent->IsClient()) { QGlobalCache *qgc = ent->CastToClient()->GetQGlobals(); @@ -4961,16 +4961,16 @@ void EntityList::UpdateFindableNPCState(NPC *n, bool Remove) fnpcs->Class = n->GetClass(); - LinkedListIterator iterator(client_list); + LinkedListIterator iterator(client_list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Client *c = iterator.GetData(); if(c && (c->GetClientVersion() >= EQClientSoD)) c->QueuePacket(outapp); - + iterator.Advance(); } @@ -5029,7 +5029,7 @@ void EntityList::HideCorpses(Client *c, uint8 CurrentMode, uint8 NewMode) c->QueuePacket(&outapp); } } - + } iterator.Advance(); } @@ -5045,10 +5045,10 @@ void EntityList::AddLootToNPCS(uint32 item_id, uint32 count) iterator.Reset(); while(iterator.MoreElements()) { - if(!iterator.GetData()->IsPet() + if(!iterator.GetData()->IsPet() && iterator.GetData()->GetClass() != LDON_TREASURE - && iterator.GetData()->GetBodyType() != BT_NoTarget - && iterator.GetData()->GetBodyType() != BT_NoTarget2 + && iterator.GetData()->GetBodyType() != BT_NoTarget + && iterator.GetData()->GetBodyType() != BT_NoTarget2 && iterator.GetData()->GetBodyType() != BT_Special) { npc_count++; @@ -5073,8 +5073,8 @@ void EntityList::AddLootToNPCS(uint32 item_id, uint32 count) { if(!iterator.GetData()->IsPet() && iterator.GetData()->GetClass() != LDON_TREASURE - && iterator.GetData()->GetBodyType() != BT_NoTarget - && iterator.GetData()->GetBodyType() != BT_NoTarget2 + && iterator.GetData()->GetBodyType() != BT_NoTarget + && iterator.GetData()->GetBodyType() != BT_NoTarget2 && iterator.GetData()->GetBodyType() != BT_Special) { npcs[i++] = iterator.GetData(); @@ -5129,7 +5129,7 @@ void EntityList::CameraEffect(uint32 duration, uint32 intensity) { NPC* EntityList::GetClosestBanker(Mob* sender, uint32 &distance) { - if(!sender) + if(!sender) return nullptr; distance = 4294967295u; @@ -5142,7 +5142,7 @@ NPC* EntityList::GetClosestBanker(Mob* sender, uint32 &distance) { if(iterator.GetData()->GetClass() == BANKER) { - uint32 nd = ((iterator.GetData()->GetY() - sender->GetY()) * (iterator.GetData()->GetY() - sender->GetY())) + + uint32 nd = ((iterator.GetData()->GetY() - sender->GetY()) * (iterator.GetData()->GetY() - sender->GetY())) + ((iterator.GetData()->GetX() - sender->GetX()) * (iterator.GetData()->GetX() - sender->GetX())); if(nd < distance){ distance = nd; @@ -5173,7 +5173,7 @@ void EntityList::ExpeditionWarning(uint32 minutes_left) Mob* EntityList::GetClosestMobByBodyType(Mob* sender, bodyType BodyType) { - if(!sender) + if(!sender) return nullptr; uint32 CurrentDistance, ClosestDistance = 4294967295u; @@ -5189,11 +5189,11 @@ Mob* EntityList::GetClosestMobByBodyType(Mob* sender, bodyType BodyType) CurrentMob = iterator.GetData(); iterator.Advance(); - + if(CurrentMob->GetBodyType() != BodyType) continue; - CurrentDistance = ((CurrentMob->GetY() - sender->GetY()) * (CurrentMob->GetY() - sender->GetY())) + + CurrentDistance = ((CurrentMob->GetY() - sender->GetY()) * (CurrentMob->GetY() - sender->GetY())) + ((CurrentMob->GetX() - sender->GetX()) * (CurrentMob->GetX() - sender->GetX())); if(CurrentDistance < ClosestDistance) @@ -5241,33 +5241,33 @@ void EntityList::GetTargetsForConeArea(Mob *start, uint32 radius, uint32 height, Client* EntityList::FindCorpseDragger(const char *CorpseName) { - LinkedListIterator iterator(client_list); - - iterator.Reset(); + LinkedListIterator iterator(client_list); - while(iterator.MoreElements()) - { + iterator.Reset(); + + while(iterator.MoreElements()) + { if (iterator.GetData()->IsDraggingCorpse(CorpseName)) { return iterator.GetData(); } - iterator.Advance(); - } - return 0; + iterator.Advance(); + } + return 0; } Mob* EntityList::GetTargetForVirus(Mob* spreader) { int max_spread_range = RuleI(Spells, VirusSpreadDistance); - + vector TargetsInRange; - LinkedListIterator iterator(mob_list); - - iterator.Reset(); + LinkedListIterator iterator(mob_list); + + iterator.Reset(); while(iterator.MoreElements()) { // Make sure the target is in range, has los and is not the mob doing the spreading - if ((iterator.GetData()->GetID() != spreader->GetID()) && + if ((iterator.GetData()->GetID() != spreader->GetID()) && (iterator.GetData()->CalculateDistance(spreader->GetX(), spreader->GetY(), spreader->GetZ()) <= max_spread_range) && (spreader->CheckLosFN(iterator.GetData()))) { diff --git a/zone/entity.h b/zone/entity.h index fab3f8d9e..be0befbf4 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -94,7 +94,7 @@ public: Doors* CastToDoors(); Trap* CastToTrap(); Beacon* CastToBeacon(); - + const Client* CastToClient() const; const NPC* CastToNPC() const; const Mob* CastToMob() const; @@ -129,7 +129,7 @@ class EntityList public: EntityList(); ~EntityList(); - + Entity* GetID(uint16 id); Mob* GetMob(uint16 id); inline Mob* GetMobID(uint16 id) { return(GetMob(id)); } //for perl @@ -139,7 +139,7 @@ public: NPC* GetNPCByID(uint16 id); NPC* GetNPCByNPCTypeID(uint32 npc_id); Merc* GetMercByID(uint16 id); - Client* GetClientByName(const char *name); + Client* GetClientByName(const char *name); Client* GetClientByAccID(uint32 accid); Client* GetClientByID(uint16 id); Client* GetClientByCharID(uint32 iCharID); @@ -198,7 +198,7 @@ public: Object* FindNearbyObject(float x, float y, float z, float radius); bool MakeDoorSpawnPacket(EQApplicationPacket* app, Client *client); bool MakeTrackPacket(Client* client); - void SendTraders(Client* client); + void SendTraders(Client* client); void AddClient(Client*); void AddNPC(NPC*, bool SendSpawnPacket = true, bool dontqueue = false); void AddMerc(Merc*, bool SendSpawnPacket = true, bool dontqueue = false); @@ -250,7 +250,7 @@ public: // Entity* GetEntityGroup(uint32 id); Entity* GetEntityTrap(uint16 id); Entity* GetEntityBeacon(uint16 id); - + void DescribeAggro(Client *towho, NPC *from_who, float dist, bool verbose); void Message(uint32 to_guilddbid, uint32 type, const char* message, ...); @@ -298,14 +298,14 @@ public: void AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true, int16 resist_adjust = 0); void MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true); void AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true); - + void RadialSetLogging(Mob *around, bool enabled, bool clients, bool non_clients, float range = 0); //trap stuff Mob* GetTrapTrigger(Trap* trap); void SendAlarm(Trap* trap, Mob* currenttarget, uint8 kos); Trap* FindNearbyTrap(Mob* searcher, float max_dist); - + void AddHealAggro(Mob* target, Mob* caster, uint16 thedam); Mob* FindDefenseNPC(uint32 npcid); void OpenDoorsNear(NPC* opener); @@ -338,14 +338,14 @@ public: void ClearFeignAggro(Mob* targ); void ClearZoneFeignAggro(Client* targ); void AggroZone(Mob* who, int hate = 0); - + bool Fighting(Mob* targ); void RemoveFromHateLists(Mob* mob, bool settoone = false); void RemoveDebuffs(Mob* caster); void MessageGroup(Mob* sender, bool skipclose, uint32 type, const char* message, ...); - + void LimitAddNPC(NPC *npc); void LimitRemoveNPC(NPC *npc); bool LimitCheckType(uint32 npc_type, int count); @@ -409,11 +409,11 @@ protected: private: void AddToSpawnQueue(uint16 entityid, NewSpawn_Struct** app); void CheckSpawnQueue(); - + //used for limiting spawns class SpawnLimitRecord { public: uint32 spawngroup_id; uint32 npc_type; }; map npc_limit_list; //entity id -> npc type - + uint32 tsFirstSpawnOnQueue; // timestamp that the top spawn on the spawnqueue was added, should be 0xFFFFFFFF if queue is empty uint32 NumSpawnsOnQueue; LinkedList SpawnQueue; @@ -454,7 +454,7 @@ class BulkZoneSpawnPacket { public: BulkZoneSpawnPacket(Client* iSendTo, uint32 iMaxSpawnsPerPacket); // 0 = send zonewide virtual ~BulkZoneSpawnPacket(); - + bool AddSpawn(NewSpawn_Struct* ns); void SendBuffer(); // Sends the buffer and cleans up everything - can safely re-use the object after this function call (no need to free and do another new) private: diff --git a/zone/errmsg.h b/zone/errmsg.h index 8087c5269..03863ec61 100644 --- a/zone/errmsg.h +++ b/zone/errmsg.h @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, diff --git a/zone/exp.cpp b/zone/exp.cpp index 2a9cdc6a0..0af39c061 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -52,10 +52,10 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { if(!resexp && (XPRate != 0)) add_exp = static_cast(in_add_exp * (static_cast(XPRate) / 100.0f)); - + if (m_epp.perAA<0 || m_epp.perAA>100) m_epp.perAA=0; // stop exploit with sanity check - + uint32 add_aaxp; if(resexp) { add_aaxp = 0; @@ -65,7 +65,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { add_aaxp = add_exp * m_epp.perAA / 100; //take that ammount away from regular exp add_exp -= add_aaxp; - + float totalmod = 1.0; float zemmod = 1.0; //get modifiers @@ -94,7 +94,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { } add_exp = uint32(float(add_exp) * totalmod * zemmod); - + if(RuleB(Character,UseXPConScaling)) { if (conlevel != 0xFF && !resexp) { @@ -163,7 +163,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { aatotalmod *= zone->newzone_data.zone_exp_multiplier; } - + if(RuleB(Character,UseRaceClassExpBonuses)) { @@ -190,7 +190,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { aaexp += had_aaexp; if(aaexp < had_aaexp) aaexp = had_aaexp; //watch for wrap - + SetEXP(exp, aaexp, resexp); } @@ -202,8 +202,8 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { Message(13, "Error in Client::SetEXP. EXP not set."); return; // Must be invalid class/race } - - + + if ((set_exp + set_aaxp) > (m_pp.exp+m_pp.expAA)) { if (isrezzexp) this->Message_StringID(MT_Experience, REZ_REGAIN); @@ -219,7 +219,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { else if((set_exp + set_aaxp) < (m_pp.exp+m_pp.expAA)){ //only loss message if you lose exp, no message if you gained/lost nothing. Message(15, "You have lost experience."); } - + //check_level represents the level we should be when we have //this ammount of exp (once these loops complete) uint16 check_level = GetLevel()+1; @@ -245,37 +245,37 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { } check_level--; - + //see if we gained any AAs if (set_aaxp >= max_AAXP) { /* Note: AA exp is stored differently than normal exp. - Exp points are only stored in m_pp.expAA until you - gain a full AA point, once you gain it, a point is + Exp points are only stored in m_pp.expAA until you + gain a full AA point, once you gain it, a point is added to m_pp.aapoints and the ammount needed to gain that point is subtracted from m_pp.expAA - + then, once they spend an AA point, it is subtracted from m_pp.aapoints. In theory it then goes into m_pp.aapoints_spent, but im not sure if we have that in the right spot. */ //record how many points we have uint32 last_unspentAA = m_pp.aapoints; - + //figure out how many AA points we get from the exp were setting m_pp.aapoints = set_aaxp / max_AAXP; _log(CLIENT__EXP, "Calculating additional AA Points from AAXP for %s: %u / %u = %.1f points", this->GetCleanName(), set_aaxp, max_AAXP, (float)set_aaxp / (float)max_AAXP); - + //get remainder exp points, set in PP below set_aaxp = set_aaxp - (max_AAXP * m_pp.aapoints); - + //add in how many points we had m_pp.aapoints += last_unspentAA; //set_aaxp = m_pp.expAA % max_AAXP; - + //figure out how many points were actually gained /*uint32 gained = m_pp.aapoints - last_unspentAA;*/ //unused - + //Message(15, "You have gained %d skill points!!", m_pp.aapoints - last_unspentAA); char val1[20]={0}; Message_StringID(MT_Experience, GAIN_ABILITY_POINT,ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)"); //You have gained an ability point! You now have %1 ability point%2. @@ -286,7 +286,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { if(maxlevel <= 1) maxlevel = RuleI(Character, MaxLevel) + 1; - + if(check_level > maxlevel) { check_level = maxlevel; @@ -299,7 +299,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { set_exp = GetEXPForLevel(maxlevel); } } - + if(RuleB(Character, PerCharacterQglobalMaxLevel)){ uint32 MaxLevel = GetCharMaxLevelFromQGlobal(); if(MaxLevel){ @@ -328,7 +328,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { Message(15, "Welcome to level %i!", check_level); SetLevel(check_level); } - + //If were at max level then stop gaining experience if we make it to the cap if(GetLevel() == maxlevel - 1){ uint32 expneeded = GetEXPForLevel(maxlevel); @@ -336,12 +336,12 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { { set_exp = expneeded; } - } - + } + //set the client's EXP and AAEXP m_pp.exp = set_exp; m_pp.expAA = set_aaxp; - + if (GetLevel() < 51) { m_epp.perAA = 0; // turn off aa exp if they drop below 51 } else @@ -358,7 +358,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { eu->exp = (uint32)(330.0f * tmpxp); FastQueuePacket(&outapp); } - + if (admin>=100 && GetGM()) { char val1[20]={0}; char val2[20]={0}; @@ -433,7 +433,7 @@ void Client::SetLevel(uint8 set_level, bool command) { SetHP(CalcMaxHP()); // Why not, lets give them a free heal } - + DoTributeUpdate(); SendHPUpdate(); SetMana(CalcMaxMana()); @@ -480,11 +480,11 @@ uint32 Client::GetEXPForLevel(uint16 check_level) mod = 3.0; else mod = 3.1; - + float base = (check_levelm1)*(check_levelm1)*(check_levelm1); mod *= 1000; - + return(uint32(base * mod)); } @@ -511,21 +511,21 @@ void Group::SplitExp(uint32 exp, Mob* other) { if(other->GetOwner() && other->GetOwner()->IsClient()) // Ensure owner isn't pc return; - - unsigned int i; - uint32 groupexp = exp; - uint8 membercount = 0; + + unsigned int i; + uint32 groupexp = exp; + uint8 membercount = 0; uint8 maxlevel = 1; - - for (i = 0; i < MAX_GROUP_MEMBERS; i++) { - if (members[i] != nullptr) { - if(members[i]->GetLevel() > maxlevel) - maxlevel = members[i]->GetLevel(); + + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { + if (members[i] != nullptr) { + if(members[i]->GetLevel() > maxlevel) + maxlevel = members[i]->GetLevel(); membercount++; - } + } } - + float groupmod; if (membercount == 2) groupmod = 1.2; @@ -545,25 +545,25 @@ void Group::SplitExp(uint32 exp, Mob* other) { int conlevel = Mob::GetLevelCon(maxlevel, other->GetLevel()); if(conlevel == CON_GREEN) return; //no exp for greenies... - - if (membercount == 0) - return; + + if (membercount == 0) + return; for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if (members[i] != nullptr && members[i]->IsClient()) // If Group Member is Client { Client *cmember = members[i]->CastToClient(); - // add exp + exp cap + // add exp + exp cap int16 diff = cmember->GetLevel() - maxlevel; int16 maxdiff = -(cmember->GetLevel()*15/10 - cmember->GetLevel()); if(maxdiff > -5) maxdiff = -5; - if (diff >= (maxdiff)) { /*Instead of person who killed the mob, the person who has the highest level in the group*/ + if (diff >= (maxdiff)) { /*Instead of person who killed the mob, the person who has the highest level in the group*/ uint32 tmp = (cmember->GetLevel()+3) * (cmember->GetLevel()+3) * 75 * 35 / 10; uint32 tmp2 = groupexp / membercount; - cmember->AddEXP( tmp < tmp2 ? tmp : tmp2, conlevel ); - } - } + cmember->AddEXP( tmp < tmp2 ? tmp : tmp2, conlevel ); + } + } } } @@ -574,17 +574,17 @@ void Raid::SplitExp(uint32 exp, Mob* other) { if(other->GetOwner() && other->GetOwner()->IsClient()) // Ensure owner isn't pc return; - uint32 groupexp = exp; - uint8 membercount = 0; + uint32 groupexp = exp; + uint8 membercount = 0; uint8 maxlevel = 1; - for (int i = 0; i < MAX_RAID_MEMBERS; i++) { - if (members[i].member != nullptr) { - if(members[i].member->GetLevel() > maxlevel) - maxlevel = members[i].member->GetLevel(); + for (int i = 0; i < MAX_RAID_MEMBERS; i++) { + if (members[i].member != nullptr) { + if(members[i].member->GetLevel() > maxlevel) + maxlevel = members[i].member->GetLevel(); - membercount++; - } + membercount++; + } } groupexp = (uint32)((float)groupexp * (1.0f-(RuleR(Character, RaidExpMultiplier)))); @@ -593,24 +593,24 @@ void Raid::SplitExp(uint32 exp, Mob* other) { if(conlevel == CON_GREEN) return; //no exp for greenies... - if (membercount == 0) - return; + if (membercount == 0) + return; for (unsigned int x = 0; x < MAX_RAID_MEMBERS; x++) { if (members[x].member != nullptr) // If Group Member is Client { Client *cmember = members[x].member; - // add exp + exp cap + // add exp + exp cap int16 diff = cmember->GetLevel() - maxlevel; int16 maxdiff = -(cmember->GetLevel()*15/10 - cmember->GetLevel()); if(maxdiff > -5) maxdiff = -5; - if (diff >= (maxdiff)) { /*Instead of person who killed the mob, the person who has the highest level in the group*/ + if (diff >= (maxdiff)) { /*Instead of person who killed the mob, the person who has the highest level in the group*/ uint32 tmp = (cmember->GetLevel()+3) * (cmember->GetLevel()+3) * 75 * 35 / 10; uint32 tmp2 = (groupexp / membercount) + 1; - cmember->AddEXP( tmp < tmp2 ? tmp : tmp2, conlevel ); - } - } + cmember->AddEXP( tmp < tmp2 ? tmp : tmp2, conlevel ); + } + } } } @@ -625,10 +625,10 @@ void Client::SetLeadershipEXP(uint32 group_exp, uint32 raid_exp) { m_pp.raid_leadership_points++; Message_StringID(MT_Leadership, GAIN_RAID_LEADERSHIP_POINT); } - + m_pp.group_leadership_exp = group_exp; m_pp.raid_leadership_exp = raid_exp; - + SendLeadershipEXPUpdate(); } @@ -639,12 +639,12 @@ void Client::AddLeadershipEXP(uint32 group_exp, uint32 raid_exp) { void Client::SendLeadershipEXPUpdate() { EQApplicationPacket* outapp = new EQApplicationPacket(OP_LeadershipExpUpdate, sizeof(LeadershipExpUpdate_Struct)); LeadershipExpUpdate_Struct* eu = (LeadershipExpUpdate_Struct *) outapp->pBuffer; - + eu->group_leadership_exp = m_pp.group_leadership_exp; eu->group_leadership_points = m_pp.group_leadership_points; eu->raid_leadership_exp = m_pp.raid_leadership_exp; eu->raid_leadership_points = m_pp.raid_leadership_points; - + FastQueuePacket(&outapp); } diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp index ed7d5045a..87a9b4317 100644 --- a/zone/fearpath.cpp +++ b/zone/fearpath.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -43,7 +43,7 @@ void Mob::CheckFlee() { //if were allready fleeing, dont need to check more... if(flee_mode && curfp) return; - + //dont bother if we are immune to fleeing if(SpecAttacks[IMMUNE_FLEEING] || spellbonuses.ImmuneToFlee) return; @@ -51,12 +51,12 @@ void Mob::CheckFlee() { if(!flee_timer.Check()) return; //only do all this stuff every little while, since //its not essential that we start running RIGHT away - + //see if were possibly hurt enough float ratio = GetHPRatio(); if(ratio >= RuleI(Combat, FleeHPRatio)) return; - + //we might be hurt enough, check con now.. Mob *hate_top = GetHateTop(); if(!hate_top) { @@ -64,14 +64,14 @@ void Mob::CheckFlee() { StartFleeing(); return; } - + float other_ratio = hate_top->GetHPRatio(); if(other_ratio < 20) { //our hate top is almost dead too... stay and fight return; } - - //base our flee ratio on our con. this is how the + + //base our flee ratio on our con. this is how the //attacker sees the mob, since this is all we can observe uint32 con = GetLevelCon(hate_top->GetLevel(), GetLevel()); float run_ratio; @@ -92,8 +92,8 @@ void Mob::CheckFlee() { } if(ratio < run_ratio) { - if( RuleB(Combat, FleeIfNotAlone) - || ( !RuleB(Combat, FleeIfNotAlone) + if( RuleB(Combat, FleeIfNotAlone) + || ( !RuleB(Combat, FleeIfNotAlone) && (entity_list.GetHatedCount(hate_top, this) == 0))) StartFleeing(); @@ -103,8 +103,8 @@ void Mob::CheckFlee() { void Mob::ProcessFlee() { - //Stop fleeing if effect is applied after they start to run. - //When ImmuneToFlee effect fades it will turn fear back on and check if it can still flee. + //Stop fleeing if effect is applied after they start to run. + //When ImmuneToFlee effect fades it will turn fear back on and check if it can still flee. if(flee_mode && (SpecAttacks[IMMUNE_FLEEING] || spellbonuses.ImmuneToFlee) && !spellbonuses.IsFeared){ curfp = false; return; @@ -113,11 +113,11 @@ void Mob::ProcessFlee() { //see if we are still dying, if so, do nothing if(GetHPRatio() < (float)RuleI(Combat, FleeHPRatio)) return; - + //we are not dying anymore... see what we do next - + flee_mode = false; - + //see if we are legitimately feared now if(!spellbonuses.IsFeared) { //not feared... were done... @@ -141,7 +141,7 @@ float Mob::GetFearSpeed() { ratio = FLEE_HP_MINSPEED; speed = speed * 0.5 * ratio / 100; - + return(speed); } return(GetRunspeed()); @@ -152,7 +152,7 @@ void Mob::CalculateNewFearpoint() if(RuleB(Pathing, Fear) && zone->pathing) { int Node = zone->pathing->GetRandomPathNode(); - + VERTEX Loc = zone->pathing->GetPathNodeCoordinates(Node); ++Loc.z; @@ -218,15 +218,15 @@ void Mob::CalculateNewFearpoint() safe_delete(fear_path_state); return; } - + flee_mode = flee; - + //fear dosent work without at least maps if(zone->zonemap == nullptr) { fear_state = fearStateStuck; return; //just stand there } - + //if we are allready feared, and we are on a fear grid.. //then just stay happy on the grid... if(fear_path_state != nullptr) { @@ -236,16 +236,16 @@ void Mob::CalculateNewFearpoint() } return; } - + //try to run straight away from the caster VERTEX hit, fear_vector; if(FearTryStraight(caster, duration, flee, hit, fear_vector)) { return; } - + //OK, so if we just run, we are going to hit something... //now we have to think a little more. - + //first, try to find a fear node that we can see. if(zone->pathing != nullptr) { fear_path_state = new MobFearState(); @@ -261,16 +261,16 @@ void Mob::CalculateNewFearpoint() fear_state = fearStateGrid; return; } - + //we have failed to find a path, so we dont need this.. safe_delete(fear_path_state); } - + //if we cannot just run, and we cannot see any paths, then - //we will give one last ditch effort to find a legit path. We - //will run as far as we can away from the player, and hope we + //we will give one last ditch effort to find a legit path. We + //will run as far as we can away from the player, and hope we //can see a path from there if not, we will start breaking rules - + #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing Start: Hope run from (%.2f, %.2f, %.2f), hit at (%.2f, %.2f, %.2f)", GetX(), GetY(), GetZ(), hit.x, hit.y, hit.z); @@ -286,7 +286,7 @@ bool Mob::FearTryStraight(Mob *caster, uint32 duration, bool flee, VERTEX &hit, //gotta have somebody to run from if(caster == nullptr) return(false); - + //our goal is to run along this vector... fear_vector.x = GetX() - caster->GetX(); fear_vector.y = GetY() - caster->GetY(); @@ -294,22 +294,22 @@ bool Mob::FearTryStraight(Mob *caster, uint32 duration, bool flee, VERTEX &hit, float mag = sqrtf(fear_vector.x*fear_vector.x + fear_vector.y*fear_vector.y); fear_vector.x /= mag; fear_vector.y /= mag; - + //now see if we can just run without hitting anything... VERTEX start, end; start.x = GetX(); start.y = GetY(); start.z = GetZ() + 5.0; //raise up a little over small bumps - + //distance moved per movement tic. float distance = NPC_SPEED_MULTIPLIER * GetFearSpeed(); //times number of movement tics in the spell. distance *= float(duration) / float(AImovement_duration); - + end.x = start.x + fear_vector.x * distance; end.y = start.y + fear_vector.y * distance; end.z = start.z; - + if(!zone->zonemap->LineIntersectsZone(start, end, 0.5, &hit, nullptr)) { #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing Start: can run entire vector from (%.2f, %.2f, %.2f) to (%.2f, %.2f, %.2f)", @@ -322,7 +322,7 @@ bool Mob::FearTryStraight(Mob *caster, uint32 duration, bool flee, VERTEX &hit, fear_state = fearStateRunningForever; return(true); //were done, nothing difficult needed. } - + return(false); } @@ -331,19 +331,19 @@ void Mob::CalculateFearPosition() { if(zone->zonemap == nullptr || fear_state == fearStateStuck) { return; //just stand there } - + //This is the entire movement section, right here: if (cur_wp_x != GetX() && cur_wp_y != GetY()) { // not at waypoint yet, so keep moving - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetFearSpeed(), true); + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetFearSpeed(), true); return; - } - - - + } + + + //we have reached our waypoint, now what? //figure out a new waypoint to run at... - + if(fear_state == fearStateRunningForever) { if(flee_mode) { //a fleeing mob may run away again @@ -362,7 +362,7 @@ void Mob::CalculateFearPosition() { } #endif } - + //first see if we are on a path. if so our life is easy if(fear_state == fearStateGrid && fear_path_state) { //assume that we have zone->pathing since we got to this state. @@ -380,11 +380,11 @@ void Mob::CalculateFearPosition() { cur_wp_x = fear_path_state->x; cur_wp_y = fear_path_state->y; cur_wp_z = fear_path_state->z; - + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetFearSpeed(), true); return; } - + //the only valid state left is fearStateRunning, where we try to //find a grid once we reach our waypoint, which we have.. if(fear_state != fearStateRunning) { @@ -393,11 +393,11 @@ void Mob::CalculateFearPosition() { fear_state = fearStateStuck; return; } - + //we wanted to try to find a waypoint now, so lets try.. if(zone->pathing != nullptr) { fear_path_state = new MobFearState(); - + if(zone->pathing->FindNearestFear(fear_path_state, GetX(), GetY(), GetZ())) { #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing: ran to find path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", @@ -411,10 +411,10 @@ void Mob::CalculateFearPosition() { CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetFearSpeed(), true); return; } - + //if we get here... all valid methods have failed -#ifdef FORCE_FEAR_TO_RUN +#ifdef FORCE_FEAR_TO_RUN //ok, now we start making shit up //for now, we will limit our bullshitting to ignoring LOS @@ -434,11 +434,11 @@ void Mob::CalculateFearPosition() { return; } #endif //FORCE_FEAR_TO_RUN - + //we have failed to find a path once again, so we dont need this.. safe_delete(fear_path_state); } - + //if we get HERE... then NOTHING worked... just stick fear_state = fearStateStuck; @@ -447,20 +447,20 @@ void Mob::CalculateFearPosition() { //I dont wanna get rid of this right now because it was a lot of hard //work to write... but it dosent work reliably, so oh well.. -#ifdef OLD_FEAR_PATHING +#ifdef OLD_FEAR_PATHING /* The idea... - + try to run along fear vector. If we can see along it, run otherwise, try to walk up a hill along the same vector then try to move along a wall along largest component of FV if cant move, change stae to stuck. - + once we know a place to run, use the waypoint code to do it then if combat ends, we will reach the waypoint and - - + + */ /* //first try our original fear vector again... @@ -468,11 +468,11 @@ void Mob::CalculateFearPosition() { start.x = GetX() - fear_vector.x * 0.4; start.y = GetY() - fear_vector.y * 0.4; start.z = GetZ() + 6.0; //raise up a little over small bumps - + end.x = start.x + fear_vector.x * 10; end.y = start.y + fear_vector.y * 10; end.z = start.z; - + if(!zone->zonemap->LineIntersectsZone(start, end, 0.5, &normalhit, nullptr)) { #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing: From (%.2f, %.2f, %.2f) normal run to (%.2f, %.2f, %.2f)", @@ -482,23 +482,23 @@ void Mob::CalculateFearPosition() { cur_wp_x = end.x; cur_wp_y = end.y; cur_wp_z = end.z - 6.0; - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); return; } //see if we can make ANY useful progress along that vector - + //first, adjust normalhit to back up a little bit //so we dont run through the wall normalhit.x -= 0.4 * fear_vector.x; normalhit.y -= 0.4 * fear_vector.y; - + float xd = normalhit.x - start.x; if(xd < 0) xd = 0 - xd; float yd = normalhit.y - start.y; if(yd < 0) yd = 0 - yd; - + //this 2 is arbitrary if((xd+yd) > 2.0) { #ifdef FEAR_PATHING_DEBUG @@ -508,38 +508,38 @@ void Mob::CalculateFearPosition() { cur_wp_x = normalhit.x; cur_wp_y = normalhit.y; cur_wp_z = GetZ(); - + //try and fix up the Z coord if possible //not sure if this is worth it, since it prolly isnt up much - + NodeRef c = zone->zonemap->SeekNode(zone->zonemap->GetRoot(), end.x, end.y); if(c != NODE_NONE) { cur_wp_z = zone->zonemap->FindBestZ(c, end, &hit, nullptr); if(cur_wp_z < start.z) cur_wp_z = end.z; //revert on error } - - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); + + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); return; } - + #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing: From (%.2f, %.2f, %.2f) normal hit at (%.2f, %.2f, %.2f)", GetX(), GetY(), GetZ(), normalhit.x, normalhit.y, normalhit.z); #endif - + //if we get here, we cannot run along our normal vector... //try up hill first - + /* while this uphill stuff works great in outdoor zones, it totally breaks dungeons... - + float speed = GetRunspeed(); end.x = start.x + fear_vector.x * speed; end.y = start.y + fear_vector.y * speed; end.z = start.z + speed + speed; - + if(!zone->zonemap->LineIntersectsZone(start, end, 0.5, &hit, nullptr)) { #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing: From (%.2f, %.2f, %.2f) up hill run to (%.2f, %.2f, %.2f)", @@ -549,19 +549,19 @@ void Mob::CalculateFearPosition() { cur_wp_x = end.x - 0.4 * fear_vector.x; cur_wp_y = end.y - 0.4 * fear_vector.y; cur_wp_z = end.z; - + //try and fix up the Z coord if possible //not sure if this is worth it, since it prolly isnt up much - + NodeRef c = zone->zonemap->SeekNode(zone->zonemap->GetRoot(), end.x, end.y); if(c != NODE_NONE) { cur_wp_z = zone->zonemap->FindBestZ(c, end, &hit, nullptr); if(cur_wp_z < start.z) cur_wp_z = end.z; //revert on error } - - - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); + + + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); return; } */ @@ -578,7 +578,7 @@ void Mob::CalculateFearPosition() { end.y = start.y + fear_vector.y * 3; } end.z = start.z + 3; //a little lift as always - + if(!zone->zonemap->LineIntersectsZone(start, end, 0.5, &hit, nullptr)) { #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing: From (%.2f, %.2f, %.2f) strafe 1 to (%.2f, %.2f, %.2f)", @@ -588,10 +588,10 @@ void Mob::CalculateFearPosition() { cur_wp_x = end.x - 0.4 * fear_vector.x; cur_wp_y = end.y - 0.4 * fear_vector.y; cur_wp_z = end.z - 3; - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); return; } - + //now the other... if(fear_vector.x < fear_vector.y) { end.x = start.x + fear_vector.x * 3; @@ -601,7 +601,7 @@ void Mob::CalculateFearPosition() { end.y = start.y + fear_vector.y * 3; } end.z = start.z + 3; //a little lift as always - + if(!zone->zonemap->LineIntersectsZone(start, end, 0.5, &hit, nullptr)) { #ifdef FEAR_PATHING_DEBUG LogFile->write(EQEMuLog::Debug, "Fear Pathing: From (%.2f, %.2f, %.2f) strafe 2 to (%.2f, %.2f, %.2f)", @@ -611,13 +611,13 @@ void Mob::CalculateFearPosition() { cur_wp_x = end.x - 0.4 * fear_vector.x; cur_wp_y = end.y - 0.4 * fear_vector.y; cur_wp_z = end.z - 3; - CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); + CalculateNewPosition2(cur_wp_x, cur_wp_y, cur_wp_z, GetRunspeed(), true); return; } - + //if we get here... we have wasted enough CPU cycles //just call it quits on fear pathing... - + //send them to normalhit and then stop cur_wp_x = normalhit.x; cur_wp_y = normalhit.y; diff --git a/zone/forage.cpp b/zone/forage.cpp index 175fb06c9..e7aa48ce0 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -89,18 +89,18 @@ uint32 ZoneDatabase::GetZoneForage(uint32 ZoneID, uint8 skill) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + uint8 index = 0; uint32 item[FORAGE_ITEM_LIMIT]; uint32 chance[FORAGE_ITEM_LIMIT]; uint32 ret; - + for (int c=0; c < FORAGE_ITEM_LIMIT; c++) { item[c] = 0; } - + uint32 chancepool = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT itemid,chance FROM forage WHERE zoneid= '%i' and level <= '%i' LIMIT %i", ZoneID, skill, FORAGE_ITEM_LIMIT), errbuf, &result)) { safe_delete_array(query); @@ -111,7 +111,7 @@ LogFile->write(EQEMuLog::Error, "Possible Forage: %d with a %d chance", item[ind chancepool = chance[index]; index++; } - + mysql_free_result(result); } else { @@ -119,14 +119,14 @@ LogFile->write(EQEMuLog::Error, "Possible Forage: %d with a %d chance", item[ind safe_delete_array(query); return 0; } - + if(chancepool == 0 || index < 1) return(0); - + if(index == 1) { return(item[0]); } - + ret = 0; uint32 rindex = MakeRandomInt(1, chancepool); @@ -137,7 +137,7 @@ LogFile->write(EQEMuLog::Error, "Possible Forage: %d with a %d chance", item[ind break; } } - + return ret; } @@ -147,7 +147,7 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + uint8 index = 0; uint32 item[50]; uint32 chance[50]; @@ -155,12 +155,12 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint32 npc_chances[50]; uint32 chancepool = 0; uint32 ret = 0; - + for (int c=0; c<50; c++) { item[c]=0; chance[c]=0; } - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT itemid,chance,npc_id,npc_chance FROM fishing WHERE (zoneid= '%i' || zoneid = 0) and skill_level <= '%i'",ZoneID, skill ), errbuf, &result)) { safe_delete_array(query); @@ -168,12 +168,12 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, item[index] = atoi(row[0]); chance[index] = atoi(row[1])+chancepool; chancepool = chance[index]; - + npc_ids[index] = atoi(row[2]); npc_chances[index] = atoi(row[3]); index++; } - + mysql_free_result(result); } else { @@ -181,7 +181,7 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, safe_delete_array(query); return 0; } - + npc_id = 0; npc_chance = 0; if (index>0) { @@ -199,7 +199,7 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, } else { ret = 0; } - + return ret; } @@ -234,10 +234,10 @@ bool Client::CanFish() { HeadingDegrees = (int) ((GetHeading()*360)/256); HeadingDegrees = HeadingDegrees % 360; - + RodX = x_pos + RodLength * sin(HeadingDegrees * M_PI/180.0f); RodY = y_pos + RodLength * cos(HeadingDegrees * M_PI/180.0f); - + // Do BestZ to find where the line hanging from the rod intersects the water (if it is water). // and go 1 unit into the water. VERTEX dest; @@ -289,13 +289,13 @@ void Client::GoFish() 7007, // Rusty Dagger 7007, // Rusty Dagger 7007 // Rusty Dagger - + }; - + //success formula is not researched at all - + int fishing_skill = GetSkill(FISHING); //will take into account skill bonuses on pole & bait - + //make sure we still have a fishing pole on: int32 bslot = m_inv.HasItemByUse(ItemTypeFishingBait, 1, invWhereWorn|invWherePersonal); const ItemInst* Bait = nullptr; @@ -306,21 +306,21 @@ void Client::GoFish() if(bslot >= IDX_INV && Bait->GetItem()->SkillModType == FISHING) { fishing_skill += Bait->GetItem()->SkillModValue; } - + if (fishing_skill > 100) { fishing_skill = 100+((fishing_skill-100)/2); } - + if (MakeRandomInt(0,175) < fishing_skill) { uint32 food_id = 0; - + //25% chance to fish an item. if (MakeRandomInt(0, 399) <= fishing_skill ) { uint32 npc_id = 0; uint8 npc_chance = 0; food_id = database.GetZoneFishing(m_pp.zone_id, fishing_skill, npc_id, npc_chance); - + //check for add NPC if(npc_chance > 0 && npc_id) { if(npc_chance < MakeRandomInt(0, 99)) { @@ -328,31 +328,31 @@ void Client::GoFish() if(tmp != nullptr) { NPC* npc = new NPC(tmp, nullptr, GetX()+3, GetY(), GetZ(), GetHeading(), FlyMode3); npc->AddLootTable(); - + npc->AddToHateList(this, 1, 0, false); //no help yelling - + entity_list.AddNPC(npc); - + Message(MT_Emote, "You fish up a little more than you bargained for..."); } } } } - + //consume bait, should we always consume bait on success? DeleteItemInInventory(bslot, 1, true); //do we need client update? - + if(food_id == 0) { int index = MakeRandomInt(0, MAX_COMMON_FISH_IDS-1); food_id = common_fish_ids[index]; } - + const Item_Struct* food_item = database.GetItem(food_id); - + Message_StringID(MT_Skills, FISHING_SUCCESS); const ItemInst* inst = database.CreateItem(food_item, 1); if(inst != nullptr) { - if(CheckLoreConflict(inst->GetItem())) + if(CheckLoreConflict(inst->GetItem())) { this->Message_StringID(0,DUP_LORE); } @@ -384,7 +384,7 @@ void Client::GoFish() parse->EventPlayer(EVENT_FISH_FAILURE, this, "", 0); } - + //chance to break fishing pole... //this is potentially exploitable in that they can fish //and then swap out items in primary slot... too lazy to fix right now @@ -401,9 +401,9 @@ void Client::GoFish() } void Client::ForageItem(bool guarantee) { - + int skill_level = GetSkill(FORAGE); - + //be wary of the string ids in switch below when changing this. uint32 common_food_ids[MAX_COMMON_FOOD_IDS] = { 13046, // Fruit @@ -415,23 +415,23 @@ void Client::ForageItem(bool guarantee) { 14905, // mushroom 13106 // Fishing Grubs }; - + // these may need to be fine tuned, I am just guessing here if (guarantee || MakeRandomInt(0,199) < skill_level) { uint32 foragedfood = 0; uint32 stringid = FORAGE_NOEAT; - + if (MakeRandomInt(0,99) <= 25) { foragedfood = database.GetZoneForage(m_pp.zone_id, skill_level); } - + //not an else in case theres no DB food if(foragedfood == 0) { uint8 index = 0; index = MakeRandomInt(0, MAX_COMMON_FOOD_IDS-1); foragedfood = common_food_ids[index]; } - + const Item_Struct* food_item = database.GetItem(foragedfood); if(!food_item) { @@ -439,17 +439,17 @@ void Client::ForageItem(bool guarantee) { return; } - if(foragedfood == 13106) + if(foragedfood == 13106) stringid = FORAGE_GRUBS; else switch(food_item->ItemType) { - case ItemTypeFood: + case ItemTypeFood: stringid = FORAGE_FOOD; break; - - case ItemTypeDrink: - if(strstr(food_item->Name, "ater")) + + case ItemTypeDrink: + if(strstr(food_item->Name, "ater")) stringid = FORAGE_WATER; else stringid = FORAGE_DRINK; @@ -457,12 +457,12 @@ void Client::ForageItem(bool guarantee) { default: break; } - + Message_StringID(MT_Skills, stringid); const ItemInst* inst = database.CreateItem(food_item, 1); if(inst != nullptr) { // check to make sure it isn't a foraged lore item - if(CheckLoreConflict(inst->GetItem())) + if(CheckLoreConflict(inst->GetItem())) { this->Message_StringID(0,DUP_LORE); } @@ -474,9 +474,9 @@ void Client::ForageItem(bool guarantee) { } safe_delete(inst); } - + parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst != nullptr ? inst->GetItem()->ID : 0); - + int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems; if(!guarantee && MakeRandomInt(0,99) < ChanceSecondForage) { this->Message_StringID(MT_Skills, FORAGE_MASTERY); @@ -487,7 +487,7 @@ void Client::ForageItem(bool guarantee) { Message_StringID(MT_Skills, FORAGE_FAILED); parse->EventPlayer(EVENT_FORAGE_FAILURE, this, "", 0); } - + CheckIncreaseSkill(FORAGE, nullptr, 5); - + } diff --git a/zone/groups.cpp b/zone/groups.cpp index 5d0168607..b2ce46c13 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -33,16 +33,16 @@ extern WorldServer worldserver; /* note about how groups work: -A group contains 2 list, a list of pointers to members and a +A group contains 2 list, a list of pointers to members and a list of member names. All members of a group should have their name in the membername array, wether they are in the zone or not. Only members in this zone will have non-null pointers in the -members array. +members array. */ //create a group which should allready exist in the database -Group::Group(uint32 gid) +Group::Group(uint32 gid) : GroupIDConsumer(gid) { leader = nullptr; @@ -55,7 +55,7 @@ Group::Group(uint32 gid) uint32 i; for(i=0;i 1) { @@ -147,7 +147,7 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu copper += 10 * mod; } } - + //calculate the splits //We can still round off copper pieces, but I dont care uint32 sc; @@ -161,7 +161,7 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu buf[63] = '\0'; string msg = "You receive"; bool one = false; - + if(ppsplit > 0) { snprintf(buf, 63, " %u platinum", ppsplit); msg += buf; @@ -191,13 +191,13 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu one = true; } msg += " as your split"; - - for (i = 0; i < MAX_GROUP_MEMBERS; i++) { + + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if (members[i] != nullptr && members[i]->IsClient()) { // If Group Member is Client Client *c = members[i]->CastToClient(); //I could not get MoneyOnCorpse to work, so we use this c->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true); - + c->Message(2, msg.c_str()); } } @@ -264,15 +264,15 @@ bool Group::AddMember(Mob* newmember, const char *NewMemberName, uint32 Characte MemberRoles[i] = 0; int x=1; - - //build the template join packet + + //build the template join packet EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; + GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; strcpy(gj->membername, NewMemberName); gj->action = groupActJoin; gj->leader_aas = LeaderAbilities; - + for (i = 0;i < MAX_GROUP_MEMBERS; i++) { if (members[i] != nullptr && members[i] != newmember) { //fill in group join & send it @@ -331,7 +331,7 @@ bool Group::AddMember(Mob* newmember, const char *NewMemberName, uint32 Characte #ifdef BOTS for (i = 0;i < MAX_GROUP_MEMBERS; i++) { if (members[i] != nullptr && members[i]->IsBot()) { - members[i]->CastToBot()->CalcChanceToCast(); + members[i]->CastToBot()->CalcChanceToCast(); } } #endif //BOTS @@ -442,7 +442,7 @@ void Group::SendHPPacketsFrom(Mob *member) bool Group::UpdatePlayer(Mob* update){ VerifyGroup(); - + uint32 i=0; if(update->IsClient()) { //update their player profile @@ -459,7 +459,7 @@ bool Group::UpdatePlayer(Mob* update){ SendLeadershipAAUpdate(); } } - + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if (!strcasecmp(membername[i],update->GetName())) @@ -490,7 +490,7 @@ void Group::MemberZoned(Mob* removemob) { } #ifdef BOTS if (members[i] != nullptr && members[i]->IsBot()) { - members[i]->CastToBot()->CalcChanceToCast(); + members[i]->CastToBot()->CalcChanceToCast(); } #endif //BOTS } @@ -592,7 +592,7 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) } #ifdef BOTS if (members[i] != nullptr && members[i]->IsBot()) { - members[i]->CastToBot()->CalcChanceToCast(); + members[i]->CastToBot()->CalcChanceToCast(); } #endif //BOTS } @@ -608,7 +608,7 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) if(oldmember->IsClient()) database.SetGroupID(oldmember->GetCleanName(), 0, oldmember->CastToClient()->CharacterID()); - + oldmember->SetGrouped(false); disbandcheck = true; @@ -619,19 +619,19 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) SetGroupTankTarget(0); UnDelegateMainTank(oldmember->GetName()); } - + if(HasRole(oldmember, RoleAssist)) { SetGroupAssistTarget(0); UnDelegateMainAssist(oldmember->GetName()); } - + if(HasRole(oldmember, RolePuller)) { SetGroupPullerTarget(0); UnDelegatePuller(oldmember->GetName()); } - + if(oldmember->IsClient()) SendMarkedNPCsToMember(oldmember->CastToClient(), true); @@ -644,7 +644,7 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) ClearAllNPCMarks(); } - return true; + return true; } // does the caster + group @@ -657,7 +657,7 @@ void Group::CastGroupSpell(Mob* caster, uint16 spell_id) { castspell = true; range = caster->GetAOERange(spell_id); - + float range2 = range*range; // caster->SpellOnTarget(spell_id, caster); @@ -699,7 +699,7 @@ void Group::GroupBardPulse(Mob* caster, uint16 spell_id) { castspell = true; range = caster->GetAOERange(spell_id); - + float range2 = range*range; for(z=0; z < MAX_GROUP_MEMBERS; z++) { @@ -767,7 +767,7 @@ void Group::GroupMessage(Mob* sender, uint8 language, uint8 lang_skill, const ch strcpy(gcm->from, sender->GetName()); strcpy(gcm->message, message); worldserver.SendPacket(pack); - safe_delete(pack); + safe_delete(pack); } uint32 Group::GetTotalGroupDamage(Mob* other) { @@ -805,7 +805,7 @@ void Group::DisbandGroup() { database.SetGroupID(members[i]->GetName(), 0, members[i]->CastToClient()->CharacterID()); members[i]->CastToClient()->QueuePacket(outapp); SendMarkedNPCsToMember(members[i]->CastToClient(), true); - + } members[i]->SetGrouped(false); @@ -814,14 +814,14 @@ void Group::DisbandGroup() { } ClearAllNPCMarks(); - + ServerPacket* pack = new ServerPacket(ServerOP_DisbandGroup, sizeof(ServerDisbandGroup_Struct)); ServerDisbandGroup_Struct* dg = (ServerDisbandGroup_Struct*)pack->pBuffer; dg->zoneid = zone->GetZoneID(); dg->groupid = GetID(); dg->instance_id = zone->GetInstanceID(); worldserver.SendPacket(pack); - safe_delete(pack); + safe_delete(pack); entity_list.RemoveGroup(GetID()); if(GetID() != 0) @@ -846,12 +846,12 @@ void Group::SendUpdate(uint32 type, Mob* member) { if(!member->IsClient()) return; - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate, sizeof(GroupUpdate2_Struct)); - GroupUpdate2_Struct* gu = (GroupUpdate2_Struct*)outapp->pBuffer; + GroupUpdate2_Struct* gu = (GroupUpdate2_Struct*)outapp->pBuffer; gu->action = type; strcpy(gu->yourname,member->GetName()); - + int x = 0; gu->leader_aas = LeaderAbilities; @@ -883,16 +883,16 @@ void Group::SendLeadershipAAUpdate() EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gu = (GroupJoin_Struct*)outapp->pBuffer; + GroupJoin_Struct* gu = (GroupJoin_Struct*)outapp->pBuffer; gu->action = groupActAAUpdate; - + uint32 i = 0; gu->leader_aas = LeaderAbilities; gu->NPCMarkerID = GetNPCMarkerID(); - + for (i = 0;i < MAX_GROUP_MEMBERS; ++i) if(members[i] && members[i]->IsClient()) { @@ -953,7 +953,7 @@ void Group::TeleportGroup(Mob* sender, uint32 zoneID, uint16 instance_id, float { members[i]->CastToClient()->MovePC(zoneID, instance_id, x, y, z, heading, 0, ZoneSolicited); } - } + } } bool Group::LearnMembers() { @@ -1000,7 +1000,7 @@ LogFile->write(EQEMuLog::Debug, "Group %lu: Verify %d: Empty.\n", (unsigned long members[i] = nullptr; continue; } - + //it should be safe to use GetClientByName, but Group is trying //to be generic, so we'll go for general Mob Mob *them = entity_list.GetMob(membername[i]); @@ -1012,7 +1012,7 @@ LogFile->write(EQEMuLog::Debug, "Group %lu: Verify %d: Empty.\n", (unsigned long members[i] = nullptr; continue; } - + if(them != nullptr && members[i] != them) { //our pointer is out of date... not so good. #if EQDEBUG >= 5 LogFile->write(EQEMuLog::Debug, "Member of group %lu named '%s' had an out of date pointer!!", (unsigned long)GetID(), membername[i]); @@ -1032,10 +1032,10 @@ void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, co for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if(members[i] == nullptr) continue; - + if(members[i] == sender) continue; - + members[i]->Message_StringID(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, 0); } } @@ -1044,7 +1044,7 @@ void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, co void Client::LeaveGroup() { Group *g = GetGroup(); - + if(g) { if(g->GroupCount() < 3) g->DisbandGroup(); @@ -1054,7 +1054,7 @@ void Client::LeaveGroup() { //force things a little database.SetGroupID(GetName(), 0, CharacterID()); } - + isgrouped = false; } @@ -1130,7 +1130,7 @@ void Group::BalanceMana(int32 penalty) for(gi = 0; gi < MAX_GROUP_MEMBERS; gi++) { if(members[gi]){ - if((members[gi]->GetMaxMana() - manataken) < 1){ + if((members[gi]->GetMaxMana() - manataken) < 1){ members[gi]->SetMana(1); if (members[gi]->IsClient()) members[gi]->CastToClient()->SendManaUpdate(); @@ -1229,7 +1229,7 @@ void Group::MarkNPC(Mob* Target, int Number) safe_delete(outapp); - UpdateXTargetMarkedNPC(Number, m); + UpdateXTargetMarkedNPC(Number, m); } void Group::DelegateMainTank(const char *NewMainTankName, uint8 toggle) @@ -1238,7 +1238,7 @@ void Group::DelegateMainTank(const char *NewMainTankName, uint8 toggle) // (or himself). All group members in the zone are notified of the new Main Tank and it is recorded // in the group_leaders table so as to persist across zones. // - + bool updateDB = false; if(!NewMainTankName) @@ -1251,7 +1251,7 @@ void Group::DelegateMainTank(const char *NewMainTankName, uint8 toggle) if(MainTankName != NewMainTankName || !toggle) updateDB = true; - + if(m->GetTarget()) TankTargetID = m->GetTarget()->GetID(); else @@ -1290,7 +1290,7 @@ void Group::DelegateMainAssist(const char *NewMainAssistName, uint8 toggle) // (or himself). All group members in the zone are notified of the new Main Assist and it is recorded // in the group_leaders table so as to persist across zones. // - + bool updateDB = false; if(!NewMainAssistName) @@ -1300,7 +1300,7 @@ void Group::DelegateMainAssist(const char *NewMainAssistName, uint8 toggle) if(!m) return; - + if(MainAssistName != NewMainAssistName || !toggle) updateDB = true; @@ -1339,7 +1339,7 @@ void Group::DelegatePuller(const char *NewPullerName, uint8 toggle) // (or himself). All group members in the zone are notified of the new Puller and it is recorded // in the group_leaders table so as to persist across zones. // - + bool updateDB = false; if(!NewPullerName) @@ -1349,7 +1349,7 @@ void Group::DelegatePuller(const char *NewPullerName, uint8 toggle) if(!m) return; - + if(PullerName != NewPullerName || !toggle) updateDB = true; @@ -1412,7 +1412,7 @@ void Group::NotifyMainTank(Client *c, uint8 toggle) strn0cpy(grs->Name2, GetLeaderName(), sizeof(grs->Name2)); - grs->RoleNumber = 1; + grs->RoleNumber = 1; grs->Toggle = toggle; @@ -1420,7 +1420,7 @@ void Group::NotifyMainTank(Client *c, uint8 toggle) safe_delete(outapp); } - + } void Group::NotifyMainAssist(Client *c, uint8 toggle) @@ -1533,7 +1533,7 @@ void Group::UnDelegateMainTank(const char *OldMainTankName, uint8 toggle) LogFile->write(EQEMuLog::Error, "Unable to clear group main tank: %s\n", errbuff); safe_delete_array(Query); - + if(!toggle) { for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) { if(members[i] && members[i]->IsClient()) @@ -1587,7 +1587,7 @@ void Group::UnDelegateMainAssist(const char *OldMainAssistName, uint8 toggle) LogFile->write(EQEMuLog::Error, "Unable to clear group main assist: %s\n", errbuff); safe_delete_array(Query); - + if(!toggle) { for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) @@ -1619,7 +1619,7 @@ void Group::UnDelegatePuller(const char *OldPullerName, uint8 toggle) LogFile->write(EQEMuLog::Error, "Unable to clear group main puller: %s\n", errbuff); safe_delete_array(Query); - + if(!toggle) { for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) { if(members[i] && members[i]->IsClient()) @@ -1712,7 +1712,7 @@ void Group::NotifyAssistTarget(Client *c) Mob *m = entity_list.GetMob(AssistTargetID); c->UpdateXTargetType(GroupAssistTarget, m); - + } void Group::NotifyTankTarget(Client *c) @@ -1816,7 +1816,7 @@ void Group::UnDelegateMarkNPC(const char *OldNPCMarkerName) if(!NPCMarkerName.size()) return; - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_DelegateAbility, sizeof(DelegateAbility_Struct)); DelegateAbility_Struct* das = (DelegateAbility_Struct*)outapp->pBuffer; @@ -1858,9 +1858,9 @@ void Group::SaveGroupLeaderAA() char *Query = new char[200 + sizeof(GroupLeadershipAA_Struct)*2]; char *End = Query; - + End += sprintf(End, "UPDATE group_leaders SET leadershipaa='"); - + End += database.DoEscapeString(End, (char*)&LeaderAbilities, sizeof(GroupLeadershipAA_Struct)); End += sprintf(End,"' WHERE gid=%i LIMIT 1", GetID()); @@ -1868,7 +1868,7 @@ void Group::SaveGroupLeaderAA() char errbuff[MYSQL_ERRMSG_SIZE]; if (!database.RunQuery(Query, End - Query, errbuff)) LogFile->write(EQEMuLog::Error, "Unable to store LeadershipAA: %s\n", errbuff); - + safe_delete_array(Query); } @@ -1883,10 +1883,10 @@ void Group::UnMarkNPC(uint16 ID) if(AssistTargetID == ID) AssistTargetID = 0; - + if(TankTargetID == ID) TankTargetID = 0; - + if(PullerTargetID == ID) PullerTargetID = 0; @@ -1963,11 +1963,11 @@ void Group::ClearAllNPCMarks() int8 Group::GetNumberNeedingHealedInGroup(int8 hpr, bool includePets) { int8 needHealed = 0; - + for( int i = 0; iqglobal) { - if(members[i]->GetHPRatio() <= hpr) + if(members[i]->GetHPRatio() <= hpr) needHealed++; if(includePets) { @@ -1976,7 +1976,7 @@ int8 Group::GetNumberNeedingHealedInGroup(int8 hpr, bool includePets) { } } } - } + } return needHealed; @@ -2040,15 +2040,15 @@ void Group::ChangeLeader(Mob* newleader) // this changes the current group leader, notifies other members, and updates leadship AA // if the new leader is invalid, do nothing - if (!newleader) + if (!newleader) return; - + Mob* oldleader = GetLeader(); - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); GroupJoin_Struct* gu = (GroupJoin_Struct*) outapp->pBuffer; gu->action = groupActMakeLeader; - + strcpy(gu->membername, newleader->GetName()); strcpy(gu->yourname, oldleader->GetName()); SetLeader(newleader); @@ -2060,7 +2060,7 @@ void Group::ChangeLeader(Mob* newleader) { if(members[i]->CastToClient()->GetClientVersion() >= EQClientSoD) members[i]->CastToClient()->SendGroupLeaderChangePacket(newleader->GetName()); - + members[i]->CastToClient()->QueuePacket(outapp); } } diff --git a/zone/groups.h b/zone/groups.h index 6fa0b4fb0..a8b7955b5 100644 --- a/zone/groups.h +++ b/zone/groups.h @@ -36,7 +36,7 @@ public: GroupIDConsumer() { id = 0; } GroupIDConsumer(uint32 gid) { id = gid; } inline const uint32 GetID() const { return id; } - + protected: friend class EntityList; //use of this function is highly discouraged @@ -50,7 +50,7 @@ public: Group(Mob* leader); Group(uint32 gid); ~Group(); - + bool AddMember(Mob* newmember, const char* NewMemberName = nullptr, uint32 CharacterID = 0); void AddMember(const char* NewMemberName); void SendUpdate(uint32 type,Mob* member); @@ -131,7 +131,7 @@ public: void ChangeLeader(Mob* newleader); const char *GetClientNameByIndex(uint8 index); void UpdateXTargetMarkedNPC(uint32 Number, Mob *m); - + Mob* members[MAX_GROUP_MEMBERS]; char membername[MAX_GROUP_MEMBERS][64]; uint8 MemberRoles[MAX_GROUP_MEMBERS]; diff --git a/zone/guild.cpp b/zone/guild.cpp index f2238e0ca..29538128a 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -53,7 +53,7 @@ void Client::SendGuildMOTD(bool GetGuildMOTDReply) { GuildMOTD_Struct *motd = (GuildMOTD_Struct *) outapp->pBuffer; motd->unknown0 = 0; strn0cpy(motd->name, m_pp.name, 64); - + if(IsInAGuild()) { if(!guild_mgr.GetGuildMOTD(GuildID(), motd->motd, motd->setby_name)) { motd->setby_name[0] = '\0'; @@ -63,12 +63,12 @@ void Client::SendGuildMOTD(bool GetGuildMOTDReply) { //we have to send them an empty MOTD anywyas. motd->motd[0] = '\0'; //just to be sure motd->setby_name[0] = '\0'; //just to be sure - + } - + mlog(GUILDS__OUT_PACKETS, "Sending OP_GuildMOTD of length %d", outapp->size); mpkt(GUILDS__OUT_PACKET_TRACE, outapp); - + FastQueuePacket(&outapp); } @@ -126,7 +126,7 @@ void Client::SendGuildSpawnAppearance() { SendAppearancePacket(AT_GuildID, GuildID()); SendAppearancePacket(AT_GuildRank, rank); } - + UpdateWho(); } @@ -134,17 +134,17 @@ void Client::SendGuildList() { EQApplicationPacket *outapp; // outapp = new EQApplicationPacket(OP_ZoneGuildList); outapp = new EQApplicationPacket(OP_GuildsList); - + //ask the guild manager to build us a nice guild list packet outapp->pBuffer = guild_mgr.MakeGuildList(/*GetName()*/"", outapp->size); if(outapp->pBuffer == nullptr) { mlog(GUILDS__ERROR, "Unable to make guild list!"); return; } - + mlog(GUILDS__OUT_PACKETS, "Sending OP_ZoneGuildList of length %d", outapp->size); // mpkt(GUILDS__OUT_PACKET_TRACE, outapp); - + FastQueuePacket(&outapp); } @@ -154,15 +154,15 @@ void Client::SendGuildMembers() { uint8 *data = guild_mgr.MakeGuildMembers(GuildID(), GetName(), len); if(data == nullptr) return; //invalid guild, shouldent happen. - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_GuildMemberList); outapp->size = len; outapp->pBuffer = data; data = nullptr; - + mlog(GUILDS__OUT_PACKETS, "Sending OP_GuildMemberList of length %d", outapp->size); mpkt(GUILDS__OUT_PACKET_TRACE, outapp); - + FastQueuePacket(&outapp); ServerPacket* pack = new ServerPacket(ServerOP_RequestOnlineGuildMembers, sizeof(ServerRequestOnlineGuildMembers_Struct)); @@ -189,13 +189,13 @@ void Client::RefreshGuildInfo() guild_id = GUILD_NONE; bool WasBanker = GuildBanker; - + CharGuildInfo info; if(!guild_mgr.GetCharInfo(CharacterID(), info)) { mlog(GUILDS__ERROR, "Unable to obtain guild char info for %s (%d)", GetName(), CharacterID()); return; } - + guildrank = info.rank; guild_id = info.guild_id; GuildBanker = info.banker || guild_mgr.IsGuildLeader(GuildID(), CharacterID()); @@ -223,7 +223,7 @@ void Client::RefreshGuildInfo() GuildBanks->SendGuildBank(this); } } - + SendGuildSpawnAppearance(); } @@ -274,10 +274,10 @@ void EntityList::RefreshAllGuildInfo(uint32 guild_id) { void EntityList::SendGuildMembers(uint32 guild_id) { if(guild_id == GUILD_NONE) return; - + //this could be optimized a bit to only build the member's packet once //and then keep swapping out the name in the packet on each send. - + LinkedListIterator iterator(client_list); iterator.Reset(); while(iterator.MoreElements()) { @@ -308,19 +308,19 @@ void Client::SendGuildJoin(GuildJoin_Struct* gj){ strcpy(outgj->name, gj->name); outgj->rank = gj->rank; outgj->zoneid = gj->zoneid; - + mlog(GUILDS__OUT_PACKETS, "Sending OP_GuildManageAdd for join of length %d", outapp->size); mpkt(GUILDS__OUT_PACKET_TRACE, outapp); - + FastQueuePacket(&outapp); - + // SendGuildMembers(gj->guild_id, true); } /* void EntityList::SendGuildJoin(GuildJoin_Struct* gj){ LinkedListIterator iterator(client_list); - + iterator.Reset(); while(iterator.MoreElements()) { @@ -383,14 +383,14 @@ bool ZoneDatabase::CheckGuildDoor(uint8 doorid,uint16 guild_id,const char* zone) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - if (!RunQuery(query, MakeAnyLenString(&query, - "SELECT guild FROM doors where doorid=%i AND zone='%s'", + if (!RunQuery(query, MakeAnyLenString(&query, + "SELECT guild FROM doors where doorid=%i AND zone='%s'", doorid-128, zone), errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in CheckGuildDoor query '%s': %s", query, errbuf); safe_delete_array(query); return false; - } else { + } else { if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); if (atoi(row[0]) == guild_id) @@ -403,7 +403,7 @@ bool ZoneDatabase::CheckGuildDoor(uint8 doorid,uint16 guild_id,const char* zone) mysql_free_result(result); return false; } - + // code below will never be reached mysql_free_result(result); return false; @@ -418,7 +418,7 @@ bool ZoneDatabase::SetGuildDoor(uint8 doorid,uint16 guild_id, const char* zone) uint32 affected_rows = 0; if (doorid > 127) doorid = doorid - 128; - if (!RunQuery(query, MakeAnyLenString(&query, + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE doors SET guild = %i WHERE (doorid=%i) AND (zone='%s')", guild_id, doorid, zone), errbuf, 0,&affected_rows)) { @@ -426,9 +426,9 @@ bool ZoneDatabase::SetGuildDoor(uint8 doorid,uint16 guild_id, const char* zone) safe_delete_array(query); return false; } - + safe_delete_array(query); - + return(affected_rows > 0); } diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index b040acdfc..a8603f0b6 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -98,7 +98,7 @@ void ZoneGuildManager::SendGuildRefresh(uint32 guild_id, bool name, bool motd, b void ZoneGuildManager::SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uint32 charid) { if(guild_id == 0) { _log(GUILDS__REFRESH, "Guild lookup for char %d when sending char refresh.", charid); - + CharGuildInfo gci; if(!GetCharInfo(charid, gci)) { guild_id = GUILD_NONE; @@ -106,9 +106,9 @@ void ZoneGuildManager::SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uin guild_id = gci.guild_id; } } - + _log(GUILDS__REFRESH, "Sending char refresh for %d from guild %d to world", charid, guild_id); - + ServerPacket* pack = new ServerPacket(ServerOP_GuildCharRefresh, sizeof(ServerGuildCharRefresh_Struct)); ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer; s->guild_id = guild_id; @@ -138,7 +138,7 @@ void ZoneGuildManager::SendRankUpdate(uint32 CharID) safe_delete(pack); } - + void ZoneGuildManager::SendGuildDelete(uint32 guild_id) { _log(GUILDS__REFRESH, "Sending guild delete for guild %d to world", guild_id); ServerPacket* pack = new ServerPacket(ServerOP_DeleteGuild, sizeof(ServerGuildID_Struct)); @@ -151,7 +151,7 @@ void ZoneGuildManager::SendGuildDelete(uint32 guild_id) { //makes a guild member list packet (internal format), returns ownership of the buffer. uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_name, uint32 &length) { uint8 *retbuffer; - + //hack because we dont have the "remove from guild" packet right now. if(guild_id == GUILD_NONE) { length = sizeof(Internal_GuildMembers_Struct); @@ -163,11 +163,11 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na gms->note_length = 0; return(retbuffer); } - + vector members; if(!GetEntireGuild(guild_id, members)) return(nullptr); - + //figure out the actual packet length. uint32 fixed_length = sizeof(Internal_GuildMembers_Struct) + members.size()*sizeof(Internal_GuildMemberEntry_Struct); vector::iterator cur, end; @@ -181,32 +181,32 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na name_len += ci->char_name.length(); note_len += ci->public_note.length(); } - + //calc total length. length = fixed_length + name_len + note_len + members.size()*2; //string data + null terminators - + //make our nice buffer retbuffer = new uint8[length]; - + Internal_GuildMembers_Struct *gms = (Internal_GuildMembers_Struct *) retbuffer; - + //fill in the global header strcpy(gms->player_name, prefix_name); gms->count = members.size(); gms->name_length = name_len; gms->note_length = note_len; - + char *name_buf = (char *) ( retbuffer + fixed_length ); char *note_buf = (char *) ( name_buf + name_len + members.size() ); - + //fill in each member's entry. Internal_GuildMemberEntry_Struct *e = gms->member; - + cur = members.begin(); end = members.end(); for(; cur != end; cur++) { ci = *cur; - + //the order we set things here must match the struct //nice helper macro @@ -215,7 +215,7 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na field += str.length() + 1 #define PutField(field) \ e->field = ci->field - + SlideStructString( name_buf, ci->char_name ); PutField(level); e->banker = ci->banker + (ci->alt * 2); // low bit is banker flag, next bit is 'alt' flag. @@ -230,12 +230,12 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na e->zone_id = 0; // Flag them as offline (zoneid 0) as world will update us with their online status afterwards. #undef SlideStructString #undef PutFieldN - + delete *cur; - + e++; } - + return(retbuffer); } @@ -266,15 +266,15 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const { c->Message(0, "Guild %d not found.", guild_id); return; } - + const GuildInfo *info = res->second; - + c->Message(0, "Guild info DB# %i <%s>", guild_id, info->name.c_str()); - + char leadername[64]; database.GetCharName(info->leader_char_id, leadername); c->Message(0, "Guild Leader: %s", leadername); - + char permbuffer[256]; uint8 i; for (i = 0; i <= GUILD_MAX_RANK; i++) { @@ -282,14 +282,14 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const { uint8 r; for(r = 0; r < _MaxGuildAction; r++) permptr += sprintf(permptr, " %s: %c", GuildActionNames[r], info->ranks[i].permissions[r]?'Y':'N'); - + c->Message(0, "Rank %i: %s", i, info->ranks[i].name.c_str()); c->Message(0, "Permissions: %s", permbuffer); } - + } -//in theory, we could get a pile of unused entries in this array, but only if +//in theory, we could get a pile of unused entries in this array, but only if //we had a malicious client sending controlled packets, plus its like 10 bytes per entry. void ZoneGuildManager::RecordInvite(uint32 char_id, uint32 guild_id, uint8 rank) { m_inviteQueue[char_id] = pair(guild_id, rank); @@ -318,50 +318,50 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { return; } ServerGuildRefresh_Struct *s = (ServerGuildRefresh_Struct *) pack->pBuffer; - + _log(GUILDS__REFRESH, "Received guild refresh from world for %d, changes: name=%d, motd=%d, rank=%d, relation=%d", s->guild_id, s->name_change, s->motd_change, s->rank_change, s->relation_change); - + //reload all the guild details from the database. RefreshGuild(s->guild_id); - + if(s->motd_change) { //resend guild MOTD to all guild members in this zone. entity_list.SendGuildMOTD(s->guild_id); } - + if(s->name_change) { //until we figure out the guild update packet, we resend the whole guild list. entity_list.SendGuildList(); } - + if(s->rank_change) { //we need to send spawn appearance packets for all members of this guild in the zone, to everybody. entity_list.SendGuildSpawnAppearance(s->guild_id); } - + if(s->relation_change) { //unknown until we implement guild relations. } - + break; } - + case ServerOP_GuildCharRefresh: { if(pack->size != sizeof(ServerGuildCharRefresh_Struct)) { _log(GUILDS__ERROR, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildCharRefresh_Struct)); return; } ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer; - + _log(GUILDS__REFRESH, "Received guild member refresh from world for char %d from guild %d", s->char_id, s->guild_id); - + Client *c = entity_list.GetClientByCharID(s->char_id); - + if(c != nullptr) { //this reloads the char's guild info from the database and sends appearance updates c->RefreshGuildInfo(); } - + //it would be nice if we had the packet to send just a one-person update if(s->guild_id == GUILD_NONE) { if(c != nullptr) @@ -369,18 +369,18 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { } else { entity_list.SendGuildMembers(s->guild_id); //even send GUILD_NONE (empty) } - + if(s->old_guild_id != 0 && s->old_guild_id != GUILD_NONE && s->old_guild_id != s->guild_id) entity_list.SendGuildMembers(s->old_guild_id); else if(c != nullptr && s->guild_id != GUILD_NONE) { //char is in zone, and has changed into a new guild, send MOTD. c->SendGuildMOTD(); } - - + + break; } - + case ServerOP_GuildRankUpdate: { if(ZoneLoaded) @@ -394,7 +394,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { } ServerGuildRankUpdate_Struct *sgrus = (ServerGuildRankUpdate_Struct*)pack->pBuffer; - + EQApplicationPacket *outapp = new EQApplicationPacket(OP_SetGuildRank, sizeof(GuildSetRank_Struct)); GuildSetRank_Struct *gsrs = (GuildSetRank_Struct*)outapp->pBuffer; @@ -417,26 +417,26 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { return; } ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer; - + _log(GUILDS__REFRESH, "Received guild delete from world for guild %d", s->guild_id); - + //clear all the guild tags. entity_list.RefreshAllGuildInfo(s->guild_id); - + //remove the guild data from the local guild manager guild_mgr.LocalDeleteGuild(s->guild_id); - + //if we stop forcing guild list to send on guild create, we need to do this: //in the case that we delete a guild and add a new one. //entity_list.SendGuildList(); - + break; } - + case ServerOP_GuildMemberUpdate: { ServerGuildMemberUpdate_Struct *sgmus = (ServerGuildMemberUpdate_Struct*)pack->pBuffer; - + if(ZoneLoaded) { EQApplicationPacket *outapp = new EQApplicationPacket(OP_GuildMemberUpdate, sizeof(GuildMemberUpdate_Struct)); @@ -463,7 +463,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { uint32 FromID = VARSTRUCT_DECODE_TYPE(uint32, Buffer); uint32 Count = VARSTRUCT_DECODE_TYPE(uint32, Buffer); Client *c = entity_list.GetClientByCharID(FromID); - + if (!c || !c->IsInAGuild()) { _log(GUILDS__ERROR,"Invalid Client or not in guild. ID=%i", FromID); @@ -489,7 +489,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { } break; - + case ServerOP_LFGuildUpdate: { if(ZoneLoaded) @@ -507,7 +507,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { TimeZone = pack->ReadUInt32(); TimePosted = pack->ReadUInt32(); Toggle = pack->ReadUInt32(); - + uint32 GuildID = GetGuildIDByName(GuildName); if(GuildID == GUILD_NONE) @@ -517,7 +517,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { LFGuild_GuildToggle_Struct *gts = (LFGuild_GuildToggle_Struct *)outapp->pBuffer; gts->Command = 1; - strcpy(gts->Comment, Comments); + strcpy(gts->Comment, Comments); gts->FromLevel = FromLevel; gts->ToLevel = ToLevel; gts->Classes = Classes; @@ -552,7 +552,7 @@ void ZoneGuildManager::RequestOnlineGuildMembers(uint32 FromID, uint32 GuildID) { ServerPacket* pack = new ServerPacket(ServerOP_RequestOnlineGuildMembers, sizeof(ServerRequestOnlineGuildMembers_Struct)); ServerRequestOnlineGuildMembers_Struct *srogm = (ServerRequestOnlineGuildMembers_Struct*)pack->pBuffer; - + srogm->FromID = FromID; srogm->GuildID = GuildID; worldserver.SendPacket(pack); @@ -618,7 +618,7 @@ GuildApproval* ZoneGuildManager::FindGuildByIDApproval(uint32 refid) } return 0; } - + GuildApproval* ZoneGuildManager::FindGuildByOwnerApproval(Client* owner) { LinkedListIterator iterator(list); @@ -779,7 +779,7 @@ void GuildBankManager::SendGuildBank(Client *c) continue; EQApplicationPacket *outapp = new EQApplicationPacket(OP_GuildBank, sizeof(GuildBankItemUpdate_Struct)); - + GuildBankItemUpdate_Struct *gbius = (GuildBankItemUpdate_Struct*)outapp->pBuffer; if(!Item->Stackable) @@ -804,7 +804,7 @@ void GuildBankManager::SendGuildBank(Client *c) c->FastQueuePacket(&outapp); } } - + for(int i = 0; i < GUILD_BANK_MAIN_AREA_SIZE; ++i) { if((*Iterator)->Items.MainArea[i].ItemID > 0) @@ -817,7 +817,7 @@ void GuildBankManager::SendGuildBank(Client *c) bool Useable = Item->IsEquipable(c->GetBaseRace(), c->GetBaseClass()); EQApplicationPacket *outapp = new EQApplicationPacket(OP_GuildBank, sizeof(GuildBankItemUpdate_Struct)); - + GuildBankItemUpdate_Struct *gbius = (GuildBankItemUpdate_Struct*)outapp->pBuffer; if(!Item->Stackable) @@ -838,7 +838,7 @@ void GuildBankManager::SendGuildBank(Client *c) strn0cpy(gbius->Donator, (*Iterator)->Items.MainArea[i].Donator, sizeof(gbius->Donator)); strn0cpy(gbius->WhoFor, (*Iterator)->Items.MainArea[i].WhoFor, sizeof(gbius->WhoFor)); - + c->FastQueuePacket(&outapp); } } @@ -924,13 +924,13 @@ bool GuildBankManager::AddItem(uint32 GuildID, uint8 Area, uint32 ItemID, int32 } } - if(Slot < 0) + if(Slot < 0) { _log(GUILDS__BANK_ERROR, "No space to add item to the guild bank."); return false; } - + const char *Query="INSERT INTO `guild_bank` (`guildid`, `area`, `slot`, `itemid`, `qty`, `donator`, `permissions`, `WhoFor`) " "VALUES (%i, %i, %i, %i, %i, '%s', %i, '%s')"; @@ -1441,7 +1441,7 @@ void GuildBankManager::UpdateItemQuantity(uint32 GuildID, uint16 Area, uint16 Sl return; } - + safe_delete_array(query); } @@ -1490,7 +1490,7 @@ bool GuildApproval::ProcessApproval() owner->Message(0,"You took too long! Your guild request has been deleted."); return false; } - + return true; } @@ -1522,7 +1522,7 @@ bool GuildApproval::AddMemberApproval(Client* addition) if(members[i] && members[i] == addition) return false; } - + for(int i=0;iSetPetitionText(petitext); pet->SetZone(zone->GetZoneID()); pet->SetUrgency(0); - petition_list.AddPetition(pet); - database.InsertPetitionToDB(pet); + petition_list.AddPetition(pet); + database.InsertPetitionToDB(pet); petition_list.UpdateGMQueue(); petition_list.UpdateZoneListQueue(); worldserver.SendEmoteMessage(0, 0, 80, 15, "%s has made a petition. #%i", owner->CastToClient()->GetName(), pet->GetID()); diff --git a/zone/guild_mgr.h b/zone/guild_mgr.h index 8a5deaad8..b7dd6d7e4 100644 --- a/zone/guild_mgr.h +++ b/zone/guild_mgr.h @@ -80,15 +80,15 @@ public: uint32 GetFreeID() { return id+1; } //called by worldserver when it receives a message from world. void ProcessWorldPacket(ServerPacket *pack); - + void ListGuilds(Client *c) const; void DescribeGuild(Client *c, uint32 guild_id) const; - - + + // bool DonateTribute(uint32 charid, uint32 guild_id, uint32 tribute_amount); - + uint8 *MakeGuildMembers(uint32 guild_id, const char *prefix_name, uint32 &length); //make a guild member list packet, returns ownership of the buffer. - + void RecordInvite(uint32 char_id, uint32 guild_id, uint8 rank); bool VerifyAndClearInvite(uint32 char_id, uint32 guild_id, uint8 rank); void SendGuildMemberUpdateToWorld(const char *MemberName, uint32 GuildID, uint16 ZoneID, uint32 LastSeen); diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index cce98d18f..2450d5a91 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -59,10 +59,10 @@ void HateList::Wipe() LinkedListIterator iterator(list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { Mob* m = iterator.GetData()->ent; - parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), m, "0", 0); + parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), m, "0", 0); iterator.RemoveCurrent(); if(m->IsClient()) @@ -70,12 +70,12 @@ void HateList::Wipe() } } -bool HateList::IsOnHateList(Mob *mob) -{ - if (Find(mob)) - return true; - return false; -} +bool HateList::IsOnHateList(Mob *mob) +{ + if (Find(mob)) + return true; + return false; +} tHateEntry *HateList::Find(Mob *ent) { @@ -154,7 +154,7 @@ Mob* HateList::GetClosest(Mob *hater) { Mob* close = nullptr; float closedist = 99999.9f; float thisdist; - + LinkedListIterator iterator(list); iterator.Reset(); while(iterator.MoreElements()) { @@ -165,10 +165,10 @@ Mob* HateList::GetClosest(Mob *hater) { } iterator.Advance(); } - + if (close == 0 && hater->IsNPC()) close = hater->CastToNPC()->GetHateTop(); - + return close; } @@ -199,7 +199,7 @@ void HateList::Add(Mob *ent, int32 in_hate, int32 in_dam, bool bFrenzy, bool iAd p->hate = in_hate; p->bFrenzy = bFrenzy; list.Append(p); - parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "1", 0); + parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "1", 0); if(ent->IsClient()) ent->CastToClient()->IncrementAggroCount(); @@ -216,7 +216,7 @@ bool HateList::RemoveEnt(Mob *ent) { if(iterator.GetData()->ent == ent) { - parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "0", 0); + parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "0", 0); iterator.RemoveCurrent(); found = true; @@ -256,7 +256,7 @@ Mob *HateList::GetTop(Mob *center) _ZP(HateList_GetTop); Mob* top = nullptr; int32 hate = -1; - + if (RuleB(Aggro,SmartAggroList)){ Mob* topClientTypeInRange = nullptr; int32 hateClientTypeInRange = -1; @@ -272,7 +272,7 @@ Mob *HateList::GetTop(Mob *center) if(!cur){ iterator.Advance(); continue; - } + } if(!cur->ent){ iterator.Advance(); @@ -300,7 +300,7 @@ Mob *HateList::GetTop(Mob *center) int32 currentHate = cur->hate; if(cur->ent->IsClient()){ - + if(cur->ent->CastToClient()->IsSitting()){ aggroMod += RuleI(Aggro, SittingAggroMod); } @@ -457,7 +457,7 @@ int32 HateList::GetEntHate(Mob *ent, bool damage) tHateEntry *p; p = Find(ent); - + if ( p && damage) return p->damage; else if (p) @@ -469,7 +469,7 @@ int32 HateList::GetEntHate(Mob *ent, bool damage) //looking for any mob with hate > -1 bool HateList::IsEmpty() { _ZP(HateList_IsEmpty); - + return(list.Count() == 0); } @@ -501,7 +501,7 @@ int HateList::AreaRampage(Mob *caster, Mob *target) while (iterator.MoreElements()) { tHateEntry *h = iterator.GetData(); - iterator.Advance(); + iterator.Advance(); if(h && h->ent && h->ent != caster) { if(caster->CombatRange(h->ent)) @@ -533,7 +533,7 @@ void HateList::SpellCast(Mob *caster, uint32 spell_id, float range) return; } - //this is slower than just iterating through the list but avoids + //this is slower than just iterating through the list but avoids //crashes when people kick the bucket in the middle of this call //that invalidates our iterator but there's no way to know sadly //So keep a list of entity ids and look up after @@ -555,7 +555,7 @@ void HateList::SpellCast(Mob *caster, uint32 spell_id, float range) { id_list.push_back(h->ent->GetID()); } - iterator.Advance(); + iterator.Advance(); } std::list::iterator iter = id_list.begin(); @@ -574,9 +574,9 @@ void HateList::SpellCast(Mob *caster, uint32 spell_id, float range) void HateList::GetHateList(std::list &h_list) { h_list.clear(); - LinkedListIterator iterator(list); + LinkedListIterator iterator(list); iterator.Reset(); - while(iterator.MoreElements()) + while(iterator.MoreElements()) { tHateEntry *ent = iterator.GetData(); h_list.push_back(ent); diff --git a/zone/horse.cpp b/zone/horse.cpp index 3ccf30525..a7c904ebf 100644 --- a/zone/horse.cpp +++ b/zone/horse.cpp @@ -30,26 +30,26 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) map Horse::horse_types; LinkedList horses_auto_delete; -Horse::Horse(Client *_owner, uint16 spell_id, float x, float y, float z, float heading) +Horse::Horse(Client *_owner, uint16 spell_id, float x, float y, float z, float heading) : NPC(GetHorseType(spell_id), nullptr, x, y, z, heading, FlyMode3) { //give the horse its proper name. strn0cpy(name, _owner->GetCleanName(), 55); strcat(name,"`s_Mount00"); - + owner = _owner; } - + void Horse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { NPC::FillSpawnStruct(ns, ForWho); - + // ns->spawn.texture = NPCTypedata->mount_color; ns->spawn.petOwnerId = 0; - + //dunno why we do these, they should allready be set right. ns->spawn.runspeed = NPCTypedata->runspeed; } - + bool Horse::IsHorseSpell(uint16 spell_id) { //written in terms of a function which does a ton more work //than we need to to figure out if this is a horse spell. @@ -89,11 +89,11 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) { memset(npc_type, 0, sizeof(NPCType)); strcpy(npc_type->name,"Unclaimed_Mount"); //this should never get used strcpy(npc_type->npc_attacks,"ABH"); - npc_type->cur_hp = 1; - npc_type->max_hp = 1; + npc_type->cur_hp = 1; + npc_type->max_hp = 1; npc_type->race = atoi(row[0]); npc_type->gender = atoi(row[1]); // Drogmor's are female horses. Yuck. - npc_type->class_ = 1; + npc_type->class_ = 1; npc_type->deity= 1; npc_type->level = 1; npc_type->npc_id = 0; @@ -112,7 +112,7 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) { npc_type->INT = 75; npc_type->WIS = 75; npc_type->CHA = 75; - + horses_auto_delete.Insert(npc_type); mysql_free_result(result); @@ -131,7 +131,7 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) { safe_delete_array(query); return nullptr; } - + } @@ -145,18 +145,18 @@ void Client::SummonHorse(uint16 spell_id) { LogFile->write(EQEMuLog::Error, "%s tried to summon an unknown horse, spell id %d", GetName(), spell_id); return; } - + // No Horse, lets get them one. - + Horse* horse = new Horse(this, spell_id, GetX(), GetY(), GetZ(), GetHeading()); - + //we want to manage the spawn packet ourself. //another reason is we dont want quests executing on it. entity_list.AddNPC(horse, false); - + // Okay, lets say they have a horse now. - - + + EQApplicationPacket outapp; horse->CreateHorseSpawnPacket(&outapp, GetName(), GetID()); /* // Doodman: Kludged in here instead of adding a field to PCType. FIXME! @@ -167,18 +167,18 @@ void Client::SummonHorse(uint16 spell_id) { ns->spawn.runspeed=npc_type->runspeed; */ entity_list.QueueClients(horse, &outapp); - - + + uint16 tmpID = horse->GetID(); SetHorseId(tmpID); - + } void Client::SetHorseId(uint16 horseid_in) { //if its the same, do nothing if(horseId == horseid_in) return; - + //otherwise it changed. //if we have a horse, get rid of it no matter what. if(horseId) { @@ -186,7 +186,7 @@ void Client::SetHorseId(uint16 horseid_in) { if(horse != nullptr) horse->Depop(); } - + //now we take whatever they gave us. horseId = horseid_in; } @@ -198,7 +198,7 @@ void Mob::CreateHorseSpawnPacket(EQApplicationPacket* app, const char* ownername memset(app->pBuffer, 0, sizeof(NewSpawn_Struct)); NewSpawn_Struct* ns = (NewSpawn_Struct*)app->pBuffer; FillSpawnStruct(ns, ForWho); - + #if (EQDEBUG >= 11) printf("Horse Spawn Packet - Owner: %s\n", ownername); DumpPacket(app); diff --git a/zone/horse.h b/zone/horse.h index e9bdb932f..a9915edf0 100644 --- a/zone/horse.h +++ b/zone/horse.h @@ -28,14 +28,14 @@ using namespace std; class Horse : public NPC { public: Horse(Client *owner, uint16 spell_id, float x, float y, float z, float heading); - + virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); - + static bool IsHorseSpell(uint16 spell_id); protected: uint8 mount_color; Client *owner; - + //generate npc type records for horses static map horse_types; static const NPCType *GetHorseType(uint16 spell_id); diff --git a/zone/inventory.cpp b/zone/inventory.cpp index cbf9503ba..0a7d070d6 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -39,7 +39,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { return 0; uint32 x = 0; ItemInst *cur = nullptr; - + int i; if(where_to_check & invWhereWorn) { for (i=0; i<=21; i++) { // Equipped @@ -68,7 +68,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { DeleteItemInInventory(9999, 0, true); else DeleteItemInInventory(9999, 0, false); // Prevents Titanium crash - } + } } if(where_to_check & invWhereCursor) { @@ -138,7 +138,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { DeleteItemInInventory(i, 0, true); } } - + for (i=2031; i<=2270; i++) { // Bank's containers if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { cur = m_inv.GetItem(i); @@ -192,7 +192,7 @@ bool Client::CheckLoreConflict(const Item_Struct* item) { return false; if (item->LoreGroup == -1) // Standard lore items; look everywhere except the shared bank, return the result - return (m_inv.HasItem(item->ID, 0, ~invWhereSharedBank) != SLOT_INVALID); + return (m_inv.HasItem(item->ID, 0, ~invWhereSharedBank) != SLOT_INVALID); //If the item has a lore group, we check for other items with the same group and return the result return (m_inv.HasItemByLoreGroup(item->LoreGroup, ~invWhereSharedBank) != SLOT_INVALID); @@ -200,7 +200,7 @@ bool Client::CheckLoreConflict(const Item_Struct* item) { void Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5, bool attuned, uint16 to_slot) { const Item_Struct* item = database.GetItem(item_id); - + if (item == nullptr) { Message(0, "No such item: %i", item_id); return; @@ -214,13 +214,13 @@ void Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, } // Checking to see if the Item is lore or not. bool foundlore = CheckLoreConflict(item); - + //TODO: check for lore conflict on augments - + // Checking to see if it is a GM only Item or not. //bool foundgm = (item->gm && (this->Admin() < 100)); bool foundgm = false; - + if (!foundlore && !foundgm) { // Okay, It isn't LORE, or if it is, it is not in player's inventory. ItemInst* inst = database.CreateItem(item, charges); if (inst) { @@ -328,13 +328,13 @@ void Client::DropItem(int16 slot_id) // Take control of item in client inventory ItemInst* inst = m_inv.PopItem(slot_id); - + if (!inst) { // Item doesn't exist in inventory! Message(13, "Error: Item not found in slot %i", slot_id); return; } - + // Save client inventory change to database if (slot_id==SLOT_CURSOR) { list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); @@ -346,7 +346,7 @@ void Client::DropItem(int16 slot_id) Object* object = new Object(this, inst); entity_list.AddObject(object, true); object->StartDecay(); - + safe_delete(inst); } @@ -377,7 +377,7 @@ uint32 Client::GetItemIDAt(int16 slot_id) { const ItemInst* inst = m_inv[slot_id]; if (inst) return inst->GetItem()->ID; - + // None found return INVALID_ID; } @@ -443,7 +443,7 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd if(m_inv[slot_id]->IsType(ItemClassContainer)) { for(uint8 bag_idx = 0; bag_idx < m_inv[slot_id]->GetItem()->BagSlots; bag_idx++) { ItemInst* bagitem = m_inv[slot_id]->GetItem(bag_idx); - + if(bagitem) { int16 bagslot_id = Inventory::CalcSlotId(slot_id, bag_idx); @@ -518,11 +518,11 @@ bool Client::PushItemOnCursor(const ItemInst& inst, bool client_update) { mlog(INVENTORY__SLOTS, "Putting item %s (%d) on the cursor", inst.GetItem()->Name, inst.GetItem()->ID); m_inv.PushCursor(inst); - + if (client_update) { SendItemPacket(SLOT_CURSOR, &inst, ItemPacketSummonItem); } - + list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); return database.SaveCursor(CharacterID(), s, e); } @@ -530,23 +530,23 @@ bool Client::PushItemOnCursor(const ItemInst& inst, bool client_update) bool Client::PutItemInInventory(int16 slot_id, const ItemInst& inst, bool client_update) { mlog(INVENTORY__SLOTS, "Putting item %s (%d) into slot %d", inst.GetItem()->Name, inst.GetItem()->ID, slot_id); - if (slot_id==SLOT_CURSOR) + if (slot_id==SLOT_CURSOR) { return PushItemOnCursor(inst,client_update); } else m_inv.PutItem(slot_id, inst); - + if (client_update) { SendItemPacket(slot_id, &inst, (slot_id==SLOT_CURSOR)?ItemPacketSummonItem:ItemPacketTrade); } - + if (slot_id==SLOT_CURSOR) { list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); return database.SaveCursor(this->CharacterID(), s, e); } else return database.SaveInventory(this->CharacterID(), &inst, slot_id); - + CalcBonuses(); } @@ -554,9 +554,9 @@ void Client::PutLootInInventory(int16 slot_id, const ItemInst &inst, ServerLootI { mlog(INVENTORY__SLOTS, "Putting loot item %s (%d) into slot %d", inst.GetItem()->Name, inst.GetItem()->ID, slot_id); m_inv.PutItem(slot_id, inst); - + SendLootItemInPacket(&inst, slot_id); - + if (slot_id==SLOT_CURSOR) { list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); database.SaveCursor(this->CharacterID(), s, e); @@ -578,7 +578,7 @@ void Client::PutLootInInventory(int16 slot_id, const ItemInst &inst, ServerLootI safe_delete(bagitem); } } - + CalcBonuses(); } bool Client::TryStacking(ItemInst* item, uint8 type, bool try_worn, bool try_cursor){ @@ -588,7 +588,7 @@ bool Client::TryStacking(ItemInst* item, uint8 type, bool try_worn, bool try_cur uint32 item_id = item->GetItem()->ID; for (i = 22; i <= 29; i++) { - ItemInst* tmp_inst = m_inv.GetItem(i); + ItemInst* tmp_inst = m_inv.GetItem(i); if(tmp_inst && tmp_inst->GetItem()->ID == item_id && tmp_inst->GetCharges() < tmp_inst->GetItem()->StackSize){ MoveItemCharges(*item, i, type); CalcBonuses(); @@ -629,7 +629,7 @@ bool Client::AutoPutLootInInventory(ItemInst& inst, bool try_worn, bool try_curs if(this->GetClientVersion() >= EQClientSoF) { i = 9999; } // added power source check for SoF+ clients else { break; } } - + if (!m_inv[i]) { if( i == SLOT_PRIMARY && inst.IsWeapon() ) // If item is primary slot weapon @@ -672,7 +672,7 @@ bool Client::AutoPutLootInInventory(ItemInst& inst, bool try_worn, bool try_curs } } } - + // #2: Stackable item? if (inst.IsStackable()) { @@ -688,7 +688,7 @@ bool Client::AutoPutLootInInventory(ItemInst& inst, bool try_worn, bool try_curs PutLootInInventory(slot_id, inst, bag_item_data); return true; } - + return false; } @@ -731,7 +731,7 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) { Master's Book of Wood Elven Culture http://eqitems.13th-floor.org/phpBB2/viewtopic.php?p=510#510 */ - + if (!inst) //have to have an item to make the link return false; @@ -749,17 +749,17 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) { //int hash = GetItemLinkHash(inst); //eventually this will work (currently crashes zone), but for now we'll skip the extra overhead if (GetClientVersion() >= EQClientRoF) { - MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X", + MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X", 0, - item->ID, - inst->GetAugmentItemID(0), - inst->GetAugmentItemID(1), - inst->GetAugmentItemID(2), - inst->GetAugmentItemID(3), - inst->GetAugmentItemID(4), + item->ID, + inst->GetAugmentItemID(0), + inst->GetAugmentItemID(1), + inst->GetAugmentItemID(2), + inst->GetAugmentItemID(3), + inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), - evolving, - loregroup, + evolving, + loregroup, evolvedlevel, 0, hash @@ -767,16 +767,16 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) { } else if (GetClientVersion() >= EQClientSoF) { - MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X", + MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X", 0, - item->ID, - inst->GetAugmentItemID(0), - inst->GetAugmentItemID(1), - inst->GetAugmentItemID(2), - inst->GetAugmentItemID(3), - inst->GetAugmentItemID(4), - evolving, - loregroup, + item->ID, + inst->GetAugmentItemID(0), + inst->GetAugmentItemID(1), + inst->GetAugmentItemID(2), + inst->GetAugmentItemID(3), + inst->GetAugmentItemID(4), + evolving, + loregroup, evolvedlevel, 0, hash @@ -784,17 +784,17 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) { } else { - MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%08X", + MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%08X", 0, - item->ID, - inst->GetAugmentItemID(0), - inst->GetAugmentItemID(1), - inst->GetAugmentItemID(2), - inst->GetAugmentItemID(3), - inst->GetAugmentItemID(4), - evolving, - loregroup, - evolvedlevel, + item->ID, + inst->GetAugmentItemID(0), + inst->GetAugmentItemID(1), + inst->GetAugmentItemID(2), + inst->GetAugmentItemID(3), + inst->GetAugmentItemID(4), + evolving, + loregroup, + evolvedlevel, hash ); } @@ -807,7 +807,7 @@ int Client::GetItemLinkHash(const ItemInst* inst) { //Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=145 if (!inst) //have to have an item to make the hash return 0; - + const Item_Struct* item = inst->GetItem(); char* hash_str = 0; /*register */int hash = 0; @@ -881,7 +881,7 @@ int Client::GetItemLinkHash(const ItemInst* inst) { // This is what the inline asm is doing: // hash *= 0x1f; // hash += (int)c; - + hash_str++; } */ @@ -900,7 +900,7 @@ packet with the item number in it, but I cant seem to find it right now */ if (!inst) return; - + const Item_Struct* item = inst->GetItem(); const char* name2 = &item->Name[0]; EQApplicationPacket* outapp = new EQApplicationPacket(OP_ItemLinkText,strlen(name2)+68); @@ -999,7 +999,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit return true; } - + if (move_in->to_slot == (uint32)SLOT_INVALID) { if(move_in->from_slot == (uint32)SLOT_CURSOR) { mlog(INVENTORY__SLOTS, "Client destroyed item from cursor slot %d", move_in->from_slot); @@ -1022,8 +1022,8 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { int16 src_slot_id = (int16)move_in->from_slot; int16 dst_slot_id = (int16)move_in->to_slot; - if(IsBankSlot(src_slot_id) || - IsBankSlot(dst_slot_id) || + if(IsBankSlot(src_slot_id) || + IsBankSlot(dst_slot_id) || IsBankSlot(src_slot_check) || IsBankSlot(dst_slot_check)) { @@ -1033,7 +1033,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if(!banker || distance > USE_NPC_RANGE2) { char *hacked_string = nullptr; - MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(items) but %s is non-existant or too far away (%u units).", + MakeAnyLenString(&hacked_string, "Player tried to make use of a banker(items) but %s is non-existant or too far away (%u units).", banker ? banker->GetName() : "UNKNOWN NPC", distance); database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName()); safe_delete_array(hacked_string); @@ -1041,7 +1041,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return false; } } - + //Setup uint32 srcitemid = 0; uint32 dstitemid = 0; @@ -1081,12 +1081,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { this->Message(13,"You cannot move your Trader Satchels, or items inside them, while Trading."); } } - + // Step 2: Validate item in from_slot // After this, we can assume src_inst is a valid ptr if (!src_inst && (src_slot_id<4000 || src_slot_id>4009)) { if (dst_inst) { - // If there is no source item, but there is a destination item, + // If there is no source item, but there is a destination item, // move the slots around before deleting the invalid source slot item, // which is now in the destination slot. move_in->from_slot = dst_slot_check; @@ -1094,7 +1094,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { move_in->number_in_stack = dst_inst->GetCharges(); if(!SwapItem(move_in)) { mlog(INVENTORY__ERROR, "Recursive SwapItem call failed due to non-existent destination item (charid: %i, fromslot: %i, toslot: %i)", CharacterID(), src_slot_id, dst_slot_id); } } - + return false; } //verify shared bank transactions in the database @@ -1140,7 +1140,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { WorldKick(); return false; } - + // Step 3: Check for interaction with World Container (tradeskills) if(m_tradeskill_object != nullptr) { if (src_slot_id>=4000 && src_slot_id<=4009) { @@ -1159,7 +1159,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Putting item into world container, which may swap (or pile onto) with existing item uint8 world_idx = Inventory::CalcBagIdx(dst_slot_id); ItemInst* world_inst = m_tradeskill_object->PopItem(world_idx); - + // Case 1: No item in container, unidirectional "Put" if (world_inst == nullptr) { m_tradeskill_object->PutItem(world_idx, src_inst); @@ -1173,7 +1173,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if ((world_item->ID == src_item->ID) && src_inst->IsStackable()) { int16 world_charges = world_inst->GetCharges(); int16 src_charges = src_inst->GetCharges(); - + // Fill up destination stack as much as possible world_charges += src_charges; if (world_charges > world_inst->GetItem()->StackSize) { @@ -1183,10 +1183,10 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { else { src_charges = 0; } - + world_inst->SetCharges(world_charges); m_tradeskill_object->Save(); - + if (src_charges == 0) { m_inv.DeleteItem(src_slot_id); // DB remove will occur below } @@ -1204,7 +1204,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } } } - + safe_delete(world_inst); if (src_slot_id==SLOT_CURSOR) { list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); @@ -1217,7 +1217,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return true; } } - + // Step 4: Check for entity trade if (dst_slot_id>=3000 && dst_slot_id<=3007) { if (src_slot_id != SLOT_CURSOR) { @@ -1231,7 +1231,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { Message(13, "Error: Cursor item not located on server!"); return false; } - + // Add cursor item to trade bucket // Also sends trade information to other client of trade session if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit @@ -1248,7 +1248,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return true; } } - + // Step 5: Swap (or stack) items if (move_in->number_in_stack > 0) { // Determine if charged items can stack @@ -1269,10 +1269,10 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { uint16 usedcharges = dst_inst->GetItem()->StackSize - dst_inst->GetCharges(); if (usedcharges > move_in->number_in_stack) usedcharges = move_in->number_in_stack; - + dst_inst->SetCharges(dst_inst->GetCharges() + usedcharges); src_inst->SetCharges(src_inst->GetCharges() - usedcharges); - + // Depleted all charges? if (src_inst->GetCharges() < 1) { @@ -1324,14 +1324,14 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if(!m_inv.SwapItem(src_slot_id, dst_slot_id)) { return false; } mlog(INVENTORY__SLOTS, "Moving entire item from slot %d to slot %d", src_slot_id, dst_slot_id); } - + int matslot = SlotConvert2(dst_slot_id); if (dst_slot_id<22 && matslot != 0) { SendWearChange(matslot); } - + // Step 7: Save change to the database - if (src_slot_id==SLOT_CURSOR){ + if (src_slot_id==SLOT_CURSOR){ list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); database.SaveCursor(character_id, s, e); } else @@ -1341,7 +1341,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { database.SaveCursor(character_id, s, e); } else database.SaveInventory(character_id, m_inv.GetItem(dst_slot_id), dst_slot_id); - + if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in, true); } // QS Audit // Step 8: Re-calc stats @@ -1363,7 +1363,7 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { ItemInst* token_inst = database.CreateItem(token_struct, 1); SendItemPacket(resync_slot, token_inst, ItemPacketTrade); - + if(m_inv[resync_slot]) { SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade); } else { EQApplicationPacket* outapp = new EQApplicationPacket(OP_DeleteItem, sizeof(DeleteItem_Struct)); @@ -1371,7 +1371,7 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { delete_slot->from_slot = resync_slot; delete_slot->to_slot = 0xFFFFFFFF; delete_slot->number_in_stack = 0xFFFFFFFF; - + QueuePacket(outapp); safe_delete(outapp); } @@ -1411,7 +1411,7 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { delete_slot->from_slot = resync_slot; delete_slot->to_slot = 0xFFFFFFFF; delete_slot->number_in_stack = 0xFFFFFFFF; - + QueuePacket(outapp); safe_delete(outapp); } @@ -1549,9 +1549,9 @@ void Client::DyeArmor(DyeStruct* dye){ if(inst){ inst->SetColor((dye->dye[i].rgb.red*65536)+(dye->dye[i].rgb.green*256)+(dye->dye[i].rgb.blue)); database.SaveInventory(CharacterID(),inst,slot2); - if(dye->dye[i].rgb.use_tint) + if(dye->dye[i].rgb.use_tint) m_pp.item_tint[i].rgb.use_tint = 0xFF; - else + else m_pp.item_tint[i].rgb.use_tint=0x00; } m_pp.item_tint[i].rgb.blue=dye->dye[i].rgb.blue; @@ -1674,7 +1674,7 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { void Client::RemoveNoRent(bool client_update) { int16 slot_id; - + // personal for(slot_id = 0; slot_id <= 30; slot_id++) { const ItemInst* inst = m_inv[slot_id]; @@ -1690,7 +1690,7 @@ void Client::RemoveNoRent(bool client_update) { mlog(INVENTORY__SLOTS, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); DeleteItemInInventory(9999, 0, (GetClientVersion() >= EQClientSoF) ? client_update : false); // Ti slot non-existent } - + // containers for(slot_id = 251; slot_id <= 340; slot_id++) { const ItemInst* inst = m_inv[slot_id]; @@ -1741,7 +1741,7 @@ void Client::RemoveNoRent(bool client_update) { void Client::RemoveDuplicateLore(bool client_update) { // Split-charge stacking may be added at some point -U int16 slot_id; - + // personal for(slot_id = 0; slot_id <= 30; slot_id++) { ItemInst* inst = m_inv.PopItem(slot_id); @@ -1749,7 +1749,7 @@ void Client::RemoveDuplicateLore(bool client_update) { if(CheckLoreConflict(inst->GetItem())) { mlog(INVENTORY__ERROR, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); database.SaveInventory(character_id, nullptr, slot_id); - } + } else { m_inv.PutItem(slot_id, *inst); } @@ -1763,13 +1763,13 @@ void Client::RemoveDuplicateLore(bool client_update) { if(CheckLoreConflict(inst->GetItem())) { mlog(INVENTORY__ERROR, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); database.SaveInventory(character_id, nullptr, 9999); - } + } else { m_inv.PutItem(9999, *inst); } safe_delete(inst); } - + // containers for(slot_id = 251; slot_id <= 340; slot_id++) { ItemInst* inst = m_inv.PopItem(slot_id); @@ -1777,7 +1777,7 @@ void Client::RemoveDuplicateLore(bool client_update) { if(CheckLoreConflict(inst->GetItem())) { mlog(INVENTORY__ERROR, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); database.SaveInventory(character_id, nullptr, slot_id); - } + } else { m_inv.PutItem(slot_id, *inst); } @@ -1792,7 +1792,7 @@ void Client::RemoveDuplicateLore(bool client_update) { if(CheckLoreConflict(inst->GetItem())) { mlog(INVENTORY__ERROR, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); database.SaveInventory(character_id, nullptr, slot_id); - } + } else { m_inv.PutItem(slot_id, *inst); } @@ -1807,7 +1807,7 @@ void Client::RemoveDuplicateLore(bool client_update) { if(CheckLoreConflict(inst->GetItem())) { mlog(INVENTORY__ERROR, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); database.SaveInventory(character_id, nullptr, slot_id); - } + } else { m_inv.PutItem(slot_id, *inst); } @@ -1867,7 +1867,7 @@ uint32 Client::GetEquipment(uint8 material_slot) const { return 0; } - + item = m_inv.GetItem(invslot); if(item && item->GetItem()) @@ -1882,7 +1882,7 @@ uint32 Client::GetEquipment(uint8 material_slot) const int32 Client::GetEquipmentMaterial(uint8 material_slot) { const Item_Struct *item; - + item = database.GetItem(GetEquipment(material_slot)); if(item != 0) { @@ -1962,21 +1962,21 @@ void Client::SendItemPacket(int16 slot_id, const ItemInst* inst, ItemPacketType { if (!inst) return; - + // Serialize item into |-delimited string string packet = inst->Serialize(slot_id); - + EmuOpcode opcode = OP_Unknown; EQApplicationPacket* outapp = nullptr; ItemPacket_Struct* itempacket = nullptr; - + // Construct packet opcode = (packet_type==ItemPacketViewLink) ? OP_ItemLinkResponse : OP_ItemPacket; outapp = new EQApplicationPacket(opcode, packet.length()+sizeof(ItemPacket_Struct)); itempacket = (ItemPacket_Struct*)outapp->pBuffer; memcpy(itempacket->SerializedItem, packet.c_str(), packet.length()); itempacket->PacketType = packet_type; - + #if EQDEBUG >= 9 DumpPacket(outapp); #endif @@ -1987,14 +1987,14 @@ EQApplicationPacket* Client::ReturnItemPacket(int16 slot_id, const ItemInst* ins { if (!inst) return 0; - + // Serialize item into |-delimited string string packet = inst->Serialize(slot_id); - + EmuOpcode opcode = OP_Unknown; EQApplicationPacket* outapp = nullptr; BulkItemPacket_Struct* itempacket = nullptr; - + // Construct packet opcode = OP_ItemPacket; outapp = new EQApplicationPacket(opcode, packet.length()+1); @@ -2090,10 +2090,10 @@ void Client::SetBandolier(const EQApplicationPacket *app) { // Check if the player has the item specified in the bandolier set on them. // - slot = m_inv.HasItem(m_pp.bandoliers[bss->number].items[BandolierSlot].item_id, 1, + slot = m_inv.HasItem(m_pp.bandoliers[bss->number].items[BandolierSlot].item_id, 1, invWhereWorn|invWherePersonal); - // removed 'invWhereCursor' argument from above and implemented slots 30, 331-340 checks here + // removed 'invWhereCursor' argument from above and implemented slots 30, 331-340 checks here if (slot == SLOT_INVALID) { if (m_inv.GetItem(SLOT_CURSOR)) { if (m_inv.GetItem(SLOT_CURSOR)->GetItem()->ID == m_pp.bandoliers[bss->number].items[BandolierSlot].item_id && @@ -2119,8 +2119,8 @@ void Client::SetBandolier(const EQApplicationPacket *app) { BandolierItems[BandolierSlot] = m_inv.PopItem(slot); // If ammo with charges, only take one charge out to put in the range slot, that is what // the client does. - - if(((BandolierSlot == bandolierAmmo) || (BandolierSlot == bandolierRange)) && + + if(((BandolierSlot == bandolierAmmo) || (BandolierSlot == bandolierRange)) && BandolierItems[BandolierSlot] && BandolierItems[BandolierSlot]->IsStackable()){ int Charges = BandolierItems[BandolierSlot]->GetCharges(); // If there is more than one charge @@ -2143,10 +2143,10 @@ void Client::SetBandolier(const EQApplicationPacket *app) { _log(INVENTORY__BANDOLIER, "Character does not have required bandolier item for slot %i", WeaponSlot); ItemInst *InvItem = m_inv.PopItem(WeaponSlot); if(InvItem) { - // If there was an item in that weapon slot, put it in the inventory + // If there was an item in that weapon slot, put it in the inventory _log(INVENTORY__BANDOLIER, "returning item %s in weapon slot %i to inventory", InvItem->GetItem()->Name, WeaponSlot); - if(MoveItemToInventory(InvItem)) + if(MoveItemToInventory(InvItem)) database.SaveInventory(character_id, 0, WeaponSlot); else _log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), @@ -2165,7 +2165,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { for(int BandolierSlot = bandolierMainHand; BandolierSlot <= bandolierAmmo; BandolierSlot++) { // Find the inventory slot corresponding to this bandolier slot - + WeaponSlot = BandolierSlotToWeaponSlot(BandolierSlot); // if there is an item in this Bandolier slot ? @@ -2183,7 +2183,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { if(InvItem) { // If there was already an item in that weapon slot that we replaced, find a place to put it - if(!MoveItemToInventory(InvItem)) + if(!MoveItemToInventory(InvItem)) _log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), InvItem->GetItem()->Name); safe_delete(InvItem); @@ -2197,8 +2197,8 @@ void Client::SetBandolier(const EQApplicationPacket *app) { if(InvItem) { _log(INVENTORY__BANDOLIER, "Bandolier has no item for slot %i, returning item %s to inventory", WeaponSlot, InvItem->GetItem()->Name); - // If there was an item in that weapon slot, put it in the inventory - if(MoveItemToInventory(InvItem)) + // If there was an item in that weapon slot, put it in the inventory + if(MoveItemToInventory(InvItem)) database.SaveInventory(character_id, 0, WeaponSlot); else _log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), @@ -2212,13 +2212,13 @@ void Client::SetBandolier(const EQApplicationPacket *app) { } bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { - + // This is a support function for Client::SetBandolier, however it can be used anywhere it's functionality is required. // - // When the client moves items around as Bandolier sets are activated, it does not send details to the + // When the client moves items around as Bandolier sets are activated, it does not send details to the // server of what item it has moved to which slot. It assumes the server knows what it will do. // - // The standard EQEmu auto inventory routines do not behave as the client does when manipulating bandoliers. + // The standard EQEmu auto inventory routines do not behave as the client does when manipulating bandoliers. // The client will look in each main inventory slot. If it finds a bag in a slot, it will then look inside // the bag for a free slot. // @@ -2245,10 +2245,10 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { ItemInst* InvItem = m_inv.GetItem(i); if(InvItem && (InvItem->GetItem()->ID == ItemID) && (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { - + int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); - int ChargesToMove = ItemToReturn->GetCharges() < ChargeSlotsLeft ? ItemToReturn->GetCharges() : + int ChargesToMove = ItemToReturn->GetCharges() < ChargeSlotsLeft ? ItemToReturn->GetCharges() : ChargeSlotsLeft; InvItem->SetCharges(InvItem->GetCharges() + ChargesToMove); @@ -2259,8 +2259,8 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { database.SaveInventory(character_id, m_inv.GetItem(i), i); ItemToReturn->SetCharges(ItemToReturn->GetCharges() - ChargesToMove); - - if(!ItemToReturn->GetCharges()) + + if(!ItemToReturn->GetCharges()) return true; } // If there is a bag in this slot, look inside it. @@ -2274,28 +2274,28 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { uint8 BagSlot; for (BagSlot=0; BagSlotGetItem()->ID == ItemID) && + if(InvItem && (InvItem->GetItem()->ID == ItemID) && (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); - int ChargesToMove = ItemToReturn->GetCharges() < ChargeSlotsLeft + int ChargesToMove = ItemToReturn->GetCharges() < ChargeSlotsLeft ? ItemToReturn->GetCharges() : ChargeSlotsLeft; InvItem->SetCharges(InvItem->GetCharges() + ChargesToMove); if(UpdateClient) - SendItemPacket(BaseSlotID + BagSlot, m_inv.GetItem(BaseSlotID + BagSlot), + SendItemPacket(BaseSlotID + BagSlot, m_inv.GetItem(BaseSlotID + BagSlot), ItemPacketTrade); - database.SaveInventory(character_id, m_inv.GetItem(BaseSlotID + BagSlot), + database.SaveInventory(character_id, m_inv.GetItem(BaseSlotID + BagSlot), BaseSlotID + BagSlot); ItemToReturn->SetCharges(ItemToReturn->GetCharges() - ChargesToMove); - if(!ItemToReturn->GetCharges()) + if(!ItemToReturn->GetCharges()) return true; - } + } } } } @@ -2346,9 +2346,9 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { } } } - + // Store on the cursor - // + // _log(INVENTORY__SLOTS, "Char: %s No space, putting on the cursor", GetName()); PushItemOnCursor(*ItemToReturn, UpdateClient); diff --git a/zone/loottables.cpp b/zone/loottables.cpp index bde979ead..d211d3e4d 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -117,13 +117,13 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml // Too long a list needs to be limited. if(lds->NumEntries > 99 && droplimit < 1) - droplimit = lds->NumEntries/100; + droplimit = lds->NumEntries/100; uint8 limit = 0; // Start at a random point in itemlist. uint32 item = MakeRandomInt(0, lds->NumEntries-1); // Main loop. - for (uint32 i=0; iNumEntries;) + for (uint32 i=0; iNumEntries;) { //Force the itemlist back to beginning. if (item > (lds->NumEntries-1)) @@ -132,7 +132,7 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml uint8 charges = lds->Entries[item].multiplier; uint8 pickedcharges = 0; // Loop to check multipliers. - for (uint32 x=1; x<=charges; x++) + for (uint32 x=1; x<=charges; x++) { // Actual roll. float thischance = 0.0; @@ -145,10 +145,10 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml #if EQDEBUG>=11 LogFile->write(EQEMuLog::Debug, "Drop chance for npc: %s, this chance:%f, drop roll:%f", npc->GetName(), thischance, drop_chance); #endif - if (thischance == 100.0 || drop_chance < thischance) + if (thischance == 100.0 || drop_chance < thischance) { uint32 itemid = lds->Entries[item].item_id; - + const Item_Struct* dbitem = GetItem(itemid); npc->AddLootDrop(dbitem, itemlist, lds->Entries[item].item_charges, lds->Entries[item].minlevel, lds->Entries[item].maxlevel, lds->Entries[item].equip_item, false); pickedcharges++; @@ -156,11 +156,11 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml } // Items with multipliers only count as 1 towards the limit. if(pickedcharges > 0) - limit++; + limit++; // If true, limit reached. if(limit >= droplimit && droplimit > 0) - break; + break; item++; i++; @@ -178,16 +178,16 @@ void ZoneDatabase::AddLootDropToNPC(NPC* npc,uint32 lootdrop_id, ItemList* iteml void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charges, uint8 minlevel, uint8 maxlevel, bool equipit, bool wearchange) { if(item2 == nullptr) return; - + //make sure we are doing something... if(!itemlist && !wearchange) return; - + ServerLootItem_Struct* item = new ServerLootItem_Struct; #if EQDEBUG>=11 LogFile->write(EQEMuLog::Debug, "Adding drop to npc: %s, Item: %i", GetName(), item2->ID); #endif - + EQApplicationPacket* outapp = nullptr; WearChange_Struct* wc = nullptr; if(wearchange) { @@ -196,7 +196,7 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge wc->spawn_id = GetID(); wc->material=0; } - + item->item_id = item2->ID; item->charges = charges; item->aug1 = 0; @@ -212,7 +212,7 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge const Item_Struct* compitem = nullptr; bool found = false; // track if we found an empty slot we fit into int32 foundslot = -1; // for multi-slot items - + // Equip rules are as follows: // If the item has the NoPet flag set it will not be equipped. // An empty slot takes priority. The first empty one that an item can @@ -229,7 +229,7 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge if(equipment[i]) { compitem = database.GetItem(equipment[i]); - if (item2->AC > compitem->AC || + if (item2->AC > compitem->AC || (item2->AC == compitem->AC && item2->HP > compitem->HP)) { // item would be an upgrade @@ -244,7 +244,7 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge found = true; } } // end if ac - } + } else { equipment[i] = item2->ID; @@ -281,17 +281,17 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge if (foundslot == SLOT_PRIMARY) { if (item2->Proc.Effect != 0) CastToMob()->AddProcToWeapon(item2->Proc.Effect, true); - + eslot = MATERIAL_PRIMARY; } - else if (foundslot == SLOT_SECONDARY + else if (foundslot == SLOT_SECONDARY && (GetOwner() != nullptr || (GetLevel() >= 13 && MakeRandomInt(0,99) < NPC_DW_CHANCE) || (item2->Damage==0)) && (item2->ItemType == ItemType1HS || item2->ItemType == ItemType1HB || item2->ItemType == ItemTypeShield || item2->ItemType == ItemTypePierce)) { if (item2->Proc.Effect!=0) CastToMob()->AddProcToWeapon(item2->Proc.Effect, true); - + eslot = MATERIAL_SECONDARY; } else if (foundslot == SLOT_HEAD) { @@ -315,10 +315,10 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge else if (foundslot == SLOT_FEET) { eslot = MATERIAL_FEET; } - + /* what was this about??? - + if (((npc->GetRace()==127) && (npc->CastToMob()->GetOwnerID()!=0)) && (item2->Slots==24576) || (item2->Slots==8192) || (item2->Slots==16384)){ npc->d_meele_texture2=atoi(newid); wc->wear_slot_id=8; @@ -331,32 +331,32 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge npc->INT+=item2->INT; } */ - + //if we found an open slot it goes in... if(eslot != 0xFF) { if(wearchange) { wc->wear_slot_id = eslot; wc->material = emat; } - + } if (found) { CalcBonuses(); // This is less than ideal for bulk adding of items } item->equipSlot = item2->Slots; } - + if(itemlist != nullptr) itemlist->push_back(item); else safe_delete(item); - + if(wearchange && outapp) { entity_list.QueueClients(this, outapp); safe_delete(outapp); } } - + void NPC::AddItem(const Item_Struct* item, uint16 charges, bool equipitem) { //slot isnt needed, its determined from the item. AddLootDrop(item, &itemlist, charges, 1, 127, equipitem, equipitem); @@ -369,7 +369,7 @@ void NPC::AddItem(uint32 itemid, uint16 charges, bool equipitem) { return; AddLootDrop(i, &itemlist, charges, 1, 127, equipitem, equipitem); } - + void NPC::AddLootTable() { if (npctype_id != 0) { // check if it's a GM spawn database.AddLootTableToNPC(this,loottable_id, &itemlist, &copper, &silver, &gold, &platinum); diff --git a/zone/map.h b/zone/map.h index 31f2c8928..d7f435b99 100644 --- a/zone/map.h +++ b/zone/map.h @@ -71,7 +71,7 @@ typedef struct _mapHeader { unsigned shorts are adequate because, worst case even in a zone that is 6000x6000 with a small node size of 30x30, there are only 40000 nodes. - + quadrent definitions: quad 1 (nodes[0]): x>=0, y>=0 @@ -81,7 +81,7 @@ typedef struct _mapHeader { x<0, y<0 quad 4 (nodes[3]): x>=0, y<0 - + */ enum { //node flags nodeFinal = 0x01 @@ -97,7 +97,7 @@ typedef struct _nodeHeader { float miny; float maxx; float maxy; - + uint8 flags; union { uint16 nodes[4]; //index 0 means nullptr, not root @@ -126,27 +126,27 @@ typedef uint16 NodeRef; class Map { public: static Map* LoadMapfile(const char* in_zonename, const char *directory = nullptr); - + Map(); ~Map(); - + bool loadMap(FILE *fp); - + //the result is always final, except special NODE_NONE NodeRef SeekNode( NodeRef _node, float x, float y ) const; - + //these are untested since rewrite: int *SeekFace( NodeRef _node, float x, float y ); float GetFaceHeight( int _idx, float x, float y ) const; - + bool LocWithinNode( NodeRef _node, float x, float y ) const; - + //nodes to these functions must be final bool LineIntersectsNode( NodeRef _node, VERTEX start, VERTEX end, VERTEX *result, FACE **on = nullptr) const; bool LineIntersectsFace( PFACE cface, VERTEX start, VERTEX end, VERTEX *result) const; float FindBestZ( NodeRef _node, VERTEX start, VERTEX *result, FACE **on = nullptr) const; bool LineIntersectsZone(VERTEX start, VERTEX end, float step, VERTEX *result, FACE **on = nullptr) const; - + // inline unsigned int GetVertexNumber( ) {return m_Vertex; } inline uint32 GetFacesNumber( ) const { return m_Faces; } // inline PVERTEX GetVertex( int _idx ) {return mFinalVertex + _idx; } @@ -154,7 +154,7 @@ public: inline PFACE GetFaceFromlist( int _idx) {return &mFinalFaces[ mFaceLists[_idx] ]; } inline NodeRef GetRoot( ) const { return MAP_ROOT_NODE; } inline PNODE GetNode( NodeRef r ) { return( mNodes + r ); } - + inline float GetMinX() const { return(_minx); } inline float GetMaxX() const { return(_maxx); } inline float GetMinY() const { return(_miny); } @@ -173,13 +173,13 @@ private: PFACE mFinalFaces; PNODE mNodes; uint32 *mFaceLists; - - + + int mCandFaces[100]; - + float _minz, _maxz; float _minx, _miny, _maxx, _maxy; - + static void Normalize(VERTEX *p); // void RecLoadNode( PNODE _node, FILE *l_f ); diff --git a/zone/masterentity.h b/zone/masterentity.h index 0a8372dea..f4199c168 100644 --- a/zone/masterentity.h +++ b/zone/masterentity.h @@ -1,4 +1,4 @@ -//Trumpcard: EntityLists are composed of multiple list types. This is the +//Trumpcard: EntityLists are composed of multiple list types. This is the //master that includes all types. When entity.h is required, many of these are as well. #include "entity.h" diff --git a/zone/maxskill.h b/zone/maxskill.h index 446b79c2e..d9f8b4ff5 100644 --- a/zone/maxskill.h +++ b/zone/maxskill.h @@ -1272,7 +1272,7 @@ uint16 Mob::MaxSkill_defensive(uint16 skillid, uint16 class_, uint16 level) cons case BARD: case BARDGM: default: break; } - break; + break; } case DISARM:{ switch (class_) { @@ -1500,7 +1500,7 @@ uint16 Mob::MaxSkill_arcane(uint16 skillid, uint16 class_, uint16 level) const{ r_value = 0; break; } - + // Int caster case ENCHANTER: case ENCHANTERGM: case MAGICIAN: case MAGICIANGM: @@ -1510,7 +1510,7 @@ uint16 Mob::MaxSkill_arcane(uint16 skillid, uint16 class_, uint16 level) const{ r_value = 0; break; } - + //make sure only 1 skill can be over 50 uint16 hskill = 0; uint16 high = 0; @@ -1544,7 +1544,7 @@ uint16 Mob::MaxSkill_arcane(uint16 skillid, uint16 class_, uint16 level) const{ r_value = 50; break; } - + if (r_value > 200) r_value = 200; break; @@ -1802,7 +1802,7 @@ uint16 Mob::MaxSkill_class(uint16 skillid, uint16 class_, uint16 level) const{ }// Class Switch break; } - + //Berzerkers case BERSERKING: { switch(class_){ @@ -1817,7 +1817,7 @@ uint16 Mob::MaxSkill_class(uint16 skillid, uint16 class_, uint16 level) const{ } break; } - + // Shaman case ALCHEMY:{ switch(class_){ @@ -1875,7 +1875,7 @@ uint16 Mob::MaxSkill_class(uint16 skillid, uint16 class_, uint16 level) const{ }// Class Switch break; } - + case SNEAK:{ switch(class_){ // True class @@ -1924,7 +1924,7 @@ uint16 Mob::MaxSkill_class(uint16 skillid, uint16 class_, uint16 level) const{ }// Class Switch break; } - + case SENSE_TRAPS: case PICK_LOCK: case DISARM_TRAPS:{ @@ -2204,25 +2204,25 @@ uint16 Mob::MaxSkill(uint16 skillid, uint16 class_, uint16 level) const { } break; } - case CLERIC: case CLERICGM:{ - r_value = ((level*5)+5); + case CLERIC: case CLERICGM:{ + r_value = ((level*5)+5); if(level >= 50) { if(r_value > 201) - r_value = 201; + r_value = 201; } else { if(r_value > 200) r_value = 200; } break; } - + case DRUID: case DRUIDGM: case SHAMAN: case SHAMANGM:{ r_value = ((level*5) + 5); if(r_value > 200) - r_value = 200; + r_value = 200; break; - } + } case MAGICIAN: case MAGICIANGM: case ENCHANTER: case ENCHANTERGM: case NECROMANCER: case NECROMANCERGM: @@ -2234,23 +2234,23 @@ uint16 Mob::MaxSkill(uint16 skillid, uint16 class_, uint16 level) const { } case BEASTLORD: case BEASTLORDGM: case BERSERKER: case BERSERKERGM: - case MONK: case MONKGM: { - r_value = ((level*5)+5); + case MONK: case MONKGM: { + r_value = ((level*5)+5); if(level >= 50) { if(r_value > 210) - r_value = 210; + r_value = 210; } else { if(r_value > 200) r_value = 200; } break; } - case PALADIN: case PALADINGM: { + case PALADIN: case PALADINGM: { if (level > 10) { - r_value = (((level-10)*5)+5); + r_value = (((level-10)*5)+5); if(level >= 50) { if(r_value > 210) - r_value = 210; + r_value = 210; } else { if(r_value > 200) r_value = 200; @@ -2258,12 +2258,12 @@ uint16 Mob::MaxSkill(uint16 skillid, uint16 class_, uint16 level) const { } break; } - case RANGER: case RANGERGM: { + case RANGER: case RANGERGM: { if (level > 15) { - r_value = (((level-15)*5)+5); + r_value = (((level-15)*5)+5); if(level >= 50) { if(r_value > 200) - r_value = 200; + r_value = 200; } else { if(r_value > 150) r_value = 150; @@ -2271,35 +2271,35 @@ uint16 Mob::MaxSkill(uint16 skillid, uint16 class_, uint16 level) const { } break; } - - case ROGUE: case ROGUEGM: { - r_value = ((level*5)+5); + + case ROGUE: case ROGUEGM: { + r_value = ((level*5)+5); if(level >= 50) { if(r_value > 210) - r_value = 210; + r_value = 210; } else { if(r_value > 176) r_value = 176; } break; } - case SHADOWKNIGHT: case SHADOWKNIGHTGM: { - r_value = ((level*5)+5); - if(level >= 50) { + case SHADOWKNIGHT: case SHADOWKNIGHTGM: { + r_value = ((level*5)+5); + if(level >= 50) { if(r_value > 200) - r_value = 200; + r_value = 200; } else { if(r_value > 150) r_value = 150; } break; } - case WARRIOR: case WARRIORGM: { + case WARRIOR: case WARRIORGM: { if (level > 5) { - r_value = (((level-5)*5)+5); + r_value = (((level-5)*5)+5); if(level >= 50) { if(r_value > 210) - r_value = 210; + r_value = 210; } else { if(r_value > 175) r_value = 175; @@ -2307,7 +2307,7 @@ uint16 Mob::MaxSkill(uint16 skillid, uint16 class_, uint16 level) const { } break; } - + default: r_value = 0; break; } diff --git a/zone/merc.cpp b/zone/merc.cpp index 6f7c8142f..1a2ff67e7 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -1786,7 +1786,7 @@ void Merc::AI_Process() { SetHatedCount(0); confidence_timer.Disable(); _check_confidence = false; - + if(!check_target_timer.Enabled()) check_target_timer.Start(2000, false); @@ -2596,7 +2596,7 @@ void Merc::CheckHateList() { } } - + hateEntryIter++; }*/ } @@ -3923,12 +3923,12 @@ MercSpell Merc::GetBestMercSpellForAENuke(Merc* caster, Mob* tar) { //check if we have a spell & allow for other AE nuke types if(result.spellid == 0 && MakeRandomInt(1, 100) <= castChanceFalloff) { - + result = GetBestMercSpellForPBAENuke(caster, tar); //check if we have a spell & allow for other AE nuke types if(result.spellid == 0 && MakeRandomInt(1, 100) <= castChanceFalloff) { - + result = GetBestMercSpellForTargetedAENuke(caster, tar); } } @@ -4106,7 +4106,7 @@ MercSpell Merc::GetBestMercSpellForNuke(Merc* caster) { for(std::list::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) { // Assuming all the spells have been loaded into this list by level and in descending order - if(IsPureNukeSpell(mercSpellListItr->spellid) && !IsAENukeSpell(mercSpellListItr->spellid) + if(IsPureNukeSpell(mercSpellListItr->spellid) && !IsAENukeSpell(mercSpellListItr->spellid) && MakeRandomInt(1, 100) <= castChance && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) { result.spellid = mercSpellListItr->spellid; result.stance = mercSpellListItr->stance; @@ -5250,7 +5250,7 @@ void Client::UpdateMercTimer() GetMercInfo().MercTimerRemaining = RuleI(Mercs, UpkeepIntervalMS); SendMercTimerPacket(GetMercID(), 5, 0, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); - GetMercTimer()->Start(RuleI(Mercs, UpkeepIntervalMS)); + GetMercTimer()->Start(RuleI(Mercs, UpkeepIntervalMS)); GetMercTimer()->SetTimer(GetMercInfo().MercTimerRemaining); // Send upkeep charge message and reset the upkeep timer @@ -5436,7 +5436,7 @@ bool Client::CheckCanUnsuspendMerc() { { SendMercMerchantResponsePacket(16); Message(0, "You must wait %i seconds before unsuspending your mercenary.", GetPTimers().GetRemainingTime(pTimerMercSuspend)); //todo: find this packet response and tell them properly. - return false; + return false; } return true; } @@ -5608,7 +5608,7 @@ bool Merc::Unsuspend(bool setMaxStats) { mercOwner->SendMercenaryUnsuspendPacket(0); mercOwner->SendMercenaryUnknownPacket(1); mercOwner->GetMercInfo().SuspendedTime = 0; - mercOwner->GetMercTimer()->Start(RuleI(Mercs, UpkeepIntervalMS)); + mercOwner->GetMercTimer()->Start(RuleI(Mercs, UpkeepIntervalMS)); mercOwner->GetMercTimer()->SetTimer(mercOwner->GetMercInfo().MercTimerRemaining); mercOwner->SendMercTimerPacket(GetID(), mercState, suspendedTime, mercOwner->GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); if(!mercOwner->GetPTimers().Expired(&database, pTimerMercSuspend, false)) @@ -5770,7 +5770,7 @@ bool Merc::AddMercToGroup(Merc* merc, Group* group) { Merc::RemoveMercFromGroup(merc, merc->GetGroup()); } //Try and add the member, followed by checking if the merc owner exists. - if(group->AddMember(merc) && merc->GetMercOwner() != nullptr) { + if(group->AddMember(merc) && merc->GetMercOwner() != nullptr) { merc->SetFollowID(merc->GetMercOwner()->GetID()); Result = true; } @@ -5863,7 +5863,7 @@ void Client::SetMerc(Merc* newmerc) { GetMercInfo().IsSuspended = newmerc->IsSuspended(); GetMercInfo().SuspendedTime = 0; GetMercInfo().Gender = newmerc->GetGender(); - //GetMercInfo().State = newmerc->GetStance(); + //GetMercInfo().State = newmerc->GetStance(); } } diff --git a/zone/mob.cpp b/zone/mob.cpp index 6782a8826..7daaad8cf 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -83,7 +83,7 @@ Mob::Mob(const char* in_name, uint8 in_qglobal, uint8 in_maxlevel, uint32 in_scalerate - ) : + ) : attack_timer(2000), attack_dw_timer(2000), ranged_timer(2000), @@ -98,7 +98,7 @@ Mob::Mob(const char* in_name, bindwound_timer(10000), gravity_timer(1000), viral_timer(0) - + { targeted = 0; tar_ndx=0; @@ -121,7 +121,7 @@ Mob::Mob(const char* in_name, rewind_y = 0; //Stored y_pos for /rewind rewind_z = 0; //Stored z_pos for /rewind move_tic_count = 0; - + _egnode = nullptr; adverrorinfo = 0; name[0]=0; @@ -151,11 +151,11 @@ Mob::Mob(const char* in_name, base_size = size; runspeed = in_runspeed; - + // sanity check if (runspeed < 0 || runspeed > 20) runspeed = 1.25f; - + heading = in_heading; x_pos = in_x_pos; y_pos = in_y_pos; @@ -192,7 +192,7 @@ Mob::Mob(const char* in_name, WIS = in_wis; CHA = in_cha; MR = CR = FR = DR = PR = Corrup = 0; - + ExtraHaste = 0; bEnraged = false; @@ -261,7 +261,7 @@ Mob::Mob(const char* in_name, islooting = false; _appearance = eaStanding; pRunAnimSpeed = 0; - + spellend_timer.Disable(); bardsong_timer.Disable(); bardsong = 0; @@ -271,7 +271,7 @@ Mob::Mob(const char* in_name, casting_spell_timer_duration = 0; casting_spell_type = 0; target = 0; - + memset(&itembonuses, 0, sizeof(StatBonuses)); memset(&spellbonuses, 0, sizeof(StatBonuses)); memset(&aabonuses, 0, sizeof(StatBonuses)); @@ -285,7 +285,7 @@ Mob::Mob(const char* in_name, held = false; nocast = false; focused = false; - + attacked_count = 0; mezzed = false; stunned = false; @@ -317,7 +317,7 @@ Mob::Mob(const char* in_name, fear_walkto_x = -999999; fear_walkto_y = -999999; fear_walkto_z = -999999; - curfp = false; + curfp = false; flee_timer.Start(); permarooted = (runspeed > 0) ? false : true; @@ -337,16 +337,16 @@ Mob::Mob(const char* in_name, see_hide = in_see_hide != 0; see_improved_hide = in_see_improved_hide != 0; qglobal = in_qglobal != 0; - + // Bind wound bindwound_timer.Disable(); bindwound_target = 0; - + trade = new Trade(this); // hp event nexthpevent = -1; nextinchpevent = -1; - + TempPets(false); SetHasRune(false); SetHasSpellRune(false); @@ -376,16 +376,16 @@ Mob::Mob(const char* in_name, m_AllowBeneficial = false; m_DisableMelee = false; - for (int i = 0; i < HIGHEST_SKILL+2; i++) { SkillDmgTaken_Mod[i] = 0; } - for (int i = 0; i < HIGHEST_RESIST+2; i++) { Vulnerability_Mod[i] = 0; } + for (int i = 0; i < HIGHEST_SKILL+2; i++) { SkillDmgTaken_Mod[i] = 0; } + for (int i = 0; i < HIGHEST_RESIST+2; i++) { Vulnerability_Mod[i] = 0; } emoteid = 0; } Mob::~Mob() { - // Our Entity ID is set to 0 in NPC::Death. This leads to mobs hanging around for a while in - // the entity list, even after they have been destroyed. Use our memory pointer to remove the mob + // Our Entity ID is set to 0 in NPC::Death. This leads to mobs hanging around for a while in + // the entity list, even after they have been destroyed. Use our memory pointer to remove the mob // if our EntityID is 0. // if(GetID() > 0) @@ -409,9 +409,9 @@ Mob::~Mob() Corpse* corpse = entity_list.GetCorpseByID(GetID()); if(!corpse || (corpse && !corpse->IsPlayerCorpse())) entity_list.QueueClients(this, &app, true); - + entity_list.RemoveFromTargets(this, true); - + if(trade) { Mob *with = trade->With(); if(with && with->IsClient()) { @@ -477,20 +477,20 @@ bool Mob::IsInvisible(Mob* other) const if(!other) return(false); - uint8 SeeInvisBonus = 0; + uint8 SeeInvisBonus = 0; if (IsClient()) SeeInvisBonus = aabonuses.SeeInvis; - + //check regular invisibility if (invisible && invisible > (other->SeeInvisible())) return true; - + //check invis vs. undead if (other->GetBodyType() == BT_Undead || other->GetBodyType() == BT_SummonedUndead) { if(invisible_undead && !other->SeeInvisibleUndead()) return true; } - + //check invis vs. animals... if (other->GetBodyType() == BT_Animal){ if(invisible_animals && !other->SeeInvisible()) @@ -508,13 +508,13 @@ bool Mob::IsInvisible(Mob* other) const return true; } } - + //handle sneaking if(sneaking) { if(BehindMob(other, GetX(), GetY()) ) return true; } - + return(false); } @@ -523,7 +523,7 @@ float Mob::_GetMovementSpeed(int mod) const { // http://everquest.allakhazam.com/db/item.html?item=1721;page=1;howmany=50#m10822246245352 if (IsRooted()) return 0.0f; - + float aa_mod = 0.0f; float speed_mod = runspeed; bool has_horse = false; @@ -543,9 +543,9 @@ float Mob::_GetMovementSpeed(int mod) const { } } } - - aa_mod += itembonuses.BaseMovementSpeed + spellbonuses.BaseMovementSpeed + aabonuses.BaseMovementSpeed; - + + aa_mod += itembonuses.BaseMovementSpeed + spellbonuses.BaseMovementSpeed + aabonuses.BaseMovementSpeed; + int spell_mod = spellbonuses.movementspeed + itembonuses.movementspeed; int movemod = 0; @@ -561,10 +561,10 @@ float Mob::_GetMovementSpeed(int mod) const { { movemod = static_cast(aa_mod); } - + if(movemod < -85) //cap it at moving very very slow movemod = -85; - + if (!has_horse && movemod != 0) speed_mod += (speed_mod * float(movemod) / 100.0f); @@ -592,7 +592,7 @@ float Mob::_GetMovementSpeed(int mod) const { return speed_mod; } -int32 Mob::CalcMaxMana() { +int32 Mob::CalcMaxMana() { switch (GetCasterClass()) { case 'I': max_mana = (((GetINT()/2)+1) * GetLevel()) + spellbonuses.Mana + itembonuses.Mana; @@ -608,7 +608,7 @@ int32 Mob::CalcMaxMana() { if (max_mana < 0) { max_mana = 0; } - + return max_mana; } @@ -722,7 +722,7 @@ void Mob::CreateSpawnPacket(EQApplicationPacket* app, Mob* ForWho) { app->SetOpcode(OP_NewSpawn); app->size = sizeof(NewSpawn_Struct); app->pBuffer = new uchar[app->size]; - memset(app->pBuffer, 0, app->size); + memset(app->pBuffer, 0, app->size); NewSpawn_Struct* ns = (NewSpawn_Struct*)app->pBuffer; FillSpawnStruct(ns, ForWho); } @@ -730,12 +730,12 @@ void Mob::CreateSpawnPacket(EQApplicationPacket* app, Mob* ForWho) { void Mob::CreateSpawnPacket(EQApplicationPacket* app, NewSpawn_Struct* ns) { app->SetOpcode(OP_NewSpawn); app->size = sizeof(NewSpawn_Struct); - + app->pBuffer = new uchar[sizeof(NewSpawn_Struct)]; - + // Copy ns directly into packet memcpy(app->pBuffer, ns, sizeof(NewSpawn_Struct)); - + // Custom packet data NewSpawn_Struct* ns2 = (NewSpawn_Struct*)app->pBuffer; strcpy(ns2->spawn.name, ns->spawn.name); @@ -809,7 +809,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) ns->spawn.findable = findable?1:0; // vesuvias - appearence fix ns->spawn.light = light; - ns->spawn.showhelm = 1; + ns->spawn.showhelm = 1; ns->spawn.invis = (invisible || hidden) ? 1 : 0; // TODO: load this before spawning players ns->spawn.NPC = IsClient() ? 0 : 1; @@ -838,7 +838,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) } else { ns->spawn.helm = 0; } - + ns->spawn.guildrank = 0xFF; ns->spawn.size = size; ns->spawn.bodytype = bodytype; @@ -856,7 +856,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) ns->spawn.flymode = flymode; ns->spawn.lastName[0] = '\0'; - + strn0cpy(ns->spawn.lastName, lastname, sizeof(ns->spawn.lastName)); for(i = 0; i < MAX_MATERIALS; i++) @@ -871,12 +871,12 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) ns->spawn.colors[i].color = GetEquipmentColor(i); } } - + memset(ns->spawn.set_to_0xFF, 0xFF, sizeof(ns->spawn.set_to_0xFF)); if(IsNPC() && IsDestructibleObject()) { ns->spawn.DestructibleObject = true; - + // Changing the first string made it vanish, so it has some significance. if(lastname) sprintf(ns->spawn.DestructibleModel, lastname); @@ -940,18 +940,18 @@ void Mob::CreateDespawnPacket(EQApplicationPacket* app, bool Decay) } void Mob::CreateHPPacket(EQApplicationPacket* app) -{ - this->IsFullHP=(cur_hp>=max_hp); - app->SetOpcode(OP_MobHealth); - app->size = sizeof(SpawnHPUpdate_Struct2); - app->pBuffer = new uchar[app->size]; - memset(app->pBuffer, 0, sizeof(SpawnHPUpdate_Struct2)); - SpawnHPUpdate_Struct2* ds = (SpawnHPUpdate_Struct2*)app->pBuffer; +{ + this->IsFullHP=(cur_hp>=max_hp); + app->SetOpcode(OP_MobHealth); + app->size = sizeof(SpawnHPUpdate_Struct2); + app->pBuffer = new uchar[app->size]; + memset(app->pBuffer, 0, sizeof(SpawnHPUpdate_Struct2)); + SpawnHPUpdate_Struct2* ds = (SpawnHPUpdate_Struct2*)app->pBuffer; - ds->spawn_id = GetID(); + ds->spawn_id = GetID(); // they don't need to know the real hp ds->hp = (int)GetHPRatio(); - + // hp event if (IsNPC() && (GetNextHPEvent() > 0)) { @@ -961,7 +961,7 @@ void Mob::CreateHPPacket(EQApplicationPacket* app) snprintf(buf, 9, "%i", GetNextHPEvent()); buf[9] = '\0'; SetNextHPEvent(-1); - parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 0); + parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 0); } } @@ -973,10 +973,10 @@ void Mob::CreateHPPacket(EQApplicationPacket* app) snprintf(buf, 9, "%i", GetNextIncHPEvent()); buf[9] = '\0'; SetNextIncHPEvent(-1); - parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 1); + parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 1); } } -} +} // sends hp update of this mob to people who might care void Mob::SendHPUpdate() @@ -1021,7 +1021,7 @@ void Mob::SendHPUpdate() if(r) r->SendHPPacketsFrom(this); } - + // send to pet if(GetPet() && GetPet()->IsClient()) { @@ -1085,10 +1085,10 @@ void Mob::SendHPUpdate() } // this one just warps the mob to the current location -void Mob::SendPosition() +void Mob::SendPosition() { EQApplicationPacket* app = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct)); - PlayerPositionUpdateServer_Struct* spu = (PlayerPositionUpdateServer_Struct*)app->pBuffer; + PlayerPositionUpdateServer_Struct* spu = (PlayerPositionUpdateServer_Struct*)app->pBuffer; MakeSpawnUpdateNoDelta(spu); move_tic_count = 0; entity_list.QueueClients(this, app, true); @@ -1100,7 +1100,7 @@ void Mob::SendPosUpdate(uint8 iSendToSelf) { EQApplicationPacket* app = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct)); PlayerPositionUpdateServer_Struct* spu = (PlayerPositionUpdateServer_Struct*)app->pBuffer; MakeSpawnUpdate(spu); - + if (iSendToSelf == 2) { if (this->IsClient()) this->CastToClient()->FastQueuePacket(&app,false); @@ -1166,9 +1166,9 @@ void Mob::MakeSpawnUpdate(PlayerPositionUpdateServer_Struct* spu) { spu->delta_heading = NewFloatToEQ13(static_cast(delta_heading)); } -void Mob::ShowStats(Client* client) +void Mob::ShowStats(Client* client) { - if (IsClient()) { + if (IsClient()) { CastToClient()->SendStatsWindow(client, RuleB(Character, UseNewStatsWindow)); } else if (IsCorpse()) { @@ -1187,9 +1187,9 @@ void Mob::ShowStats(Client* client) client->Message(0, " STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA()); client->Message(0, " MR: %i PR: %i FR: %i CR: %i DR: %i Corruption: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup()); client->Message(0, " Race: %i BaseRace: %i Texture: %i HelmTexture: %i Gender: %i BaseGender: %i", GetRace(), GetBaseRace(), GetTexture(), GetHelmTexture(), GetGender(), GetBaseGender()); - if (client->Admin() >= 100) + if (client->Admin() >= 100) client->Message(0, " EntityID: %i PetID: %i OwnerID: %i AIControlled: %i Targetted: %i", GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted); - + if (IsNPC()) { NPC *n = CastToNPC(); uint32 spawngroupid = 0; @@ -1585,14 +1585,14 @@ void Mob::QuestReward(Client *c, uint32 silver, uint32 gold, uint32 platinum) { memset(outapp->pBuffer, 0, sizeof(outapp->pBuffer)); QuestReward_Struct* qr = (QuestReward_Struct*) outapp->pBuffer; - qr->from_mob = GetID(); // Entity ID for the from mob name + qr->from_mob = GetID(); // Entity ID for the from mob name qr->silver = silver; qr->gold = gold; qr->platinum = platinum; - + if(c) c->QueuePacket(outapp, false, Client::CLIENT_CONNECTED); - + safe_delete(outapp); } @@ -1616,12 +1616,12 @@ void Mob::CameraEffect(uint32 duration, uint32 intensity, Client *c, bool global Camera_Struct* cs = (Camera_Struct*) outapp->pBuffer; cs->duration = duration; // Duration in milliseconds cs->intensity = ((intensity * 6710886) + 1023410176); // Intensity ranges from 1023410176 to 1090519040, so simplify it from 0 to 10. - + if(c) c->QueuePacket(outapp, false, Client::CLIENT_CONNECTED); else entity_list.QueueClients(this, outapp); - + safe_delete(outapp); } @@ -1639,14 +1639,14 @@ void Mob::SendSpellEffect(uint32 effectid, uint32 duration, uint32 finish_delay, se->Unknown024 = 1; // Seen 1 for SoD se->Unknown025 = 1; // Seen 1 for Live se->Unknown026 = 0; // Seen 1157 - + if(c) c->QueuePacket(outapp, false, Client::CLIENT_CONNECTED); else if(zone_wide) entity_list.QueueClients(this, outapp); else entity_list.QueueCloseClients(this, outapp); - + safe_delete(outapp); if (perm_effect) { @@ -1664,7 +1664,7 @@ void Mob::TempName(const char *newname) strn0cpy(old_name, GetName(), 64); if(newname) - strn0cpy(temp_name, newname, 64); + strn0cpy(temp_name, newname, 64); // Reset the name to the original if left null. if(!newname) { @@ -1676,7 +1676,7 @@ void Mob::TempName(const char *newname) // Make the new name unique and set it strn0cpy(temp_name, entity_list.MakeNameUnique(temp_name), 64); - + // Send the new name to all clients EQApplicationPacket* outapp = new EQApplicationPacket(OP_MobRename, sizeof(MobRename_Struct)); @@ -1853,16 +1853,16 @@ void Mob::SetAttackTimer() { PermaHaste = 1 * (1 - (float)GetHaste()/100); else PermaHaste = 1.0f; - + //default value for attack timer in case they have //an invalid weapon equipped: attack_timer.SetAtTrigger(4000, true); - + Timer* TimerToUse = nullptr; const Item_Struct* PrimaryWeapon = nullptr; - + for (int i=SLOT_RANGE; i<=SLOT_SECONDARY; i++) { - + //pick a timer if (i == SLOT_PRIMARY) TimerToUse = &attack_timer; @@ -1872,9 +1872,9 @@ void Mob::SetAttackTimer() { TimerToUse = &attack_dw_timer; else //invalid slot (hands will always hit this) continue; - + const Item_Struct* ItemToUse = nullptr; - + //find our item if (IsClient()) { ItemInst* ci = CastToClient()->GetInv().GetItem(i); @@ -1882,12 +1882,12 @@ void Mob::SetAttackTimer() { ItemToUse = ci->GetItem(); } else if(IsNPC()) { - //The code before here was fundementally flawed because equipment[] + //The code before here was fundementally flawed because equipment[] //isn't the same as PC inventory and also: //NPCs don't use weapon speed to dictate how fast they hit anyway. ItemToUse = nullptr; } - + //special offhand stuff if(i == SLOT_SECONDARY) { //if we have a 2H weapon in our main hand, no dual @@ -1916,12 +1916,12 @@ void Mob::SetAttackTimer() { } } } - + //see if we have a valid weapon if(ItemToUse != nullptr) { //check type and damage/delay - if(ItemToUse->ItemClass != ItemClassCommon - || ItemToUse->Damage == 0 + if(ItemToUse->ItemClass != ItemClassCommon + || ItemToUse->Damage == 0 || ItemToUse->Delay == 0) { //no weapon ItemToUse = nullptr; @@ -1968,7 +1968,7 @@ void Mob::SetAttackTimer() { if(IsClient()) { float max_quiver = 0; - for(int r = SLOT_PERSONAL_BEGIN; r <= SLOT_PERSONAL_END; r++) + for(int r = SLOT_PERSONAL_BEGIN; r <= SLOT_PERSONAL_END; r++) { const ItemInst *pi = CastToClient()->GetInv().GetItem(r); if(!pi) @@ -1991,17 +1991,17 @@ void Mob::SetAttackTimer() { } TimerToUse->SetAtTrigger(speed, true); } - + if(i == SLOT_PRIMARY) PrimaryWeapon = ItemToUse; } - + } bool Mob::CanThisClassDualWield(void) const { if (!IsClient()) { - return(GetSkill(DUAL_WIELD) > 0); + return(GetSkill(DUAL_WIELD) > 0); } else { const ItemInst* inst = CastToClient()->GetInv().GetItem(SLOT_PRIMARY); // 2HS, 2HB, or 2HP @@ -2016,7 +2016,7 @@ bool Mob::CanThisClassDualWield(void) const return false; } } - + return (CastToClient()->HasSkill(DUAL_WIELD)); // No skill = no chance } } @@ -2108,8 +2108,8 @@ float Mob::Dist(const Mob &other) const { float yDiff = other.y_pos - y_pos; float zDiff = other.z_pos - z_pos; - return sqrtf( (xDiff * xDiff) - + (yDiff * yDiff) + return sqrtf( (xDiff * xDiff) + + (yDiff * yDiff) + (zDiff * zDiff) ); } @@ -2117,8 +2117,8 @@ float Mob::DistNoZ(const Mob &other) const { _ZP(Mob_DistNoZ); float xDiff = other.x_pos - x_pos; float yDiff = other.y_pos - y_pos; - - return sqrtf( (xDiff * xDiff) + + return sqrtf( (xDiff * xDiff) + (yDiff * yDiff) ); } @@ -2128,8 +2128,8 @@ float Mob::DistNoRoot(const Mob &other) const { float yDiff = other.y_pos - y_pos; float zDiff = other.z_pos - z_pos; - return ( (xDiff * xDiff) - + (yDiff * yDiff) + return ( (xDiff * xDiff) + + (yDiff * yDiff) + (zDiff * zDiff) ); } @@ -2139,8 +2139,8 @@ float Mob::DistNoRoot(float x, float y, float z) const { float yDiff = y - y_pos; float zDiff = z - z_pos; - return ( (xDiff * xDiff) - + (yDiff * yDiff) + return ( (xDiff * xDiff) + + (yDiff * yDiff) + (zDiff * zDiff) ); } @@ -2149,7 +2149,7 @@ float Mob::DistNoRootNoZ(float x, float y) const { float xDiff = x - x_pos; float yDiff = y - y_pos; - return ( (xDiff * xDiff) + return ( (xDiff * xDiff) + (yDiff * yDiff) ); } @@ -2261,8 +2261,8 @@ bool Mob::HateSummon() { Mob* mob_owner = nullptr; if(GetOwnerID()) mob_owner = entity_list.GetMob(GetOwnerID()); - - if (GetHPRatio() >= 98 || SpecAttacks[SPECATK_SUMMON] == false || !GetTarget() || + + if (GetHPRatio() >= 98 || SpecAttacks[SPECATK_SUMMON] == false || !GetTarget() || (mob_owner && mob_owner->IsClient() && !CheckLosFN(GetTarget()))) return false; @@ -2337,13 +2337,13 @@ void Mob::FaceTarget(Mob* MobToFace) { } } -bool Mob::RemoveFromHateList(Mob* mob) +bool Mob::RemoveFromHateList(Mob* mob) { SetRunAnimSpeed(0); bool bFound = false; if(IsEngaged()) { - bFound = hate_list.RemoveEnt(mob); + bFound = hate_list.RemoveEnt(mob); if(hate_list.IsEmpty()) { AI_Event_NoLongerEngaged(); @@ -2357,9 +2357,9 @@ bool Mob::RemoveFromHateList(Mob* mob) return bFound; } -void Mob::WipeHateList() +void Mob::WipeHateList() { - if(IsEngaged()) + if(IsEngaged()) { AI_Event_NoLongerEngaged(); } @@ -2463,7 +2463,7 @@ void Mob::WearChange(uint8 material_slot, uint16 texture, uint32 color) int32 Mob::GetEquipmentMaterial(uint8 material_slot) const { const Item_Struct *item; - + item = database.GetItem(GetEquipment(material_slot)); if(item != 0) { @@ -2490,7 +2490,7 @@ int32 Mob::GetEquipmentMaterial(uint8 material_slot) const uint32 Mob::GetEquipmentColor(uint8 material_slot) const { const Item_Struct *item; - + item = database.GetItem(GetEquipment(material_slot)); if(item != 0) { @@ -2503,7 +2503,7 @@ uint32 Mob::GetEquipmentColor(uint8 material_slot) const uint32 Mob::IsEliteMaterialItem(uint8 material_slot) const { const Item_Struct *item; - + item = database.GetItem(GetEquipment(material_slot)); if(item != 0) { @@ -2518,11 +2518,11 @@ void Mob::Say(const char *format, ...) { char buf[1000]; va_list ap; - + va_start(ap, format); vsnprintf(buf, 1000, format, ap); va_end(ap); - + Mob* talker = this; if(spellbonuses.VoiceGraft != 0) { if(spellbonuses.VoiceGraft == GetPetID()) @@ -2530,10 +2530,10 @@ void Mob::Say(const char *format, ...) else spellbonuses.VoiceGraft = 0; } - + if(!talker) talker = this; - + entity_list.MessageClose_StringID(talker, false, 200, 10, GENERIC_SAY, GetCleanName(), buf); } @@ -2569,11 +2569,11 @@ void Mob::Shout(const char *format, ...) { char buf[1000]; va_list ap; - + va_start(ap, format); vsnprintf(buf, 1000, format, ap); va_end(ap); - + entity_list.Message_StringID(this, false, MT_Shout, GENERIC_SHOUT, GetCleanName(), buf); } @@ -2582,11 +2582,11 @@ void Mob::Emote(const char *format, ...) { char buf[1000]; va_list ap; - + va_start(ap, format); vsnprintf(buf, 1000, format, ap); va_end(ap); - + entity_list.MessageClose_StringID(this, false, 200, 10, GENERIC_EMOTE, GetCleanName(), buf); } @@ -2606,29 +2606,29 @@ const char *Mob::GetCleanName() return clean_name; } -// hp event -void Mob::SetNextHPEvent( int hpevent ) -{ +// hp event +void Mob::SetNextHPEvent( int hpevent ) +{ nexthpevent = hpevent; } -void Mob::SetNextIncHPEvent( int inchpevent ) -{ +void Mob::SetNextIncHPEvent( int inchpevent ) +{ nextinchpevent = inchpevent; } //warp for quest function,from sandy -void Mob::Warp( float x, float y, float z ) -{ - x_pos = x; - y_pos = y; - z_pos = z; +void Mob::Warp( float x, float y, float z ) +{ + x_pos = x; + y_pos = y; + z_pos = z; - Mob* target = GetTarget(); - if ( target ) { - FaceTarget( target ); - } + Mob* target = GetTarget(); + if ( target ) { + FaceTarget( target ); + } - SendPosition(); + SendPosition(); } @@ -2748,7 +2748,7 @@ void Mob::ExecWeaponProc(uint16 spell_id, Mob *on) { return; } /* - + int twinproc_chance = itembonuses.TwinProc + spellbonuses.TwinProc; if(IsClient()) twinproc_chance += aabonuses.TwinProc; @@ -2757,11 +2757,11 @@ void Mob::ExecWeaponProc(uint16 spell_id, Mob *on) { int32 twinproc_chance = 0; if(IsClient()) - twinproc_chance = CastToClient()->GetFocusEffect(focusTwincast, spell_id); - + twinproc_chance = CastToClient()->GetFocusEffect(focusTwincast, spell_id); + if(twinproc_chance && (MakeRandomInt(0,99) < twinproc_chance)) twinproc = true; - + if (IsBeneficialSpell(spell_id)) { SpellFinished(spell_id, this, 10, 0, -1, spells[spell_id].ResistDiff, true); if(twinproc) @@ -2795,7 +2795,7 @@ int Mob::GetHaste() { } else { cap = RuleI(Character, HasteCap); } - + if(h > cap) h = cap; h += spellbonuses.hastetype3; @@ -2803,13 +2803,13 @@ int Mob::GetHaste() { if (spellbonuses.inhibitmelee){ if (h >= 0) - h -= spellbonuses.inhibitmelee; - - else + h -= spellbonuses.inhibitmelee; + + else h -=((100+h)*spellbonuses.inhibitmelee/100); } - return(h); + return(h); } void Mob::SetTarget(Mob* mob) { @@ -2822,7 +2822,7 @@ void Mob::SetTarget(Mob* mob) { parse->EventPlayer(EVENT_TARGET_CHANGE, CastToClient(), "", 0); //parse->Event(EVENT_TARGET_CHANGE, 0, "", (NPC*)nullptr, this->CastToClient()); if(IsPet() && GetOwner() && GetOwner()->IsClient()) - GetOwner()->CastToClient()->UpdateXTargetType(MyPetTarget, mob); + GetOwner()->CastToClient()->UpdateXTargetType(MyPetTarget, mob); } float Mob::FindGroundZ(float new_x, float new_y, float z_offset) @@ -2886,7 +2886,7 @@ int Mob::CountDispellableBuffs() if(buffs[x].counters) continue; - + if(spells[buffs[x].spellid].goodEffect == 0) continue; @@ -3018,7 +3018,7 @@ void Mob::TryTriggerOnCast(uint32 spell_id, bool aa_trigger) if (aabonuses.SpellTriggers[0] || spellbonuses.SpellTriggers[0] || itembonuses.SpellTriggers[0]){ for(int i = 0; i < MAX_SPELL_TRIGGER; i++){ - + if(aabonuses.SpellTriggers[i] && IsClient()) TriggerOnCast(aabonuses.SpellTriggers[i], spell_id,1); @@ -3042,14 +3042,14 @@ void Mob::TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger) if (aa_trigger && IsClient()){ //focus_spell = aaid trigger_spell_id = CastToClient()->CalcAAFocus(focusTriggerOnCast, focus_spell, spell_id); - + if(IsValidSpell(trigger_spell_id) && GetTarget()) SpellFinished(trigger_spell_id, GetTarget()); } else{ trigger_spell_id = CalcFocusEffect(focusTriggerOnCast, focus_spell, spell_id); - + if(IsValidSpell(trigger_spell_id) && GetTarget()){ SpellFinished(trigger_spell_id, GetTarget()); CheckHitsRemaining(0, false,false, 0, focus_spell); @@ -3078,7 +3078,7 @@ void Mob::TrySpellTrigger(Mob *target, uint32 spell_id) { if (spells[spell_id].effectid[i] == SE_SpellTrigger) { - if(MakeRandomInt(0, trig_chance) <= spells[spell_id].base[i]) + if(MakeRandomInt(0, trig_chance) <= spells[spell_id].base[i]) { // If we trigger an effect then its over. SpellFinished(spells[spell_id].base2[i], target); @@ -3090,7 +3090,7 @@ void Mob::TrySpellTrigger(Mob *target, uint32 spell_id) trig_chance -= spells[spell_id].base[i]; } } - + } } // if the chances don't add to 100, then each effect gets a chance to fire, chance for no trigger as well. @@ -3100,7 +3100,7 @@ void Mob::TrySpellTrigger(Mob *target, uint32 spell_id) { if (spells[spell_id].effectid[i] == SE_SpellTrigger) { - if(MakeRandomInt(0, 100) <= spells[spell_id].base[i]) + if(MakeRandomInt(0, 100) <= spells[spell_id].base[i]) { SpellFinished(spells[spell_id].base2[i], target); } @@ -3120,7 +3120,7 @@ void Mob::TryApplyEffect(Mob *target, uint32 spell_id) { if (spells[spell_id].effectid[i] == SE_ApplyEffect) { - if(MakeRandomInt(0, 100) <= spells[spell_id].base[i]) + if(MakeRandomInt(0, 100) <= spells[spell_id].base[i]) { if(target) SpellFinished(spells[spell_id].base2[i], target); @@ -3133,10 +3133,10 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id) { if(!IsValidSpell(spell_id)) return; - + if(IsClient()) { - int32 focus = CastToClient()->GetFocusEffect(focusTwincast, spell_id); + int32 focus = CastToClient()->GetFocusEffect(focusTwincast, spell_id); if (focus > 0) { @@ -3152,7 +3152,7 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id) else if (spellbonuses.FocusEffects[focusTwincast] || itembonuses.FocusEffects[focusTwincast]) { int buff_count = GetMaxTotalSlots(); - for(int i = 0; i < buff_count; i++) + for(int i = 0; i < buff_count; i++) { if(IsEffectInSpell(buffs[i].spellid, SE_Twincast)) { @@ -3176,7 +3176,7 @@ int32 Mob::GetVulnerability(int32 damage, Mob *caster, uint32 spell_id, uint32 t //Apply innate vulnerabilities if (Vulnerability_Mod[GetSpellResistType(spell_id)] != 0) damage += damage * Vulnerability_Mod[GetSpellResistType(spell_id)] / 100; - + else if (Vulnerability_Mod[HIGHEST_RESIST+1] != 0) damage += damage * Vulnerability_Mod[HIGHEST_RESIST+1] / 100; @@ -3199,20 +3199,20 @@ int32 Mob::GetVulnerability(int32 damage, Mob *caster, uint32 spell_id, uint32 t if (tmp_focus && focus > tmp_focus){ tmp_focus = focus; - tmp_buffslot = i; + tmp_buffslot = i; } else if (!tmp_focus){ tmp_focus = focus; - tmp_buffslot = i; + tmp_buffslot = i; } - + } } if (tmp_focus < -99) tmp_focus = -99; - + damage += damage * tmp_focus / 100; if (tmp_buffslot >= 0) @@ -3226,9 +3226,9 @@ int16 Mob::GetSkillDmgTaken(const SkillType skill_used) int skilldmg_mod = 0; // All skill dmg mod + Skill specific - skilldmg_mod += itembonuses.SkillDmgTaken[HIGHEST_SKILL+1] + spellbonuses.SkillDmgTaken[HIGHEST_SKILL+1] + + skilldmg_mod += itembonuses.SkillDmgTaken[HIGHEST_SKILL+1] + spellbonuses.SkillDmgTaken[HIGHEST_SKILL+1] + itembonuses.SkillDmgTaken[skill_used] + spellbonuses.SkillDmgTaken[skill_used]; - + //Innate SetSkillDamgeTaken(skill,value) if ((SkillDmgTaken_Mod[skill_used]) || (SkillDmgTaken_Mod[HIGHEST_SKILL+1])) skilldmg_mod += SkillDmgTaken_Mod[skill_used] + SkillDmgTaken_Mod[HIGHEST_SKILL+1]; @@ -3250,7 +3250,7 @@ int16 Mob::GetHealRate(uint16 spell_id) if (target){ heal_rate = target->itembonuses.HealRate + target->spellbonuses.HealRate; - + if (target->IsClient()) heal_rate += target->CastToClient()->GetFocusEffect(focusHealRate, spell_id); @@ -3269,7 +3269,7 @@ int16 Mob::GetCriticalHealRate(uint16 spell_id) if (target && target->IsClient()) critical_heal_rate = target->CastToClient()->GetFocusEffect(focusCriticalHealRate, spell_id); - + return critical_heal_rate; } @@ -3283,10 +3283,10 @@ bool Mob::TryFadeEffect(int slot) { uint16 spell_id = spells[buffs[slot].spellid].base[i]; BuffFadeBySlot(slot); - + if(spell_id) - { - + { + if(spell_id == SPELL_UNKNOWN) return false; @@ -3311,7 +3311,7 @@ void Mob::TrySympatheticProc(Mob *target, uint32 spell_id) { if(target == nullptr || !IsValidSpell(spell_id)) return; - + int focus_spell = CastToClient()->GetSympatheticFocusEffect(focusSympatheticProc,spell_id); if(IsValidSpell(focus_spell)){ @@ -3322,7 +3322,7 @@ void Mob::TrySympatheticProc(Mob *target, uint32 spell_id) { if(IsBeneficialSpell(focus_trigger)) SpellFinished(focus_trigger, target); - + else SpellFinished(focus_trigger, this); } @@ -3929,7 +3929,7 @@ void Mob::DoKnockback(Mob *caster, uint32 pushback, uint32 pushup) EQApplicationPacket* outapp_push = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct)); PlayerPositionUpdateServer_Struct* spu = (PlayerPositionUpdateServer_Struct*)outapp_push->pBuffer; - + double look_heading = caster->CalculateHeadingToTarget(GetX(), GetY()); look_heading /= 256; look_heading *= 360; @@ -3978,27 +3978,27 @@ void Mob::TrySpellOnKill(uint8 level, uint16 spell_id) } } - if (!aabonuses.SpellOnKill[0] && !itembonuses.SpellOnKill[0] && !spellbonuses.SpellOnKill[0]) + if (!aabonuses.SpellOnKill[0] && !itembonuses.SpellOnKill[0] && !spellbonuses.SpellOnKill[0]) return; - + // Allow to check AA, items and buffs in all cases. Base2 = Spell to fire | Base1 = % chance | Base3 = min level for(int i = 0; i < MAX_SPELL_TRIGGER*3; i+=3) { - + if(aabonuses.SpellOnKill[i] && (level >= aabonuses.SpellOnKill[i + 2])) { if(MakeRandomInt(0, 99) < static_cast(aabonuses.SpellOnKill[i + 1])) SpellFinished(aabonuses.SpellOnKill[i], this); } if(itembonuses.SpellOnKill[i] && (level >= itembonuses.SpellOnKill[i + 2])){ - if(MakeRandomInt(0, 99) < static_cast(itembonuses.SpellOnKill[i + 1])) + if(MakeRandomInt(0, 99) < static_cast(itembonuses.SpellOnKill[i + 1])) SpellFinished(itembonuses.SpellOnKill[i], this); } - + if(spellbonuses.SpellOnKill[i] && (level >= spellbonuses.SpellOnKill[i + 2])) { - if(MakeRandomInt(0, 99) < static_cast(spellbonuses.SpellOnKill[i + 1])) + if(MakeRandomInt(0, 99) < static_cast(spellbonuses.SpellOnKill[i + 1])) SpellFinished(spellbonuses.SpellOnKill[i], this); } - + } } @@ -4006,7 +4006,7 @@ bool Mob::TrySpellOnDeath() { if (IsNPC() && !spellbonuses.SpellOnDeath[0] && !itembonuses.SpellOnDeath[0]) return false; - + if (IsClient() && !aabonuses.SpellOnDeath[0] && !spellbonuses.SpellOnDeath[0] && !itembonuses.SpellOnDeath[0]) return false; @@ -4019,20 +4019,20 @@ bool Mob::TrySpellOnDeath() if(itembonuses.SpellOnDeath[i]) { if(MakeRandomInt(0, 99) < static_cast(itembonuses.SpellOnDeath[i + 1])) { - SpellFinished(itembonuses.SpellOnDeath[i], this); + SpellFinished(itembonuses.SpellOnDeath[i], this); } } - + if(spellbonuses.SpellOnDeath[i]) { if(MakeRandomInt(0, 99) < static_cast(spellbonuses.SpellOnDeath[i + 1])) { - SpellFinished(spellbonuses.SpellOnDeath[i], this); + SpellFinished(spellbonuses.SpellOnDeath[i], this); } } } - + BuffFadeAll(); return false; - //You should not be able to use this effect and survive (ALWAYS return false), + //You should not be able to use this effect and survive (ALWAYS return false), //attempting to place a heal in these effects will still result //in death because the heal will not register before the script kills you. } @@ -4103,7 +4103,7 @@ int16 Mob::GetMeleeDamageMod_SE(uint16 skill) // All skill dmg mod + Skill specific dmg_mod += itembonuses.DamageModifier[HIGHEST_SKILL+1] + spellbonuses.DamageModifier[HIGHEST_SKILL+1] + aabonuses.DamageModifier[HIGHEST_SKILL+1] + itembonuses.DamageModifier[skill] + spellbonuses.DamageModifier[skill] + aabonuses.DamageModifier[skill]; - + if(dmg_mod < -100) dmg_mod = -100; @@ -4116,7 +4116,7 @@ int16 Mob::GetMeleeDamageMod_SE(uint16 skill) int16 Mob::GetMeleeMinDamageMod_SE(uint16 skill) { int dmg_mod = 0; - + dmg_mod = itembonuses.MinDamageModifier[skill] + spellbonuses.MinDamageModifier[skill] + itembonuses.MinDamageModifier[HIGHEST_SKILL+1] + spellbonuses.MinDamageModifier[HIGHEST_SKILL+1]; @@ -4131,7 +4131,7 @@ int16 Mob::GetCrippBlowChance() int16 crip_chance = 0; crip_chance += itembonuses.CrippBlowChance + spellbonuses.CrippBlowChance + aabonuses.CrippBlowChance; - + if(crip_chance < 0) crip_chance = 0; @@ -4141,7 +4141,7 @@ int16 Mob::GetCrippBlowChance() int16 Mob::GetSkillReuseTime(uint16 skill) { int skill_reduction = this->itembonuses.SkillReuseTime[skill] + this->spellbonuses.SkillReuseTime[skill] + this->aabonuses.SkillReuseTime[skill]; - + return skill_reduction; } @@ -4162,7 +4162,7 @@ int16 Mob::GetSkillDmgAmt(uint16 skill) if (spellbonuses.SkillDamageAmount2[HIGHEST_SKILL+1] || spellbonuses.SkillDamageAmount2[skill]) CheckHitsRemaining(0, false,false, SE_SkillDamageAmount2,0,true,skill); - + return skill_dmg; } @@ -4170,7 +4170,7 @@ bool Mob::TryReflectSpell(uint32 spell_id) { if(!GetTarget()) return false; - + if(GetTarget()->spellbonuses.reflect_chance) CheckHitsRemaining(0, false, false, SE_Reflect); @@ -4185,50 +4185,50 @@ void Mob::DoGravityEffect() Mob *caster = nullptr; int away = -1; float caster_x, caster_y, amount, value, cur_x, my_x, cur_y, my_y, x_vector, y_vector, hypot; - - // Set values so we can run through all gravity effects and then apply the culmative move at the end + + // Set values so we can run through all gravity effects and then apply the culmative move at the end // instead of many small moves if the mob/client had more than 1 gravity effect on them cur_x = my_x = GetX(); cur_y = my_y = GetY(); - + int buff_count = GetMaxTotalSlots(); for (int slot = 0; slot < buff_count; slot++) { if (buffs[slot].spellid != SPELL_UNKNOWN && IsEffectInSpell(buffs[slot].spellid, SE_GravityEffect)) { - for (int i = 0; i < EFFECT_COUNT; i++) + for (int i = 0; i < EFFECT_COUNT; i++) { if(spells[buffs[slot].spellid].effectid[i] == SE_GravityEffect) { - + int casterId = buffs[slot].casterid; if(casterId) caster = entity_list.GetMob(casterId); - + if(!caster || casterId == this->GetID()) continue; - + caster_x = caster->GetX(); caster_y = caster->GetY(); - + value = static_cast(spells[buffs[slot].spellid].base[i]); - if(value == 0) + if(value == 0) continue; - - if(value > 0) + + if(value > 0) away = 1; - + amount = fabs(value) / (100.0f); // to bring the values in line, arbitarily picked - + x_vector = cur_x - caster_x; y_vector = cur_y - caster_y; hypot = sqrt(x_vector*x_vector + y_vector*y_vector); - + if(hypot <= 5) // dont want to be inside the mob, even though we can, it looks bad continue; - + x_vector /= hypot; y_vector /= hypot; - + cur_x = cur_x + (x_vector * amount * away); cur_y = cur_y + (y_vector * amount * away); } @@ -4254,15 +4254,15 @@ void Mob::DoGravityEffect() return; } else { - cur_x = my_x; + cur_x = my_x; } } else { cur_y = my_y; } } - - if(IsClient()) + + if(IsClient()) this->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), cur_x, cur_y, new_ground, GetHeading()*2); // I know the heading thing is weird(chance of movepc to halve the heading value, too lazy to figure out why atm) else this->GMMove(cur_x, cur_y, new_ground, GetHeading()); @@ -4280,21 +4280,21 @@ void Mob::SpreadVirus(uint16 spell_id, uint16 casterID) for(int i = 0; i < num_targs; i++) { target = entity_list.GetTargetForVirus(this); if(target) { - // Only spreads to the uninfected + // Only spreads to the uninfected if(!target->FindBuff(spell_id)) { if(caster) caster->SpellOnTarget(spell_id, target); - + } } } } } -void Mob::RemoveNimbusEffect(int effectid) +void Mob::RemoveNimbusEffect(int effectid) { EQApplicationPacket* outapp = new EQApplicationPacket(OP_RemoveNimbusEffect, sizeof(RemoveNimbusEffect_Struct)); - RemoveNimbusEffect_Struct* rne = (RemoveNimbusEffect_Struct*)outapp->pBuffer; + RemoveNimbusEffect_Struct* rne = (RemoveNimbusEffect_Struct*)outapp->pBuffer; rne->spawnid = GetID(); rne->nimbus_effect = effectid; entity_list.QueueClients(this, outapp); @@ -4327,44 +4327,44 @@ void Mob::SetBodyType(bodyType new_body, bool overwrite_orig) { } -void Mob::ModSkillDmgTaken(SkillType skill_num, int value) -{ - if (skill_num <= HIGHEST_SKILL) - SkillDmgTaken_Mod[skill_num] = value; - - - else if (skill_num == 255) - SkillDmgTaken_Mod[HIGHEST_SKILL+1] = value; -} - -int16 Mob::GetModSkillDmgTaken(const SkillType skill_num) -{ - if (skill_num <= HIGHEST_SKILL) - return SkillDmgTaken_Mod[skill_num]; - - else if (skill_num == 255) - return SkillDmgTaken_Mod[HIGHEST_SKILL+1]; - - return 0; +void Mob::ModSkillDmgTaken(SkillType skill_num, int value) +{ + if (skill_num <= HIGHEST_SKILL) + SkillDmgTaken_Mod[skill_num] = value; + + + else if (skill_num == 255) + SkillDmgTaken_Mod[HIGHEST_SKILL+1] = value; } -void Mob::ModVulnerability(uint8 resist, int16 value) -{ - if (resist < HIGHEST_RESIST+1) - Vulnerability_Mod[resist] = value; +int16 Mob::GetModSkillDmgTaken(const SkillType skill_num) +{ + if (skill_num <= HIGHEST_SKILL) + return SkillDmgTaken_Mod[skill_num]; + + else if (skill_num == 255) + return SkillDmgTaken_Mod[HIGHEST_SKILL+1]; + + return 0; +} + +void Mob::ModVulnerability(uint8 resist, int16 value) +{ + if (resist < HIGHEST_RESIST+1) + Vulnerability_Mod[resist] = value; else if (resist == 255) - Vulnerability_Mod[HIGHEST_RESIST+1] = value; + Vulnerability_Mod[HIGHEST_RESIST+1] = value; } - -int16 Mob::GetModVulnerability(const uint8 resist) -{ - if (resist < HIGHEST_RESIST+1) - return Vulnerability_Mod[resist]; - else if (resist == 255) - return Vulnerability_Mod[HIGHEST_RESIST+1]; - +int16 Mob::GetModVulnerability(const uint8 resist) +{ + if (resist < HIGHEST_RESIST+1) + return Vulnerability_Mod[resist]; + + else if (resist == 255) + return Vulnerability_Mod[HIGHEST_RESIST+1]; + return 0; } @@ -4415,8 +4415,8 @@ void Mob::CastOnNumHitFade(uint32 spell_id) } } -int Mob::SlowMitigation(bool slow_msg, Mob *caster, int slow_value) -{ +int Mob::SlowMitigation(bool slow_msg, Mob *caster, int slow_value) +{ float int_slow_mitigation = slow_mitigation * 100.0f; if (int_slow_mitigation > 100.0f) @@ -4449,17 +4449,17 @@ uint16 Mob::GetSkillByItemType(int ItemType) { switch (ItemType) { - case ItemType1HS: + case ItemType1HS: return _1H_SLASHING; case ItemType2HS: return _2H_SLASHING; case ItemTypePierce: return PIERCING; - case ItemType1HB: + case ItemType1HB: return _1H_BLUNT; - case ItemType2HB: + case ItemType2HB: return _2H_BLUNT; - case ItemType2HPierce: + case ItemType2HPierce: return PIERCING; case ItemTypeHand2Hand: return HAND_TO_HAND; @@ -4477,7 +4477,7 @@ bool Mob::PassLimitToSkill(uint16 spell_id, uint16 skill) { if (!IsEffectInSpell(spell_id, SE_LimitToSkill)) return false; - + for (int i = 0; i < EFFECT_COUNT; i++) { if (spells[spell_id].effectid[i] == SE_LimitToSkill){ if (spells[spell_id].base[i] == skill){ @@ -4485,7 +4485,7 @@ bool Mob::PassLimitToSkill(uint16 spell_id, uint16 skill) { } } } - return false; + return false; } // Faction Mods for Alliance type spells @@ -4567,7 +4567,7 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) { bool iOtherAIControlled = iOther->IsAIControlled(); int selfPrimaryFaction = self->GetPrimaryFaction(); int iOtherPrimaryFaction = iOther->GetPrimaryFaction(); - + if (selfPrimaryFaction >= 0 && selfAIcontrolled) return FACTION_INDIFFERENT; if (iOther->GetPrimaryFaction() >= 0) diff --git a/zone/mob.h b/zone/mob.h index 3c3767842..95a16a854 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -103,7 +103,7 @@ public: virtual void ThrowingAttack(Mob* other) { } uint16 GetThrownDamage(int16 wDmg, int32& TotalDmg, int& minDmg); // 13 = Primary (default), 14 = secondary - virtual bool Attack(Mob* other, int Hand = 13, bool FromRiposte = false, bool IsStrikethrough = false, + virtual bool Attack(Mob* other, int Hand = 13, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false) = 0; int MonkSpecialAttack(Mob* other, uint8 skill_used); virtual void TryBackstab(Mob *other,int ReuseTime = 10); @@ -121,20 +121,20 @@ public: //Appearance void SendLevelAppearance(); - void SendAppearanceEffect(uint32 parm1, uint32 parm2, uint32 parm3, uint32 parm4, uint32 parm5, + void SendAppearanceEffect(uint32 parm1, uint32 parm2, uint32 parm3, uint32 parm4, uint32 parm5, Client *specific_target=nullptr); void SendTargetable(bool on, Client *specific_target = nullptr); virtual void SendWearChange(uint8 material_slot); - virtual void SendTextureWC(uint8 slot, uint16 texture, uint32 hero_forge_model = 0, uint32 elite_material = 0, + virtual void SendTextureWC(uint8 slot, uint16 texture, uint32 hero_forge_model = 0, uint32 elite_material = 0, uint32 unknown06 = 0, uint32 unknown18 = 0); virtual void SetSlotTint(uint8 material_slot, uint8 red_tint, uint8 green_tint, uint8 blue_tint); virtual void WearChange(uint8 material_slot, uint16 texture, uint32 color); void DoAnim(const int animnum, int type=0, bool ackreq = true, eqFilterType filter = FilterNone); - void ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow = false, float speed = 0, + void ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow = false, float speed = 0, float angle = 0, float tilt = 0, float arc = 0); void ChangeSize(float in_size, bool bNoRestriction = false); - inline uint8 SeeInvisible() const { return see_invis; } - inline bool SeeInvisibleUndead() const { return see_invis_undead; } + inline uint8 SeeInvisible() const { return see_invis; } + inline bool SeeInvisibleUndead() const { return see_invis_undead; } inline bool SeeHide() const { return see_hide; } inline bool SeeImprovedHide() const { return see_improved_hide; } bool IsInvisible(Mob* other = 0) const; @@ -147,11 +147,11 @@ public: void BardPulse(uint16 spell_id, Mob *caster); //Spell - void SendSpellEffect(uint32 effectid, uint32 duration, uint32 finish_delay, bool zone_wide, + void SendSpellEffect(uint32 effectid, uint32 duration, uint32 finish_delay, bool zone_wide, uint32 unk020, bool perm_effect = false, Client *c = nullptr); bool IsBeneficialAllowed(Mob *target); virtual int GetCasterLevel(uint16 spell_id); - void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0, + void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0, bool item_bonus = false, uint32 ticsremaining = 0, int buffslot = -1); void NegateSpellsBonuses(uint16 spell_id); virtual float GetActSpellRange(uint16 spell_id, float range, bool IsBard = false) { return range;} @@ -160,27 +160,27 @@ public: virtual int32 GetActSpellCost(uint16 spell_id, int32 cost){ return cost;} virtual int32 GetActSpellDuration(uint16 spell_id, int32 duration){ return duration;} virtual int32 GetActSpellCasttime(uint16 spell_id, int32 casttime); - float ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use_resist_override = false, + float ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use_resist_override = false, int resist_override = 0, bool CharismaCheck = false); uint16 GetSpecializeSkillValue(uint16 spell_id) const; void SendSpellBarDisable(); void SendSpellBarEnable(uint16 spellid); void ZeroCastingVars(); virtual void SpellProcess(); - virtual bool CastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, - int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, + virtual bool CastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, + int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, uint32 type = 0, int16 *resist_adjust = nullptr); - virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, - int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, + virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, + int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, uint32 type = 0, int16 resist_adjust = 0); - void CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, uint16 mana_used, + void CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, uint16 mana_used, uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0); - bool SpellFinished(uint16 spell_id, Mob *target, uint16 slot = 10, uint16 mana_used = 0, + bool SpellFinished(uint16 spell_id, Mob *target, uint16 slot = 10, uint16 mana_used = 0, uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false); - virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect = false, + virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect = false, bool use_resist_adjust = false, int16 resist_adjust = 0, bool isproc = false); virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100); - virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, + virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction); virtual bool CheckFizzle(uint16 spell_id); virtual bool IsImmuneToSpell(uint16 spell_id, Mob *caster); @@ -234,7 +234,7 @@ public: uint16 GetSpellIDFromSlot(uint8 slot); int CountDispellableBuffs(); bool HasBuffIcon(Mob* caster, Mob* target, uint16 spell_id); - bool CheckHitsRemaining(uint32 buff_slot, bool when_spell_done=false, bool negate=false,uint16 type=0, + bool CheckHitsRemaining(uint32 buff_slot, bool when_spell_done=false, bool negate=false,uint16 type=0, uint16 spell_id=0, bool use_skill=false,uint16 skill=0); void SpreadVirus(uint16 spell_id, uint16 casterID); bool IsNimbusEffectActive(uint32 nimbus_effect); @@ -256,7 +256,7 @@ public: virtual uint32 IsEliteMaterialItem(uint8 material_slot) const; bool AffectedBySpellExcludingSlot(int slot, int effect); virtual void Death(Mob* killerMob, int32 damage, uint16 spell_id, SkillType attack_skill) = 0; - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false) = 0; inline virtual void SetHP(int32 hp) { if (hp >= max_hp) cur_hp = max_hp; else cur_hp = hp;} bool ChangeHP(Mob* other, int32 amount, uint16 spell_id = 0, int8 buffslot = -1, bool iBuffTic = false); @@ -288,7 +288,7 @@ public: inline const char* GetOrigName() const { return orig_name; } inline const char* GetLastName() const { return lastname; } const char *GetCleanName(); - virtual void SetName(const char *new_name = nullptr) { new_name ? strn0cpy(name, new_name, 64) : + virtual void SetName(const char *new_name = nullptr) { new_name ? strn0cpy(name, new_name, 64) : strn0cpy(name, GetName(), 64); return; }; inline Mob* GetTarget() const { return target; } virtual void SetTarget(Mob* mob); @@ -333,7 +333,7 @@ public: int32 GetItemHPBonuses(); int32 GetSpellHPBonuses(); virtual const int32& SetMana(int32 amount); - inline float GetManaRatio() const { return max_mana == 0 ? 100 : + inline float GetManaRatio() const { return max_mana == 0 ? 100 : ((static_cast(cur_mana) / max_mana) * 100); } virtual int32 CalcMaxMana(); uint32 GetNPCTypeID() const { return npctype_id; } @@ -358,7 +358,7 @@ public: virtual bool HasGroup() = 0; virtual Raid* GetRaid() = 0; virtual Group* GetGroup() = 0; - + //Faction virtual inline int32 GetPrimaryFaction() const { return 0; } @@ -382,14 +382,14 @@ public: void MakeSpawnUpdate(PlayerPositionUpdateServer_Struct* spu); void SendPosition(); void SetFlyMode(uint8 flymode); - inline void Teleport(VERTEX NewPosition) { x_pos = NewPosition.x; y_pos = NewPosition.y; + inline void Teleport(VERTEX NewPosition) { x_pos = NewPosition.x; y_pos = NewPosition.y; z_pos = NewPosition.z; }; - + //AI static uint32 GetLevelCon(uint8 mylevel, uint8 iOtherLevel); - inline uint32 GetLevelCon(uint8 iOtherLevel) const { + inline uint32 GetLevelCon(uint8 iOtherLevel) const { return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GREEN; } - virtual void AddToHateList(Mob* other, int32 hate = 0, int32 damage = 0, bool iYellForHelp = true, + virtual void AddToHateList(Mob* other, int32 hate = 0, int32 damage = 0, bool iYellForHelp = true, bool bFrenzy = false, bool iBuffTic = false); bool RemoveFromHateList(Mob* mob); void SetHate(Mob* other, int32 hate = 0, int32 damage = 0) { hate_list.Set(other,hate,damage);} @@ -402,7 +402,7 @@ public: bool IsEngaged() { return(!hate_list.IsEmpty()); } bool HateSummon(); void FaceTarget(Mob* MobToFace = 0); - void SetHeading(float iHeading) { if(heading != iHeading) { pLastChange = Timer::GetCurrentTime(); + void SetHeading(float iHeading) { if(heading != iHeading) { pLastChange = Timer::GetCurrentTime(); heading = iHeading; } } void WipeHateList(); void AddFeignMemory(Client* attacker); @@ -419,7 +419,7 @@ public: //Quest void QuestReward(Client *c = nullptr, uint32 silver = 0, uint32 gold = 0, uint32 platinum = 0); void CameraEffect(uint32 duration, uint32 intensity, Client *c = nullptr, bool global = false); - inline bool GetQglobal() const { return qglobal; } + inline bool GetQglobal() const { return qglobal; } //Other Packet void CreateDespawnPacket(EQApplicationPacket* app, bool Decay); @@ -450,7 +450,7 @@ public: float DistNoRootNoZ(float x, float y) const; float DistNoRootNoZ(const Mob &) const; static float GetReciprocalHeading(Mob* target); - bool PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, float &z_dest, + bool PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, float &z_dest, bool lookForAftArc = true); //Procs @@ -472,9 +472,9 @@ public: void EnableLogging() { logging_enabled = true; } void DisableLogging() { logging_enabled = false; } - + //More stuff to sort: - virtual bool IsAttackAllowed(Mob *target, bool isSpellAttack = false); + virtual bool IsAttackAllowed(Mob *target, bool isSpellAttack = false); bool IsTargeted() const { return (targeted > 0); } inline void IsTargeted(int in_tar) { targeted += in_tar; if(targeted < 0) targeted = 0;} void SetFollowID(uint32 id) { follow = id; } @@ -488,18 +488,18 @@ public: const char* message3 = 0, const char* message4 = 0, const char* message5 = 0, const char* message6 = 0, const char* message7 = 0, const char* message8 = 0, const char* message9 = 0, uint32 distance = 0) { } void Say(const char *format, ...); - void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, + void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); - void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, + void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); void Shout(const char *format, ...); void Emote(const char *format, ...); void QuestJournalledSay(Client *QuestInitiator, const char *str); uint32 GetItemStat(uint32 itemid, const char *identifier); - + int16 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false); - uint8 IsFocusEffect(uint16 spellid, int effect_index, bool AA=false,uint32 aa_effect=0); + uint8 IsFocusEffect(uint16 spellid, int effect_index, bool AA=false,uint32 aa_effect=0); void SendIllusionPacket(uint16 in_race, uint8 in_gender = 0xFF, uint8 in_texture = 0xFF, uint8 in_helmtexture = 0xFF, uint8 in_haircolor = 0xFF, uint8 in_beardcolor = 0xFF, uint8 in_eyecolor1 = 0xFF, uint8 in_eyecolor2 = 0xFF, uint8 in_hairstyle = 0xFF, uint8 in_luclinface = 0xFF, uint8 in_beard = 0xFF, uint8 in_aa_title = 0xFF, uint32 in_drakkin_heritage = 0xFFFFFFFF, uint32 in_drakkin_tattoo = 0xFFFFFFFF, uint32 in_drakkin_details = 0xFFFFFFFF, float in_size = 0xFFFFFFFF); virtual void Stun(int duration); virtual void UnStun(); @@ -512,7 +512,7 @@ public: void Kill(); bool PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id); bool TryDeathSave(); - bool TryDivineSave(); + bool TryDivineSave(); void DoBuffWearOffEffect(uint32 index); void TryTriggerOnCast(uint32 spell_id, bool aa_trigger); void TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger); @@ -535,7 +535,7 @@ public: void CastOnCurer(uint32 spell_id); void CastOnCure(uint32 spell_id); void CastOnNumHitFade(uint32 spell_id); - int SlowMitigation(bool slow_msg=false, Mob *caster = nullptr,int slow_value = 0); + int SlowMitigation(bool slow_msg=false, Mob *caster = nullptr,int slow_value = 0); int16 GetCritDmgMob(uint16 skill); int16 GetMeleeDamageMod_SE(uint16 skill); int16 GetMeleeMinDamageMod_SE(uint16 skill); @@ -548,22 +548,22 @@ public: bool DoHPToManaCovert(uint16 mana_cost = 0); int32 ApplySpellEffectiveness(Mob* caster, int16 spell_id, int32 value, bool IsBard = false); - void ModSkillDmgTaken(SkillType skill_num, int value); + void ModSkillDmgTaken(SkillType skill_num, int value); int16 GetModSkillDmgTaken(const SkillType skill_num); - void ModVulnerability(uint8 resist, int16 value); - int16 GetModVulnerability(const uint8 resist); + void ModVulnerability(uint8 resist, int16 value); + int16 GetModVulnerability(const uint8 resist); void SetAllowBeneficial(bool value) { m_AllowBeneficial = value; } bool GetAllowBeneficial() { return m_AllowBeneficial; } void SetDisableMelee(bool value) { m_DisableMelee = value; } bool IsMeleeDisabled() { return m_DisableMelee; } - + bool IsOffHandAtk() const { return offhand; } inline void OffHandAtk(bool val) { offhand = val; } inline void SetFlurryChance(uint8 value) { NPC_FlurryChance = value;} uint8 GetFlurryChance() { return NPC_FlurryChance; } - + static uint32 GetAppearanceValue(EmuAppearance iAppearance); void SendAppearancePacket(uint32 type, uint32 value, bool WholeZone = true, bool iIgnoreSelf = false, Client *specific_target=nullptr); void SetAppearance(EmuAppearance app, bool iIgnoreSelf = true); @@ -581,7 +581,7 @@ public: void SetPetID(uint16 NewPetID); inline uint16 GetPetID() const { return petid; } inline PetType GetPetType() const { return typeofpet; } - void SetPetType(PetType p) { typeofpet = p; } + void SetPetType(PetType p) { typeofpet = p; } inline int16 GetPetPower() const { return (petpower < 0) ? 0 : petpower; } void SetPetPower(int16 p) { if (p < 0) petpower = 0; else petpower = p; } bool IsFamiliar() const { return(typeofpet == petFamiliar); } @@ -602,8 +602,8 @@ public: uint8 invisible, see_invis; bool invulnerable, invisible_undead, invisible_animals, sneaking, hidden, improved_hidden; - bool see_invis_undead, see_hide, see_improved_hide; - bool qglobal; + bool see_invis_undead, see_hide, see_improved_hide; + bool qglobal; virtual void SetAttackTimer(); inline void SetInvul(bool invul) { invulnerable=invul; } @@ -769,7 +769,7 @@ public: inline int GetCWP() const { return(cur_wp); } void SetCurrentWP(uint16 waypoint) { cur_wp = waypoint; } virtual FACTION_VALUE GetReverseFactionCon(Mob* iOther) { return FACTION_INDIFFERENT; } - + inline bool IsTrackable() const { return(trackable); } Timer* GetAIThinkTimer() { return AIthink_timer; } Timer* GetAIMovementTimer() { return AImovement_timer; } @@ -822,7 +822,7 @@ protected: virtual bool AI_EngagedCastCheck() { return(false); } virtual bool AI_PursueCastCheck() { return(false); } virtual bool AI_IdleCastCheck() { return(false); } - + bool IsFullHP; bool moved; @@ -831,7 +831,7 @@ protected: std::map m_EntityVariables; int16 SkillDmgTaken_Mod[HIGHEST_SKILL+2]; - int16 Vulnerability_Mod[HIGHEST_RESIST+2]; + int16 Vulnerability_Mod[HIGHEST_RESIST+2]; bool m_AllowBeneficial; bool m_DisableMelee; uint8 NPC_FlurryChance; @@ -960,7 +960,7 @@ protected: uint8 pRunAnimSpeed; bool m_is_running; - + Timer attack_timer; Timer attack_dw_timer; Timer ranged_timer; @@ -972,7 +972,7 @@ protected: float rewind_x; float rewind_y; float rewind_z; - Timer rewind_timer; + Timer rewind_timer; //spell casting vars Timer spellend_timer; @@ -1002,7 +1002,7 @@ protected: uint8 eyecolor1; // the eyecolors always seem to be the same, maybe left and right eye? uint8 eyecolor2; uint8 hairstyle; - uint8 luclinface; // + uint8 luclinface; // uint8 beard; uint32 drakkin_heritage; uint32 drakkin_tattoo; diff --git a/zone/net.cpp b/zone/net.cpp index e7d7ddf1c..ec54148a5 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -5,13 +5,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -100,7 +100,7 @@ DBAsync *dbasync = nullptr; TaskManager *taskmanager = 0; QuestParserCollection *parse = 0; -const SPDat_Spell_Struct* spells; +const SPDat_Spell_Struct* spells; void LoadSpells(EQEmu::MemoryMappedFile **mmf); int32 SPDAT_RECORDS = -1; @@ -119,7 +119,7 @@ int main(int argc, char** argv) { set_exception_handler(); const char *zone_name; - + if(argc == 3) { worldserver.SetLauncherName(argv[2]); worldserver.SetLaunchedName(argv[1]); @@ -157,7 +157,7 @@ int main(int argc, char** argv) { _log(ZONE__INIT, "Warning: Unable to read %s", Config->LogSettingsFile.c_str()); else _log(ZONE__INIT, "Log settings loaded from %s", Config->LogSettingsFile.c_str()); - + worldserver.SetPassword(Config->SharedKey.c_str()); _log(ZONE__INIT, "Connecting to MySQL..."); @@ -179,9 +179,9 @@ int main(int argc, char** argv) { #ifdef _EQDEBUG _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); #endif - + _log(ZONE__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION); - + /* * Setup nice signal handlers */ @@ -205,7 +205,7 @@ int main(int argc, char** argv) { _log(ZONE__INIT, "Warning: Unable to read %s", log_ini_file); else _log(ZONE__INIT, "Log settings loaded from %s", log_ini_file); - + _log(ZONE__INIT, "Mapping Incoming Opcodes"); MapOpcodes(); _log(ZONE__INIT, "Loading Variables"); @@ -236,7 +236,7 @@ int main(int argc, char** argv) { CheckEQEMuErrorAndPause(); return 0; } - + _log(ZONE__INIT, "Loading spells"); EQEmu::MemoryMappedFile *mmf = nullptr; LoadSpells(&mmf); @@ -295,7 +295,7 @@ int main(int argc, char** argv) { //now we have our parser, load the quests _log(ZONE__INIT, "Loading quests"); parse->ReloadQuests(); - + #ifdef CLIENT_LOGS LogFile->SetAllCallbacks(ClientLogs::EQEmuIO_buf); @@ -305,7 +305,7 @@ int main(int argc, char** argv) { if (!worldserver.Connect()) { _log(ZONE__INIT_ERR, "worldserver.Connect() FAILED!"); } - + Timer InterserverTimer(INTERSERVER_TIMER); // does MySQL pings and auto-reconnect #ifdef EQPROFILE #ifdef PROFILE_DUMP_TIME @@ -319,15 +319,15 @@ int main(int argc, char** argv) { _log(ZONE__INIT_ERR, "Zone bootup FAILED!"); zone = 0; } - + //register all the patches we have avaliable with the stream identifier. EQStreamIdentifier stream_identifier; RegisterAllPatches(stream_identifier); - + #ifndef WIN32 _log(COMMON__THREADS, "Main thread running with thread id %d", pthread_self()); #endif - + Timer quest_timers(100); UpdateWindowTitle(); bool worldwasconnected = worldserver.Connected(); @@ -338,10 +338,10 @@ int main(int argc, char** argv) { while(RunLoops) { { //profiler block to omit the sleep from times _ZP(net_main); - + //Advance the timer to our current point in time Timer::SetCurrentTime(); - + //process stuff from world worldserver.Process(); @@ -354,7 +354,7 @@ int main(int argc, char** argv) { worldwasconnected = false; } } - + //check the factory for any new incoming streams. while ((eqss = eqsf.Pop())) { //pull the stream out of the factory and give it to the stream identifier @@ -365,10 +365,10 @@ int main(int argc, char** argv) { _log(WORLD__CLIENT, "New connection from %s:%d", inet_ntoa(in),ntohs(eqss->GetRemotePort())); stream_identifier.AddStream(eqss); //takes the stream } - + //give the stream identifier a chance to do its work.... stream_identifier.Process(); - + //check the stream identifier for any now-identified streams while((eqsi = stream_identifier.PopIdentified())) { //now that we know what patch they are running, start up their client object @@ -378,11 +378,11 @@ int main(int argc, char** argv) { Client* client = new Client(eqsi); entity_list.AddClient(client); } - - + + //check for timeouts in other threads timeout_manager.CheckTimeouts(); - + if (worldserver.Connected()) { worldwasconnected = true; } @@ -480,7 +480,7 @@ int main(int argc, char** argv) { #endif safe_delete(ps); safe_delete(mmf); - + if (zone != 0) Zone::Shutdown(true); //Fix for Linux world server problem. @@ -490,7 +490,7 @@ int main(int argc, char** argv) { dbasync->StopThread(); safe_delete(taskmanager); command_deinit(); - + CheckEQEMuErrorAndPause(); _log(ZONE__INIT, "Proper zone shutdown complete."); return 0; @@ -517,33 +517,33 @@ uint32 NetConnection::GetIP() char name[255+1]; size_t len = 0; hostent* host = 0; - + if (gethostname(name, len) < 0 || len <= 0) { return 0; } - + host = (hostent*)gethostbyname(name); if (host == 0) { return 0; } - + return inet_addr(host->h_addr); } uint32 NetConnection::GetIP(char* name) { hostent* host = 0; - + host = (hostent*)gethostbyname(name); if (host == 0) { return 0; } - + return inet_addr(host->h_addr); - + } void NetConnection::SaveInfo(char* address, uint32 port, char* waddress, char* filename) { @@ -556,8 +556,8 @@ void NetConnection::SaveInfo(char* address, uint32 port, char* waddress, char* f strn0cpy(ZoneFileName, filename, sizeof(ZoneFileName)); } -NetConnection::NetConnection() -: +NetConnection::NetConnection() +: object_timer(5000), door_timer(5000), corpse_timer(2000), diff --git a/zone/net.h b/zone/net.h index 9249606a3..25f5002c7 100644 --- a/zone/net.h +++ b/zone/net.h @@ -39,7 +39,7 @@ class NetConnection public: ~NetConnection(); NetConnection(); - + uint32 GetIP(); uint32 GetIP(char* name); void SaveInfo(char* address, uint32 port, char* waddress,char* filename); diff --git a/zone/npc.cpp b/zone/npc.cpp index afba99199..ad0525fee 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -121,12 +121,12 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float entity_list.RemoveEntity(mob->GetID()); int moblevel=GetLevel(); - + NPCTypedata = d; NPCTypedata_ours = nullptr; respawn2 = in_respawn; swarm_timer.Disable(); - + taunting = false; proximity = nullptr; copper = 0; @@ -146,7 +146,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float healscale = d->healscale; logging_enabled = NPC_DEFAULT_LOGGING_ENABLED; - + pAggroRange = d->aggroradius; pAssistRange = GetAggroRange(); findable = d->findable; @@ -186,12 +186,12 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float // Set Mana and HP Regen Rates if they are 0 in the DB CalcNPCRegen(); - + // Set Min and Max Damage if they are 0 in the DB if(max_dmg == 0){ CalcNPCDamage(); - } - + } + accuracy_rating = d->accuracy_rating; ATK = d->ATK; @@ -217,9 +217,9 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float roambox_movingto_x = -2; roambox_movingto_y = -2; roambox_delay = 1000; - org_heading = heading; + org_heading = heading; p_depop = false; - loottable_id = d->loottable_id; + loottable_id = d->loottable_id; primary_faction = 0; SetNPCFactionID(d->npc_faction_id); @@ -234,10 +234,10 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float } SpellFocusDMG = 0; - SpellFocusHeal = 0; - + SpellFocusHeal = 0; + pet_spell_id = 0; - + delaytimer = false; combat_event = false; attack_speed = d->attack_speed; @@ -262,7 +262,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float prim_melee_type = 28; if(!d_meele_texture2) sec_melee_type = 28; - + //give NPCs skill values... int r; for(r = 0; r <= HIGHEST_SKILL; r++) { @@ -271,7 +271,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float if(d->trap_template > 0) { - std::map >::iterator trap_ent_iter; + std::map >::iterator trap_ent_iter; std::list trap_list; trap_ent_iter = zone->ldon_trap_entry_list.find(d->trap_template); @@ -354,7 +354,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float InitializeBuffSlots(); CalcBonuses(); } - + NPC::~NPC() { ClearQuestLists(); @@ -368,9 +368,9 @@ NPC::~NPC() //clear our spawn limit record if we had one. entity_list.LimitRemoveNPC(this); - + safe_delete(NPCTypedata_ours); - + { ItemList::iterator cur,end; cur = itemlist.begin(); @@ -381,7 +381,7 @@ NPC::~NPC() } itemlist.clear(); } - + { list::iterator cur,end; cur = faction_list.begin(); @@ -402,7 +402,7 @@ NPC::~NPC() void NPC::SetTarget(Mob* mob) { if(mob == GetTarget()) //dont bother if they are allready our target return; - + //our target is already set, do not turn from the course, unless our current target is dead. if(GetSwarmInfo() && GetTarget() && (GetTarget()->GetHP() > 0)) { Mob *targ = entity_list.GetMob(GetSwarmInfo()->target); @@ -433,7 +433,7 @@ ServerLootItem_Struct* NPC::GetItem(int slot_id) { } return(nullptr); } - + void NPC::RemoveItem(uint32 item_id, uint16 quantity, uint16 slot) { ItemList::iterator cur,end; cur = itemlist.begin(); @@ -480,7 +480,7 @@ void NPC::CheckMinMaxLevel(Mob *them) } cur++; } - + } void NPC::ClearItemList() { @@ -493,7 +493,7 @@ void NPC::ClearItemList() { } itemlist.clear(); } - + void NPC::QueryLoot(Client* to) { int x = 0; to->Message(0, "Coin: %ip %ig %is %ic", platinum, gold, silver, copper); @@ -544,14 +544,14 @@ void NPC::AddCash(uint16 in_copper, uint16 in_silver, uint16 in_gold, uint16 in_ else platinum = 0; } - + void NPC::AddCash() { copper = MakeRandomInt(1, 100); silver = MakeRandomInt(1, 50); gold = MakeRandomInt(1, 10); platinum = MakeRandomInt(1, 5); } - + void NPC::RemoveCash() { copper = 0; silver = 0; @@ -562,7 +562,7 @@ void NPC::RemoveCash() { bool NPC::Process() { _ZP(NPC_Process); - + adverrorinfo = 1; if (IsStunned() && stunned_timer.Check()) { @@ -585,21 +585,21 @@ bool NPC::Process() } adverrorinfo = 2; - + SpellProcess(); - - if(tic_timer.Check()) - { + + if(tic_timer.Check()) + { BuffProcess(); - + if(curfp) ProcessFlee(); - + uint32 bonus = 0; - + if(GetAppearance() == eaSitting) bonus+=3; - + int32 OOCRegen = 0; if(oocregen > 0){ //should pull from Mob class OOCRegen += GetMaxHP() * oocregen / 100; @@ -618,7 +618,7 @@ bool NPC::Process() SetHP(GetHP()+hp_regen+bonus+(GetLevel()/5)); else SetHP(GetHP()+hp_regen+bonus); - } else + } else SetHP(GetHP()+hp_regen); if(GetMana() < GetMaxMana()) { @@ -655,7 +655,7 @@ bool NPC::Process() SendHPUpdate(); } } - + if(HasVirus()) { if(viral_timer.Check()) { viral_timer_counter++; @@ -670,7 +670,7 @@ bool NPC::Process() if(viral_timer_counter > 999) viral_timer_counter = 0; } - + if(spellbonuses.GravityEffect == 1) { if(gravity_timer.Check()) DoGravityEffect(); @@ -681,20 +681,20 @@ bool NPC::Process() SendPosition(); reface_timer->Disable(); } - + if (IsMezzed()) return true; - + if(IsStunned()) { - if(spun_timer.Check()) + if(spun_timer.Check()) Spin(); return true; } - + if (enraged_timer.Check()){ ProcessEnrage(); } - + //Handle assists... if(assist_timer.Check() && IsEngaged() && !Charmed()) { entity_list.AIYellForHelp(this, GetTarget()); @@ -709,7 +709,7 @@ bool NPC::Process() } AI_Process(); - + return true; } @@ -764,7 +764,7 @@ bool NPC::DatabaseCastAccepted(int spell_id) { return false; break; } - + case SE_HealOverTime: { if(this->GetHPRatio() < 100) return true; @@ -805,19 +805,19 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, } else { Seperator sep(spawncommand); - //Lets see if someone didn't fill out the whole #spawn function properly + //Lets see if someone didn't fill out the whole #spawn function properly if (!sep.IsNumber(1)) - sprintf(sep.arg[1],"1"); + sprintf(sep.arg[1],"1"); if (!sep.IsNumber(2)) - sprintf(sep.arg[2],"1"); + sprintf(sep.arg[2],"1"); if (!sep.IsNumber(3)) sprintf(sep.arg[3],"0"); if (atoi(sep.arg[4]) > 2100000000 || atoi(sep.arg[4]) <= 0) sprintf(sep.arg[4]," "); if (!strcmp(sep.arg[5],"-")) - sprintf(sep.arg[5]," "); + sprintf(sep.arg[5]," "); if (!sep.IsNumber(5)) - sprintf(sep.arg[5]," "); + sprintf(sep.arg[5]," "); if (!sep.IsNumber(6)) sprintf(sep.arg[6],"1"); if (!sep.IsNumber(8)) @@ -827,7 +827,7 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, if (!sep.IsNumber(7)) sprintf(sep.arg[7],"0"); if (!strcmp(sep.arg[4],"-")) - sprintf(sep.arg[4]," "); + sprintf(sep.arg[4]," "); if (!sep.IsNumber(10)) // bodytype sprintf(sep.arg[10], "0"); //Calc MaxHP if client neglected to enter it... @@ -848,16 +848,16 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, multiplier = 27; else if (tmplevel < 57) multiplier = 28; - else + else multiplier = 30; break; - + case DRUID: case CLERIC: case SHAMAN: multiplier = 15; break; - + case PALADIN: case SHADOWKNIGHT: if (tmplevel < 35) @@ -873,7 +873,7 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, else multiplier = 26; break; - + case MONK: case BARD: case ROGUE: @@ -883,23 +883,23 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, else if (tmplevel < 58) multiplier = 19; else - multiplier = 20; + multiplier = 20; break; - + case RANGER: if (tmplevel < 58) multiplier = 20; else - multiplier = 21; + multiplier = 21; break; - + case MAGICIAN: case WIZARD: case NECROMANCER: case ENCHANTER: multiplier = 12; break; - + default: if (tmplevel < 35) multiplier = 21; @@ -917,22 +917,22 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, } sprintf(sep.arg[4],"%i",5+multiplier*atoi(sep.arg[2])+multiplier*atoi(sep.arg[2])*75/300); } - + // Autoselect NPC Gender if (sep.arg[5][0] == 0) { sprintf(sep.arg[5], "%i", (int) Mob::GetDefaultGender(atoi(sep.arg[1]))); } - - //Time to create the NPC!! + + //Time to create the NPC!! NPCType* npc_type = new NPCType; memset(npc_type, 0, sizeof(NPCType)); - + strncpy(npc_type->name, sep.arg[0], 60); - npc_type->cur_hp = atoi(sep.arg[4]); - npc_type->max_hp = atoi(sep.arg[4]); + npc_type->cur_hp = atoi(sep.arg[4]); + npc_type->max_hp = atoi(sep.arg[4]); npc_type->race = atoi(sep.arg[1]); - npc_type->gender = atoi(sep.arg[5]); - npc_type->class_ = atoi(sep.arg[6]); + npc_type->gender = atoi(sep.arg[5]); + npc_type->class_ = atoi(sep.arg[6]); npc_type->deity = 1; npc_type->level = atoi(sep.arg[2]); npc_type->npc_id = 0; @@ -942,9 +942,9 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, npc_type->runspeed = 1.25; npc_type->d_meele_texture1 = atoi(sep.arg[7]); npc_type->d_meele_texture2 = atoi(sep.arg[8]); - npc_type->merchanttype = atoi(sep.arg[9]); + npc_type->merchanttype = atoi(sep.arg[9]); npc_type->bodytype = atoi(sep.arg[10]); - + npc_type->STR = 150; npc_type->STA = 150; npc_type->DEX = 150; @@ -955,14 +955,14 @@ NPC* NPC::SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, npc_type->prim_melee_type = 28; npc_type->sec_melee_type = 28; - + NPC* npc = new NPC(npc_type, 0, in_x, in_y, in_z, in_heading/8, FlyMode3); npc->GiveNPCTypeData(npc_type); - + entity_list.AddNPC(npc); if (client) { - // Notify client of spawn data + // Notify client of spawn data client->Message(0, "New spawn:"); client->Message(0, "Name: %s", npc->name); client->Message(0, "Race: %u", npc->race); @@ -995,7 +995,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver if (extra && c && c->GetZoneID()) { // Set an npc_type ID within the standard range for the current zone if possible (zone_id * 1000) - int starting_npc_id = c->GetZoneID() * 1000; + int starting_npc_id = c->GetZoneID() * 1000; if (RunQuery(query, MakeAnyLenString(&query, "SELECT MAX(id) FROM npc_types WHERE id >= %i AND id < %i", starting_npc_id, (starting_npc_id + 1000)), errbuf, &result)) { row = mysql_fetch_row(result); if(row) @@ -1015,7 +1015,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver npc_type_id = starting_npc_id; } } - + safe_delete_array(query); mysql_free_result(result); } @@ -1242,7 +1242,7 @@ int32 NPC::GetEquipmentMaterial(uint8 material_slot) const return(0); } } - + //they have some loot item in this slot, pass it up to the default handler return(Mob::GetEquipmentMaterial(material_slot)); } @@ -1262,9 +1262,9 @@ uint32 NPC::GetMaxDamage(uint8 tlevel) } void NPC::PickPocket(Client* thief) { - + thief->CheckIncreaseSkill(PICK_POCKETS, nullptr, 5); - + //make sure were allowed to targte them: int olevel = GetLevel(); if(olevel > (thief->GetLevel() + THIEF_PICKPOCKET_OVER)) { @@ -1273,7 +1273,7 @@ void NPC::PickPocket(Client* thief) { //should we check aggro return; } - + if(MakeRandomInt(0, 100) > 95){ AddToHateList(thief, 50); Say("Stop thief!"); @@ -1281,7 +1281,7 @@ void NPC::PickPocket(Client* thief) { thief->SendPickPocketResponse(this, 0, PickPocketFailed); return; } - + int steal_skill = thief->GetSkill(PICK_POCKETS); int stealchance = steal_skill*100/(5*olevel+5); ItemInst* inst = 0; @@ -1318,7 +1318,7 @@ void NPC::PickPocket(Client* thief) { bool is_arrow = (item->ItemType == ItemTypeArrow) ? true : false; int slot_id = thief->GetInv().FindFreeSlot(false, true, inst->GetItem()->Size, is_arrow); if (/*!Equipped(item->ID) &&*/ - !item->Magic && item->NoDrop != 0 && !inst->IsType(ItemClassContainer) && slot_id != SLOT_INVALID + !item->Magic && item->NoDrop != 0 && !inst->IsType(ItemClassContainer) && slot_id != SLOT_INVALID /*&& steal_skill > item->StealSkill*/ ) { slot[x] = slot_id; @@ -2024,7 +2024,7 @@ void NPC::LevelScale() { uint8 random_level = (MakeRandomInt(level, maxlevel)); float scaling = (((random_level / (float)level) - 1) * (scalerate / 100.0f)); - + // Compensate for scale rates at low levels so they don't add too much uint8 scale_adjust = 1; if(level > 0 && level <= 5) @@ -2047,7 +2047,7 @@ void NPC::LevelScale() { WIS += (int)(WIS * scaling / scale_adjust); CHA += (int)(CHA * scaling / scale_adjust); if (MR) - MR += (int)(MR * scaling / scale_adjust); + MR += (int)(MR * scaling / scale_adjust); if (CR) CR += (int)(CR * scaling / scale_adjust); if (DR) @@ -2094,29 +2094,29 @@ void NPC::CalcNPCRegen() { mana_regen = 0; else mana_regen = mana_regen; - + // Gives low end monsters no regen if set to 0 in database. Should make low end monsters killable // Might want to lower this to /5 rather than 10. if(hp_regen == 0) { - if(GetLevel() <= 6) - hp_regen = 1; - else if(GetLevel() > 6 && GetLevel() <= 10) - hp_regen = 2; - else if(GetLevel() > 10 && GetLevel() <= 15) - hp_regen = 3; - else if(GetLevel() > 15 && GetLevel() <= 20) - hp_regen = 5; - else if(GetLevel() > 20 && GetLevel() <= 30) - hp_regen = 7; - else if(GetLevel() > 30 && GetLevel() <= 35) - hp_regen = 9; - else if(GetLevel() > 35 && GetLevel() <= 40) - hp_regen = 12; - else if(GetLevel() > 40 && GetLevel() <= 45) - hp_regen = 18; - else if(GetLevel() > 45 && GetLevel() <= 50) - hp_regen = 21; + if(GetLevel() <= 6) + hp_regen = 1; + else if(GetLevel() > 6 && GetLevel() <= 10) + hp_regen = 2; + else if(GetLevel() > 10 && GetLevel() <= 15) + hp_regen = 3; + else if(GetLevel() > 15 && GetLevel() <= 20) + hp_regen = 5; + else if(GetLevel() > 20 && GetLevel() <= 30) + hp_regen = 7; + else if(GetLevel() > 30 && GetLevel() <= 35) + hp_regen = 9; + else if(GetLevel() > 35 && GetLevel() <= 40) + hp_regen = 12; + else if(GetLevel() > 40 && GetLevel() <= 45) + hp_regen = 18; + else if(GetLevel() > 45 && GetLevel() <= 50) + hp_regen = 21; else hp_regen = 30; } else if(hp_regen < 0) { @@ -2167,10 +2167,10 @@ void NPC::CalcNPCDamage() { if (max_dmg==0) max_dmg = (GetLevel()*2)*AC_adjust/10; } - + int clfact = GetClassLevelFactor(); min_dmg = (min_dmg * clfact) / 220; - max_dmg = (max_dmg * clfact) / 220; + max_dmg = (max_dmg * clfact) / 220; return; } @@ -2243,7 +2243,7 @@ int32 NPC::CalcMaxMana() { if (max_mana < 0) { max_mana = 0; } - + return max_mana; } else { switch (GetCasterClass()) { @@ -2261,7 +2261,7 @@ int32 NPC::CalcMaxMana() { if (max_mana < 0) { max_mana = 0; } - + return max_mana; } } @@ -2284,7 +2284,7 @@ NPC_Emote_Struct* NPC::GetNPCEmote(uint16 emoteid, uint8 event_) { } return (nullptr); } - + void NPC::DoNPCEmote(uint8 event_, uint16 emoteid) { if(this == nullptr || emoteid == 0) @@ -2338,7 +2338,7 @@ bool NPC::CanTalk() if (TalkRace[GetRace() - 1] > 0) return true; - + return false; } @@ -2360,39 +2360,39 @@ void NPC::PrintOutQuestItems(Client* c){ //this is called with 'this' as the mob being looked at, and //iOther the mob who is doing the looking. It should figure out //what iOther thinks about 'this' -FACTION_VALUE NPC::GetReverseFactionCon(Mob* iOther) { +FACTION_VALUE NPC::GetReverseFactionCon(Mob* iOther) { _ZP(NPC_GetReverseFactionCon); iOther = iOther->GetOwnerOrSelf(); int primaryFaction= iOther->GetPrimaryFaction(); - + //I am pretty sure that this special faction call is backwards //and should be iOther->GetSpecialFactionCon(this) if (primaryFaction < 0) return GetSpecialFactionCon(iOther); - + if (primaryFaction == 0) return FACTION_INDIFFERENT; - + //if we are a pet, use our owner's faction stuff Mob *own = GetOwner(); if (own != nullptr) return own->GetReverseFactionCon(iOther); - + //make sure iOther is an npc //also, if we dont have a faction, then they arnt gunna think anything of us either if(!iOther->IsNPC() || GetPrimaryFaction() == 0) return(FACTION_INDIFFERENT); - + //if we get here, iOther is an NPC too - + //otherwise, employ the npc faction stuff //so we need to look at iOther's faction table to see //what iOther thinks about our primary faction return(iOther->CastToNPC()->CheckNPCFactionAlly(GetPrimaryFaction())); } -//Look through our faction list and return a faction con based +//Look through our faction list and return a faction con based //on the npc_value for the other person's primary faction in our list. FACTION_VALUE NPC::CheckNPCFactionAlly(int32 other_faction) { list::iterator cur,end; diff --git a/zone/npc.h b/zone/npc.h index 26ce5822e..5090c2bdb 100644 --- a/zone/npc.h +++ b/zone/npc.h @@ -74,9 +74,9 @@ class NPC : public Mob public: static NPC* SpawnNPC(const char* spawncommand, float in_x, float in_y, float in_z, float in_heading = 0, Client* client = 0); static int8 GetAILevel(bool iForceReRead = false); - + NPC(const NPCType* data, Spawn2* respawn, float x, float y, float z, float heading, int iflymode, bool IsCorpse = false); - + virtual ~NPC(); //abstract virtual function implementations requird by base abstract class @@ -109,12 +109,12 @@ public: void CalcNPCDamage(); - int32 GetActSpellDamage(uint16 spell_id, int32 value); - int32 GetActSpellHealing(uint16 spell_id, int32 value); - inline void SetSpellFocusDMG(int32 NewSpellFocusDMG) {SpellFocusDMG = NewSpellFocusDMG;} - inline void SetSpellFocusHeal(int32 NewSpellFocusHeal) {SpellFocusHeal = NewSpellFocusHeal;} - int32 SpellFocusDMG; - int32 SpellFocusHeal; + int32 GetActSpellDamage(uint16 spell_id, int32 value); + int32 GetActSpellHealing(uint16 spell_id, int32 value); + inline void SetSpellFocusDMG(int32 NewSpellFocusDMG) {SpellFocusDMG = NewSpellFocusDMG;} + inline void SetSpellFocusHeal(int32 NewSpellFocusHeal) {SpellFocusHeal = NewSpellFocusHeal;} + int32 SpellFocusDMG; + int32 SpellFocusHeal; virtual void SetTarget(Mob* mob); virtual uint16 GetSkill(SkillType skill_num) const { if (skill_num <= HIGHEST_SKILL) { return skills[skill_num]; } return 0; } @@ -216,9 +216,9 @@ public: uint32 GetSwarmOwner(); uint32 GetSwarmTarget(); void SetSwarmTarget(int target_id = 0); - + void SignalNPC(int _signal_id); - + inline int32 GetNPCFactionID() const { return npc_faction_id; } inline int32 GetPrimaryFaction() const { return primary_faction; } int32 GetNPCHate(Mob* in_ent) {return hate_list.GetEntHate(in_ent);} @@ -227,7 +227,7 @@ public: void SetNPCFactionID(int32 in) { npc_faction_id = in; database.GetFactionIdsForNPC(npc_faction_id, &faction_list, &primary_faction); } float org_x, org_y, org_z, org_heading; - + uint32 GetMaxDMG() const {return max_dmg;} uint32 GetMinDMG() const {return min_dmg;} float GetSlowMitigation() const {return slow_mitigation;} @@ -242,7 +242,7 @@ public: void AddLootDrop(const Item_Struct*dbitem, ItemList* itemlistconst, int16 charges, uint8 minlevel, uint8 maxlevel, bool equipit, bool wearchange = false); virtual void DoClassAttacks(Mob *target); void CheckSignal(); - + //waypoint crap int GetMaxWp() const { return max_wp; } void DisplayWaypointInfo(Client *to); @@ -257,10 +257,10 @@ public: void PauseWandering(int pausetime); void MoveTo(float mtx, float mty, float mtz, float mth, bool saveguardspot); void GetClosestWaypoint(list &wp_list, int count, float m_x, float m_y, float m_z); - + uint32 GetEquipment(uint8 material_slot) const; // returns item id int32 GetEquipmentMaterial(uint8 material_slot) const; - + void NextGuardPosition(); void SaveGuardSpot(bool iClearGuardSpot = false); inline bool IsGuarding() const { return(guard_heading != 0); } @@ -268,7 +268,7 @@ public: void RestoreGuardSpotCharm(); void AI_SetRoambox(float iDist, float iRoamDist, uint32 iDelay = 2500); void AI_SetRoambox(float iDist, float iMaxX, float iMinX, float iMaxY, float iMinY, uint32 iDelay = 2500); - + //mercenary stuff void LoadMercTypes(); void LoadMercs(); @@ -280,12 +280,12 @@ public: int GetNumMercTypes( uint32 expansion ); int GetNumMercs() { return static_cast(mercDataList.size()); }; int GetNumMercs( uint32 expansion ); - + inline bool WillAggroNPCs() const { return(npc_aggro); } - + inline void GiveNPCTypeData(NPCType *ours) { NPCTypedata_ours = ours; } inline const uint32 GetNPCSpellsID() const { return npc_spells_id; } - + ItemList itemlist; //kathgar - why is this public? Doing other things or I would check the code NPCProximity* proximity; @@ -361,8 +361,8 @@ public: { ClearQuestDeleteItems(true); } - - + + void ClearQuestItems(bool delete_=false) { LinkedListIterator iterator(questItems); @@ -386,7 +386,7 @@ public: questDeletionItems.Clear(); } - + ItemInst* FindQuestItemByID(uint32 itmID, int charges, bool flagItemForDeletion=false) { LinkedListIterator iterator(questItems); @@ -413,7 +413,7 @@ public: return nullptr; } - bool DoesQuestItemExist(uint32 itmID, int charges, bool flagItemForDeletion=false) { + bool DoesQuestItemExist(uint32 itmID, int charges, bool flagItemForDeletion=false) { ItemInst* inst = FindQuestItemByID(itmID,charges,flagItemForDeletion); if ( inst != nullptr ) { @@ -462,7 +462,7 @@ public: void mod_npc_killed(Mob* oos); protected: - + const NPCType* NPCTypedata; NPCType* NPCTypedata_ours; //special case for npcs with uniquely created data. @@ -478,7 +478,7 @@ protected: int32 npc_faction_id; int32 primary_faction; - + Timer attacked_timer; //running while we are being attacked (damaged) Timer swarm_timer; Timer classattack_timer; @@ -499,8 +499,8 @@ protected: bool HasAISpell; virtual bool AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes); virtual bool AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore = 0); - - + + uint32 max_dmg; uint32 min_dmg; int32 accuracy_rating; @@ -513,11 +513,11 @@ protected: uint16 pet_spell_id; bool taunting; Timer taunt_timer; //for pet taunting - + bool npc_aggro; - + deque signal_q; - + //waypoint crap: vector Waypoints; void _ClearWaypints(); @@ -534,7 +534,7 @@ protected: float roambox_movingto_x; float roambox_movingto_y; uint32 roambox_delay; - + uint16 skills[HIGHEST_SKILL+1]; uint32 equipment[MAX_WORN_INVENTORY]; //this is an array of item IDs uint16 d_meele_texture1; //this is an item Material value @@ -542,7 +542,7 @@ protected: uint8 prim_melee_type; //Sets the Primary Weapon attack message and animation uint8 sec_melee_type; //Sets the Secondary Weapon attack message and animation AA_SwarmPetInfo *swarmInfoPtr; - + bool ldon_trapped; uint8 ldon_trap_type; uint16 ldon_spell_id; diff --git a/zone/object.h b/zone/object.h index 9de16cee6..4328f3ff9 100644 --- a/zone/object.h +++ b/zone/object.h @@ -94,7 +94,7 @@ IT10725_ACTORDEF=Shuriken #define OT_VALEFORGE 0x31 //halfling // gnome forge 0x23 (ak'anon forge) // barbarian forge 0x24 (northman forge) -// +// // iksar forge 0x26 (cabilis forge) // human forge 0x27 (qeynos or freeport?) (royal qeynos forge or freeport forge) // human forge 0x28 (qeynos or freeport?) @@ -136,7 +136,7 @@ public: Object(Client* client, const ItemInst* inst); Object(const ItemInst *inst, float x, float y, float z, float heading, uint32 decay_time = 300000); Object(const char *model, float x, float y, float z, float heading, uint8 type, uint32 decay_time = 0); - + // Destructor ~Object(); bool Process(); @@ -148,29 +148,29 @@ public: static void HandleCombine(Client* user, const NewCombine_Struct* in_combine, Object *worldo); static void HandleAugmentation(Client* user, const AugmentItem_Struct* in_augment, Object *worldo); static void HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac); - + static SkillType TypeToSkill(uint32 type); - + // Packet functions void CreateSpawnPacket(EQApplicationPacket* app); void CreateDeSpawnPacket(EQApplicationPacket* app); void Depop(); void Repop(); - + //Decay functions void StartDecay() {decay_timer.Start();} - + // Container functions void PutItem(uint8 index, const ItemInst* inst); void DeleteItem(uint8 index); // Item inside container ItemInst* PopItem(uint8 index); // Pop item out of container - + // Override base class implementations virtual bool IsObject() const { return true; } virtual bool Save(); virtual uint16 VarSave(); virtual void SetID(uint16 set_id); - + void ClearUser() { user = nullptr; } uint32 GetDBID(); @@ -204,7 +204,7 @@ public: protected: void ResetState(); // Set state back to original void RandomSpawn(bool send_packet = false); //spawn this ground spawn at a random place - + Object_Struct m_data; // Packet data ItemInst* m_inst; // Item representing object bool m_inuse; // Currently in use by a client? @@ -220,10 +220,10 @@ protected: bool m_ground_spawn; std::map o_EntityVariables; - + Client *user; Client *last_user; - + Timer respawn_timer; Timer decay_timer; }; diff --git a/zone/oldcode.cpp b/zone/oldcode.cpp index becf920eb..504343993 100644 --- a/zone/oldcode.cpp +++ b/zone/oldcode.cpp @@ -57,7 +57,7 @@ extern volatile bool ZoneLoaded; ushort *array; struct seminfo *__buf; void *__pad; - }; + }; #endif #endif #endif @@ -106,7 +106,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { #error ifstreams seem to break BSD... #endif ifstream in;in.open(SPELLS_FILE); - + if(!in.is_open()){ LogFile->write(EQEMuLog::Error, "File '%s' not found in same directory as zone.exe, spell loading FAILED!", SPELLS_FILE); return; @@ -122,7 +122,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { // cout << "BLEH"; // getch(); //} - + //in.getline(&temp, 624); in.get(temp); while(chrcmpI(&temp, &sep)) @@ -138,7 +138,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -163,7 +163,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -177,7 +177,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -190,7 +190,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -202,7 +202,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { //cout << spells[tempid].other_casts << '^'; a=0; for(u=0;u<64;u++) - token[u]=(char)0; + token[u]=(char)0; in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -215,7 +215,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -228,7 +228,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -241,7 +241,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -252,7 +252,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { //cout << spells[tempid].range << '^'; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -265,7 +265,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -279,7 +279,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -292,8 +292,8 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - - in.get(temp); + + in.get(temp); while(chrcmpI(&temp,&sep)) { strncat(token,&temp,1); @@ -301,12 +301,12 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { in.get(temp); } spells[tempid].cast_time=atoi(token); - + //cout << spells[tempid].cast_time << '^'; a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -319,7 +319,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -332,7 +332,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -345,7 +345,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -359,7 +359,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -372,7 +372,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -385,7 +385,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + int y; for(y=0; y< 12;y++) { @@ -401,8 +401,8 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - - + + } for(y=0; y< 12;y++) { @@ -418,7 +418,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } in.get(temp); while(chrcmpI(&temp,&sep)) @@ -427,12 +427,12 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a++; in.get(temp); } - spells[tempid].icon=atoi(token); + spells[tempid].icon=atoi(token); //cout << spells[tempid].icon << '^'; a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -440,13 +440,13 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a++; in.get(temp); } - spells[tempid].memicon=atoi(token); + spells[tempid].memicon=atoi(token); //cout << spells[tempid].memicon << '^'; - + a=0; for(u=0;u<64;u++) token[u]=(char)0; - + for(y=0; y< 4;y++) { in.get(temp); @@ -461,7 +461,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } for(y=0; y< 4;y++) { @@ -477,7 +477,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - } + } for(y=0; y< 4;y++) { in.get(temp); @@ -492,7 +492,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } for(y=0; y< 12;y++) { @@ -508,7 +508,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } in.get(temp); while(chrcmpI(&temp,&sep)) @@ -522,7 +522,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { //cout << spells[tempid].LightType << '^'; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -535,7 +535,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -548,7 +548,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) @@ -562,7 +562,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + for(y=0; y< 12;y++) { in.get(temp); @@ -577,7 +577,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } in.get(temp); while(chrcmpI(&temp,&sep)) @@ -591,7 +591,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -617,7 +617,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -630,7 +630,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -643,7 +643,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -657,7 +657,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + for(y=0; y< 15;y++) { in.get(temp); @@ -672,7 +672,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } //cout << "end class"; /*for(y=0; y< 3;y++) { @@ -688,7 +688,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + } in.get(temp); while(chrcmpI(&temp,&sep)) @@ -748,11 +748,11 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { } spells[tempid].SpellAffectIndex=atoi(token); //cout << spells[tempid].SpellAffectIndex << '^'; - + a=0; for(u=0;u<64;u++) token[u]=(char)0; - + for(y=0; y< 23;y++) { in.get(temp); @@ -768,7 +768,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { for(u=0;u<64;u++) token[u]=(char)0; } - + in.get(temp); while(chrcmpI(&temp,&sep)) { @@ -781,7 +781,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { a=0; for(u=0;u<64;u++) token[u]=(char)0; - + in.get(temp); for(y=0; y< 2;y++) { @@ -814,17 +814,17 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { while(temp!='\n') in.get(temp); - + //cout << endl; if(tempid==SPDAT_RECORDS-1) break; - } + } //for(u=0;u< SPDAT_RECORDS;u++) // cout << u << ' ' << spells[u].name << '^'; - + spells_loaded = true; cout << "Spells loaded.\n"; in.close(); - + } #endif @@ -842,7 +842,7 @@ void ZoneDatabase::UpdateAndDeleteAATimers(uint32 charid){ char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; char *query2 = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "delete from aa_timers where charid=%i and UNIX_TIMESTAMP(now())>=end",charid), errbuf)) { LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf); } @@ -867,7 +867,7 @@ void ZoneDatabase::GetAATimers(uint32 charid){ char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT ability,begin,end from aa_timers WHERE charid=%i", charid), errbuf, &result)) { while( ( row = mysql_fetch_row(result) ) ){ UseAA_Struct* uaa=new UseAA_Struct(); @@ -881,7 +881,7 @@ void ZoneDatabase::GetAATimers(uint32 charid){ } else { LogFile->write(EQEMuLog::Error, "Database::GetAATimers query '%s' %s", query, errbuf); - } + } safe_delete_array(query); } @@ -899,7 +899,7 @@ uint32 ZoneDatabase::GetTimerRemaining(uint32 charid,uint32 ability){ } else { LogFile->write(EQEMuLog::Error, "Database::GetTimerRemaining query '%s' %s", query, errbuf); - } + } safe_delete_array(query); return remain; } @@ -955,7 +955,7 @@ uint16 Client::GetCombinedAC_TEST() { const ItemInst* inst = m_inv[i]; if (!inst || !inst->IsType(ItemTypeCommon)) continue; - + const Item_Struct* item = inst->GetItem(); if (item->FocusId && (item->FocusId != 0xFFFF)) { if (IsIncreaseDurationSpell(item->FocusId)) { @@ -975,7 +975,7 @@ bool Client::GetReduceManaCostItem(uint16 &spell_id, char *itemname) const ItemInst* inst = m_inv[i]; if (!inst || !inst->IsType(ItemTypeCommon)) continue; - + const Item_Struct* item = inst->GetItem(); if (item->FocusId && (item->FocusId != 0xFFFF)) { if (IsReduceManaSpell(item->FocusId)) { @@ -995,7 +995,7 @@ bool Client::GetReduceCastTimeItem(uint16 &spell_id, char *itemname) const ItemInst* inst = m_inv[i]; if (!inst || !inst->IsType(ItemTypeCommon)) continue; - + const Item_Struct* item = inst->GetItem(); if (item->FocusId && (item->FocusId != 0xFFFF)) { if (IsReduceCastTimeSpell(item->FocusId)) { @@ -1015,7 +1015,7 @@ bool Client::GetExtendedRangeItem(uint16 &spell_id, char *itemname) const ItemInst* inst = m_inv[i]; if (!inst || !inst->IsType(ItemTypeCommon)) continue; - + const Item_Struct* item = inst->GetItem(); if (item->FocusId && (item->FocusId != 0xFFFF)) { if (IsExtRangeSpell(item->FocusId)) { @@ -1035,7 +1035,7 @@ bool Client::GetImprovedHealingItem(uint16 &spell_id, char *itemname) const ItemInst* inst = m_inv[i]; if (!inst || !inst->IsType(ItemTypeCommon)) continue; - + const Item_Struct* item = inst->GetItem(); if (item->FocusId && (item->FocusId != 0xFFFF)) { if (IsImprovedHealingSpell(item->FocusId)) { @@ -1055,7 +1055,7 @@ bool Client::GetImprovedDamageItem(uint16 &spell_id, char *itemname) const ItemInst* inst = m_inv[i]; if (!inst || !inst->IsType(ItemTypeCommon)) continue; - + const Item_Struct* item = inst->GetItem(); if (item->FocusId && (item->FocusId != 0xFFFF)) { if (IsImprovedDamageSpell(item->FocusId)) { @@ -1074,7 +1074,7 @@ int32 Client::GenericFocus(uint16 spell_id, uint16 modspellid) int modifier = 100, i; const SPDat_Spell_Struct &spell = spells[spell_id]; const SPDat_Spell_Struct &modspell = spells[modspellid]; - + for (i = 0; i < EFFECT_COUNT; i++) { if(IsBlankSpellEffect(modspellid, i)) @@ -1202,22 +1202,22 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] //Message(0,"You can use a new discipline in %i minutes %i seconds.", (disc_timer.GetRemainingTime()/1000)/60, disc_timer.GetRemainingTime()/1000%60); return; } - + //reuse times are a little messes up, they should scale down somehow //as you gain in levels, but im not sure how, so its just a lvl 60 bonus right now - + //should change this to check classes better. - + //both in seconds, converted at the end. uint32 duration = 0; uint32 reuse = 0; - + switch(disc_in->disc_id){ // Shared? case discResistant: { // Resistant // 1 minute duration // 1 hour reuse - // +3 to +10 to resists + // +3 to +10 to resists if (GetLevel()<=29) return; duration = 60; @@ -1517,11 +1517,11 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] case 0:{ // Timer request break; } - default: + default: LogFile->write(EQEMuLog::Error, "Unknown Discipline requested by client: %s class: %i Disciline:%i", GetName(), class_,disc_in->disc_id); return; } - + if(reuse != 0) { p_timers.Start(pTimerDisciplineReuse, reuse); //nonpersistent timer for the 'discipline ready' message @@ -1529,7 +1529,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] } if(duration != 0) disc_elapse.Start(1000*duration); - + disc_inuse = disc_in->disc_id; }*/ @@ -1654,7 +1654,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] } } iterator.Advance(); - } + } }*/ #endif // solar: old code @@ -1669,7 +1669,7 @@ void ZoneDatabase::AddLootTableToNPC(uint32 loottable_id, ItemList* itemlist, ui *silver = 0; *gold = 0; *plat = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, mincash, maxcash, avgcoin FROM loottable WHERE id=%i", loottable_id), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) { @@ -1721,7 +1721,7 @@ void ZoneDatabase::AddLootTableToNPC(uint32 loottable_id, ItemList* itemlist, ui safe_delete_array(query); return; } - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT loottable_id, lootdrop_id, multiplier, probability FROM loottable_entries WHERE loottable_id=%i", loottable_id), errbuf, &result)) { safe_delete_array(query); while ((row = mysql_fetch_row(result))) { @@ -1739,7 +1739,7 @@ void ZoneDatabase::AddLootTableToNPC(uint32 loottable_id, ItemList* itemlist, ui safe_delete_array(query); return; } - + return; } @@ -1750,7 +1750,7 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + // This is Wiz's updated Pool Looting functionality. Eventually, the database format should be moved over to use this // or implemented to support both methods. (A unique identifier in lootable_entries indicates to roll for a pool item // in another table. @@ -1760,14 +1760,14 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { uint32 itemchance[50]; uint16 itemcharges[50]; uint8 i = 0; - + for (int m=0;m < 50;m++) { items[m]=0; itemchance[m]=0; itemcharges[m]=0; } - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT lootdrop_id, item_id, item_charges, equip_item, chance FROM lootdrop_entries WHERE lootdrop_id=%i order by chance desc", lootdrop_id), errbuf, &result)) { safe_delete_array(query); @@ -1781,7 +1781,7 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { } uint32 res; i = 0; - + if (chancepool!=0) //avoid divide by zero if some mobs have 0 for chancepool { res = rand()%chancepool; @@ -1790,7 +1790,7 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { { res = 0; } - + while (items[i] != 0) { if (res <= itemchance[i]) @@ -1839,7 +1839,7 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { item->equipSlot = 0; (*itemlist).Append(item); } - + //mysql_free_result(result); //return; } @@ -1853,7 +1853,7 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { safe_delete_array(query); return; } - + return; } #endif*/ diff --git a/zone/parser.cpp b/zone/parser.cpp index 4ff3a0f56..280020533 100644 --- a/zone/parser.cpp +++ b/zone/parser.cpp @@ -91,10 +91,10 @@ int calc(string calc) string integer1; char op = 0; int returnvalue = 0; - + while (*iterator) { char ch = *iterator; - + if(ch >= '0' && ch <= '9') { //If this character is numeric add it to the buffer buffer += ch; } @@ -108,7 +108,7 @@ int calc(string calc) printf("Parser::calc() Error in syntax: '%s'.\n", calc.c_str()); return 0; } - + //what was the previous op switch(op) { @@ -134,7 +134,7 @@ int calc(string calc) break; } }; - + op = ch; //save current operator and continue parsing } buffer=""; //clear buffer now that we're starting on a new number @@ -293,7 +293,7 @@ int Parser::HasQuestFile(uint32 npcid) int success=1; if (qstID==-1) success = LoadScript(npcid, zone->GetShortName()); - if (!success) + if (!success) return false; return true; @@ -308,7 +308,7 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc int success=1; if (qstID==-1) success = LoadScript(npcid, zone->GetShortName(),mob); - if (!success) + if (!success) return; else qstID = GetNPCqstID(npcid); @@ -323,7 +323,7 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc MYSQL_ROW row; char tmpname[65]; int charid=0; - + if (mob && mob->IsClient()) // some events like waypoint and spawn don't have a player involved { charid=mob->CastToClient()->CharacterID(); @@ -336,8 +336,8 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc AddVar("charid.g",itoa(charid)); - database.RunQuery(query, MakeAnyLenString(&query, - "SELECT name,value FROM quest_globals WHERE (npcid=%i || npcid=0) && (charid=%i || charid=0) && (zoneid=%i || zoneid=0) && expdate >= unix_timestamp(now())", + database.RunQuery(query, MakeAnyLenString(&query, + "SELECT name,value FROM quest_globals WHERE (npcid=%i || npcid=0) && (charid=%i || charid=0) && (zoneid=%i || zoneid=0) && expdate >= unix_timestamp(now())", npcmob->GetNPCTypeID(),charid,zone->GetZoneID()), errbuf, &result); printf("%s\n",query); printf("%s\n",errbuf); @@ -349,7 +349,7 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc sprintf(tmpname,"%s.g",row[0]); AddVar(tmpname, row[1]); } - mysql_free_result(result); + mysql_free_result(result); } if (query) { @@ -367,7 +367,7 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc AddVar("signal.g",data); } uint8 fac = 0; - if (mob && mob->IsClient()) { + if (mob && mob->IsClient()) { AddVar("uguild_id.g", itoa(mob->CastToClient()->GuildID())); AddVar("uguildrank.g", itoa(mob->CastToClient()->GuildRank())); } @@ -375,7 +375,7 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc if (mob && npcmob && mob->IsClient() && npcmob->IsNPC()) { Client* client = mob->CastToClient(); NPC* npc = npcmob->CastToNPC(); - + // Need to figure out why one of these casts would fail.. if (client && npc) { fac = client->GetFactionLevel(client->GetID(), npcmob->GetID(), client->GetRace(), client->GetClass(), DEITY_AGNOSTIC, npc->GetPrimaryFaction(), npcmob); @@ -495,7 +495,7 @@ void Parser::Event(QuestEventID event, uint32 npcid, const char * data, NPC* npc DelChatAndItemVars(npcid); } - + Parser::Parser() : DEFAULT_QUEST_PREFIX("default") { MainList.clear(); pNPCqstID = new int32[1]; @@ -756,7 +756,7 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci #if Parser_DEBUG>10 printf("After: %s\n", arglist[0]); #endif - + char command[256]; strncpy(command, o_command.c_str(), 255); command[255] = 0; @@ -766,8 +766,8 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci *cptr = *cptr + ('a' - 'A'); *cptr++; } - - + + if (!strcmp(command,"write")) { quest_manager.write(arglist[0], arglist[1]); } @@ -776,11 +776,11 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci quest_manager.me(parms.c_str()); //end Myra } - else if (!strcmp(command,"spawn") || !strcmp(command,"spawn2")) + else if (!strcmp(command,"spawn") || !strcmp(command,"spawn2")) { - + float hdng; - if (!strcmp(command,"spawn")) + if (!strcmp(command,"spawn")) { hdng=mob->CastToClient()->GetHeading(); } @@ -791,9 +791,9 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci quest_manager.spawn2(atoi(arglist[0]), atoi(arglist[1]), 0, atof(arglist[3]), atof(arglist[4]), atof(arglist[5]), hdng); } - else if (!strcmp(command,"unique_spawn")) + else if (!strcmp(command,"unique_spawn")) { - + float hdng; hdng=mob->CastToClient()->GetHeading(); quest_manager.unique_spawn(atoi(arglist[0]), atoi(arglist[1]), 0, @@ -877,18 +877,18 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci else if (!strcmp(command,"snow")) { quest_manager.snow(atoi(arglist[0])); } - else if (!strcmp(command,"surname")) { + else if (!strcmp(command,"surname")) { quest_manager.surname(arglist[0]); - } - else if (!strcmp(command,"permaclass")) { + } + else if (!strcmp(command,"permaclass")) { quest_manager.permaclass(atoi(arglist[0])); - } + } else if (!strcmp(command,"permarace")) { quest_manager.permarace(atoi(arglist[0])); - } + } else if (!strcmp(command,"permagender")) { quest_manager.permagender(atoi(arglist[0])); - } + } else if (!strcmp(command,"scribespells")) { quest_manager.scribespells(atoi(arglist[0])); } @@ -904,8 +904,8 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci else if (!strcmp(command,"movepc")) { quest_manager.movepc((atoi(arglist[0])),(atof(arglist[1])),(atof(arglist[2])),(atof(arglist[3])),(atof(arglist[4]))); } - else if (!strcmp(command,"gmmove")) { - quest_manager.gmmove(atof(arglist[0]), atof(arglist[1]), atof(arglist[2])); + else if (!strcmp(command,"gmmove")) { + quest_manager.gmmove(atof(arglist[0]), atof(arglist[1]), atof(arglist[2])); } else if (!strcmp(command,"movegrp")) { quest_manager.movegrp((atoi(arglist[0])),(atof(arglist[1])),(atof(arglist[2])),(atof(arglist[3]))); @@ -946,7 +946,7 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci else if (!strcmp(command,"settime")) { quest_manager.settime(atoi(arglist[0]), atoi(arglist[1])); } - else if (!strcmp(command,"itemlink")) { + else if (!strcmp(command,"itemlink")) { quest_manager.itemlink(atoi(arglist[0])); } else if (!strcmp(command,"signal")) { @@ -1023,7 +1023,7 @@ void Parser::ExCommands(string o_command, string parms, int argnums, uint32 npci else if (!strcmp(command,"clear_proximity")) { quest_manager.clear_proximity(); } - else if (!strcmp(command,"respawn")) + else if (!strcmp(command,"respawn")) { quest_manager.respawn(atoi(arglist[0]), atoi(arglist[1])); } @@ -1102,7 +1102,7 @@ int Parser::LoadScript(int npcid, const char * zone, Mob* activater) NewEventList->Event.push_back(event1); } if (bracket==-1) - { + { if(activater && activater->IsClient()) activater->CastToClient()->Message(10,"Line: %d,File: %s | error C0006: syntax error : too many ')'s",line_num,filename.c_str()); return 0; @@ -1328,13 +1328,13 @@ void Parser::HandleVars(string varname, string varparms, string& origstring, str temp[0] = atoi(varparms.c_str()); Replace(origstring,format,temp); } - //used_pawn - random implementation. - else if (!strcmp(strlwr((const char*)varname.c_str()),"random")) { - Replace(origstring,format,itoa(MakeRandomInt(0, varparms[0]-1))); - } - else if (!strcmp(strlwr((const char*)varname.c_str()),"asc")) { - Replace(origstring,format,itoa(varparms[0])); - } + //used_pawn - random implementation. + else if (!strcmp(strlwr((const char*)varname.c_str()),"random")) { + Replace(origstring,format,itoa(MakeRandomInt(0, varparms[0]-1))); + } + else if (!strcmp(strlwr((const char*)varname.c_str()),"asc")) { + Replace(origstring,format,itoa(varparms[0])); + } else if (!strcmp(strlwr((const char*)varname.c_str()),"gettok")) { Replace(origstring,format,gettok(arglist[0],arglist[1][0],atoi(arglist[2]))); } @@ -1385,7 +1385,7 @@ void Parser::ParseVars(string& text, uint32 npcid, Mob* mob) if (*iterator != '(' && *iterator != ')') buffer+=*iterator; } - else + else { buffer.replace(0,1,"",0); HandleVars(buffer,"",text,buffer2,npcid,mob); @@ -1423,7 +1423,7 @@ void Parser::ParseVars(string& text, uint32 npcid, Mob* mob) } } } - + /* char * fixstring(char * string) { @@ -1567,14 +1567,14 @@ int Parser::ParseCommands(string text, int line, int justcheck, uint32 npcid, Mo if (*iterator == '"' && !escape && !ignore) if (quote)quote--; else quote++; - + if (*iterator == ',' && !ignore && !quote && !escape && paren) argit++; if (*iterator == '(' && !ignore && !quote && !escape) { paren++; - if (paren == 1) + if (paren == 1) { if (last_finished) { @@ -1598,7 +1598,7 @@ int Parser::ParseCommands(string text, int line, int justcheck, uint32 npcid, Mo return 0; } } - } + } else if (*iterator == ')' && !ignore && !quote && !escape) { paren--; @@ -1618,7 +1618,7 @@ int Parser::ParseCommands(string text, int line, int justcheck, uint32 npcid, Mo mob->CastToClient()->Message(10,"Line: %d,File: %s | error C0006: syntax error : too many ')'s",line,filename.c_str() ); return 0; } - } + } else if (*iterator == '{' && !escape) { bracket++; @@ -1655,7 +1655,7 @@ int Parser::ParseCommands(string text, int line, int justcheck, uint32 npcid, Mo else lastif=0; lastif=0,last_finished=0,quote=0,escape=0,ignore=0,argnums=0,argit=1; } - } + } else if (*iterator == ';' && !escape && !ignore && !quote) { if (last_finished) diff --git a/zone/parser.h b/zone/parser.h index 3e2cb539f..1a3497a93 100644 --- a/zone/parser.h +++ b/zone/parser.h @@ -9,13 +9,13 @@ #include "QuestInterface.h" -struct EventList { +struct EventList { std::string event; std::string command; }; struct Events { -uint32 npcid; +uint32 npcid; std::list Event; }; @@ -44,7 +44,7 @@ public: virtual ~Parser(); int mindex; const std::string DEFAULT_QUEST_PREFIX; - + typedef list::iterator iter_events; typedef list::iterator iter_eventlist; std::list MainList; @@ -94,7 +94,7 @@ public: virtual void SendCommands(const char * event, uint32 npcid, NPC* npcmob, Mob* mob); int HasQuestFile(uint32 npcid); - + //interface stuff virtual void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data) {} virtual void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) {} diff --git a/zone/pathing.cpp b/zone/pathing.cpp index 0e2264ece..93b3f9bea 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -54,7 +54,7 @@ PathManager* PathManager::LoadPathFile(const char* ZoneName) PathManager* Ret = nullptr; strn0cpy(LowerCaseZoneName, ZoneName, 64); - + strlwr(LowerCaseZoneName); snprintf(ZonePathFileName, 250, MAP_DIR "/%s.path", LowerCaseZoneName); @@ -123,7 +123,7 @@ bool PathManager::loadPaths(FILE *PathFile) } PathNodes = new PathNode[Head.PathNodeCount]; - + fread(PathNodes, sizeof(PathNode), Head.PathNodeCount, PathFile); ClosedListFlag = new int[Head.PathNodeCount]; @@ -164,7 +164,7 @@ void PathManager::PrintPathing() { printf("PathNode: %2d id %2d. (%8.3f, %8.3f, %8.3f), BestZ: %8.3f\n", i, PathNodes[i].id, PathNodes[i].v.x, PathNodes[i].v.y, PathNodes[i].v.z, PathNodes[i].bestz); - + if(PathNodes[i].Neighbours[0].id == -1) { @@ -206,7 +206,7 @@ VERTEX PathManager::GetPathNodeCoordinates(int NodeNumber, bool BestZ) } return Result; - + } list PathManager::FindRoute(int startID, int endID) @@ -238,7 +238,7 @@ list PathManager::FindRoute(int startID, int endID) CurrentNode = (*OpenList.begin()); ClosedList.push_back(CurrentNode); - + ClosedListFlag[CurrentNode.PathNodeID] = true; OpenList.pop_front(); @@ -256,7 +256,7 @@ list PathManager::FindRoute(int startID, int endID) Route.push_back(CurrentNode.PathNodeID); Route.push_back(endID); - + list::iterator RouteIterator; while(CurrentNode.PathNodeID != startID) @@ -269,7 +269,7 @@ list PathManager::FindRoute(int startID, int endID) Route.insert(Route.begin(), -1); CurrentNode = (*RouteIterator); - + Route.insert(Route.begin(), CurrentNode.PathNodeID); break; @@ -295,9 +295,9 @@ list PathManager::FindRoute(int startID, int endID) AStarEntry.GCost = CurrentNode.GCost + PathNodes[CurrentNode.PathNodeID].Neighbours[i].distance; float FCost = AStarEntry.HCost + AStarEntry.GCost; -#ifdef PATHDEBUG +#ifdef PATHDEBUG printf("Node: %i, Open Neighbour %i has HCost %8.3f, GCost %8.3f (Total Cost: %8.3f)\n", - CurrentNode.PathNodeID, + CurrentNode.PathNodeID, PathNodes[CurrentNode.PathNodeID].Neighbours[i].id, AStarEntry.HCost, AStarEntry.GCost, @@ -390,7 +390,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) } } - + SortedByDistance.sort(SortPathNodesByDistance); for(list::iterator Iterator = SortedByDistance.begin(); Iterator != SortedByDistance.end(); ++Iterator) @@ -428,7 +428,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) SortedByDistance.push_back(TempNode); } } - + SortedByDistance.sort(SortPathNodesByDistance); for(list::iterator Iterator = SortedByDistance.begin(); Iterator != SortedByDistance.end(); ++Iterator) @@ -444,7 +444,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) break; } } - + if(ClosestPathNodeToEnd < 0) { _log(PATHING__DEBUG, "No LOS to any end Path Node within range."); return noderoute; @@ -464,7 +464,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) if(NodesToAttemptToCull > 0) { int CulledNodes = 0; - + list::iterator First, Second; while((noderoute.size() >= 2) && (CulledNodes < NodesToAttemptToCull)) @@ -489,13 +489,13 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) break; } } - + NodesToAttemptToCull = RuleI(Pathing, CullNodesFromEnd); if(NodesToAttemptToCull > 0) { int CulledNodes = 0; - + list::iterator First, Second; while((noderoute.size() >= 2) && (CulledNodes < NodesToAttemptToCull)) @@ -566,7 +566,7 @@ void PathManager::SpawnPathNodes() else if(PathNodes[i].id < 100) sprintf(npc_type->name, "%s_%s", DigitToWord(PathNodes[i].id/10), DigitToWord(PathNodes[i].id % 10)); else - sprintf(npc_type->name, "%s_%s_%s", DigitToWord(PathNodes[i].id/100), DigitToWord((PathNodes[i].id % 100)/10), + sprintf(npc_type->name, "%s_%s_%s", DigitToWord(PathNodes[i].id/100), DigitToWord((PathNodes[i].id % 100)/10), DigitToWord(((PathNodes[i].id % 100) %10))); sprintf(npc_type->lastname, "%i", PathNodes[i].id); @@ -586,7 +586,7 @@ void PathManager::SpawnPathNodes() npc_type->d_meele_texture2 = 1; npc_type->merchanttype = 1; npc_type->bodytype = 1; - + npc_type->STR = 150; npc_type->STA = 150; npc_type->DEX = 150; @@ -596,10 +596,10 @@ void PathManager::SpawnPathNodes() npc_type->CHA = 150; npc_type->findable = 1; - + NPC* npc = new NPC(npc_type, 0, PathNodes[i].v.x, PathNodes[i].v.y, PathNodes[i].v.z, 0, FlyMode1); npc->GiveNPCTypeData(npc_type); - + entity_list.AddNPC(npc, true, true); } } @@ -619,7 +619,7 @@ void PathManager::MeshTest() { if(j == i) continue; - + list Route = FindRoute(PathNodes[i].id, PathNodes[j].id); if(Route.size() == 0) @@ -627,7 +627,7 @@ void PathManager::MeshTest() ++NoConnections; printf("FindRoute(%i, %i) **** NO ROUTE FOUND ****\n", PathNodes[i].id, PathNodes[j].id); } - ++TotalTests; + ++TotalTests; } } printf("Executed %i route searches.\n", TotalTests); @@ -642,7 +642,7 @@ void PathManager::SimpleMeshTest() int TotalTests = 0; int NoConnections = 0; - printf("Beginning Pathmanager connectivity tests.\n"); + printf("Beginning Pathmanager connectivity tests.\n"); fflush(stdout); for(uint32 j = 1; j < Head.PathNodeCount; ++j) @@ -654,7 +654,7 @@ void PathManager::SimpleMeshTest() ++NoConnections; printf("FindRoute(%i, %i) **** NO ROUTE FOUND ****\n", PathNodes[0].id, PathNodes[j].id); } - ++TotalTests; + ++TotalTests; } printf("Executed %i route searches.\n", TotalTests); printf("Failed to find %i routes.\n", NoConnections); @@ -725,7 +725,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo PathingLastPosition = From; } - + if(Route.size() > 0) { @@ -743,7 +743,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo // We have reached the path node. if(NodeLoc == From) { - mlog(PATHING__DEBUG, " Arrived at node %i", NextNode); + mlog(PATHING__DEBUG, " Arrived at node %i", NextNode); NodeReached = true; @@ -776,7 +776,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo PathingLOSState = HaveLOS; else PathingLOSState = NoLOS; - mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); + mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); if((PathingLOSState == HaveLOS) && zone->pathing->NoHazards(From, To)) { @@ -787,7 +787,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo } else { - mlog(PATHING__DEBUG, " Continuing on node path."); + mlog(PATHING__DEBUG, " Continuing on node path."); } } else @@ -839,7 +839,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo return zone->pathing->GetPathNodeCoordinates(NextNode); } else - { + { // we have run all the nodes, all that is left is the direct path from the last node // to the destination mlog(PATHING__DEBUG, " Reached end of node path, running direct to target."); @@ -869,7 +869,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo PathingLOSState = HaveLOS; else PathingLOSState = NoLOS; - mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); + mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); if((PathingLOSState == HaveLOS) && zone->pathing->NoHazards(From, To)) { @@ -880,7 +880,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo } else { - mlog(PATHING__DEBUG, " Continuing on node path."); + mlog(PATHING__DEBUG, " Continuing on node path."); } } else @@ -895,7 +895,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo mlog(PATHING__DEBUG, " Target has changed position."); // Update our record of where we are going to. PathingDestination = To; - // Check if we now have LOS etc to the new destination. + // Check if we now have LOS etc to the new destination. if(PathingLOSCheckTimer->Check()) { float Distance = VertexDistanceNoRoot(From, To); @@ -908,9 +908,9 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo PathingLOSState = HaveLOS; else PathingLOSState = NoLOS; - - mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); - + + mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); + if((PathingLOSState == HaveLOS) && zone->pathing->NoHazards(From, To)) { mlog(PATHING__DEBUG, " No hazards. Running directly to target."); @@ -919,7 +919,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo } else { - mlog(PATHING__DEBUG, " Continuing on node path."); + mlog(PATHING__DEBUG, " Continuing on node path."); } } } @@ -966,13 +966,13 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo // May need to refine this as rounding errors may mean we never have equality // Check if we have reached a path node. if(NodeLoc == From) - { + { mlog(PATHING__DEBUG, " Arrived at node %i, moving to next one.\n", Route.front()); NodeReached = true; PathingLastNodeVisited = Route.front(); - + Route.pop_front(); ++PathingTraversedNodes; @@ -993,7 +993,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo mlog(PATHING__DEBUG, "Missing node after teleport."); return To; } - + NextNode = Route.front(); NodeLoc = zone->pathing->GetPathNodeCoordinates(NextNode); @@ -1024,7 +1024,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo } return NodeLoc; } - else + else { mlog(PATHING__DEBUG, " Target moved. End node is different. Clearing route."); @@ -1054,16 +1054,16 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo if((Distance <= RuleR(Pathing, MinDistanceForLOSCheckLong)) && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) - { + { mlog(PATHING__DEBUG, " Checking for long LOS at distance %8.3f.", Distance); - + if(!zone->zonemap->LineIntersectsZone(HeadPosition, To, 1.0f, nullptr, nullptr)) PathingLOSState = HaveLOS; else PathingLOSState = NoLOS; - mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); - + mlog(PATHING__DEBUG, " LOS stats is %s", (PathingLOSState == HaveLOS) ? "HaveLOS" : "NoLOS"); + if((PathingLOSState == HaveLOS) && zone->pathing->NoHazards(From, To)) { mlog(PATHING__DEBUG, "Target is reachable. Running directly there."); @@ -1130,7 +1130,7 @@ int PathManager::FindNearestPathNode(VERTEX Position) } } - + SortedByDistance.sort(SortPathNodesByDistance); for(list::iterator Iterator = SortedByDistance.begin(); Iterator != SortedByDistance.end(); ++Iterator) @@ -1188,7 +1188,7 @@ bool PathManager::NoHazardsAccurate(VERTEX From, VERTEX To) cury = From.y; curz = From.z; - do + do { stepx = (float)To.x - curx; stepy = (float)To.y - cury; @@ -1197,7 +1197,7 @@ bool PathManager::NoHazardsAccurate(VERTEX From, VERTEX To) stepx = (stepx/factor)*step_size; stepy = (stepy/factor)*step_size; stepz = (stepz/factor)*step_size; - + VERTEX TestPoint(curx, cury, curz); float NewZ = zone->zonemap->FindBestZ(MAP_ROOT_NODE, TestPoint, nullptr, nullptr); if(ABS(NewZ - last_z) > 5.0) @@ -1211,7 +1211,7 @@ bool PathManager::NoHazardsAccurate(VERTEX From, VERTEX To) if(zone->watermap) { NodeRef n = zone->zonemap->SeekNode( zone->zonemap->GetRoot(), TestPoint.x, TestPoint.y); - if(n != NODE_NONE) + if(n != NODE_NONE) { if(zone->watermap->InLiquid(From.x, From.y, From.z) || zone->watermap->InLiquid(To.x, To.y, To.z)) { @@ -1225,7 +1225,7 @@ bool PathManager::NoHazardsAccurate(VERTEX From, VERTEX To) VERTEX hit; TestPointWaterDest.z -= 500; float best_z2 = -999990; - if(zone->zonemap->LineIntersectsNode(n, TestPointWater, TestPointWaterDest, &hit, nullptr)) + if(zone->zonemap->LineIntersectsNode(n, TestPointWater, TestPointWaterDest, &hit, nullptr)) { best_z2 = hit.z; } @@ -1270,7 +1270,7 @@ bool PathManager::NoHazardsAccurate(VERTEX From, VERTEX To) if(ABS(cury - To.y) < step_size) cur.y = To.y; if(ABS(curz - To.z) < step_size) cur.z = To.z; - } + } while(cur.x != To.x || cur.y != To.y || cur.z != To.z); return true; } @@ -1279,7 +1279,7 @@ void Mob::PrintRoute() { printf("Route is : "); - + list::iterator Iterator; for(Iterator = Route.begin(); Iterator !=Route.end(); ++Iterator) @@ -1331,11 +1331,11 @@ void Client::SendPathPacket(vector &points) { QueuePacket(&outapp); return; } - + int len = sizeof(FindPersonResult_Struct) + (points.size()+1) * sizeof(FindPerson_Point); EQApplicationPacket *outapp = new EQApplicationPacket(OP_FindPersonReply, len); FindPersonResult_Struct* fpr=(FindPersonResult_Struct*)outapp->pBuffer; - + vector::iterator cur, end; cur = points.begin(); end = points.end(); @@ -1350,8 +1350,8 @@ void Client::SendPathPacket(vector &points) { fpr->dest = *cur; FastQueuePacket(&outapp); - - + + } PathNode* PathManager::FindPathNodeByCoordinates(float x, float y, float z) @@ -1393,7 +1393,7 @@ void PathManager::ShowPathNodeNeighbours(Client *c) else if(PathNodes[i].id < 100) sprintf(Name, "%s_%s000", DigitToWord(PathNodes[i].id / 10), DigitToWord(PathNodes[i].id % 10)); else - sprintf(Name, "%s_%s_%s000", DigitToWord(PathNodes[i].id/100), DigitToWord((PathNodes[i].id % 100)/10), + sprintf(Name, "%s_%s_%s000", DigitToWord(PathNodes[i].id/100), DigitToWord((PathNodes[i].id % 100)/10), DigitToWord(((PathNodes[i].id % 100) %10))); Mob *m = entity_list.GetMob(Name); @@ -1408,7 +1408,7 @@ void PathManager::ShowPathNodeNeighbours(Client *c) { if(Node->Neighbours[i].id == -1) break; - Neighbours << Node->Neighbours[i].id << ", "; + Neighbours << Node->Neighbours[i].id << ", "; char Name[64]; @@ -1417,7 +1417,7 @@ void PathManager::ShowPathNodeNeighbours(Client *c) else if(Node->Neighbours[i].id < 100) sprintf(Name, "%s_%s000", DigitToWord(Node->Neighbours[i].id / 10), DigitToWord(Node->Neighbours[i].id % 10)); else - sprintf(Name, "%s_%s_%s000", DigitToWord(Node->Neighbours[i].id/100), DigitToWord((Node->Neighbours[i].id % 100)/10), + sprintf(Name, "%s_%s_%s000", DigitToWord(Node->Neighbours[i].id/100), DigitToWord((Node->Neighbours[i].id % 100)/10), DigitToWord(((Node->Neighbours[i].id % 100) %10))); Mob *m = entity_list.GetMob(Name); @@ -1447,7 +1447,7 @@ void PathManager::NodeInfo(Client *c) return; } - c->Message(0, "Pathing node: %i at (%.2f, %.2f, %.2f) with bestz %.2f", + c->Message(0, "Pathing node: %i at (%.2f, %.2f, %.2f) with bestz %.2f", Node->id, Node->v.x, Node->v.y, Node->v.z, Node->bestz); bool neighbour = false; @@ -1460,7 +1460,7 @@ void PathManager::NodeInfo(Client *c) c->Message(0, "Neighbours found:"); neighbour = true; } - c->Message(0, "id: %i, distance: %.2f, door id: %i, is teleport: %i", + c->Message(0, "id: %i, distance: %.2f, door id: %i, is teleport: %i", Node->Neighbours[x].id, Node->Neighbours[x].distance, Node->Neighbours[x].DoorID, Node->Neighbours[x].Teleport); } @@ -1498,9 +1498,9 @@ int32 PathManager::AddNode(float x, float y, float z, float best_z, int32 reques } } } - + if(new_id == -1) - { + { for(uint32 i = 0; i < Head.PathNodeCount; ++i) { if(PathNodes[i].id > new_id) @@ -1508,7 +1508,7 @@ int32 PathManager::AddNode(float x, float y, float z, float best_z, int32 reques } new_id++; } - + PathNode new_node; new_node.v.x = x; new_node.v.y = y; @@ -1568,7 +1568,7 @@ int32 PathManager::AddNode(float x, float y, float z, float best_z, int32 reques else if(new_id < 100) sprintf(npc_type->name, "%s_%s", DigitToWord(new_id/10), DigitToWord(new_id % 10)); else - sprintf(npc_type->name, "%s_%s_%s", DigitToWord(new_id/100), DigitToWord((new_id % 100)/10), + sprintf(npc_type->name, "%s_%s_%s", DigitToWord(new_id/100), DigitToWord((new_id % 100)/10), DigitToWord(((new_id % 100) %10))); sprintf(npc_type->lastname, "%i", new_id); @@ -1628,7 +1628,7 @@ int32 PathManager::AddNode(float x, float y, float z, float best_z, int32 reques else if(new_id < 100) sprintf(npc_type->name, "%s_%s", DigitToWord(new_id/10), DigitToWord(new_id % 10)); else - sprintf(npc_type->name, "%s_%s_%s", DigitToWord(new_id/100), DigitToWord((new_id % 100)/10), + sprintf(npc_type->name, "%s_%s_%s", DigitToWord(new_id/100), DigitToWord((new_id % 100)/10), DigitToWord(((new_id % 100) %10))); sprintf(npc_type->lastname, "%i", new_id); @@ -2094,7 +2094,7 @@ bool PathManager::CheckLosFN(VERTEX a, VERTEX b) { VERTEX hit; - VERTEX myloc; + VERTEX myloc; VERTEX oloc; myloc.x = a.x; diff --git a/zone/pathing.h b/zone/pathing.h index e47377f50..1f0e52ff7 100644 --- a/zone/pathing.h +++ b/zone/pathing.h @@ -107,6 +107,6 @@ private: int *ClosedListFlag; }; - + #endif diff --git a/zone/perl_PlayerCorpse.cpp b/zone/perl_PlayerCorpse.cpp index c27b781fb..288d901a6 100644 --- a/zone/perl_PlayerCorpse.cpp +++ b/zone/perl_PlayerCorpse.cpp @@ -37,7 +37,7 @@ #include "PlayerCorpse.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -797,7 +797,7 @@ XS(boot_Corpse) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index c5d43ccc0..efbf1ba15 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -2887,7 +2887,7 @@ XS(XS_Client_NukeItem) Perl_croak(aTHX_ "THIS is not of type Client"); if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - + if(items < 3){ where_to_check = 0xFF; } @@ -4883,7 +4883,7 @@ XS(XS_Client_AddLevelBasedExp) XSRETURN_EMPTY; } -XS(XS_Client_IncrementAA); +XS(XS_Client_IncrementAA); XS(XS_Client_IncrementAA) { dXSARGS; @@ -4901,17 +4901,17 @@ XS(XS_Client_IncrementAA) Perl_croak(aTHX_ "THIS is not of type Client"); if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - + SendAA_Struct* aa2 = zone->FindAA(aaskillid); - + if(aa2 == nullptr) - Perl_croak(aTHX_ "Invalid AA."); - - if(THIS->GetAA(aaskillid) == aa2->max_level) - Perl_croak(aTHX_ "AA at Max already."); - + Perl_croak(aTHX_ "Invalid AA."); + + if(THIS->GetAA(aaskillid) == aa2->max_level) + Perl_croak(aTHX_ "AA at Max already."); + THIS->SetAA(aaskillid, THIS->GetAA(aaskillid)+1); - + THIS->Save(); THIS->SendAA(aaskillid); @@ -4942,7 +4942,7 @@ XS(XS_Client_GetAALevel) Perl_croak(aTHX_ "THIS is not of type Client"); if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - + RETVAL = THIS->GetAA(aaskillid); XSprePUSH; PUSHu((UV)RETVAL); } @@ -5559,7 +5559,7 @@ XS(XS_Client_SignalClient) { Client * THIS; uint32 data = (uint32)SvUV(ST(1)); - + if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV*)SvRV(ST(0))); THIS = INT2PTR(Client *,tmp); @@ -5584,7 +5584,7 @@ XS(XS_Client_AddAlternateCurrencyValue) Client * THIS; uint32 currency_id = (uint32)SvUV(ST(1)); int32 amount = (int32)SvUV(ST(2)); - + if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV*)SvRV(ST(0))); THIS = INT2PTR(Client *,tmp); @@ -5790,7 +5790,7 @@ XS(boot_Client) newXSproto(strcpy(buf, "GetWeight"), XS_Client_GetWeight, file, "$"); newXSproto(strcpy(buf, "GetEXP"), XS_Client_GetEXP, file, "$"); newXSproto(strcpy(buf, "GetAAExp"), XS_Client_GetAAExp, file, "$"); - newXSproto(strcpy(buf, "GetTotalSecondsPlayed"), XS_Client_GetTotalSecondsPlayed, file, "$"); + newXSproto(strcpy(buf, "GetTotalSecondsPlayed"), XS_Client_GetTotalSecondsPlayed, file, "$"); newXSproto(strcpy(buf, "UpdateLDoNPoints"), XS_Client_UpdateLDoNPoints, file, "$$$"); newXSproto(strcpy(buf, "SetDeity"), XS_Client_SetDeity, file, "$$"); newXSproto(strcpy(buf, "AddEXP"), XS_Client_AddEXP, file, "$$;$$"); diff --git a/zone/perl_doors.cpp b/zone/perl_doors.cpp index aab945af7..5d0f7a15f 100644 --- a/zone/perl_doors.cpp +++ b/zone/perl_doors.cpp @@ -37,7 +37,7 @@ #include "doors.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif XS(XS_Doors_GetDoorDBID); /* prototype to pass -Wmissing-prototypes */ @@ -730,7 +730,7 @@ XS(boot_Doors) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; @@ -751,7 +751,7 @@ XS(boot_Doors) newXSproto(strcpy(buf, "SetY"),XS_Doors_SetY, file, "$$"); newXSproto(strcpy(buf, "SetZ"),XS_Doors_SetZ, file, "$$"); newXSproto(strcpy(buf, "SetHeading"),XS_Doors_SetHeading, file, "$$"); - newXSproto(strcpy(buf, "SetLocation"),XS_Doors_SetLocation, file, "$$$$"); + newXSproto(strcpy(buf, "SetLocation"),XS_Doors_SetLocation, file, "$$$$"); newXSproto(strcpy(buf, "GetDoorDBID"),XS_Doors_GetDoorDBID, file, "$"); newXSproto(strcpy(buf, "GetDoorID"),XS_Doors_GetDoorID, file, "$"); newXSproto(strcpy(buf, "SetSize"),XS_Doors_SetSize, file, "$$"); diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp index eb24384ce..5703e7c96 100644 --- a/zone/perl_entity.cpp +++ b/zone/perl_entity.cpp @@ -38,7 +38,7 @@ #include "entity.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -2112,7 +2112,7 @@ XS(boot_EntityList) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp index 9a7f52336..1ace3eddb 100644 --- a/zone/perl_groups.cpp +++ b/zone/perl_groups.cpp @@ -37,7 +37,7 @@ #include "groups.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -580,7 +580,7 @@ XS(XS_Group_GetID) } XS(XS_Group_GetMember); -XS(XS_Group_GetMember) +XS(XS_Group_GetMember) { dXSARGS; if (items != 2) @@ -601,7 +601,7 @@ XS(XS_Group_GetMember) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); int index = (int)SvUV(ST(1)); - if (index < 0 || index > 5) + if (index < 0 || index > 5) RETVAL = nullptr; else { member = THIS->members[index]; @@ -625,7 +625,7 @@ XS(boot_Group) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perl_hateentry.cpp b/zone/perl_hateentry.cpp index 070c615e8..456d59413 100644 --- a/zone/perl_hateentry.cpp +++ b/zone/perl_hateentry.cpp @@ -116,7 +116,7 @@ extern "C" #endif XS(boot_HateEntry); -XS(boot_HateEntry) +XS(boot_HateEntry) { dXSARGS; char file[256]; diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index e40365faf..fa57c0423 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -41,7 +41,7 @@ typedef const char Const_char; #include "../common/spdat.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -6571,7 +6571,7 @@ XS(XS_Mob_SignalClient) Mob * THIS; Client* client = nullptr; uint32 data = (uint32)SvUV(ST(2)); - + if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV*)SvRV(ST(0))); THIS = INT2PTR(Mob *,tmp); @@ -6926,7 +6926,7 @@ XS(XS_Mob_QuestReward) Client* client = nullptr; int32 silver = 0; int32 gold = 0; - int32 platinum = 0; + int32 platinum = 0; if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -7162,7 +7162,7 @@ XS(XS_Mob_SpellEffect) uint32 unk20 = 3000; bool perm_effect = false; Client* client = nullptr; - + if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -7188,7 +7188,7 @@ XS(XS_Mob_SpellEffect) if(client == nullptr) Perl_croak(aTHX_ "client is nullptr, avoiding crash."); } - + THIS->SendSpellEffect(effect, duration, finish_delay, zone_wide, unk20, perm_effect, client); } @@ -8079,7 +8079,7 @@ XS(boot_Mob) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; @@ -8368,7 +8368,7 @@ XS(boot_Mob) newXSproto(strcpy(buf, "IsMeleeDisabled"), XS_Mob_IsMeleeDisabled, file, "$$"); newXSproto(strcpy(buf, "SetFlurryChance"), XS_Mob_SetFlurryChance, file, "$$"); newXSproto(strcpy(buf, "GetFlurryChance"), XS_Mob_GetFlurryChance, file, "$"); - + XSRETURN_YES; } diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp index 3888c05ea..381a5c6b7 100644 --- a/zone/perl_npc.cpp +++ b/zone/perl_npc.cpp @@ -39,7 +39,7 @@ typedef const char Const_char; #include "npc.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -2147,7 +2147,7 @@ XS(boot_NPC) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perl_object.cpp b/zone/perl_object.cpp index e6c6272ae..3c9390c70 100644 --- a/zone/perl_object.cpp +++ b/zone/perl_object.cpp @@ -37,7 +37,7 @@ #include "object.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif XS(XS_Object_IsGroundSpawn); /* prototype to pass -Wmissing-prototypes */ @@ -920,7 +920,7 @@ XS(boot_Object) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perl_perlpacket.cpp b/zone/perl_perlpacket.cpp index 703595b40..6faf46a7b 100644 --- a/zone/perl_perlpacket.cpp +++ b/zone/perl_perlpacket.cpp @@ -37,7 +37,7 @@ #include "perlpacket.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif XS(XS_PerlPacket_new); /* prototype to pass -Wmissing-prototypes */ @@ -561,7 +561,7 @@ XS(boot_PerlPacket) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 976638390..2b5491ee3 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -58,7 +58,7 @@ XS(XS_QuestItem_GetName) { } XS(XS_QuestItem_SetScale); -XS(XS_QuestItem_SetScale) +XS(XS_QuestItem_SetScale) { dXSARGS; if (items != 2) @@ -66,7 +66,7 @@ XS(XS_QuestItem_SetScale) { ItemInst * THIS; float Mult; - + if (sv_derived_from(ST(0), "QuestItem")) { IV tmp = SvIV((SV*)SvRV(ST(0))); THIS = INT2PTR(ItemInst *,tmp); @@ -86,7 +86,7 @@ XS(XS_QuestItem_SetScale) } XS(XS_QuestItem_ItemSay); -XS(XS_QuestItem_ItemSay) +XS(XS_QuestItem_ItemSay) { dXSARGS; if (items != 2 && items != 3) @@ -251,7 +251,7 @@ extern "C" #endif XS(boot_QuestItem); -XS(boot_QuestItem) +XS(boot_QuestItem) { dXSARGS; char file[256]; diff --git a/zone/perl_raids.cpp b/zone/perl_raids.cpp index 6e656dd64..6a9ea9b89 100644 --- a/zone/perl_raids.cpp +++ b/zone/perl_raids.cpp @@ -2,7 +2,7 @@ * This file was generated automatically by ExtUtils::ParseXS version 2.18 from the * contents of raids.h.xs. Do not edit this file, edit raids.h.xs instead. * - * ANY CHANGES MADE HERE WILL BE LOST! + * ANY CHANGES MADE HERE WILL BE LOST! * */ @@ -38,7 +38,7 @@ #include "client.h" #ifdef THIS /* this macro seems to leak out on some systems */ -#undef THIS +#undef THIS #endif @@ -543,7 +543,7 @@ XS(XS_Raid_GetID) } XS(XS_Raid_GetMember); -XS(XS_Raid_GetMember) +XS(XS_Raid_GetMember) { dXSARGS; if (items != 2) @@ -563,7 +563,7 @@ XS(XS_Raid_GetMember) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); int index = (int)SvUV(ST(1)); - if (index < 0 || index > 71) + if (index < 0 || index > 71) RETVAL = nullptr; else { if(THIS->members[index].member != nullptr) @@ -586,7 +586,7 @@ XS(boot_Raid) char file[256]; strncpy(file, __FILE__, 256); file[255] = 0; - + if(items != 1) fprintf(stderr, "boot_quest does not take any arguments."); char buf[128]; diff --git a/zone/perlpacket.cpp b/zone/perlpacket.cpp index c8eb55d8c..80f3814ed 100644 --- a/zone/perlpacket.cpp +++ b/zone/perlpacket.cpp @@ -61,21 +61,21 @@ void PerlPacket::Resize(uint32 length) { void PerlPacket::SendTo(Client *who) { if(!who || op == OP_Unknown || (len > 0 && packet == nullptr)) return; - + EQApplicationPacket *outapp = new EQApplicationPacket(op, len); if(len > 0) memcpy(outapp->pBuffer, packet, len); - + // printf("Created this packet with PerlPacket: OP: %s\n", ZoneOpcodeManager->EmuToName(op)); DumpPacket(outapp); - + who->FastQueuePacket(&outapp); } void PerlPacket::SendToAll() { if(op == OP_Unknown || (len > 0 && packet == nullptr)) return; - + EQApplicationPacket *outapp = new EQApplicationPacket(op, len); if(len > 0) memcpy(outapp->pBuffer, packet, len); @@ -161,7 +161,7 @@ void PerlPacket::SetEQ1913(uint32 pos, float part19, float part13) { p->part19 = FloatToEQ19(part19); p->part13 = FloatToEQ13(part13); } - + //reading uint8 PerlPacket::GetByte(uint32 pos) { if(pos + sizeof(uint8) > len || packet == nullptr) diff --git a/zone/perlpacket.h b/zone/perlpacket.h index a7ed9bca3..039344574 100644 --- a/zone/perlpacket.h +++ b/zone/perlpacket.h @@ -30,14 +30,14 @@ class PerlPacket { public: PerlPacket(const char *opcode = "OP_Unknown", uint32 len = 0); ~PerlPacket(); - + bool SetOpcode(const char *opcode); void Resize(uint32 len); - + //sending functions void SendTo(Client *who); void SendToAll(); - + //editing void Zero(); void FromArray(int numbers[], uint32 length); @@ -46,16 +46,16 @@ public: void SetLong(uint32 pos, uint32 val); void SetFloat(uint32 pos, float val); void SetString(uint32 pos, char *str); - + void SetEQ1319(uint32 pos, float part13, float part19); void SetEQ1913(uint32 pos, float part19, float part13); - + //reading uint8 GetByte(uint32 pos); uint16 GetShort(uint32 pos); uint32 GetLong(uint32 pos); float GetFloat(uint32 pos); - + protected: EmuOpcode op; uint32 len; diff --git a/zone/perlparser.cpp b/zone/perlparser.cpp index 2d2c4e79e..d69d69c7d 100644 --- a/zone/perlparser.cpp +++ b/zone/perlparser.cpp @@ -1302,7 +1302,7 @@ XS(XS__createguild) Perl_croak(aTHX_ "Usage: createguild(guild_name, leader)"); char * guild_name = (char *)SvPV_nolen(ST(0)); - char * leader = (char *)SvPV_nolen(ST(1)); + char * leader = (char *)SvPV_nolen(ST(1)); quest_manager.CreateGuild(guild_name, leader); @@ -3357,7 +3357,7 @@ XS(XS__GetZoneID) char *zone = (char *)SvPV_nolen(ST(0)); int32 id = quest_manager.GetZoneID(zone); - + XSRETURN_IV(id); } @@ -3370,7 +3370,7 @@ XS(XS__GetZoneLongName) dXSTARG; char *zone = (char *)SvPV_nolen(ST(0)); Const_char* RETVAL = quest_manager.GetZoneLongName(zone); - + sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; XSRETURN(1); } @@ -3392,14 +3392,14 @@ XS(XS__GetTimeSeconds) XS(XS__handleturnin); // prototype to pass -Wmissing-prototypes XS(XS__handleturnin) { dXSARGS; - + if (items != 2) Perl_croak(aTHX_ "Usage: handleturnin(itemid, itemcharges)"); int itemid = (int)SvIV(ST(0)); int charges = (int)SvIV(ST(1)); bool returnVal = quest_manager.TurnInItem(itemid,charges); - + ST(0) = boolSV(returnVal); sv_2mortal(ST(0)); XSRETURN(1); @@ -3408,36 +3408,36 @@ XS(XS__handleturnin) { XS(XS__completehandin); // prototype to pass -Wmissing-prototypes XS(XS__completehandin) { dXSARGS; - + if (items != 0) Perl_croak(aTHX_ "Usage: completehandin()"); quest_manager.CompleteHandIn(); - + XSRETURN_EMPTY; } XS(XS__resethandin); // prototype to pass -Wmissing-prototypes XS(XS__resethandin) { dXSARGS; - + if (items != 0) Perl_croak(aTHX_ "Usage: resethandin()"); quest_manager.ResetHandIn(); - + XSRETURN_EMPTY; } XS(XS__clearhandin); // prototype to pass -Wmissing-prototypes XS(XS__clearhandin) { dXSARGS; - + if (items != 0) Perl_croak(aTHX_ "Usage: clearhandin()"); quest_manager.ClearHandIn(); - + XSRETURN_EMPTY; } diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 13954df17..e4d8a60e5 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -77,7 +77,7 @@ void Petition::SendPetitionToPlayer(Client* clientto) { return; } -Petition::Petition(uint32 id) +Petition::Petition(uint32 id) { petid = id; charclass = 0; @@ -93,56 +93,56 @@ Petition::Petition(uint32 id) memset(lastgm, 0, sizeof(lastgm)); memset(petitiontext, 0, sizeof(petitiontext)); memset(gmtext, 0, sizeof(gmtext)); - + //memset(this->zone, 0, sizeof(this->zone)); zone = 1; } -Petition* PetitionList::GetPetitionByID(uint32 id_in) { - LinkedListIterator iterator(list); - - iterator.Reset(); - while(iterator.MoreElements()) { - if (iterator.GetData()->GetID() == id_in) +Petition* PetitionList::GetPetitionByID(uint32 id_in) { + LinkedListIterator iterator(list); + + iterator.Reset(); + while(iterator.MoreElements()) { + if (iterator.GetData()->GetID() == id_in) return iterator.GetData(); - iterator.Advance(); - } - return 0; -} + iterator.Advance(); + } + return 0; +} uint32 PetitionList::GetTotalPetitions(){ LinkedListIterator iterator(list); iterator.Reset(); uint32 total=0; - while(iterator.MoreElements()) { + while(iterator.MoreElements()) { total++; - iterator.Advance(); + iterator.Advance(); } - return total; + return total; } bool PetitionList::FindPetitionByAccountName(const char* acctname) { - LinkedListIterator iterator(list); - - iterator.Reset(); - while(iterator.MoreElements()) { - if (!strcmp(acctname,iterator.GetData()->GetAccountName())) + LinkedListIterator iterator(list); + + iterator.Reset(); + while(iterator.MoreElements()) { + if (!strcmp(acctname,iterator.GetData()->GetAccountName())) return true; - iterator.Advance(); - } - return false; + iterator.Advance(); + } + return false; } bool PetitionList::DeletePetitionByCharName(const char* charname) { - LinkedListIterator iterator(list); - - iterator.Reset(); - while(iterator.MoreElements()) { + LinkedListIterator iterator(list); + + iterator.Reset(); + while(iterator.MoreElements()) { if (!strcmp(charname,iterator.GetData()->GetCharName())) { if(DeletePetition(iterator.GetData()->GetID())==0) return true; else return false; } - iterator.Advance(); - } - return false; + iterator.Advance(); + } + return false; } void PetitionList::UpdateZoneListQueue() { ServerPacket* pack = new ServerPacket(ServerOP_Petition, sizeof(ServerPetitionUpdate_Struct)); @@ -228,7 +228,7 @@ void ZoneDatabase::DeletePetitionFromDB(Petition* wpet) { LogFile->write(EQEMuLog::Error, "Error in DeletePetitionFromDB query '%s': %s", query, errbuf); } safe_delete_array(query); - + return; } @@ -258,7 +258,7 @@ void ZoneDatabase::InsertPetitionToDB(Petition* wpet) checkedout = 1; else checkedout = 0; - + uint32 len = strlen(wpet->GetPetitionText()); char* petitiontext = new char[2*len+1]; memset(petitiontext, 0, 2*len+1); @@ -266,7 +266,7 @@ void ZoneDatabase::InsertPetitionToDB(Petition* wpet) if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO petitions (petid, charname, accountname, lastgm, petitiontext, zone, urgency, charclass, charrace, charlevel, checkouts, unavailables, ischeckedout, senttime, gmtext) values (%i,'%s','%s','%s','%s',%i,%i,%i,%i,%i,%i,%i,%i,%i, '%s')", wpet->GetID(), wpet->GetCharName(), wpet->GetAccountName(), wpet->GetLastGM(), petitiontext, wpet->GetZone(), wpet->GetUrgency(), wpet->GetCharClass(), wpet->GetCharRace(), wpet->GetCharLevel(), wpet->GetCheckouts(), wpet->GetUnavails(), checkedout, wpet->GetSentTime(), wpet->GetGMText()), errbuf, 0, &affected_rows)) { LogFile->write(EQEMuLog::Error, "Error in InsertPetitionToDB query '%s': %s", query, errbuf); } - + safe_delete_array(petitiontext); safe_delete_array(query); #if EQDEBUG >= 5 @@ -312,6 +312,6 @@ void ZoneDatabase::RefreshPetitionsFromDB() safe_delete_array(query); return; } - + return; } diff --git a/zone/petitions.h b/zone/petitions.h index 2a5d5649e..ed8def1f8 100644 --- a/zone/petitions.h +++ b/zone/petitions.h @@ -71,7 +71,7 @@ public: void SetUnavails(uint32 unavails_in) { unavailables = unavails_in; } void SetSentTime() { time(&senttime); } void SetSentTime2(time_t senttime_in) { senttime = senttime_in; } - + protected: uint32 petid; diff --git a/zone/pets.cpp b/zone/pets.cpp index f7b3fa357..ce5aab779 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -221,7 +221,7 @@ void Mob::MakePet(uint16 spell_id, const char* pettype, const char *petname) { MakePoweredPet(spell_id, pettype, -1, petname); } -// Split from the basic MakePet to allow backward compatiblity with existing code while also +// Split from the basic MakePet to allow backward compatiblity with existing code while also // making it possible for petpower to be retained without the focus item having to // stay equipped when the character zones. petpower of -1 means that the currently equipped petfocus // of a client is searched for and used instead. @@ -288,9 +288,9 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c npc_type->max_hp += (npc_type->max_hp*MaxHP)/100; npc_type->cur_hp = npc_type->max_hp; } - + //TODO: think about regen (engaged vs. not engaged) - + // Pet naming: // 0 - `s pet // 1 - `s familiar @@ -323,38 +323,38 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c npc_type->name[25] = '\0'; strcat(npc_type->name, "`s_pet"); } - + //handle beastlord pet appearance - if(record.petnaming == 2) + if(record.petnaming == 2) { - switch(GetBaseRace()) + switch(GetBaseRace()) { - case VAHSHIR: - npc_type->race = TIGER; - npc_type->size *= 0.8f; + case VAHSHIR: + npc_type->race = TIGER; + npc_type->size *= 0.8f; break; - case TROLL: - npc_type->race = ALLIGATOR; - npc_type->size *= 2.5f; + case TROLL: + npc_type->race = ALLIGATOR; + npc_type->size *= 2.5f; break; - case OGRE: - npc_type->race = BEAR; - npc_type->texture = 3; - npc_type->gender = 2; + case OGRE: + npc_type->race = BEAR; + npc_type->texture = 3; + npc_type->gender = 2; break; - case BARBARIAN: - npc_type->race = WOLF; + case BARBARIAN: + npc_type->race = WOLF; npc_type->texture = 2; break; - case IKSAR: - npc_type->race = WOLF; - npc_type->texture = 0; - npc_type->gender = 1; + case IKSAR: + npc_type->race = WOLF; + npc_type->texture = 0; + npc_type->gender = 1; npc_type->size *= 2.0f; npc_type->luclinface = 0; break; - default: - npc_type->race = WOLF; + default: + npc_type->race = WOLF; npc_type->texture = 0; } } @@ -366,7 +366,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c MYSQL_RES *result = nullptr; MYSQL_ROW row = nullptr; uint32 monsterid; - + // get a random npc id from the spawngroups assigned to this zone if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT npcID FROM (spawnentry INNER JOIN spawn2 ON spawn2.spawngroupID = spawnentry.spawngroupID) " @@ -376,16 +376,16 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c "ORDER BY RAND() LIMIT 1", zone->GetShortName()), errbuf, &result)) { row = mysql_fetch_row(result); - if (row) + if (row) monsterid = atoi(row[0]); - else + else monsterid = 567; // since we don't have any monsters, just make it look like an earth pet for now } else { // if the database query failed LogFile->write(EQEMuLog::Error, "Error querying database for monster summoning pet in zone %s (%s)", zone->GetShortName(), errbuf); monsterid = 567; } - + // give the summoned pet the attributes of the monster we found const NPCType* monster = database.GetNPCType(monsterid); if(monster) { @@ -426,7 +426,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c // We need to handle PetType 5 (petHatelist), add the current target to the hatelist of the pet } /* This is why the pets ghost - pets were being spawned too far away from its npc owner and some -into walls or objects (+10), this sometimes creates the "ghost" effect. I changed to +2 (as close as I +into walls or objects (+10), this sometimes creates the "ghost" effect. I changed to +2 (as close as I could get while it still looked good). I also noticed this can happen if an NPC is spawned on the same spot of another or in a related bad spot.*/ Pet::Pet(NPCType *type_data, Mob *owner, PetType type, uint16 spell_id, int16 power) : NPC(type_data, 0, owner->GetX()+2, owner->GetY()+2, owner->GetZ(), owner->GetHeading(), FlyMode3) @@ -465,7 +465,7 @@ bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetR safe_delete_array(query); if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); - + into->npc_type = atoi(row[0]); into->temporary = atoi(row[1]); into->petpower = atoi(row[2]); @@ -473,7 +473,7 @@ bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetR into->petnaming = atoi(row[4]); into->monsterflag = atoi(row[5]); into->equipmentset = atoi(row[6]); - + mysql_free_result(result); return(true); } @@ -489,18 +489,18 @@ bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetR Mob* Mob::GetPet() { if(GetPetID() == 0) return(nullptr); - + Mob* tmp = entity_list.GetMob(GetPetID()); if(tmp == nullptr) { SetPetID(0); return(nullptr); } - + if(tmp->GetOwnerID() != GetID()) { SetPetID(0); return(nullptr); } - + return(tmp); } @@ -535,10 +535,10 @@ void Mob::SetPetID(uint16 NewPetID) { void NPC::GetPetState(SpellBuff_Struct *pet_buffs, uint32 *items, char *name) { //save the pet name strn0cpy(name, GetName(), 64); - + //save their items, we only care about what they are actually wearing memcpy(items, equipment, sizeof(uint32)*MAX_WORN_INVENTORY); - + //save their buffs. for (int i=0; i < GetPetMaxTotalSlots(); i++) { if (buffs[i].spellid != SPELL_UNKNOWN) { @@ -561,7 +561,7 @@ void NPC::GetPetState(SpellBuff_Struct *pet_buffs, uint32 *items, char *name) { void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) { //restore their buffs... - + int i; for (i = 0; i < GetPetMaxTotalSlots(); i++) { for(int z = 0; z < GetPetMaxTotalSlots(); z++) { @@ -571,7 +571,7 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) { pet_buffs[i].spellid = 0xFFFFFFFF; } } - + if (pet_buffs[i].spellid <= (uint32)SPDAT_RECORDS && pet_buffs[i].spellid != 0 && pet_buffs[i].duration > 0) { if(pet_buffs[i].level == 0 || pet_buffs[i].level > 100) pet_buffs[i].level = 1; @@ -627,7 +627,7 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) { for(i = 0; i < MAX_WORN_INVENTORY; i++) { if(items[i] == 0) continue; - + const Item_Struct* item2 = database.GetItem(items[i]); if (item2 && item2->NoDrop != 0) { //dont bother saving item charges for now, NPCs never use them @@ -670,7 +670,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { // already. If no, add the item id to the equipment array. while (curset >= 0 && depth < 5) { - if (RunQuery(query, + if (RunQuery(query, MakeAnyLenString(&query, "SELECT nested_set FROM pets_equipmentset WHERE set_id='%s'", curset), errbuf, &result)) { @@ -679,8 +679,8 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { row = mysql_fetch_row(result); nextset = atoi(row[0]); mysql_free_result(result); - - if (RunQuery(query, + + if (RunQuery(query, MakeAnyLenString(&query, "SELECT slot, item_id FROM pets_equipmentset_entries WHERE set_id='%s'", curset), errbuf, &result)) { diff --git a/zone/pets.h b/zone/pets.h index 420e69699..a343b0380 100644 --- a/zone/pets.h +++ b/zone/pets.h @@ -14,26 +14,26 @@ #define PET_HOLD 12 #define PET_NOTAUNT 14 #define PET_LEADER 16 - #define PET_SLUMBER 17 - #define PET_NOCAST 18 - #define PET_FOCUS 19 - #define PET_FOCUS_ON 25 - #define PET_FOCUS_OFF 26 - + #define PET_SLUMBER 17 + #define PET_NOCAST 18 + #define PET_FOCUS 19 + #define PET_FOCUS_ON 25 + #define PET_FOCUS_OFF 26 + class Pet : public NPC { public: Pet(NPCType *type_data, Mob *owner, PetType type, uint16 spell_id, int16 power); - + }; /* * I dont have the patience to take on this project today.... class Pet : public NPC { public: enum eStandingPetOrder { SPO_Follow, SPO_Sit, SPO_Guard }; - + const uint16 pet_spell_id; - + inline void SetPetOrder(eStandingPetOrder i) { pStandingPetOrder = i; } inline eStandingPetOrder GetPetOrder() const { return pStandingPetOrder; } // void SetPetType(uint16 in_type) { typeofpet = in_type; } // put this here because only NPCs can be anything but charmed pets @@ -41,7 +41,7 @@ public: void SetPetState(SpellBuff_Struct *buffs, uint32 *items); protected: // uint16 typeofpet; // 0xFF = charmed - + eStandingPetOrder pStandingPetOrder; bool taunting; Timer taunt_timer; //for pet taunting diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index d29e99e87..25ceac1b4 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -667,7 +667,7 @@ void QuestManager::sfollow() { void QuestManager::changedeity(int diety_id) { //Changes the deity. if(initiator) - { + { if(initiator->IsClient()) { initiator->SetDeity(diety_id); @@ -820,7 +820,7 @@ void QuestManager::permagender(int gender_id) { uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { uint16 book_slot, count; uint16 curspell; - + uint16 Char_ID = initiator->CharacterID(); bool SpellGlobalRule = RuleB(Spells, EnableSpellGlobals); bool SpellGlobalCheckResult = 0; @@ -861,11 +861,11 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) { uint16 count; uint16 curspell; - + uint16 Char_ID = initiator->CharacterID(); bool SpellGlobalRule = RuleB(Spells, EnableSpellGlobals); bool SpellGlobalCheckResult = 0; - + for(curspell = 0, count = 0; curspell < SPDAT_RECORDS; curspell++) { if @@ -937,7 +937,7 @@ void QuestManager::givecash(int copper, int silver, int gold, int platinum) { tmp = "You receive "; else tmp += ","; - + tmp += itoa(gold); tmp += " gold"; } @@ -957,7 +957,7 @@ void QuestManager::givecash(int copper, int silver, int gold, int platinum) { tmp = "You receive "; else tmp += ","; - + tmp += itoa(copper); tmp += " copper"; } @@ -1122,7 +1122,7 @@ void QuestManager::setguild(uint32 new_guild_id, uint8 new_rank) { } void QuestManager::CreateGuild(const char *guild_name, const char *leader) { - uint32 cid = database.GetCharacterID(leader); + uint32 cid = database.GetCharacterID(leader); char hString[250]; if (cid == 0) { worldserver.SendEmoteMessage(0, 0, 80, 15, "%s", "Guild Creation: Guild leader not found."); @@ -1134,7 +1134,7 @@ void QuestManager::CreateGuild(const char *guild_name, const char *leader) { sprintf(hString, "Guild Creation: Error: %s already is the leader of DB# %i '%s'.", leader, tmp, guild_mgr.GetGuildName(tmp)); worldserver.SendEmoteMessage(0, 0, 80, 15, "%s", hString); } - else { + else { uint32 gid = guild_mgr.CreateGuild(guild_name, cid); if (gid == GUILD_NONE) worldserver.SendEmoteMessage(0, 0, 80, 15, "%s", "Guild Creation: Guild creation failed"); @@ -1142,9 +1142,9 @@ void QuestManager::CreateGuild(const char *guild_name, const char *leader) { sprintf(hString, "Guild Creation: Guild created: Leader: %i, number %i: %s", cid, gid, leader); worldserver.SendEmoteMessage(0, 0, 80, 15, "%s", hString); if(!guild_mgr.SetGuild(cid, gid, GUILD_LEADER)) - worldserver.SendEmoteMessage(0, 0, 80, 15, "%s", "Unable to set guild leader's guild in the database. Your going to have to run #guild set"); + worldserver.SendEmoteMessage(0, 0, 80, 15, "%s", "Unable to set guild leader's guild in the database. Your going to have to run #guild set"); } - + } } @@ -1671,11 +1671,11 @@ uint32 QuestManager::getplayerburriedcorpsecount(uint32 char_id) { return Result; } -bool QuestManager::buryplayercorpse(uint32 char_id) +bool QuestManager::buryplayercorpse(uint32 char_id) { bool Result = false; - if(char_id > 0) + if(char_id > 0) { uint32 PlayerCorpse = database.GetFirstCorpseID(char_id); if(PlayerCorpse > 0) @@ -2016,7 +2016,7 @@ int QuestManager::gettaskactivitydonecount(int task, int activity) { return initiator->GetTaskActivityDoneCountFromTaskID(task, activity); return 0; //improper args - + } void QuestManager::updatetaskactivity(int task, int activity, int count) { diff --git a/zone/queues.h b/zone/queues.h index 66125e650..c6779385a 100644 --- a/zone/queues.h +++ b/zone/queues.h @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, diff --git a/zone/raids.cpp b/zone/raids.cpp index b1518701b..8bd5519e3 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -416,7 +416,7 @@ void Raid::CastGroupSpell(Mob* caster, uint16 spellid, uint32 gid) return; range = caster->GetAOERange(spellid); - + float range2 = range*range; for(int x = 0; x < MAX_RAID_MEMBERS; x++) @@ -549,14 +549,14 @@ void Raid::BalanceMana(int32 penalty, uint32 gid) if(members[gi].member){ if(members[gi].GroupNumber == gid) { - if((members[gi].member->GetMaxMana() - manataken) < 1){ - members[gi].member->SetMana(1); - if (members[gi].member->IsClient()) - members[gi].member->CastToClient()->SendManaUpdate(); + if((members[gi].member->GetMaxMana() - manataken) < 1){ + members[gi].member->SetMana(1); + if (members[gi].member->IsClient()) + members[gi].member->CastToClient()->SendManaUpdate(); } else{ members[gi].member->SetMana(members[gi].member->GetMaxMana() - manataken); - if (members[gi].member->IsClient()) + if (members[gi].member->IsClient()) members[gi].member->CastToClient()->SendManaUpdate(); } } @@ -569,19 +569,19 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum //avoid unneeded work if(copper == 0 && silver == 0 && gold == 0 && platinum == 0) return; - + uint32 i; uint8 membercount = 0; - for (i = 0; i < MAX_RAID_MEMBERS; i++) { + for (i = 0; i < MAX_RAID_MEMBERS; i++) { if (members[i].member != nullptr) { - membercount++; - } - } + membercount++; + } + } - if (membercount == 0) + if (membercount == 0) return; - + uint32 mod; //try to handle round off error a little better if(membercount > 1) { @@ -601,7 +601,7 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum copper += 10 * mod; } } - + //calculate the splits //We can still round off copper pieces, but I dont care uint32 sc; @@ -615,7 +615,7 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum buf[63] = '\0'; string msg = "You receive"; bool one = false; - + if(ppsplit > 0) { snprintf(buf, 63, " %u platinum", ppsplit); msg += buf; @@ -645,12 +645,12 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum one = true; } msg += " as your split"; - - for (i = 0; i < MAX_RAID_MEMBERS; i++) { + + for (i = 0; i < MAX_RAID_MEMBERS; i++) { if (members[i].member != nullptr) { // If Group Member is Client //I could not get MoneyOnCorpse to work, so we use this members[i].member->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true); - + members[i].member->Message(2, msg.c_str()); } } @@ -664,7 +664,7 @@ void Raid::GroupBardPulse(Mob* caster, uint16 spellid, uint32 gid){ return; range = caster->GetAOERange(spellid); - + float range2 = range*range; for(z=0; z < MAX_RAID_MEMBERS; z++) { @@ -694,7 +694,7 @@ void Raid::GroupBardPulse(Mob* caster, uint16 spellid, uint32 gid){ void Raid::TeleportGroup(Mob* sender, uint32 zoneID, uint16 instance_id, float x, float y, float z, float heading, uint32 gid) { - for(int i = 0; i < MAX_RAID_MEMBERS; i++) + for(int i = 0; i < MAX_RAID_MEMBERS; i++) { if(members[i].member) { @@ -703,13 +703,13 @@ void Raid::TeleportGroup(Mob* sender, uint32 zoneID, uint16 instance_id, float x members[i].member->MovePC(zoneID, instance_id, x, y, z, heading, 0, ZoneSolicited); } } - + } } void Raid::TeleportRaid(Mob* sender, uint32 zoneID, uint16 instance_id, float x, float y, float z, float heading) { - for(int i = 0; i < MAX_RAID_MEMBERS; i++) + for(int i = 0; i < MAX_RAID_MEMBERS; i++) { if(members[i].member) { @@ -741,7 +741,7 @@ void Raid::AddRaidLooter(const char* looter) } safe_delete_array(query); - + for(int x = 0; x < MAX_RAID_MEMBERS; x++) { if(strcmp(looter, members[x].membername) == 0) @@ -778,7 +778,7 @@ void Raid::RemoveRaidLooter(const char* looter) } safe_delete_array(query); - + for(int x = 0; x < MAX_RAID_MEMBERS; x++) { if(strcmp(looter, members[x].membername) == 0) @@ -987,8 +987,8 @@ void Raid::SendRaidMove(const char* who, Client *to) SendRaidAdd(who, to); if(c && c == to){ SendBulkRaid(c); - if(IsLocked()) { - SendRaidLockTo(c); + if(IsLocked()) { + SendRaidLockTo(c); } } } @@ -1080,7 +1080,7 @@ void Raid::SendGroupUpdate(Client *to) return; EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupUpdate2_Struct)); - GroupUpdate2_Struct* gu = (GroupUpdate2_Struct*)outapp->pBuffer; + GroupUpdate2_Struct* gu = (GroupUpdate2_Struct*)outapp->pBuffer; gu->action = groupActUpdate; int index = 0; uint32 grp = GetGroup(to->GetName()); @@ -1365,7 +1365,7 @@ void Raid::SendHPPacketsTo(Client *c) { if(!c) return; - + uint32 gid = this->GetGroup(c); EQApplicationPacket hpapp; EQApplicationPacket outapp(OP_MobManaUpdate, sizeof(MobManaUpdate_Struct)); diff --git a/zone/raids.h b/zone/raids.h index 45735fc23..ab0089cea 100644 --- a/zone/raids.h +++ b/zone/raids.h @@ -45,7 +45,7 @@ enum { //raid packet types: raidChangeLootType = 11, raidStringID = 12, raidChangeGroupLeader = 13, //136 raid leader, new group leader, group_id? - raidBecomeGroupLeader = 14, //472 + raidBecomeGroupLeader = 14, //472 raidUnknown2 = 15, raidChangeGroup = 16, //?? len 136 old leader, new leader, 0 (preceeded with a remove2) raidLock = 17, //len 136 leader?, leader, 0 @@ -133,7 +133,7 @@ public: void RemoveRaidLooter(const char* looter); //util func - //keeps me from having to keep iterating through the list + //keeps me from having to keep iterating through the list //when I want lots of data from the same entry uint32 GetPlayerIndex(const char *name); //for perl interface diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index c0fa5a986..faf402959 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -47,7 +47,7 @@ CREATE TABLE spawn_events ( zone VARCHAR(16) NOT nullptr, cond_id MEDIUMINT UNSIGNED NOT nullptr, name VARCHAR(255) NOT nullptr DEFAULT '', - + #timing information period INT UNSIGNED NOT nullptr, next_minute TINYINT UNSIGNED NOT nullptr, @@ -56,7 +56,7 @@ CREATE TABLE spawn_events ( next_month TINYINT UNSIGNED NOT nullptr, next_year INT UNSIGNED NOT nullptr, enabled TINYINT NOT nullptr DEFAULT '1', - + #action: action TINYINT UNSIGNED NOT nullptr DEFAULT '0', argument MEDIUMINT NOT nullptr DEFAULT '0' @@ -64,8 +64,8 @@ CREATE TABLE spawn_events ( */ -Spawn2::Spawn2(uint32 in_spawn2_id, uint32 spawngroup_id, - float in_x, float in_y, float in_z, float in_heading, +Spawn2::Spawn2(uint32 in_spawn2_id, uint32 spawngroup_id, + float in_x, float in_y, float in_z, float in_heading, uint32 respawn, uint32 variance, uint32 timeleft, uint32 grid, uint16 in_cond_id, int16 in_min_value, bool in_enabled, EmuAppearance anim) : timer(100000), killcount(0) @@ -92,7 +92,7 @@ Spawn2::Spawn2(uint32 in_spawn2_id, uint32 spawngroup_id, //we have a timeleft from the DB or something timer.Start(timeleft); } else { - //no timeleft at all, reset to + //no timeleft at all, reset to timer.Start(resetTimer()); timer.Trigger(); } @@ -105,35 +105,35 @@ Spawn2::~Spawn2() uint32 Spawn2::resetTimer() { uint32 rspawn = respawn_ * 1000; - + if (variance_ != 0) { int var_over_2 = (variance_ * 1000) / 2; rspawn = MakeRandomInt(rspawn - var_over_2, rspawn + var_over_2); - + //put a lower bound on it, not a lot of difference below 100, so set that as the bound. if(rspawn < 100) rspawn = 100; } - + return (rspawn); - + } uint32 Spawn2::despawnTimer(uint32 despawn_timer) { uint32 dspawn = despawn_timer * 1000; - + if (variance_ != 0) { int var_over_2 = (variance_ * 1000) / 2; dspawn = MakeRandomInt(dspawn - var_over_2, dspawn + var_over_2); - + //put a lower bound on it, not a lot of difference below 100, so set that as the bound. if(dspawn < 100) dspawn = 100; } - + return (dspawn); - + } bool Spawn2::Process() { @@ -152,18 +152,18 @@ bool Spawn2::Process() { if (timer.Check()) { timer.Disable(); - + _log(SPAWNS__MAIN, "Spawn2 %d: Timer has triggered", spawn2_id); - + //first check our spawn condition, if this isnt active //then we reset the timer and try again next time. - if(condition_id != SC_AlwaysEnabled + if(condition_id != SC_AlwaysEnabled && !zone->spawn_conditions.Check(condition_id, condition_min_value)) { _log(SPAWNS__CONDITIONS, "Spawn2 %d: spawning prevented by spawn condition %d", spawn2_id, condition_id); Reset(); return(true); } - + if (sg == nullptr) { database.LoadSpawnGroupsByID(spawngroup_id_,&zone->spawn_group_list); sg = zone->spawn_group_list.GetSpawnGroup(spawngroup_id_); @@ -173,7 +173,7 @@ bool Spawn2::Process() { _log(SPAWNS__MAIN, "Spawn2 %d: Unable to locate spawn group %d. Disabling.", spawn2_id, spawngroup_id_); return false; } - + //have the spawn group pick an NPC for us uint32 npcid = sg->GetNPCType(); if (npcid == 0) { @@ -181,7 +181,7 @@ bool Spawn2::Process() { Reset(); //try again later (why?) return(true); } - + //try to find our NPC type. const NPCType* tmp = database.GetNPCType(npcid); if (tmp == nullptr) { @@ -192,7 +192,7 @@ bool Spawn2::Process() { if(tmp->unique_spawn_by_name) { - if(!entity_list.LimitCheckName(tmp->name)) + if(!entity_list.LimitCheckName(tmp->name)) { _log(SPAWNS__MAIN, "Spawn2 %d: Spawn group %d yeilded NPC type %d, which is unique and one already exists.", spawn2_id, spawngroup_id_, npcid); timer.Start(5000); //try again in five seconds. @@ -216,7 +216,7 @@ bool Spawn2::Process() { if(spawn2_id) database.UpdateSpawn2Timeleft(spawn2_id, zone->GetInstanceID(), 0); - + currentnpcid = npcid; NPC* npc = new NPC(tmp, this, x, y, z, heading, FlyMode3); @@ -244,10 +244,10 @@ bool Spawn2::Process() { void Spawn2::Disable() { - if(npcthis) + if(npcthis) { npcthis->Depop(); - } + } enabled = false; } @@ -357,20 +357,20 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList &spa char* query = 0; MYSQL_RES *result; MYSQL_ROW row; - + const char *zone_name = database.GetZoneName(zoneid); - MakeAnyLenString(&query, "SELECT id, spawngroupID, x, y, z, heading, respawntime, variance, pathgrid, _condition, cond_value, enabled, animation FROM spawn2 WHERE zone='%s' AND version=%u", zone_name, version); + MakeAnyLenString(&query, "SELECT id, spawngroupID, x, y, z, heading, respawntime, variance, pathgrid, _condition, cond_value, enabled, animation FROM spawn2 WHERE zone='%s' AND version=%u", zone_name, version); if (RunQuery(query, strlen(query), errbuf, &result)) { safe_delete_array(query); while((row = mysql_fetch_row(result))) { Spawn2* newSpawn = 0; - + bool perl_enabled = atoi(row[11]) == 1 ? true : false; uint32 spawnLeft = (GetSpawnTimeLeft(atoi(row[0]), zone->GetInstanceID()) * 1000); - newSpawn = new Spawn2(atoi(row[0]), atoi(row[1]), atof(row[2]), atof(row[3]), atof(row[4]), atof(row[5]), atoi(row[6]), atoi(row[7]), spawnLeft, atoi(row[8]), atoi(row[9]), atoi(row[10]), perl_enabled, (EmuAppearance)atoi(row[12])); + newSpawn = new Spawn2(atoi(row[0]), atoi(row[1]), atof(row[2]), atof(row[3]), atof(row[4]), atof(row[5]), atoi(row[6]), atoi(row[7]), spawnLeft, atoi(row[8]), atoi(row[9]), atoi(row[10]), perl_enabled, (EmuAppearance)atoi(row[12])); spawn2_list.Insert( newSpawn ); } mysql_free_result(result); @@ -381,7 +381,7 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList &spa safe_delete_array(query); return false; } - + return true; } @@ -417,14 +417,14 @@ bool ZoneDatabase::CreateSpawn2(Client *c, uint32 spawngroup, const char* zone, char *query = 0; uint32 affected_rows = 0; - + // if(GetInverseXY()==1) { // float temp=x; // x=y; // y=temp; // } - if (RunQuery(query, MakeAnyLenString(&query, - "INSERT INTO spawn2 (spawngroupID,zone,x,y,z,heading,respawntime,variance,_condition,cond_value) Values (%i, '%s', %f, %f, %f, %f, %i, %i, %u, %i)", + if (RunQuery(query, MakeAnyLenString(&query, + "INSERT INTO spawn2 (spawngroupID,zone,x,y,z,heading,respawntime,variance,_condition,cond_value) Values (%i, '%s', %f, %f, %f, %f, %i, %i, %u, %i)", spawngroup, zone, x, y, z, heading, respawn, variance, condition, cond_value ), errbuf, 0, &affected_rows)) { safe_delete_array(query); @@ -441,7 +441,7 @@ bool ZoneDatabase::CreateSpawn2(Client *c, uint32 spawngroup, const char* zone, safe_delete_array(query); return false; } - + return false; } @@ -508,16 +508,16 @@ void Zone::Despawn(uint32 spawn2ID) { void Spawn2::SpawnConditionChanged(const SpawnCondition &c, int16 old_value) { if(GetSpawnCondition() != c.condition_id) return; - + _log(SPAWNS__CONDITIONS, "Spawn2 %d: Notified that our spawn condition %d has changed from %d to %d. Our min value is %d.", spawn2_id, c.condition_id, old_value, c.value, condition_min_value); - + bool old_state = (old_value >= condition_min_value); bool new_state = (c.value >= condition_min_value); if(old_state == new_state) { _log(SPAWNS__CONDITIONS, "Spawn2 %d: Our threshold for this condition was not crossed. Doing nothing.", spawn2_id); return; //no change } - + switch(c.on_change) { case SpawnCondition::DoNothing: //that was easy. @@ -549,7 +549,7 @@ void Spawn2::SpawnConditionChanged(const SpawnCondition &c, int16 old_value) { void Zone::SpawnConditionChanged(const SpawnCondition &c, int16 old_value) { _log(SPAWNS__CONDITIONS, "Zone notified that spawn condition %d has changed from %d to %d. Notifying all spawn points.", c.condition_id, old_value, c.value); - + LinkedListIterator iterator(spawn2_list); iterator.Reset(); @@ -586,28 +586,28 @@ SpawnConditionManager::SpawnConditionManager() void SpawnConditionManager::Process() { if(spawn_events.empty()) return; - + if(minute_timer.Check()) { //check each spawn event. - + //get our current time TimeOfDay_Struct tod; zone->zone_time.getEQTimeOfDay(&tod); - + //see if time is past our nearest event. if(EQTime::IsTimeBefore(&next_event, &tod)) return; - - //at least one event should get triggered, + + //at least one event should get triggered, vector::iterator cur,end; cur = spawn_events.begin(); end = spawn_events.end(); for(; cur != end; cur++) { SpawnEvent &cevent = *cur; - + if(!cevent.enabled) continue; - + if(EQTime::IsTimeBefore(&tod, &cevent.next)) { //this event has been triggered. //execute the event @@ -637,11 +637,11 @@ void SpawnConditionManager::ExecEvent(SpawnEvent &event, bool send_update) { _log(SPAWNS__CONDITIONS, "Event %d: Unable to find condition %d to execute on.", event.id, event.condition_id); return; //unable to find the spawn condition to operate on } - + SpawnCondition &cond = condi->second; - + int16 new_value = cond.value; - + //we have our event and our condition, do our stuff. switch(event.action) { case SpawnEvent::ActionSet: @@ -668,7 +668,7 @@ void SpawnConditionManager::ExecEvent(SpawnEvent &event, bool send_update) { _log(SPAWNS__CONDITIONS, "Event %d: Invalid event action type %d", event.id, event.action); return; } - + //now set the condition to the new value if(send_update) //full blown update SetCondition(zone->GetShortName(), zone->GetInstanceID(), cond.condition_id, new_value); @@ -680,14 +680,14 @@ void SpawnConditionManager::UpdateDBEvent(SpawnEvent &event) { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; int len; - + SpawnCondition cond; - len = MakeAnyLenString(&query, + len = MakeAnyLenString(&query, "UPDATE spawn_events SET " "next_minute=%d, next_hour=%d, next_day=%d, next_month=%d, " "next_year=%d, enabled=%d " "WHERE id=%d", - event.next.minute, event.next.hour, event.next.day, event.next.month, + event.next.minute, event.next.hour, event.next.day, event.next.month, event.next.year, event.enabled?1:0, event.id ); if(!database.RunQuery(query, len, errbuf)) { @@ -700,9 +700,9 @@ void SpawnConditionManager::UpdateDBCondition(const char* zone_name, uint32 inst char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; int len; - + SpawnCondition cond; - len = MakeAnyLenString(&query, + len = MakeAnyLenString(&query, "REPLACE INTO spawn_condition_values (id, value, zone, instance_id) VALUES(%u, %u, '%s', %u)", cond_id, value, zone_name, instance_id ); @@ -718,10 +718,10 @@ bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, stri MYSQL_RES *result; MYSQL_ROW row; int len; - + bool ret = false; - - len = MakeAnyLenString(&query, + + len = MakeAnyLenString(&query, "SELECT id,cond_id,period,next_minute,next_hour,next_day,next_month,next_year,enabled,action,argument,zone " "FROM spawn_events WHERE id=%d", event_id); if (database.RunQuery(query, len, errbuf, &result)) { @@ -730,23 +730,23 @@ bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, stri event.id = atoi(row[0]); event.condition_id = atoi(row[1]); event.period = atoi(row[2]); - + event.next.minute = atoi(row[3]); event.next.hour = atoi(row[4]); event.next.day = atoi(row[5]); event.next.month = atoi(row[6]); event.next.year = atoi(row[7]); - + event.enabled = atoi(row[8])==0?false:true; event.action = (SpawnEvent::Action) atoi(row[9]); event.argument = atoi(row[10]); zone_name = row[11]; string t; - EQTime::ToString(&event.next, t); + EQTime::ToString(&event.next, t); _log(SPAWNS__CONDITIONS, "Loaded %s spawn event %d on condition %d with period %d, action %d, argument %d. Will trigger at %s", event.enabled?"enabled":"disabled", event.id, event.condition_id, event.period, event.action, event.argument, t.c_str()); - + ret = true; } mysql_free_result(result); @@ -757,18 +757,18 @@ bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, stri return(ret); } -bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 instance_id) +bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 instance_id) { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; MYSQL_RES *result; MYSQL_ROW row; int len; - + //clear out old stuff.. spawn_conditions.clear(); - - //load spawn conditions + + //load spawn conditions SpawnCondition cond; len = MakeAnyLenString(&query, "SELECT id, onchange, value FROM spawn_conditions WHERE zone='%s'", zone_name); if (database.RunQuery(query, len, errbuf, &result)) { @@ -778,7 +778,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in cond.value = atoi(row[2]); cond.on_change = (SpawnCondition::OnChange) atoi(row[1]); spawn_conditions[cond.condition_id] = cond; - + _log(SPAWNS__CONDITIONS, "Loaded spawn condition %d with value %d and on_change %d", cond.condition_id, cond.value, cond.on_change); } mysql_free_result(result); @@ -792,8 +792,8 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in len = MakeAnyLenString(&query, "SELECT id, value FROM spawn_condition_values WHERE zone='%s' and instance_id=%u", zone_name, instance_id); if (database.RunQuery(query, len, errbuf, &result)) { safe_delete_array(query); - while((row = mysql_fetch_row(result))) - { + while((row = mysql_fetch_row(result))) + { std::map::iterator iter = spawn_conditions.find(atoi(row[0])); if(iter != spawn_conditions.end()) { @@ -801,18 +801,18 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in } } mysql_free_result(result); - } - else + } + else { LogFile->write(EQEMuLog::Error, "Error in LoadSpawnConditions query '%s': %s", query, errbuf); safe_delete_array(query); spawn_conditions.clear(); return false; } - + //load spawn events SpawnEvent event; - len = MakeAnyLenString(&query, + len = MakeAnyLenString(&query, "SELECT id,cond_id,period,next_minute,next_hour,next_day,next_month,next_year,enabled,action,argument " "FROM spawn_events WHERE zone='%s'", zone_name); if (database.RunQuery(query, len, errbuf, &result)) { @@ -825,18 +825,18 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in LogFile->write(EQEMuLog::Error, "Refusing to load spawn event #%d because it has a period of 0\n", event.id); continue; } - + event.next.minute = atoi(row[3]); event.next.hour = atoi(row[4]); event.next.day = atoi(row[5]); event.next.month = atoi(row[6]); event.next.year = atoi(row[7]); - + event.enabled = atoi(row[8])==0?false:true; event.action = (SpawnEvent::Action) atoi(row[9]); event.argument = atoi(row[10]); spawn_events.push_back(event); - + _log(SPAWNS__CONDITIONS, "Loaded %s spawn event %d on condition %d with period %d, action %d, argument %d", event.enabled?"enabled":"disabled", event.id, event.condition_id, event.period, event.action, event.argument); } @@ -846,10 +846,10 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in safe_delete_array(query); return false; } - + //now we need to catch up on events that happened while we were away //and use them to alter just the condition variables. - + //each spawn2 will then use its correct condition value when //it decides what to do. This essentially forces a 'depop' action //on spawn points which are turned off, and a 'repop' action on @@ -858,17 +858,17 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in //get our current time TimeOfDay_Struct tod; zone->zone_time.getEQTimeOfDay(&tod); - + vector::iterator cur,end; cur = spawn_events.begin(); end = spawn_events.end(); bool ran; for(; cur != end; cur++) { SpawnEvent &cevent = *cur; - + if(!cevent.enabled) continue; - + //watch for special case of all 0s, which means to reset next to now if(cevent.next.year == 0 && cevent.next.month == 0 && cevent.next.day == 0 && cevent.next.hour == 0 && cevent.next.minute == 0) { _log(SPAWNS__CONDITIONS, "Initial next trigger time set for spawn event %d", cevent.id); @@ -879,7 +879,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in UpdateDBEvent(cevent); continue; //were done with this event. } - + ran = false; while(EQTime::IsTimeBefore(&tod, &cevent.next)) { _log(SPAWNS__CONDITIONS, "Catch up triggering on event %d", cevent.id); @@ -896,27 +896,27 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in UpdateDBEvent(cevent); } } - + //now our event timers are all up to date, find our closest event. FindNearestEvent(); - + return(true); } void SpawnConditionManager::FindNearestEvent() { //set a huge year which should never get reached normally next_event.year = 0xFFFFFF; - + vector::iterator cur,end; cur = spawn_events.begin(); end = spawn_events.end(); int next_id = -1; for(; cur != end; cur++) { SpawnEvent &cevent = *cur; - + if(!cevent.enabled) continue; - + //see if this event is before our last nearest if(EQTime::IsTimeBefore(&next_event, &cevent.next)) { memcpy(&next_event, &cevent.next, sizeof(next_event)); @@ -929,7 +929,7 @@ void SpawnConditionManager::FindNearestEvent() { _log(SPAWNS__CONDITIONS, "Next event determined to be event %d", next_id); } -void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance_id, uint16 condition_id, int16 new_value, bool world_update) +void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance_id, uint16 condition_id, int16 new_value, bool world_update) { if(world_update) { //this is an update coming from another zone, they @@ -941,24 +941,24 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance _log(SPAWNS__CONDITIONS, "Condition update received from world for %d, but we do not have that conditon.", condition_id); return; //unable to find the spawn condition } - + SpawnCondition &cond = condi->second; - + if(cond.value == new_value) { _log(SPAWNS__CONDITIONS, "Condition update received from world for %d with value %d, which is what we already have.", condition_id, new_value); return; } - + int16 old_value = cond.value; - + //set our local value cond.value = new_value; - + _log(SPAWNS__CONDITIONS, "Condition update received from world for %d with value %d", condition_id, new_value); - + //now we have to test each spawn point to see if it changed. zone->SpawnConditionChanged(cond, old_value); - } else if(!strcasecmp(zone_short, zone->GetShortName()) && instance_id == zone->GetInstanceID()) + } else if(!strcasecmp(zone_short, zone->GetShortName()) && instance_id == zone->GetInstanceID()) { //this is a local spawn condition, we need to update the DB, //our memory, then notify spawn points of the change. @@ -968,43 +968,43 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance _log(SPAWNS__CONDITIONS, "Local Condition update requested for %d, but we do not have that conditon.", condition_id); return; //unable to find the spawn condition } - + SpawnCondition &cond = condi->second; - + if(cond.value == new_value) { _log(SPAWNS__CONDITIONS, "Local Condition update requested for %d with value %d, which is what we already have.", condition_id, new_value); return; } - + int16 old_value = cond.value; - + //set our local value cond.value = new_value; //save it in the DB too UpdateDBCondition(zone_short, instance_id, condition_id, new_value); - + _log(SPAWNS__CONDITIONS, "Local Condition update requested for %d with value %d", condition_id, new_value); - + //now we have to test each spawn point to see if it changed. zone->SpawnConditionChanged(cond, old_value); - } + } else { //this is a remote spawn condition, update the DB and send //an update packet to the zone if its up - + _log(SPAWNS__CONDITIONS, "Remote spawn condition %d set to %d. Updating DB and notifying world.", condition_id, new_value); - + UpdateDBCondition(zone_short, instance_id, condition_id, new_value); - + ServerPacket* pack = new ServerPacket(ServerOP_SpawnCondition, sizeof(ServerSpawnCondition_Struct)); ServerSpawnCondition_Struct* ssc = (ServerSpawnCondition_Struct*)pack->pBuffer; - + ssc->zoneID = database.GetZoneID(zone_short); ssc->instanceID = instance_id; ssc->condition_id = condition_id; ssc->value = new_value; - + worldserver.SendPacket(pack); safe_delete(pack); } @@ -1012,16 +1012,16 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance void SpawnConditionManager::ReloadEvent(uint32 event_id) { string zone_short_name; - + _log(SPAWNS__CONDITIONS, "Requested to reload event %d from the database.", event_id); - + //first look for the event in our local event list vector::iterator cur,end; cur = spawn_events.begin(); end = spawn_events.end(); for(; cur != end; cur++) { SpawnEvent &cevent = *cur; - + if(cevent.id == event_id) { //load the event into the old event slot if(!LoadDBEvent(event_id, cevent, zone_short_name)) { @@ -1034,7 +1034,7 @@ void SpawnConditionManager::ReloadEvent(uint32 event_id) { return; } } - + //if we get here, it is a new event... SpawnEvent e; if(!LoadDBEvent(event_id, e, zone_short_name)) { @@ -1042,29 +1042,29 @@ void SpawnConditionManager::ReloadEvent(uint32 event_id) { _log(SPAWNS__CONDITIONS, "Failed to reload event %d from the database.", event_id); return; } - + //we might want to check the next timer like we do on //regular load events, but we are assuming this is a new event //and anyways, this will get handled (albeit not optimally) //naturally by the event handling code. - + spawn_events.push_back(e); - + //sync up our nearest event FindNearestEvent(); } void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool reset_base) { - + _log(SPAWNS__CONDITIONS, "Request to %s spawn event %d %sresetting trigger time", enabled?"enable":"disable", event_id, reset_base?"":"without "); - + //first look for the event in our local event list vector::iterator cur,end; cur = spawn_events.begin(); end = spawn_events.end(); for(; cur != end; cur++) { SpawnEvent &cevent = *cur; - + if(cevent.id == event_id) { //make sure were actually changing something if(cevent.enabled != enabled || reset_base) { @@ -1078,10 +1078,10 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool rese } else { _log(SPAWNS__CONDITIONS, "Spawn event %d located in this zone. State changed.", event_id); } - + //save the event in the DB UpdateDBEvent(cevent); - + //sync up our nearest event FindNearestEvent(); } else { @@ -1091,13 +1091,13 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool rese return; } } - + //if we get here, the condition must be in another zone. //first figure out what zone it applies to. - //update the DB and send and send an update packet to + //update the DB and send and send an update packet to //the zone if its up - - //we need to load the event from the DB and then update + + //we need to load the event from the DB and then update //the values in the DB, because we do not know if the zone //is up or not. The message to the zone will just tell it to //update its in-memory event list @@ -1112,7 +1112,7 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool rese _log(SPAWNS__CONDITIONS, "Spawn event %d is not located in this zone but no change was needed.", event_id); return; //no changes. } - + e.enabled = enabled; if(reset_base) { _log(SPAWNS__CONDITIONS, "Spawn event %d is in zone %s. State set. Trigger time reset (period %d). Notifying world.", event_id, zone_short_name.c_str(), e.period); @@ -1125,31 +1125,31 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool rese } //save the event in the DB UpdateDBEvent(e); - - + + //now notify the zone ServerPacket* pack = new ServerPacket(ServerOP_SpawnEvent, sizeof(ServerSpawnEvent_Struct)); ServerSpawnEvent_Struct* sse = (ServerSpawnEvent_Struct*)pack->pBuffer; - + sse->zoneID = database.GetZoneID(zone_short_name.c_str()); sse->event_id = event_id; - + worldserver.SendPacket(pack); safe_delete(pack); } int16 SpawnConditionManager::GetCondition(const char *zone_short, uint32 instance_id, uint16 condition_id) { - if(!strcasecmp(zone_short, zone->GetShortName()) && instance_id == zone->GetInstanceID()) + if(!strcasecmp(zone_short, zone->GetShortName()) && instance_id == zone->GetInstanceID()) { //this is a local spawn condition map::iterator condi; condi = spawn_conditions.find(condition_id); - if(condi == spawn_conditions.end()) + if(condi == spawn_conditions.end()) { _log(SPAWNS__CONDITIONS, "Unable to find local condition %d in Get request.", condition_id); return(0); //unable to find the spawn condition } - + SpawnCondition &cond = condi->second; return(cond.value); } else { @@ -1159,12 +1159,12 @@ int16 SpawnConditionManager::GetCondition(const char *zone_short, uint32 instanc MYSQL_RES *result; MYSQL_ROW row; int len; - + int16 value; - - //load spawn conditions + + //load spawn conditions SpawnCondition cond; - len = MakeAnyLenString(&query, "SELECT value FROM spawn_condition_values WHERE zone='%s' AND instance_id=%u AND id=%d", + len = MakeAnyLenString(&query, "SELECT value FROM spawn_condition_values WHERE zone='%s' AND instance_id=%u AND id=%d", zone_short, instance_id, condition_id); if (database.RunQuery(query, len, errbuf, &result)) { safe_delete_array(query); @@ -1189,9 +1189,9 @@ bool SpawnConditionManager::Check(uint16 condition, int16 min_value) { condi = spawn_conditions.find(condition); if(condi == spawn_conditions.end()) return(false); //unable to find the spawn condition - + SpawnCondition &cond = condi->second; - + return(cond.value >= min_value); } diff --git a/zone/spawn2.h b/zone/spawn2.h index e0cdefc72..6a12f50cf 100644 --- a/zone/spawn2.h +++ b/zone/spawn2.h @@ -32,9 +32,9 @@ class NPC; class Spawn2 { public: - Spawn2(uint32 spawn2_id, uint32 spawngroup_id, - float x, float y, float z, float heading, - uint32 respawn, uint32 variance, + Spawn2(uint32 spawn2_id, uint32 spawngroup_id, + float x, float y, float z, float heading, + uint32 respawn, uint32 variance, uint32 timeleft = 0, uint32 grid = 0, uint16 cond_id = SC_AlwaysEnabled, int16 min_value = 0, bool in_enabled = true, EmuAppearance anim = eaStanding); ~Spawn2(); @@ -107,9 +107,9 @@ public: //a base for the signal ID sent. e.g. // value 12 sends signal id 2 } OnChange; - + SpawnCondition(); - + uint16 condition_id; int16 value; OnChange on_change; @@ -124,17 +124,17 @@ public: ActionMultiply = 3, ActionDivide = 4 } Action; - + SpawnEvent(); - + uint32 id; uint16 condition_id; string zone_name; - + bool enabled; Action action; int16 argument; - + uint32 period; //eq minutes (3 seconds) between events TimeOfDay_Struct next; //next time this event triggers }; @@ -142,26 +142,26 @@ public: class SpawnConditionManager { public: SpawnConditionManager(); - + void Process(); bool LoadSpawnConditions(const char* zone_name, uint32 instance_id); - + int16 GetCondition(const char *zone_short, uint32 instance_id, uint16 condition_id); void SetCondition(const char *zone_short, uint32 instance_id, uint16 condition_id, int16 new_value, bool world_update = false); void ToggleEvent(uint32 event_id, bool enabled, bool reset_base); bool Check(uint16 condition, int16 min_value); void ReloadEvent(uint32 event_id); - + protected: map spawn_conditions; vector spawn_events; - + void ExecEvent(SpawnEvent &e, bool send_update); void UpdateDBEvent(SpawnEvent &e); bool LoadDBEvent(uint32 event_id, SpawnEvent &e, string &zone_name); void UpdateDBCondition(const char* zone_name, uint32 instance_id, uint16 cond_id, int16 value); void FindNearestEvent(); - + Timer minute_timer; TimeOfDay_Struct next_event; }; diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp index 4af61d9a1..20eca6eb9 100644 --- a/zone/spawngroup.cpp +++ b/zone/spawngroup.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -28,7 +28,7 @@ using namespace std; extern EntityList entity_list; -SpawnEntry::SpawnEntry( uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit ) +SpawnEntry::SpawnEntry( uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit ) { NPCType = in_NPCType; chance = in_chance; @@ -55,32 +55,32 @@ uint32 SpawnGroup::GetNPCType() { #endif int npcType = 0; int totalchance = 0; - + //check limits on this spawn group and npc type if(!entity_list.LimitCheckGroup(id, group_spawn_limit)) return(0); - + list::iterator cur,end; list possible; cur = list_.begin(); end = list_.end(); for(; cur != end; cur++) { SpawnEntry *se = *cur; - + //check limits on this spawn group and npc type if(!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit)) continue; - + totalchance += se->chance; possible.push_back(se); } if(totalchance == 0) return 0; - - + + int32 roll = 0; roll = MakeRandomInt(0, totalchance-1); - + cur = possible.begin(); end = possible.end(); for(; cur != end; cur++) { @@ -137,7 +137,7 @@ SpawnGroup* SpawnGroupList::GetSpawnGroup(uint32 in_id) { bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id) { if(groups.count(in_id) != 1) return(false); - + groups.erase(in_id); return(true); } @@ -147,7 +147,7 @@ bool ZoneDatabase::LoadSpawnGroups(const char* zone_name, uint16 version, SpawnG char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + // CODER new spawn code query = 0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT DISTINCT(spawngroupID), spawngroup.name, spawngroup.spawn_limit, spawngroup.dist, spawngroup.max_x, spawngroup.min_x, spawngroup.max_y, spawngroup.min_y, spawngroup.delay, spawngroup.despawn, spawngroup.despawn_timer FROM spawn2,spawngroup WHERE spawn2.spawngroupID=spawngroup.ID and spawn2.version=%u and zone='%s'", version, zone_name), errbuf, &result)) @@ -167,7 +167,7 @@ bool ZoneDatabase::LoadSpawnGroups(const char* zone_name, uint16 version, SpawnG } query = 0; - if (RunQuery(query, MakeAnyLenString(&query, + if (RunQuery(query, MakeAnyLenString(&query, "SELECT DISTINCT spawnentry.spawngroupID, npcid, chance, " "npc_types.spawn_limit AS sl " "FROM spawnentry, spawn2, npc_types " @@ -201,7 +201,7 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_g char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + // CODER new spawn code query = 0; @@ -222,7 +222,7 @@ bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_g } query = 0; - if (RunQuery(query, MakeAnyLenString(&query, + if (RunQuery(query, MakeAnyLenString(&query, "SELECT DISTINCT spawnentry.spawngroupID, spawnentry.npcid, spawnentry.chance, spawngroup.spawn_limit FROM spawnentry,spawngroup WHERE spawnentry.spawngroupID='%i' AND spawngroup.spawn_limit='0' ORDER by chance", spawngroupid), errbuf, &result)) { safe_delete_array(query); while((row = mysql_fetch_row(result))) diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 374ce4f76..9c2e83ef6 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -79,7 +79,7 @@ void Mob::ApplySpecialAttackMod(SkillType skill, int32 &dmg, int32 &mindmg) { int item_slot = -1; //1: Apply bonus from AC (BOOT/SHIELD/HANDS) est. 40AC=6dmg if (IsClient()){ - + switch (skill){ case FLYING_KICK: @@ -88,7 +88,7 @@ void Mob::ApplySpecialAttackMod(SkillType skill, int32 &dmg, int32 &mindmg) { item_slot = SLOT_FEET; break; - case BASH: + case BASH: item_slot = SLOT_SECONDARY; break; @@ -145,9 +145,9 @@ void Mob::DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int who->AvoidDamage(this, max_damage, CanRiposte); who->MeleeMitigation(this, max_damage, min_damage); - + if(max_damage > 0) { - ApplyMeleeDamageBonus(skill, max_damage); + ApplyMeleeDamageBonus(skill, max_damage); max_damage += who->GetAdditionalDamage(this, 0, true, skill); max_damage += (itembonuses.HeroicSTR / 10) + (max_damage * who->GetSkillDmgTaken(skill) / 100) + GetSkillDmgAmt(skill); TryCriticalHit(who, skill, max_damage); @@ -167,11 +167,11 @@ void Mob::DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int if(aabonuses.SpecialAttackKBProc[0] && aabonuses.SpecialAttackKBProc[1] == skill){ int kb_chance = 25; kb_chance += kb_chance*(100-aabonuses.SpecialAttackKBProc[0])/100; - + if (MakeRandomInt(0, 99) < kb_chance) SpellFinished(904, who, 10, 0, -1, spells[904].ResistDiff); //who->Stun(100); Kayen: This effect does not stun on live, it only moves the NPC. - } + } if (HasSkillProcs()){ float chance = (float)ReuseTime*RuleR(Combat, AvgProcsPerMinute)/60000.0f; @@ -179,7 +179,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int } if(max_damage == -3 && !who->HasDied()) - DoRiposte(who); + DoRiposte(who); } @@ -189,15 +189,15 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { //make sure were actually able to use such an attack. if(spellend_timer.Enabled() || IsFeared() || IsStunned() || IsMezzed() || DivineAura() || dead) return; - + CombatAbility_Struct* ca_atk = (CombatAbility_Struct*) app->pBuffer; - + if(GetTarget()->GetID() != ca_atk->m_target) return; //invalid packet. - + if(!IsAttackAllowed(GetTarget())) return; - + //These two are not subject to the combat ability timer, as they //allready do their checking in conjunction with the attack timer //throwing weapons @@ -215,16 +215,16 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { } //could we return here? Im not sure is m_atk 11 is used for real specials } - + //check range for all these abilities, they are all close combat stuff if(!CombatRange(GetTarget())) return; - + if(!p_timers.Expired(&database, pTimerCombatAbility, false)) { Message(13,"Ability recovery time not yet met."); return; } - + int ReuseTime = 0; int ClientHaste = GetHaste(); int HasteMod = 0; @@ -238,11 +238,11 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { int32 dmg = 0; int32 skill_reduction = this->GetSkillReuseTime(ca_atk->m_skill); - - if ((ca_atk->m_atk == 100) + + if ((ca_atk->m_atk == 100) && (ca_atk->m_skill == BASH)) { // SLAM - Bash without a shield equipped if (GetTarget() != this) { - + CheckIncreaseSkill(BASH, GetTarget(), 10); DoAnim(animTailRake); @@ -276,14 +276,14 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { return; } - if ((ca_atk->m_atk == 100) && (ca_atk->m_skill == FRENZY)) + if ((ca_atk->m_atk == 100) && (ca_atk->m_skill == FRENZY)) { CheckIncreaseSkill(FRENZY, GetTarget(), 10); int AtkRounds = 3; int skillmod = 100*GetSkill(FRENZY)/MaxSkill(FRENZY); int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); int32 min_dmg = 0; - DoAnim(anim2HSlashing); + DoAnim(anim2HSlashing); max_dmg = mod_frenzy_damage(max_dmg); @@ -297,10 +297,10 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { ReuseTime = FrenzyReuseTime-1-skill_reduction; ReuseTime = (ReuseTime*HasteMod)/100; - + //Live parses show around 55% Triple 35% Double 10% Single, you will always get first hit. while(AtkRounds > 0) { - + if (GetTarget() && (AtkRounds == 1 || MakeRandomInt(0,100) < 75)){ DoSpecialAttackDamage(GetTarget(), FRENZY, max_dmg, min_dmg, max_dmg , ReuseTime, true); } @@ -345,7 +345,7 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { ReuseTime = KickReuseTime-1-skill_reduction; DoSpecialAttackDamage(GetTarget(), KICK, dmg, 1, ht, ReuseTime); - + } break; case MONK: { @@ -355,7 +355,7 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { uint16 bDoubleSpecialAttack = itembonuses.DoubleSpecialAttack + spellbonuses.DoubleSpecialAttack + aabonuses.DoubleSpecialAttack; if( bDoubleSpecialAttack && (bDoubleSpecialAttack >= 100 || bDoubleSpecialAttack > MakeRandomInt(0,100)) ) { - int MonkSPA [5] = { FLYING_KICK, DRAGON_PUNCH, EAGLE_STRIKE, TIGER_CLAW, ROUND_KICK }; + int MonkSPA [5] = { FLYING_KICK, DRAGON_PUNCH, EAGLE_STRIKE, TIGER_CLAW, ROUND_KICK }; MonkSpecialAttack(GetTarget(), MonkSPA[MakeRandomInt(0,4)]); int TripleChance = 25; @@ -369,8 +369,8 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { } if(ReuseTime < 100) { - //hackish... but we return a huge reuse time if this is an - // invalid skill, otherwise, we can safely assume it is a + //hackish... but we return a huge reuse time if this is an + // invalid skill, otherwise, we can safely assume it is a // valid monk skill and just cast it to a SkillType CheckIncreaseSkill((SkillType) ca_atk->m_skill, GetTarget(), 10); } @@ -389,12 +389,12 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { ReuseTime = 9 - skill_reduction; break; } - + ReuseTime = (ReuseTime*HasteMod)/100; if(ReuseTime > 0) { p_timers.Start(pTimerCombatAbility, ReuseTime); - } + } } //returns the reuse time in sec for the special attack used. @@ -409,7 +409,7 @@ int Mob::MonkSpecialAttack(Mob* other, uint8 unchecked_type) int reuse = 0; SkillType skill_type; //to avoid casting... even though it "would work" uint8 itemslot = SLOT_FEET; - + switch(unchecked_type) { case FLYING_KICK:{ @@ -417,7 +417,7 @@ int Mob::MonkSpecialAttack(Mob* other, uint8 unchecked_type) max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, FlyingKickBonus) / 100) + 35; min_dmg = ((level*8)/10); ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); - DoAnim(animFlyingKick); + DoAnim(animFlyingKick); reuse = FlyingKickReuseTime; break; } @@ -520,16 +520,16 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) { return; } } - + //Live AA - Triple Backstab int tripleChance = itembonuses.TripleBackstab + spellbonuses.TripleBackstab + aabonuses.TripleBackstab; if (BehindMob(other, GetX(), GetY())) bIsBehind = true; - + else { - //Live AA - Seized Opportunity - int FrontalBSChance = itembonuses.FrontalBackstabChance + spellbonuses.FrontalBackstabChance + aabonuses.FrontalBackstabChance; + //Live AA - Seized Opportunity + int FrontalBSChance = itembonuses.FrontalBackstabChance + spellbonuses.FrontalBackstabChance + aabonuses.FrontalBackstabChance; if (FrontalBSChance && (FrontalBSChance > MakeRandomInt(0, 100))) bCanFrontalBS = true; @@ -561,13 +561,13 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) { if (level > 54) { float DoubleAttackProbability = (GetSkill(DOUBLE_ATTACK) + GetLevel()) / 500.0f; // 62.4 max // Check for double attack with main hand assuming maxed DA Skill (MS) - + if(MakeRandomFloat(0, 1) < DoubleAttackProbability) // Max 62.4 % chance of DA { if(other->GetHP() > 0) RogueBackstab(other,false,ReuseTime); - if (tripleChance && other->GetHP() > 0 && tripleChance > MakeRandomInt(0, 100)) + if (tripleChance && other->GetHP() > 0 && tripleChance > MakeRandomInt(0, 100)) RogueBackstab(other,false,ReuseTime); } } @@ -626,7 +626,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) primaryweapondamage = (GetLevel()/7)+1; // fallback incase it's a npc without a weapon, 2 dmg at 10, 10 dmg at 65 backstab_dmg = primaryweapondamage; } - + if(primaryweapondamage > 0){ if(level > 25){ max_hit = (((2*backstab_dmg) * GetDamageTable(BACKSTAB) / 100) * 10 * GetSkill(BACKSTAB) / 355) + ((level-25)/3) + 1; @@ -661,7 +661,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) max_hit = min_hit; if(RuleB(Combat, UseIntervalAC)) - ndamage = max_hit; + ndamage = max_hit; else ndamage = MakeRandomInt(min_hit, max_hit); @@ -707,7 +707,7 @@ void Client::RangedAttack(Mob* other) { //locate ammo int ammo_slot = SLOT_AMMO; const ItemInst* Ammo = m_inv[SLOT_AMMO]; - + if (!RangeWeapon || !RangeWeapon->IsType(ItemClassCommon)) { mlog(COMBAT__RANGED, "Ranged attack canceled. Missing or invalid ranged weapon (%d) in slot %d", GetItemIDAt(SLOT_RANGE), SLOT_RANGE); Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have no bow!", GetItemIDAt(SLOT_RANGE)); @@ -718,10 +718,10 @@ void Client::RangedAttack(Mob* other) { Message(0, "Error: Ammo: GetItem(%i)==0, you have no ammo!", GetItemIDAt(SLOT_AMMO)); return; } - + const Item_Struct* RangeItem = RangeWeapon->GetItem(); const Item_Struct* AmmoItem = Ammo->GetItem(); - + if(RangeItem->ItemType != ItemTypeBow) { mlog(COMBAT__RANGED, "Ranged attack canceled. Ranged item is not a bow. type %d.", RangeItem->ItemType); Message(0, "Error: Rangeweapon: Item %d is not a bow.", RangeWeapon->GetID()); @@ -732,9 +732,9 @@ void Client::RangedAttack(Mob* other) { Message(0, "Error: Ammo: type %d != %d, you have the wrong type of ammo!", AmmoItem->ItemType, ItemTypeArrow); return; } - + mlog(COMBAT__RANGED, "Shooting %s with bow %s (%d) and arrow %s (%d)", GetTarget()->GetName(), RangeItem->Name, RangeItem->ID, AmmoItem->Name, AmmoItem->ID); - + //look for ammo in inventory if we only have 1 left... if(Ammo->GetCharges() == 1) { //first look for quivers @@ -747,7 +747,7 @@ void Client::RangedAttack(Mob* other) { const Item_Struct* bagitem = pi->GetItem(); if(!bagitem || bagitem->BagType != bagTypeQuiver) continue; - + //we found a quiver, look for the ammo in it int i; for (i = 0; i < bagitem->BagSlots; i++) { @@ -767,7 +767,7 @@ void Client::RangedAttack(Mob* other) { if(found) break; } - + if(!found) { //if we dont find a quiver, look through our inventory again //not caring if the thing is a quiver. @@ -779,7 +779,7 @@ void Client::RangedAttack(Mob* other) { } } } - + float range = RangeItem->Range + AmmoItem->Range + 5; //Fudge it a little, client will let you hit something at 0 0 0 when you are at 205 0 0 mlog(COMBAT__RANGED, "Calculated bow range to be %.1f", range); range *= range; @@ -792,9 +792,9 @@ void Client::RangedAttack(Mob* other) { return; } - if(!IsAttackAllowed(GetTarget()) || - IsCasting() || - IsSitting() || + if(!IsAttackAllowed(GetTarget()) || + IsCasting() || + IsSitting() || (DivineAura() && !GetGM()) || IsStunned() || IsFeared() || @@ -802,11 +802,11 @@ void Client::RangedAttack(Mob* other) { (GetAppearance() == eaDead)){ return; } - + SendItemAnimation(GetTarget(), AmmoItem, ARCHERY); - + DoArcheryAttackDmg(GetTarget(), RangeWeapon, Ammo); - + //EndlessQuiver AA base1 = 100% Chance to avoid consumption arrow. int ChanceAvoidConsume = aabonuses.ConsumeProjectile + itembonuses.ConsumeProjectile + spellbonuses.ConsumeProjectile; @@ -817,7 +817,7 @@ void Client::RangedAttack(Mob* other) { } else { mlog(COMBAT__RANGED, "Endless Quiver prevented ammo consumption."); } - + CheckIncreaseSkill(ARCHERY, GetTarget(), -15); //break invis when you attack @@ -862,8 +862,8 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item other->Damage(this, 0, SPELL_UNKNOWN, ARCHERY); } else { mlog(COMBAT__RANGED, "Ranged attack hit %s.", other->GetName()); - - if(!TryHeadShot(other, ARCHERY)) + + if(!TryHeadShot(other, ARCHERY)) { int32 TotalDmg = 0; int16 WDmg = 0; @@ -874,7 +874,7 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item } else WDmg = weapon_damage; - + if((WDmg > 0) || (ADmg > 0)) { if(WDmg < 0) @@ -883,11 +883,11 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item ADmg = 0; uint32 MaxDmg = (RuleR(Combat, ArcheryBaseDamageBonus)*(WDmg+ADmg)*GetDamageTable(ARCHERY)) / 100; int32 hate = ((WDmg+ADmg)); - + uint16 bonusArcheryDamageModifier = aabonuses.ArcheryDamageModifier + itembonuses.ArcheryDamageModifier + spellbonuses.ArcheryDamageModifier; MaxDmg += MaxDmg*bonusArcheryDamageModifier / 100; - + mlog(COMBAT__RANGED, "Bow DMG %d, Arrow DMG %d, Max Damage %d.", WDmg, ADmg, MaxDmg); bool dobonus = false; @@ -930,7 +930,7 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item TotalDmg = MaxDmg; else TotalDmg = MakeRandomInt(1, MaxDmg); - + int minDmg = 1; if(GetLevel() > 25){ //twice, for ammo and weapon @@ -942,7 +942,7 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item other->AvoidDamage(this, TotalDmg, false); //CanRiposte=false - Can not riposte archery attacks. other->MeleeMitigation(this, TotalDmg, minDmg); - if(TotalDmg > 0) + if(TotalDmg > 0) { TotalDmg += TotalDmg*focus/100; ApplyMeleeDamageBonus(ARCHERY, TotalDmg); @@ -955,13 +955,13 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item other->AddToHateList(this, hate, 0, false); } } - else + else TotalDmg = -5; - + other->Damage(this, TotalDmg, SPELL_UNKNOWN, ARCHERY); } } - + //try proc on hits and misses if((RangeWeapon != nullptr) && GetTarget() && other && (other->GetHP() > -10)) { @@ -975,11 +975,11 @@ void Mob::DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Item } } -void NPC::RangedAttack(Mob* other) +void NPC::RangedAttack(Mob* other) { //make sure the attack and ranged timers are up //if the ranged timer is disabled, then they have no ranged weapon and shouldent be attacking anyhow - if((attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check())) + if((attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check())) { mlog(COMBAT__RANGED, "Archery canceled. Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime()); return; @@ -1006,8 +1006,8 @@ void NPC::RangedAttack(Mob* other) return; } - if(!IsAttackAllowed(GetTarget()) || - IsCasting() || + if(!IsAttackAllowed(GetTarget()) || + IsCasting() || DivineAura() || IsStunned() || IsFeared() || @@ -1015,7 +1015,7 @@ void NPC::RangedAttack(Mob* other) (GetAppearance() == eaDead)){ return; } - + if(!ammo) { ammo = database.GetItem(8005); @@ -1023,17 +1023,17 @@ void NPC::RangedAttack(Mob* other) if(ammo) SendItemAnimation(GetTarget(), ammo, ARCHERY); - + // Face the Target FaceTarget(GetTarget()); - + // Hit? - if (!GetTarget()->CheckHitChance(this, ARCHERY, 13)) + if (!GetTarget()->CheckHitChance(this, ARCHERY, 13)) { mlog(COMBAT__RANGED, "Ranged attack missed %s.", GetTarget()->GetName()); GetTarget()->Damage(this, 0, SPELL_UNKNOWN, ARCHERY); - } - else + } + else { int16 WDmg = GetWeaponDamage(GetTarget(), weapon); int16 ADmg = GetWeaponDamage(GetTarget(), ammo); @@ -1041,7 +1041,7 @@ void NPC::RangedAttack(Mob* other) { mlog(COMBAT__RANGED, "Ranged attack hit %s.", GetTarget()->GetName()); int32 TotalDmg = 0; - + int32 MaxDmg = max_dmg * RuleR(Combat, ArcheryNPCMultiplier); // should add a field to npc_types int32 MinDmg = min_dmg * RuleR(Combat, ArcheryNPCMultiplier); @@ -1058,7 +1058,7 @@ void NPC::RangedAttack(Mob* other) GetTarget()->AddToHateList(this, hate, 0, false); GetTarget()->Damage(this, TotalDmg, SPELL_UNKNOWN, ARCHERY); } - else + else { GetTarget()->Damage(this, -5, SPELL_UNKNOWN, ARCHERY); } @@ -1111,12 +1111,12 @@ uint16 Mob::GetThrownDamage(int16 wDmg, int32& TotalDmg, int& minDmg) minDmg = 1; if(GetLevel() > 25) - { + { TotalDmg += ((GetLevel()-25)/3); minDmg += ((GetLevel()-25)/3); minDmg += minDmg * GetMeleeMinDamageMod_SE(THROWING) / 100; } - + if(MaxDmg < minDmg) MaxDmg = minDmg; @@ -1127,7 +1127,7 @@ uint16 Mob::GetThrownDamage(int16 wDmg, int32& TotalDmg, int& minDmg) void Client::ThrowingAttack(Mob* other) { //old was 51 //conditions to use an attack checked before we are called - + //make sure the attack and ranged timers are up //if the ranged timer is disabled, then they have no ranged weapon and shouldent be attacking anyhow if((attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check())) { @@ -1136,25 +1136,25 @@ void Client::ThrowingAttack(Mob* other) { //old was 51 //Message(0, "Error: Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime()); return; } - + int ammo_slot = SLOT_RANGE; const ItemInst* RangeWeapon = m_inv[SLOT_RANGE]; - + if (!RangeWeapon || !RangeWeapon->IsType(ItemClassCommon)) { mlog(COMBAT__RANGED, "Ranged attack canceled. Missing or invalid ranged weapon (%d) in slot %d", GetItemIDAt(SLOT_RANGE), SLOT_RANGE); Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing to throw!", GetItemIDAt(SLOT_RANGE)); return; } - + const Item_Struct* item = RangeWeapon->GetItem(); if(item->ItemType != ItemTypeThrowing && item->ItemType != ItemTypeThrowingv2) { mlog(COMBAT__RANGED, "Ranged attack canceled. Ranged item %d is not a throwing weapon. type %d.", item->ItemType); Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing useful to throw!", GetItemIDAt(SLOT_RANGE)); return; } - + mlog(COMBAT__RANGED, "Throwing %s (%d) at %s", item->Name, item->ID, GetTarget()->GetName()); - + if(RangeWeapon->GetCharges() == 1) { //first check ammo const ItemInst* AmmoItem = m_inv[SLOT_AMMO]; @@ -1174,7 +1174,7 @@ void Client::ThrowingAttack(Mob* other) { //old was 51 } } } - + int range = item->Range +50/*Fudge it a little, client will let you hit something at 0 0 0 when you are at 205 0 0*/; mlog(COMBAT__RANGED, "Calculated bow range to be %.1f", range); range *= range; @@ -1187,9 +1187,9 @@ void Client::ThrowingAttack(Mob* other) { //old was 51 return; } - if(!IsAttackAllowed(GetTarget()) || - IsCasting() || - IsSitting() || + if(!IsAttackAllowed(GetTarget()) || + IsCasting() || + IsSitting() || (DivineAura() && !GetGM()) || IsStunned() || IsFeared() || @@ -1199,13 +1199,13 @@ void Client::ThrowingAttack(Mob* other) { //old was 51 } //send item animation, also does the throw animation SendItemAnimation(GetTarget(), item, THROWING); - + DoThrowingAttackDmg(GetTarget(), RangeWeapon, item); - + //consume ammo DeleteItemInInventory(ammo_slot, 1, true); CheckIncreaseSkill(THROWING, GetTarget()); - + //break invis when you attack if(invisible) { mlog(COMBAT__ATTACKS, "Removing invisibility due to melee attack."); @@ -1255,7 +1255,7 @@ void Mob::DoThrowingAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Ite WDmg = GetWeaponDamage(other, item); else WDmg = weapon_damage; - + int32 TotalDmg = 0; if(WDmg > 0) @@ -1266,7 +1266,7 @@ void Mob::DoThrowingAttackDmg(Mob* other, const ItemInst* RangeWeapon, const Ite mlog(COMBAT__RANGED, "Item DMG %d. Max Damage %d. Hit for damage %d", WDmg, MaxDmg, TotalDmg); other->AvoidDamage(this, TotalDmg, false); //CanRiposte=false - Can not riposte throw attacks. other->MeleeMitigation(this, TotalDmg, minDmg); - if(TotalDmg > 0) + if(TotalDmg > 0) { TotalDmg += TotalDmg*focus/100; ApplyMeleeDamageBonus(THROWING, TotalDmg); @@ -1303,11 +1303,11 @@ void Mob::SendItemAnimation(Mob *to, const Item_Struct *item, SkillType skillInU as->skill = (uint8)skillInUse; strn0cpy(as->model_name, item->IDFile, 16); - + /* The angular field affects how the object flies towards the target. - A low angular (10) makes it circle the target widely, where a high + A low angular (10) makes it circle the target widely, where a high angular (20000) makes it go straight at them. The tilt field causes the object to be tilted flying through the air @@ -1323,13 +1323,13 @@ void Mob::SendItemAnimation(Mob *to, const Item_Struct *item, SkillType skillInU as->launch_angle = CalculateHeadingToTarget(to->GetX(), to->GetY()) * 2; as->tilt = 125; as->arc = 50; - - + + //fill in some unknowns, we dont know their meaning yet //neither of these seem to change the behavior any as->unknown088 = 125; as->unknown092 = 16; - + entity_list.QueueCloseClients(this, outapp); safe_delete(outapp); } @@ -1388,7 +1388,7 @@ void Mob::ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow, float speed as->arc = arc; as->unknown088 = 125; as->unknown092 = 16; - + entity_list.QueueCloseClients(this, outapp); safe_delete(outapp); @@ -1398,7 +1398,7 @@ void Mob::ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow, float speed void NPC::DoClassAttacks(Mob *target) { if(target == nullptr) return; //gotta have a target for all these - + bool taunt_time = taunt_timer.Check(); bool ca_time = classattack_timer.Check(false); bool ka_time = knightattack_timer.Check(false); @@ -1425,19 +1425,19 @@ void NPC::DoClassAttacks(Mob *target) { break; } } - knightattack_timer.Start(knightreuse); + knightattack_timer.Start(knightreuse); } - + //general stuff, for all classes.... //only gets used when their primary ability get used too if (taunting && HasOwner() && target->IsNPC() && target->GetBodyType() != BT_Undead && taunt_time) { this->GetOwner()->Message_StringID(MT_PetResponse, PET_TAUNTING); Taunt(target->CastToNPC(), false); } - + if(!ca_time) return; - + float HasteModifier = 0; if(GetHaste() > 0) HasteModifier = 10000 / (100 + GetHaste()); @@ -1530,7 +1530,7 @@ void NPC::DoClassAttacks(Mob *target) { int AtkRounds = 3; int32 max_dmg = 26 + ((GetLevel()-6) * 2); int32 min_dmg = 0; - DoAnim(anim2HSlashing); + DoAnim(anim2HSlashing); if (GetLevel() < 51) min_dmg = 1; @@ -1543,14 +1543,14 @@ void NPC::DoClassAttacks(Mob *target) { reuse = FrenzyReuseTime * 1000; while(AtkRounds > 0) { - + if (GetTarget() && (AtkRounds == 1 || MakeRandomInt(0,100) < 75)){ DoSpecialAttackDamage(GetTarget(), FRENZY, max_dmg, min_dmg, -1 , reuse, true); } AtkRounds--; } - + did_attack = true; break; } @@ -1606,7 +1606,7 @@ void NPC::DoClassAttacks(Mob *target) { break; } } - + classattack_timer.Start(reuse*HasteModifier/100); } @@ -1617,20 +1617,20 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) if(spellend_timer.Enabled() || IsFeared() || IsStunned() || IsMezzed() || DivineAura() || dead) return; - + if(!IsAttackAllowed(ca_target)) return; - + //check range for all these abilities, they are all close combat stuff if(!CombatRange(ca_target)) { return; } - + if(!IsRiposte && (!p_timers.Expired(&database, pTimerCombatAbility, false))) { return; } - + int ReuseTime = 0; int ClientHaste = GetHaste(); int HasteMod = 0; @@ -1644,7 +1644,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) int32 dmg = 0; uint16 skill_to_use = -1; - + if (skill == -1){ switch(GetClass()) @@ -1695,13 +1695,13 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) else skill_to_use = skill; - + if(skill_to_use == -1) return; - - if(skill_to_use == BASH) + + if(skill_to_use == BASH) { - if (ca_target!=this) + if (ca_target!=this) { DoAnim(animTailRake); @@ -1742,7 +1742,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) int skillmod = 100*GetSkill(FRENZY)/MaxSkill(FRENZY); int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); int32 min_dmg = 0; - DoAnim(anim2HSlashing); + DoAnim(anim2HSlashing); if (GetLevel() < 51) min_dmg = 1; @@ -1754,10 +1754,10 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) ReuseTime = FrenzyReuseTime-1; ReuseTime = (ReuseTime*HasteMod)/100; - + //Live parses show around 55% Triple 35% Double 10% Single, you will always get first hit. while(AtkRounds > 0) { - + if (GetTarget() && (AtkRounds == 1 || MakeRandomInt(0,100) < 75)){ DoSpecialAttackDamage(GetTarget(), FRENZY, max_dmg, min_dmg, max_dmg , ReuseTime, true); } @@ -1813,7 +1813,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) uint16 bDoubleSpecialAttack = itembonuses.DoubleSpecialAttack + spellbonuses.DoubleSpecialAttack + aabonuses.DoubleSpecialAttack; if( bDoubleSpecialAttack && (bDoubleSpecialAttack >= 100 || bDoubleSpecialAttack > MakeRandomInt(0,100))) { - int MonkSPA [5] = { FLYING_KICK, DRAGON_PUNCH, EAGLE_STRIKE, TIGER_CLAW, ROUND_KICK }; + int MonkSPA [5] = { FLYING_KICK, DRAGON_PUNCH, EAGLE_STRIKE, TIGER_CLAW, ROUND_KICK }; MonkSpecialAttack(ca_target, MonkSPA[MakeRandomInt(0,4)]); int TripleChance = 25; @@ -1826,7 +1826,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) } } } - + if(skill_to_use == BACKSTAB) { ReuseTime = BackstabReuseTime-1; @@ -1836,12 +1836,12 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) TryBackstab(ca_target,ReuseTime); } - + ReuseTime = (ReuseTime*HasteMod)/100; if(ReuseTime > 0 && !IsRiposte) { p_timers.Start(pTimerCombatAbility, ReuseTime); - } + } } /* @@ -1849,7 +1849,7 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { if (who == nullptr) return; - + if(DivineAura()) return; @@ -1858,14 +1858,14 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { if(!always_succeed && IsClient()) CastToClient()->CheckIncreaseSkill(TAUNT, who, 10); - + int level = GetLevel(); Mob *hate_top = who->GetHateMost(); - + // Check to see if we're already at the top of the target's hate list // a mob will not be taunted if its target's health is below 20% - if ((hate_top != this) - && (who->GetLevel() < level) + if ((hate_top != this) + && (who->GetLevel() < level) && (hate_top == nullptr || hate_top->GetHPRatio() >= 20) ) { int32 newhate, tauntvalue; @@ -1873,7 +1873,7 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { if(always_succeed) { tauntchance = 101; } else { - + // no idea how taunt success is actually calculated // TODO: chance for level 50+ mobs should be lower int level_difference = level - who->GetLevel(); @@ -1905,7 +1905,7 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { if (chance_bonus) tauntchance = tauntchance + (tauntchance*chance_bonus/100.0f); - + if (tauntchance > MakeRandomFloat(0, 100)) { // this is the max additional hate added per succesfull taunt tauntvalue = (MakeRandomInt(2, 4) * level); @@ -1920,7 +1920,7 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { who->CastToNPC()->AddToHateList(this, (MakeRandomInt(2, 4)*level)); } } - + //generate at least some hate reguardless of the outcome. who->CastToNPC()->AddToHateList(this, (MakeRandomInt(2, 4)*level)); if (HasSkillProcs()){ @@ -1934,7 +1934,7 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { if (who == nullptr) return; - + if(DivineAura()) return; @@ -1943,24 +1943,24 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { if(!always_succeed && IsClient()) CastToClient()->CheckIncreaseSkill(TAUNT, who, 10); - + Mob *hate_top = who->GetHateMost(); float level_difference = GetLevel() - who->GetLevel(); //Support for how taunt worked pre 2000 on LIVE - Can not taunt NPC over your level. if ((RuleB(Combat,TauntOverLevel) == false) && (level_difference < 0) || who->SpecAttacks[IMMUNE_TAUNT]){ - Message_StringID(MT_SpellFailure,FAILED_TAUNT); + Message_StringID(MT_SpellFailure,FAILED_TAUNT); return; } //All values used based on live parses after taunt was updated in 2006. if ((hate_top && hate_top->GetHPRatio() >= 20) || hate_top == nullptr) { - - int32 newhate = 0; - float tauntchance = 50.0f; - if(always_succeed) + int32 newhate = 0; + float tauntchance = 50.0f; + + if(always_succeed) tauntchance = 101.0f; else { @@ -1980,36 +1980,36 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { //TauntSkillFalloff rate is not based on any real data. Default of 33% gives a reasonable result. if (IsClient() && !always_succeed) - tauntchance -= (RuleR(Combat,TauntSkillFalloff) * (CastToClient()->MaxSkill(TAUNT) - GetSkill(TAUNT))); + tauntchance -= (RuleR(Combat,TauntSkillFalloff) * (CastToClient()->MaxSkill(TAUNT) - GetSkill(TAUNT))); - //From SE_Taunt (Does a taunt with a chance modifier) + //From SE_Taunt (Does a taunt with a chance modifier) if (chance_bonus) tauntchance += tauntchance*chance_bonus/100.0f; if (tauntchance < 1) tauntchance = 1.0f; - + tauntchance /= 100.0f; if (tauntchance > MakeRandomFloat(0, 1)) { - + if (hate_top && hate_top != this){ newhate = (who->GetNPCHate(hate_top) - who->GetNPCHate(this)) + 1; who->CastToNPC()->AddToHateList(this, newhate); } else who->CastToNPC()->AddToHateList(this,12); - + if (who->CanTalk()) - who->Say_StringID(SUCCESSFUL_TAUNT,GetCleanName()); + who->Say_StringID(SUCCESSFUL_TAUNT,GetCleanName()); } else{ - Message_StringID(MT_SpellFailure,FAILED_TAUNT); + Message_StringID(MT_SpellFailure,FAILED_TAUNT); } } else - Message_StringID(MT_SpellFailure,FAILED_TAUNT); + Message_StringID(MT_SpellFailure,FAILED_TAUNT); if (HasSkillProcs()){ float chance = (float)TauntReuseTime*RuleR(Combat, AvgProcsPerMinute)/60000.0f; @@ -2021,18 +2021,18 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus) { void Mob::InstillDoubt(Mob *who) { //make sure we can use this skill /*int skill = GetSkill(INTIMIDATION);*/ //unused - + //make sure our target is an NPC if(!who || !who->IsNPC()) return; - + if(DivineAura()) return; - + //range check if(!CombatRange(who)) return; - + if(IsClient()) { CastToClient()->CheckIncreaseSkill(INTIMIDATION, who, 10); @@ -2040,13 +2040,13 @@ void Mob::InstillDoubt(Mob *who) { //I think this formula needs work int value = 0; - + //user's bonus value += GetSkill(INTIMIDATION) + GetCHA()/4; - + //target's counters value -= target->GetLevel()*4 + who->GetWIS()/4; - + if (MakeRandomInt(0,99) < value) { //temporary hack... //cast fear on them... should prolly be a different spell @@ -2104,9 +2104,9 @@ void Mob::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skil uint32 hate = 0; int Hand = 13; if (hate == 0 && weapon_damage > 1) hate = weapon_damage; - + if(weapon_damage > 0){ - + if(GetClass() == BERSERKER){ int bonus = 3 + GetLevel()/10; weapon_damage = weapon_damage * (100+bonus) / 100; @@ -2156,7 +2156,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skil return; } } - + else damage = -5; @@ -2172,13 +2172,13 @@ void Mob::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skil } } } - + other->AddToHateList(this, hate); bool CanSkillProc = true; if (skillinuse == OFFENSE){ //Hack to allow damage to display. - skillinuse = TIGER_CLAW; //'strike' your opponent - Arbitrary choice for message. - CanSkillProc = false; //Disable skill procs + skillinuse = TIGER_CLAW; //'strike' your opponent - Arbitrary choice for message. + CanSkillProc = false; //Disable skill procs } other->Damage(this, damage, SPELL_UNKNOWN, skillinuse); @@ -2189,10 +2189,10 @@ void Mob::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skil if(aabonuses.SpecialAttackKBProc[0] && aabonuses.SpecialAttackKBProc[1] == skillinuse){ int kb_chance = 25; kb_chance += kb_chance*(100-aabonuses.SpecialAttackKBProc[0])/100; - + if (MakeRandomInt(0, 99) < kb_chance) SpellFinished(904, other, 10, 0, -1, spells[904].ResistDiff); - } + } if (CanSkillProc && HasSkillProcs()){ float chance = 10.0f*RuleR(Combat, AvgProcsPerMinute)/60000.0f; @@ -2207,13 +2207,13 @@ bool Mob::CanDoSpecialAttack(Mob *other) SetTarget(nullptr); return false; } - + if(!GetTarget()) SetTarget(other); - + if ((other == nullptr || ((IsClient() && CastToClient()->dead) || (other->IsClient() && other->CastToClient()->dead)) || HasDied() || (!IsAttackAllowed(other)))) { - return false; + return false; } if(other->GetInvul() || other->SpecAttacks[IMMUNE_MELEE]) diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 59c0b2404..831193f86 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -126,12 +126,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } #endif - if(buffslot >= 0) + if(buffslot >= 0) { buffs[buffslot].melee_rune = 0; buffs[buffslot].magic_rune = 0; buffs[buffslot].numhits = 0; - + if(IsClient() && CastToClient()->GetClientVersionBit() & BIT_UnderfootAndLater) { EQApplicationPacket *outapp = MakeBuffsPacket(false); @@ -157,11 +157,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) return true; } } - + if(spells[spell_id].viral_targets > 0) { - if(!viral_timer.Enabled()) + if(!viral_timer.Enabled()) viral_timer.Start(1000); - + has_virus = true; for(int i = 0; i < MAX_SPELL_TRIGGER*2; i+=2) { @@ -175,10 +175,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } if(spells[spell_id].numhits > 0 && buffslot >= 0){ - + int numhit = spells[spell_id].numhits; - - if (caster && caster->IsClient()) + + if (caster && caster->IsClient()) numhit += caster->CastToClient()->GetFocusEffect(focusIncreaseNumHits, spell_id); buffs[buffslot].numhits = numhit; } @@ -222,7 +222,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) { dmg = GetVulnerability(dmg, caster, spell_id, 0); dmg -= GetAdditionalDamage(caster, spell_id); - dmg = caster->GetActSpellDamage(spell_id, dmg); + dmg = caster->GetActSpellDamage(spell_id, dmg); } dmg = -dmg; Damage(caster, dmg, spell_id, spell.skill, false, buffslot, false); @@ -260,7 +260,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) caster->CastToClient()->SetFeigned(true); caster->SendAppearancePacket(AT_Anim, 115); } - } + } //do any AAs apply to these spells? if(dmg < 0) { @@ -349,7 +349,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) break; } - + case SE_CurrentManaOnce: { #ifdef SPELL_EFFECT_SPAM @@ -370,9 +370,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if(IsClient()) { - if(caster) + if(caster) CastToClient()->SendOPTranslocateConfirm(caster, spell_id); - + } break; } @@ -525,7 +525,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Invisibility to Animals"); #endif - invisible_animals = true; + invisible_animals = true; break; } @@ -535,10 +535,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Invisibility to Undead"); #endif - invisible_undead = true; + invisible_undead = true; break; } - case SE_SeeInvis: + case SE_SeeInvis: { #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "See Invisible"); @@ -546,7 +546,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) see_invis = spell.base[i]; break; } - + case SE_FleshToBone: { #ifdef SPELL_EFFECT_SPAM @@ -611,10 +611,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } } } - + else{ CastToClient()->EnableAAEffect(aaEffectWarcry , time); - Message(13, "You let loose a fierce war cry."); + Message(13, "You let loose a fierce war cry."); } break; @@ -644,27 +644,27 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if (max_level == 0) max_level = RuleI(Spells, BaseImmunityLevel); // NPCs get to ignore max_level for their spells. - if(SpecAttacks[UNSTUNABLE] || - ((GetLevel() > max_level) + if(SpecAttacks[UNSTUNABLE] || + ((GetLevel() > max_level) && caster && (!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))) { caster->Message_StringID(MT_SpellFailure, IMMUNE_STUN); } else { - int stun_resist = itembonuses.StunResist+spellbonuses.StunResist; - if(IsClient()) + int stun_resist = itembonuses.StunResist+spellbonuses.StunResist; + if(IsClient()) stun_resist += aabonuses.StunResist; - if(stun_resist <= 0 || MakeRandomInt(0,99) >= stun_resist) - { + if(stun_resist <= 0 || MakeRandomInt(0,99) >= stun_resist) + { mlog(COMBAT__HITS, "Stunned. We had %d percent resist chance.", stun_resist); - Stun(effect_value); + Stun(effect_value); } - else { - if(IsClient()) + else { + if(IsClient()) Message_StringID(MT_Stun, SHAKE_OFF_STUN); - + mlog(COMBAT__HITS, "Stun Resisted. We had %d percent resist chance.", stun_resist); } } @@ -729,7 +729,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) SendAppearancePacket(AT_Pet, caster->GetID(), true, true); } - if (IsClient()) + if (IsClient()) { AI_Start(); SendAppearancePacket(14, 100, true, true); @@ -771,7 +771,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if(IsClient()) { CastToClient()->SetSenseExemption(true); - + if(CastToClient()->GetClientVersionBit() & BIT_SoDAndLater) { bodyType bt = BT_Undead; @@ -828,12 +828,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } CalculateNewFearpoint(); - if(curfp) + if(curfp) { break; } - } - else + } + else { Stun(buffs[buffslot].ticsremaining * 6000 - (6000 - tic_timer.GetRemainingTime())); } @@ -853,7 +853,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) Action_Struct* action = (Action_Struct*) action_packet->pBuffer; EQApplicationPacket *message_packet = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); CombatDamage_Struct *cd = (CombatDamage_Struct *)message_packet->pBuffer; - + action->target = GetID(); action->source = caster ? caster->GetID() : GetID(); action->level = 65; @@ -902,7 +902,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) Action_Struct* action = (Action_Struct*) action_packet->pBuffer; EQApplicationPacket *message_packet = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); CombatDamage_Struct *cd = (CombatDamage_Struct *)message_packet->pBuffer; - + action->target = GetID(); action->source = caster ? caster->GetID() : GetID(); action->level = 65; @@ -938,7 +938,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) Action_Struct* action = (Action_Struct*) action_packet->pBuffer; EQApplicationPacket *message_packet = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); CombatDamage_Struct *cd = (CombatDamage_Struct *)message_packet->pBuffer; - + action->target = GetID(); action->source = caster ? caster->GetID() : GetID(); action->level = 65; @@ -976,7 +976,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) { #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Gate"); -#endif +#endif if(!spellbonuses.AntiGate) Gate(); break; @@ -987,11 +987,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Cancel Magic: %d", effect_value); #endif - if(SpecAttacks[UNDISPELLABLE]){ + if(SpecAttacks[UNDISPELLABLE]){ caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name); break; } - + uint32 buff_count = GetMaxTotalSlots(); for(int slot = 0; slot < buff_count; slot++) { if( buffs[slot].spellid != SPELL_UNKNOWN && @@ -1011,7 +1011,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Dispel Detrimental: %d", effect_value); #endif - if(SpecAttacks[UNDISPELLABLE]){ + if(SpecAttacks[UNDISPELLABLE]){ caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name); break; } @@ -1029,13 +1029,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } break; } - + case SE_DispelBeneficial: { #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Dispel Beneficial: %d", effect_value); #endif - if(SpecAttacks[UNDISPELLABLE]){ + if(SpecAttacks[UNDISPELLABLE]){ caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name); break; } @@ -1211,7 +1211,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) snprintf(effect_desc, _EDLEN, "Spell Absorb Rune: %+i", effect_value); #endif if(effect_value > 0) { - buffs[buffslot].magic_rune = effect_value; + buffs[buffslot].magic_rune = effect_value; SetHasSpellRune(true); } break; @@ -1253,10 +1253,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if(spell_id == 1732 || spell_id == 1731) { int specific_gender = -1; // Male - if(spell_id == 1732) + if(spell_id == 1732) specific_gender = 0; // Female - else if (spell_id == 1731) + else if (spell_id == 1731) specific_gender = 1; if(specific_gender > -1) { if(caster && caster->GetTarget()) { @@ -1273,9 +1273,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) else { if(caster && caster->GetTarget()) { int opposite_gender = 0; - if(caster->GetTarget()->GetGender() == 0) + if(caster->GetTarget()->GetGender() == 0) opposite_gender = 1; - + SendIllusionPacket ( caster->GetTarget()->GetRace(), @@ -1373,10 +1373,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) int max_level = spells[spell_id].max[i]; if(max_level == 0) max_level = RuleI(Spells, BaseImmunityLevel); // Default max is 55 level limit - + // NPCs ignore level limits in their spells - if(SpecAttacks[UNSTUNABLE] || - ((GetLevel() > max_level) + if(SpecAttacks[UNSTUNABLE] || + ((GetLevel() > max_level) && caster && (!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))) { caster->Message_StringID(MT_Shout, IMMUNE_STUN); @@ -1529,10 +1529,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #endif rooted = true; rooted_mod = 0; - + if (caster){ - rooted_mod = caster->aabonuses.RootBreakChance + - caster->itembonuses.RootBreakChance + + rooted_mod = caster->aabonuses.RootBreakChance + + caster->itembonuses.RootBreakChance + caster->spellbonuses.RootBreakChance; } @@ -1557,7 +1557,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) snprintf(effect_desc, _EDLEN, "Summon Corpse: %d", effect_value); #endif // can only summon corpses of clients - if(!IsNPC()) { + if(!IsNPC()) { Client* TargetClient = 0; if(this->GetTarget()) TargetClient = this->GetTarget()->CastToClient(); @@ -1601,7 +1601,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) Message_StringID(4, SUMMONING_CORPSE, TargetClient->CastToMob()->GetCleanName()); else Message_StringID(4, SUMMONING_CORPSE_OTHER, TargetClient->CastToMob()->GetCleanName()); - + corpse->Summon(CastToClient(), true, true); } else { @@ -1653,7 +1653,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #endif if(buffslot >= 0) buffs[buffslot].numhits = effect_value; - break; + break; } case SE_AppraiseLDonChest: { @@ -1675,7 +1675,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) caster->CastToClient()->HandleLDoNSenseTraps(CastToNPC(), check, LDoNTypeMagical); } } - } + } break; } @@ -1699,7 +1699,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) caster->CastToClient()->HandleLDoNDisarm(CastToNPC(), check, LDoNTypeMagical); } } - } + } break; } @@ -1723,10 +1723,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) caster->CastToClient()->HandleLDoNPickLock(CastToNPC(), check, LDoNTypeMagical); } } - } + } break; } - + case SE_Lull: { #ifdef SPELL_EFFECT_SPAM @@ -1735,7 +1735,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) // TODO: check vs. CHA when harmony effect failed, if caster is to be added to hatelist break; } - + case SE_PoisonCounter: { #ifdef SPELL_EFFECT_SPAM @@ -1837,7 +1837,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } break; } - + case SE_CorruptionCounter: { #ifdef SPELL_EFFECT_SPAM @@ -1989,7 +1989,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) Silence(true); break; } - + case SE_Amnesia: { #ifdef SPELL_EFFECT_SPAM @@ -2011,7 +2011,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } break; } - + case SE_StackingCommand_Block: case SE_StackingCommand_Overwrite: { @@ -2062,29 +2062,29 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) AddRangedProc(procid, spells[spell_id].base2[i]+100, spell_id); break; } - + case SE_Rampage: { #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Rampage"); #endif - if(caster) + if(caster) entity_list.AEAttack(caster, 30, 13, 0, true); // on live wars dont get a duration ramp, its a one shot deal break; } - + case SE_AEMelee: { #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Duration Rampage"); #endif - if (caster && caster->IsClient()) { // will tidy this up later so that NPCs can duration ramp from spells too + if (caster && caster->IsClient()) { // will tidy this up later so that NPCs can duration ramp from spells too CastToClient()->DurationRampage(effect_value*12); } break; } - + case SE_AETaunt://Dook- slapped it in the spell effect so client does the animations { // and incase there are similar spells we havent found yet #ifdef SPELL_EFFECT_SPAM @@ -2115,12 +2115,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) { case THROWING: caster->DoThrowingAttackDmg(this, nullptr, nullptr, spells[spell_id].base[i],spells[spell_id].base2[i], focus); - break; - + break; + case ARCHERY: caster->DoArcheryAttackDmg(this, nullptr, nullptr, spells[spell_id].base[i],spells[spell_id].base2[i],focus); break; - + default: caster->DoMeleeSkillAttackDmg(this, spells[spell_id].base[i], spells[spell_id].skill, spells[spell_id].base2[i], focus); break; @@ -2147,7 +2147,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) break; } - case SE_Doppelganger: + case SE_Doppelganger: { if(caster && caster->IsClient()) { char pet_name[64]; @@ -2170,7 +2170,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) else AddDefensiveProc(procid, spells[spell_id].base2[i]+100,spell_id); break; - + break; } @@ -2294,11 +2294,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) uint8 BonusChance = 0; if(caster) { - BonusChance = caster->aabonuses.UnfailingDivinity + - caster->itembonuses.UnfailingDivinity + + BonusChance = caster->aabonuses.UnfailingDivinity + + caster->itembonuses.UnfailingDivinity + caster->spellbonuses.UnfailingDivinity; } - + #ifdef SPELL_EFFECT_SPAM //snprintf(effect_desc, _EDLEN, "Death Save Chance: %+i", SuccessChance); #endif @@ -2306,7 +2306,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) //buffs[buffslot].deathsaveCasterAARank = caster->GetAA(aaUnfailingDivinity); buffs[buffslot].deathsaveCasterAARank = BonusChance; //SetDeathSaveChance(true); - + break; } @@ -2334,7 +2334,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) break; } - + case SE_Forceful_Rejuv: { if(IsClient()) { @@ -2348,25 +2348,25 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } break; } - + case SE_HealGroupFromMana: { if(!caster) break; if(!caster->IsClient()) break; - + uint32 max_mana = spell.base[i]; - int ratio = spell.base2[i]; + int ratio = spell.base2[i]; uint32 heal_amt = 0; - + if (caster->GetMana() <= max_mana){ - heal_amt = ratio*caster->GetMana()/10; + heal_amt = ratio*caster->GetMana()/10; caster->SetMana(0); } else { - heal_amt = ratio*max_mana/10; + heal_amt = ratio*max_mana/10; caster->SetMana(caster->GetMana() - max_mana); } @@ -2392,7 +2392,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) g->HealGroup(heal_amt, caster); break; } - + case SE_ManaDrainWithDmg: { int mana_damage = 0; @@ -2410,7 +2410,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } break; } - + case SE_EndDrainWithDmg: { if(IsClient()) { @@ -2430,13 +2430,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } break; } - + case SE_SetBodyType: { SetBodyType((bodyType)spell.base[i], false); break; } - + case SE_Leap: { // These effects remove lev and only work a certain distance away. @@ -2450,25 +2450,25 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) float target_z = GetZ(); if ((CalculateDistance(my_x, my_y, my_z) > 10) && (CalculateDistance(my_x, my_y, my_z) < 75) && - (caster->CheckLosFN(caster->GetTarget()))) + (caster->CheckLosFN(caster->GetTarget()))) { float value, x_vector, y_vector, hypot; - + value = (float)spell.base[i]; // distance away from target x_vector = target_x - my_x; y_vector = target_y - my_y; hypot = sqrt(x_vector*x_vector + y_vector*y_vector); - + x_vector /= hypot; y_vector /= hypot; - + my_x = target_x - (x_vector * value); my_y = target_y - (y_vector * value); - + float new_ground = GetGroundZ(my_x, my_y); - - if(caster->IsClient()) + + if(caster->IsClient()) caster->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), my_x, my_y, new_ground, GetHeading()*2); else caster->GMMove(my_x, my_y, new_ground, GetHeading()); @@ -2480,7 +2480,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) { if(caster && caster->GetPet()) caster->spellbonuses.VoiceGraft = caster->GetPetID(); - + break; } @@ -2489,18 +2489,18 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) uint32 max_mana = spell.base[i]; int ratio = spell.base2[i]; int32 dmg = 0; - + if (caster){ if (caster->GetMana() <= max_mana){ - dmg = ratio*caster->GetMana()/10; + dmg = ratio*caster->GetMana()/10; caster->SetMana(0); } else { - dmg = ratio*max_mana/10; + dmg = ratio*max_mana/10; caster->SetMana(caster->GetMana() - max_mana); } - + if(IsDetrimentalSpell(spell_id)) { dmg = -dmg; Damage(caster, dmg, spell_id, spell.skill, false, buffslot, false); @@ -2509,9 +2509,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } } } - + case SE_Taunt: - { + { if (IsNPC()) caster->Taunt(this->CastToNPC(), false, spell.base[i]); } @@ -2519,7 +2519,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) case SE_Purify: { /* - Guessing as to exactly how this effect works. + Guessing as to exactly how this effect works. All spells that utilize it 'remove all determental effects' with a value of (20). Lets assume the value determines how many determental effects can be removed. @@ -2654,7 +2654,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) case SE_SpellTrigger: case SE_ApplyEffect: case SE_Twincast: - case SE_DelayDeath: + case SE_DelayDeath: case SE_InterruptCasting: case SE_ImprovedSpellEffect: case SE_BossSpellTrigger: @@ -2671,7 +2671,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) case SE_CriticalHealOverTime: case SE_CriticalDoTChance: case SE_SpellOnKill: - case SE_SpellOnKill2: + case SE_SpellOnKill2: case SE_CriticalDamageMob: case SE_LimitSpellGroup: case SE_ResistCorruption: @@ -2773,7 +2773,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) int Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level, Mob *caster, int ticsremaining) { int formula, base, max, effect_value; - + if ( !IsValidSpell(spell_id) || @@ -3013,11 +3013,11 @@ void Mob::BuffProcess() if(!zone->BuffTimersSuspended() || IsDetrimentalSpell(buffs[buffs_i].spellid)) { --buffs[buffs_i].ticsremaining; - + if (buffs[buffs_i].ticsremaining == 0) { - if (!IsShortDurationBuff(buffs[buffs_i].spellid) || - IsFearSpell(buffs[buffs_i].spellid) || - IsCharmSpell(buffs[buffs_i].spellid) || + if (!IsShortDurationBuff(buffs[buffs_i].spellid) || + IsFearSpell(buffs[buffs_i].spellid) || + IsCharmSpell(buffs[buffs_i].spellid) || IsMezSpell(buffs[buffs_i].spellid) || IsBlindSpell(buffs[buffs_i].spellid)) { @@ -3082,7 +3082,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M return; } } - + // Check for non buff spell effects to fade // AE melee effects if(IsClient()) @@ -3106,7 +3106,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M if (caster && caster->IsClient() && IsDetrimentalSpell(spell_id) && effect_value < 0) { effect_value = GetVulnerability(effect_value, caster, spell_id, ticsremaining); effect_value = caster->CastToClient()->GetActDoTDamage(spell_id, effect_value); - + if (!caster->CastToClient()->GetFeigned()) AddToHateList(caster, -effect_value); } @@ -3215,7 +3215,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M } case SE_Hunger: { - // this procedure gets called 7 times for every once that the stamina update occurs so we add 1/7 of the subtraction. + // this procedure gets called 7 times for every once that the stamina update occurs so we add 1/7 of the subtraction. // It's far from perfect, but works without any unnecessary buff checks to bog down the server. if(IsClient()) { CastToClient()->m_pp.hunger_level += 5; @@ -3258,7 +3258,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M break; } case SE_InterruptCasting: - { + { if(IsCasting()) { if(MakeRandomInt(0, 100) <= spells[spell_id].base[i]) @@ -3273,7 +3273,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M case SE_BossSpellTrigger: case SE_CastOnWearoff: { - if (ticsremaining == 1) + if (ticsremaining == 1) { SpellOnTarget(spells[spell_id].base[i], this); } @@ -3295,7 +3295,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M //CalcBonuses(); CalcSpellBonuses(&spellbonuses); CalcMaxHP(); - } + } break; } default: @@ -3319,7 +3319,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) CastToClient()->MakeBuffFadePacket(buffs[slot].spellid, slot); mlog(SPELLS__BUFFS, "Fading buff %d from slot %d", buffs[slot].spellid, slot); - + if(spells[buffs[slot].spellid].viral_targets > 0) { bool last_virus = true; for(int i = 0; i < MAX_SPELL_TRIGGER*2; i+=2) @@ -3443,8 +3443,8 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) invisible_animals = false; break; } - - case SE_SeeInvis: + + case SE_SeeInvis: { see_invis = 0; break; @@ -3592,9 +3592,9 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) { CastToClient()->SetBindSightTarget(nullptr); } - break; + break; } - + case SE_SetBodyType: { SetBodyType(GetOrigBodyType(), false); @@ -3626,7 +3626,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) } else if(my_c->IsKnockBackExempted()) { - //still potential to trigger this if you're knocked back off a + //still potential to trigger this if you're knocked back off a //HUGE fall that takes > 2.5 seconds if(speed > 30.0f) { @@ -3701,26 +3701,26 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) } /* No longer used. -int16 Client::CalcAAFocusEffect(focusType type, uint16 focus_spell, uint16 spell_id) +int16 Client::CalcAAFocusEffect(focusType type, uint16 focus_spell, uint16 spell_id) { uint32 slots = 0; uint32 aa_AA = 0; uint32 aa_value = 0; - + int32 value = 0; // Iterate through all of the client's AAs - for (int i = 0; i < MAX_PP_AA_ARRAY; i++) - { + for (int i = 0; i < MAX_PP_AA_ARRAY; i++) + { aa_AA = this->aa[i]->AA; aa_value = this->aa[i]->value; - if (aa_AA > 0 || aa_value > 0) - { + if (aa_AA > 0 || aa_value > 0) + { slots = zone->GetTotalAALevels(aa_AA); if (slots > 0) for(int j = 1;j <= slots; j++) { switch (aa_effects[aa_AA][j].skill_id) - { + { case SE_TriggerOnCast: // If focus_spell matches the spell listed in the DB, load these restrictions if(type == focusTriggerOnCast && focus_spell == aa_effects[aa_AA][j].base1) @@ -3735,10 +3735,10 @@ int16 Client::CalcAAFocusEffect(focusType type, uint16 focus_spell, uint16 spell */ -int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) +int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) { const SPDat_Spell_Struct &spell = spells[spell_id]; - + int16 value = 0; int lvlModifier = 100; int spell_level = 0; @@ -3759,17 +3759,17 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) return 0; } - for (map::const_iterator iter = aa_effects[aa_ID].begin(); iter != aa_effects[aa_ID].end(); ++iter) + for (map::const_iterator iter = aa_effects[aa_ID].begin(); iter != aa_effects[aa_ID].end(); ++iter) { effect = iter->second.skill_id; base1 = iter->second.base1; base2 = iter->second.base2; slot = iter->second.slot; - + //AA Foci's can contain multiple focus effects within the same AA. //To handle this we will not automatically return zero if a limit is found. //Instead if limit is found and multiple effects, we will reset the limit check - //when the next valid focus effect is found. + //when the next valid focus effect is found. if (IsFocusEffect(0, 0, true,effect) || (effect == SE_TriggerOnCast)){ FocusCount++; //If limit found on prior check next, else end loop. @@ -3784,13 +3784,13 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) } } } - + switch (effect) { case SE_Blank: break; - + //Handle Focus Limits case SE_LimitResist: if(base1) @@ -3808,14 +3808,14 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) lvldiff = spell_level - base1; //every level over cap reduces the effect by base2 percent unless from a clicky when ItemCastsUseFocus is true if(lvldiff > 0 && (spell_level <= RuleI(Character, MaxLevel) || RuleB(Character, ItemCastsUseFocus) == false)) - { + { if(base2 > 0) { lvlModifier -= base2*lvldiff; if(lvlModifier < 1) LimitFound = true; } - else { + else { LimitFound = true; } } @@ -3830,10 +3830,10 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) break; case SE_LimitSpell: // Exclude spell(any but this) - if(base1 < 0) { + if(base1 < 0) { if (spell_id == (base1*-1)) LimitFound = true; - } + } else { // Include Spell(only this) if (spell_id != base1) @@ -3852,7 +3852,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) } else { // Include effect(only this) - if(!IsEffectInSpell(spell_id,base1)) + if(!IsEffectInSpell(spell_id,base1)) LimitFound = true; } break; @@ -3869,16 +3869,16 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) break; } break; - + case SE_LimitManaCost: if(spell.mana < base1) LimitFound = true; break; - + case SE_LimitTarget: // Exclude if(base1 < 0){ - if(-base1 == spell.targettype) + if(-base1 == spell.targettype) LimitFound = true; } // Include @@ -3887,7 +3887,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) LimitFound = true; } break; - + case SE_CombatSkills: // 1 is for disciplines only if(base1 == 1 && !IsDiscipline(spell_id)) @@ -3896,15 +3896,15 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) else if(base1 == 0 && IsDiscipline(spell_id)) LimitFound = true; break; - + case SE_LimitSpellGroup: if(base1 > 0 && base1 != spell.spellgroup) LimitFound = true; else if(base1 < 0 && base1 == spell.spellgroup) LimitFound = true; break; - - + + case SE_LimitSpellSkill: LimitSpellSkill = true; if(base1 == spell.skill) @@ -3914,30 +3914,30 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) case SE_LimitExcludeSkill:{ int16 spell_skill = spell.skill * -1; if(base1 == spell_skill) - LimitFound = true; + LimitFound = true; break; } case SE_LimitClass: //Do not use this limit more then once per spell. If multiple class, treat value like items would. if (!PassLimitClass(base1, GetClass())) - LimitFound = true; + LimitFound = true; break; - - + + //Handle Focus Effects case SE_ImprovedDamage: if (type == focusImprovedDamage && base1 > value) value = base1; break; - + case SE_ImprovedHeal: - if (type == focusImprovedHeal && base1 > value) - value = base1; + if (type == focusImprovedHeal && base1 > value) + value = base1; break; - + case SE_ReduceManaCost: - if (type == focusManaCost ) + if (type == focusManaCost ) value = base1; break; @@ -3945,42 +3945,42 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) if (type == focusSpellHaste && base1 > value) value = base1; break; - + case SE_IncreaseSpellDuration: if (type == focusSpellDuration && base1 > value) value = base1; break; - + case SE_SpellDurationIncByTic: if (type == focusSpellDurByTic && base1 > value) value = base1; - break; - + break; + case SE_SwarmPetDuration: if (type == focusSwarmPetDuration && base1 > value) value = base1; - break; - + break; + case SE_IncreaseRange: if (type == focusRange && base1 > value) value = base1; break; - + case SE_ReduceReagentCost: if (type == focusReagentCost && base1 > value) value = base1; break; - + case SE_PetPowerIncrease: if (type == focusPetPower && base1 > value) value = base1; break; - + case SE_SpellResistReduction: if (type == focusResistRate && base1 > value) value = base1; break; - + case SE_SpellHateMod: if (type == focusSpellHateMod) { @@ -4005,12 +4005,12 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) value = base1; } break; - + case SE_ReduceReuseTimer: - { + { if(type == focusReduceRecastTime) value = base1 / 1000; - + break; } @@ -4021,7 +4021,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) if(MakeRandomInt(0, 100) <= base1){ value = base2; } - + else{ value = 0; LimitFound = true; @@ -4041,7 +4041,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) { if(type == focusBlockNextSpell) { - if(MakeRandomInt(1, 100) <= base1) + if(MakeRandomInt(1, 100) <= base1) value = 1; } break; @@ -4050,7 +4050,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) { if(type == focusTwincast) { - value = base1; + value = base1; } break; } @@ -4060,14 +4060,14 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) { if(type == focusSympatheticProc) { - float ProcChance, ProcBonus; + float ProcChance, ProcBonus; int16 ProcRateMod = base1; //Baseline is 100 for most Sympathetic foci int32 cast_time = GetActSpellCasttime(spell_id, spells[spell_id].cast_time); GetSympatheticProcChances(ProcBonus, ProcChance, cast_time, ProcRateMod); if(MakeRandomFloat(0, 1) <= ProcChance) value = focus_id; - + else value = 0; } @@ -4156,7 +4156,7 @@ int16 Client::CalcAAFocus(focusType type, uint32 aa_ID, uint16 spell_id) //Check for spell skill limits. if ((LimitSpellSkill) && (!SpellSkill_Found)) return 0; - + } } @@ -4297,7 +4297,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo if(spell.mana < focus_spell.base[i]) return 0; break; - + case SE_LimitTarget: // Exclude if((focus_spell.base[i] < 0) && -focus_spell.base[i] == spell.targettype) @@ -4307,7 +4307,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo return 0; break; - + case SE_CombatSkills: // 1 is for disciplines only if(focus_spell.base[i] == 1 && !IsDiscipline(spell_id)) @@ -4316,7 +4316,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo else if(focus_spell.base[i] == 0 && IsDiscipline(spell_id)) return 0; break; - + case SE_LimitSpellGroup: if(focus_spell.base[i] > 0 && focus_spell.base[i] != spell.spellgroup) return 0; @@ -4333,14 +4333,14 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo case SE_LimitExcludeSkill:{ int16 spell_skill = spell.skill * -1; if(focus_spell.base[i] == spell_skill) - return 0; + return 0; break; } case SE_LimitClass: //Do not use this limit more then once per spell. If multiple class, treat value like items would. if (!PassLimitClass(focus_spell.base[i], GetClass())) - return 0; + return 0; break; //handle effects @@ -4421,13 +4421,13 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo { value = focus_spell.base[i]; } - break; + break; case SE_SwarmPetDuration: if (type == focusSwarmPetDuration && focus_spell.base[i] > value) { value = focus_spell.base[i]; } - break; + break; case SE_IncreaseRange: if (type == focusRange && focus_spell.base[i] > value) { @@ -4476,25 +4476,25 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo value = focus_spell.base[i]; } break; - + case SE_ReduceReuseTimer: - { + { if(type == focusReduceRecastTime) value = focus_spell.base[i] / 1000; - + break; } case SE_TriggerOnCast: { if(type == focusTriggerOnCast) - + if(MakeRandomInt(0, 100) <= focus_spell.base[i]) value = focus_spell.base2[i]; - + else value = 0; - + break; } case SE_SpellVulnerability: @@ -4509,7 +4509,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo { if(type == focusBlockNextSpell) { - if(MakeRandomInt(1, 100) <= focus_spell.base[i]) + if(MakeRandomInt(1, 100) <= focus_spell.base[i]) value = 1; } break; @@ -4518,7 +4518,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo { if(type == focusTwincast) { - value = focus_spell.base[i]; + value = focus_spell.base[i]; } break; } @@ -4526,14 +4526,14 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo { if(type == focusSympatheticProc) { - float ProcChance, ProcBonus; + float ProcChance, ProcBonus; int16 ProcRateMod = focus_spell.base[i]; //Baseline is 100 for most Sympathetic foci int32 cast_time = GetActSpellCasttime(spell_id, spells[spell_id].cast_time); GetSympatheticProcChances(ProcBonus, ProcChance, cast_time, ProcRateMod); if(MakeRandomFloat(0, 1) <= ProcChance) value = focus_id; - + else value = 0; } @@ -4637,31 +4637,31 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { if (IsBardSong(spell_id)) return 0; - + uint16 proc_spellid = 0; uint8 SizeProcList = 0; uint8 MAX_SYMPATHETIC = 10; - + vector SympatheticProcList; //item focus if (itembonuses.FocusEffects[type]){ const Item_Struct* TempItem = 0; - + for(int x=0; x<=21; x++) { if (SizeProcList > MAX_SYMPATHETIC) continue; - + TempItem = nullptr; ItemInst* ins = GetInv().GetItem(x); if (!ins) continue; TempItem = ins->GetItem(); if (TempItem && TempItem->Focus.Effect > 0 && TempItem->Focus.Effect != SPELL_UNKNOWN) { - - proc_spellid = CalcFocusEffect(type, TempItem->Focus.Effect, spell_id); + + proc_spellid = CalcFocusEffect(type, TempItem->Focus.Effect, spell_id); if (proc_spellid > 0) { @@ -4669,12 +4669,12 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { SizeProcList = SympatheticProcList.size(); } } - + for(int y = 0; y < MAX_AUGMENT_SLOTS; ++y) { if (SizeProcList > MAX_SYMPATHETIC) continue; - + ItemInst *aug = nullptr; aug = ins->GetAugment(y); if(aug) @@ -4683,7 +4683,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { if (TempItemAug && TempItemAug->Focus.Effect > 0 && TempItemAug->Focus.Effect != SPELL_UNKNOWN) { proc_spellid = CalcFocusEffect(type, TempItemAug->Focus.Effect, spell_id); - + if (proc_spellid > 0) { SympatheticProcList.push_back(proc_spellid); @@ -4701,29 +4701,29 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { uint16 focusspellid = 0; uint32 buff_max = GetMaxTotalSlots(); for (buff_slot = 0; buff_slot < buff_max; buff_slot++) { - + if (SizeProcList > MAX_SYMPATHETIC) continue; - + focusspellid = buffs[buff_slot].spellid; if (focusspellid == 0 || focusspellid >= SPDAT_RECORDS) continue; - + proc_spellid = CalcFocusEffect(type, focusspellid, spell_id); - + if (proc_spellid > 0) { - SympatheticProcList.push_back(proc_spellid); + SympatheticProcList.push_back(proc_spellid); SizeProcList = SympatheticProcList.size(); } } } - if (SizeProcList > 0) + if (SizeProcList > 0) { uint8 random = MakeRandomInt(0, SizeProcList-1); int FinalSympatheticProc = SympatheticProcList[random]; - SympatheticProcList.clear(); + SympatheticProcList.clear(); return FinalSympatheticProc; } @@ -4734,7 +4734,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { if (IsBardSong(spell_id) && type != focusSpellEffectiveness) return 0; - + int16 realTotal = 0; int16 realTotal2 = 0; int16 realTotal3 = 0; @@ -4743,7 +4743,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { //Improved Healing, Damage & Mana Reduction are handled differently in that some are random percentages //In these cases we need to find the most powerful effect, so that each piece of gear wont get its own chance if((type == focusManaCost || type == focusImprovedHeal || type == focusImprovedDamage) - && RuleB(Spells, LiveLikeFocusEffects)) + && RuleB(Spells, LiveLikeFocusEffects)) { rand_effectiveness = true; } @@ -4792,7 +4792,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { } } } - + for(int y = 0; y < MAX_AUGMENT_SLOTS; ++y) { ItemInst *aug = nullptr; @@ -4829,7 +4829,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { } } } - + //Tribute Focus for(int x = TRIBUTE_SLOT_START; x < (TRIBUTE_SLOT_START + MAX_PLAYER_TRIBUTES); ++x) { @@ -4866,14 +4866,14 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { } } } - + if(UsedItem && rand_effectiveness && focus_max_real != 0) realTotal = CalcFocusEffect(type, UsedFocusID, spell_id); - - if (realTotal != 0 && UsedItem) + + if (realTotal != 0 && UsedItem) Message_StringID(MT_Spells, BEGINS_TO_GLOW, UsedItem->Name); } - + //Check if spell focus effect exists for the client. if (spellbonuses.FocusEffects[type]){ @@ -4881,7 +4881,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { int16 Total2 = 0; int16 focus_max2 = 0; int16 focus_max_real2 = 0; - + int buff_tracker = -1; int buff_slot = 0; uint16 focusspellid = 0; @@ -4891,7 +4891,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { focusspellid = buffs[buff_slot].spellid; if (focusspellid == 0 || focusspellid >= SPDAT_RECORDS) continue; - + if(rand_effectiveness) { focus_max2 = CalcFocusEffect(type, focusspellid, spell_id, true); if (focus_max2 > 0 && focus_max_real2 >= 0 && focus_max2 > focus_max_real2) { @@ -4917,17 +4917,17 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { } } } - + if(focusspell_tracker && rand_effectiveness && focus_max_real2 != 0) realTotal2 = CalcFocusEffect(type, focusspell_tracker, spell_id); - + // For effects like gift of mana that only fire once, save the spellid into an array that consists of all available buff slots. if(buff_tracker >= 0 && buffs[buff_tracker].numhits > 0) { m_spellHitsLeft[buff_tracker] = focusspell_tracker; } } - - + + // AA Focus if (aabonuses.FocusEffects[type]){ @@ -4935,18 +4935,18 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { uint32 slots = 0; uint32 aa_AA = 0; uint32 aa_value = 0; - - for (int i = 0; i < MAX_PP_AA_ARRAY; i++) + + for (int i = 0; i < MAX_PP_AA_ARRAY; i++) { aa_AA = this->aa[i]->AA; aa_value = this->aa[i]->value; - if (aa_AA < 1 || aa_value < 1) + if (aa_AA < 1 || aa_value < 1) continue; - + Total3 = CalcAAFocus(type, aa_AA, spell_id); if (Total3 > 0 && realTotal3 >= 0 && Total3 > realTotal3) { realTotal3 = Total3; - } + } else if (Total3 < 0 && Total3 < realTotal3) { realTotal3 = Total3; } @@ -4960,13 +4960,13 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { return 0; //Summon Spells that require reagents are typically imbue type spells, enchant metal, sacrifice and shouldn't be affected //by reagent conservation for obvious reasons. - + return realTotal + realTotal2 + realTotal3; } bool Mob::CheckHitsRemaining(uint32 buff_slot, bool when_spell_done, bool negate, uint16 type, uint16 spell_id,bool use_skill,uint16 skill) { - bool bDepleted = false; + bool bDepleted = false; //Effects: Cast: SE_ResistSpellChance, SE_Reflect, SE_SpellDamageShield //Effects: Attack: SE_MeleeLifetap : SE_DamageShield, SE_AvoidMeleeChance, SE_SkillProc //Effects: Skill: SE_DamageModifier, SE_SkillDamageTaken, SE_SkillDamageAmount, SE_HitChance @@ -4986,7 +4986,7 @@ bool Mob::CheckHitsRemaining(uint32 buff_slot, bool when_spell_done, bool negate else{ bDepleted = false; for (int j = 0; j < EFFECT_COUNT; j++) { - if (bDepleted) + if (bDepleted) continue; if ((buffs[d].spellid != SPELL_UNKNOWN) && (spells[buffs[d].spellid].effectid[j] == type)) { if(spells[buffs[d].spellid].base2[j] == -1 || spells[buffs[d].spellid].base2[j] == skill) { @@ -5081,7 +5081,7 @@ uint16 Mob::GetProcID(uint16 spell_id, uint8 effect_index) { other = true; } } - + if(sk && !other) { return(spells[spell_id].base[effect_index] + 1); @@ -5091,7 +5091,7 @@ uint16 Mob::GetProcID(uint16 spell_id, uint8 effect_index) { } } -bool Mob::TryDivineSave() +bool Mob::TryDivineSave() { /* How Touch of the Divine AA works: @@ -5106,8 +5106,8 @@ bool Mob::TryDivineSave() { SetHP(1); - uint16 EffectsToTry[] = - { + uint16 EffectsToTry[] = + { aabonuses.DivineSaveChance[1], itembonuses.DivineSaveChance[1], spellbonuses.DivineSaveChance[1] @@ -5133,13 +5133,13 @@ bool Mob::TryDivineSave() bool Mob::TryDeathSave() { /* - How Death Save works: + How Death Save works: -Chance for Death Save to fire is the same for Death Pact/Divine Intervention -Base value of these determines amount healed (1=partial(300HP), 2='full (8000HP)) HARD CODED -Charisma of client who has the effect determines fire rate, parses show this clearly with ratio used. -Unfailing Divinity AA - Allows for a chance to give a heal for a percentage of the orginal value - when your innate chance fails and removes the buff. The spell effect for Unfailing Divinity gives - the a value of a heal modifier of the base effects heal. + when your innate chance fails and removes the buff. The spell effect for Unfailing Divinity gives + the a value of a heal modifier of the base effects heal. Ie. Divine Intervention is 8000 HP Max UD1=20, therefore heal is 8000*20/100 -No evidence of chance rate increasing between UD1-3, numbers indicate it uses same CHA rate as first DI. -In later expansions this SE_DeathSave was given a level limit and a heal value in its effect data. @@ -5160,9 +5160,9 @@ bool Mob::TryDeathSave() { SuccessChance = 95; if(SuccessChance >= MakeRandomInt(0, 100)) { - - if(spellbonuses.DeathSave[0] == 2) - HealAmt = RuleI(Spells, DivineInterventionHeal); //8000HP is how much LIVE Divine Intervention max heals + + if(spellbonuses.DeathSave[0] == 2) + HealAmt = RuleI(Spells, DivineInterventionHeal); //8000HP is how much LIVE Divine Intervention max heals //Check if bonus Heal amount can be applied ([3] Bonus Heal [2] Level limit) if (spellbonuses.DeathSave[3] && (GetLevel() >= spellbonuses.DeathSave[2])) @@ -5174,9 +5174,9 @@ bool Mob::TryDeathSave() { SetHP((GetHP()+HealAmt)); Message(263, "The gods have healed you for %i points of damage.", HealAmt); - if(spellbonuses.DeathSave[0] == 2) + if(spellbonuses.DeathSave[0] == 2) entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DIVINE_INTERVENTION, GetCleanName()); - else + else entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DEATH_PACT, GetCleanName()); SendHPUpdate(); @@ -5191,9 +5191,9 @@ bool Mob::TryDeathSave() { SuccessChance = 95; if(SuccessChance >= MakeRandomInt(0, 100)) { - - if(spellbonuses.DeathSave[0] == 2) - HealAmt = RuleI(Spells, DivineInterventionHeal); + + if(spellbonuses.DeathSave[0] == 2) + HealAmt = RuleI(Spells, DivineInterventionHeal); //Check if bonus Heal amount can be applied ([3] Bonus Heal [2] Level limit) if (spellbonuses.DeathSave[3] && (GetLevel() >= spellbonuses.DeathSave[2])) @@ -5203,15 +5203,15 @@ bool Mob::TryDeathSave() { if ((GetMaxHP() - GetHP()) < HealAmt) HealAmt = GetMaxHP() - GetHP(); - - SetHP((GetHP()+HealAmt)); + + SetHP((GetHP()+HealAmt)); Message(263, "The gods have healed you for %i points of damage.", HealAmt); - - if(spellbonuses.DeathSave[0] == 2) + + if(spellbonuses.DeathSave[0] == 2) entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DIVINE_INTERVENTION, GetCleanName()); - else + else entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DEATH_PACT, GetCleanName()); - + SendHPUpdate(); BuffFadeBySlot(buffSlot); return true; @@ -5237,12 +5237,12 @@ bool Mob::AffectedBySpellExcludingSlot(int slot, int effect) float Mob::GetSympatheticProcChances(float &ProcBonus, float &ProcChance, int32 cast_time, int16 ProcRateMod) { - ProcBonus = spellbonuses.SpellProcChance + itembonuses.SpellProcChance; + ProcBonus = spellbonuses.SpellProcChance + itembonuses.SpellProcChance; ProcChance = 0; - - if(cast_time > 0) + + if(cast_time > 0) { - ProcChance = ((float)cast_time * RuleR(Casting, AvgSpellProcsPerMinute) / 60000.0f); + ProcChance = ((float)cast_time * RuleR(Casting, AvgSpellProcsPerMinute) / 60000.0f); ProcChance = ProcChance * (float)(ProcRateMod/100); ProcChance = ProcChance+(ProcChance*ProcBonus/100); } @@ -5259,7 +5259,7 @@ bool Mob::DoHPToManaCovert(uint16 mana_cost) } return false; } - + return false; } @@ -5282,7 +5282,7 @@ int32 Mob::GetAdditionalDamage(Mob *caster, uint32 spell_id, bool use_skill, uin if (use_skill){ int32 temp_dmg = 0; for (int e = 0; e < EFFECT_COUNT; e++) { - + if (spells[buffs[i].spellid].effectid[e] == SE_Empathy){ temp_dmg += spells[buffs[i].spellid].base[e]; continue; @@ -5290,9 +5290,9 @@ int32 Mob::GetAdditionalDamage(Mob *caster, uint32 spell_id, bool use_skill, uin if (!skill_found){ if ((spells[buffs[i].spellid].effectid[e] == SE_LimitToSkill) || - (spells[buffs[i].spellid].effectid[e] == SE_LimitSpellSkill)){ + (spells[buffs[i].spellid].effectid[e] == SE_LimitSpellSkill)){ limit_exists = true; - + if (spells[buffs[i].spellid].base[e] == skill) skill_found = true; } @@ -5331,7 +5331,7 @@ int32 Mob::ApplySpellEffectiveness(Mob* caster, int16 spell_id, int32 value, boo if (IsBard) value += focus; - + else value += value*focus/100; } @@ -5344,7 +5344,7 @@ bool Mob::PassLimitClass(uint32 Classes_, uint16 Class_) //Example Bard on items is '128' while Bard on SE_LimitClass is '256', keep this in mind if making custom spells. if (Class_ > 16) return false; - + Class_ += 1; for (int CurrentClass = 1; CurrentClass <= PLAYER_CLASS_COUNT; ++CurrentClass){ @@ -5358,8 +5358,8 @@ bool Mob::PassLimitClass(uint32 Classes_, uint16 Class_) } uint16 Mob::GetSpellEffectResistChance(uint16 spell_id) -{ - +{ + if(!IsValidSpell(spell_id)) return 0; @@ -5378,12 +5378,12 @@ uint16 Mob::GetSpellEffectResistChance(uint16 spell_id) resist_chance += aabonuses.SEResist[d+1]; found = true; } - + if (spells[spell_id].effectid[i] == itembonuses.SEResist[d]){ resist_chance += itembonuses.SEResist[d+1]; found = true; } - + if (spells[spell_id].effectid[i] == spellbonuses.SEResist[d]){ resist_chance += spellbonuses.SEResist[d+1]; diff --git a/zone/spells.cpp b/zone/spells.cpp index af27d92fa..2c1908414 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -20,7 +20,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) /* General outline of spell casting process - + 1. a) Client clicks a spell bar gem, ability, or item. client_process.cpp gets the op and calls CastSpell() with all the relevant info including @@ -117,7 +117,7 @@ void Mob::SpellProcess() { spellend_timer.Disable(); delaytimer = false; - CastedSpellFinished(casting_spell_id, casting_spell_targetid, casting_spell_slot, + CastedSpellFinished(casting_spell_id, casting_spell_targetid, casting_spell_slot, casting_spell_mana, casting_spell_inventory_slot, casting_spell_resist_adjust); } @@ -126,7 +126,7 @@ void Mob::SpellProcess() void NPC::SpellProcess() { Mob::SpellProcess(); - + if(GetSwarmInfo()){ Mob *swp_o = GetSwarmInfo()->GetOwner(); if(!swp_o) @@ -162,17 +162,17 @@ void NPC::SpellProcess() // but things like SpellFinished() can run concurrent with a triggered cast // to allow procs to work bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, - int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, + int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 timer, uint32 timer_duration, uint32 type, int16 *resist_adjust) { _ZP(Mob_CastSpell); - + mlog(SPELLS__CASTING, "CastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item slot %d", spells[spell_id].name, spell_id, target_id, slot, cast_time, mana_cost, (item_slot==0xFFFFFFFF)?999:item_slot); - + if(casting_spell_id == spell_id) ZeroCastingVars(); - + if ( !IsValidSpell(spell_id) || @@ -186,7 +186,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, (IsAmnesiad() && IsDiscipline(spell_id)) ) { - mlog(SPELLS__CASTING_ERR, "Spell casting canceled: not able to cast now. Valid? %d, casting %d, waiting? %d, spellend? %d, stunned? %d, feared? %d, mezed? %d, silenced? %d, amnesiad? %d", + mlog(SPELLS__CASTING_ERR, "Spell casting canceled: not able to cast now. Valid? %d, casting %d, waiting? %d, spellend? %d, stunned? %d, feared? %d, mezed? %d, silenced? %d, amnesiad? %d", IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced(), IsAmnesiad() ); if(IsSilenced() && !IsDiscipline(spell_id)) Message_StringID(13, SILENCED_STRING); @@ -198,7 +198,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, CastToNPC()->AI_Event_SpellCastFinished(false, casting_spell_slot); return(false); } - + if(IsDetrimentalSpell(spell_id) && !zone->CanDoCombat()){ Message_StringID(13, SPELL_WOULDNT_HOLD); if(IsClient()) @@ -214,7 +214,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, InterruptSpell(173, 0x121, false); return(false); } - + if(IsClient() && GetTarget() && IsHarmonySpell(spell_id)) { for(int i = 0; i < EFFECT_COUNT; i++) { @@ -227,7 +227,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, } } } - + // check for fizzle // note that CheckFizzle itself doesn't let NPCs fizzle, // but this code allows for it. @@ -235,15 +235,15 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, { int fizzle_msg = IsBardSong(spell_id) ? MISS_NOTE : SPELL_FIZZLE; InterruptSpell(fizzle_msg, 0x121, spell_id); - + uint32 use_mana = ((spells[spell_id].mana) / 4); mlog(SPELLS__CASTING_ERR, "Spell casting canceled: fizzled. %d mana has been consumed", use_mana); - + // fizzle 1/4 the mana away SetMana(GetMana() - use_mana); return(false); } - + if (HasActiveSong() && IsBardSong(spell_id)) { mlog(SPELLS__BARDS, "Casting a new song while singing a song. Killing old song %d.", bardsong); //Note: this does NOT tell the client @@ -314,12 +314,12 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, // to repeat a spell for bard songs // bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, - int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, + int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 timer, uint32 timer_duration, uint32 type, int16 resist_adjust) { _ZP(Mob_DoCastSpell); - + Mob* pMob = nullptr; int32 orgcasttime; EQApplicationPacket *outapp = nullptr; @@ -328,13 +328,13 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, InterruptSpell(); return(false); } - + const SPDat_Spell_Struct &spell = spells[spell_id]; - + mlog(SPELLS__CASTING, "DoCastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item %d", spell.name, spell_id, target_id, slot, cast_time, mana_cost, item_slot==0xFFFFFFFF?999:item_slot); - - + + casting_spell_id = spell_id; casting_spell_slot = slot; casting_spell_inventory_slot = item_slot; @@ -351,7 +351,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, // if this spell doesn't require a target, or if it's an optional target // and a target wasn't provided, then it's us; unless TGB is on and this // is a TGB compatible spell. - if((IsGroupSpell(spell_id) || + if((IsGroupSpell(spell_id) || spell.targettype == ST_Self || spell.targettype == ST_AECaster || spell.targettype == ST_TargetOptional) && target_id == 0) @@ -365,7 +365,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, cast_time = orgcasttime = spell.cast_time; // if there's a cast time, check if they have a modifier for it if(cast_time) { - cast_time = GetActSpellCasttime(spell_id, cast_time); + cast_time = GetActSpellCasttime(spell_id, cast_time); } } else @@ -394,7 +394,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, if(IsClient() && CastToClient()->CheckAAEffect(aaEffectMassGroupBuff) && spells[spell_id].can_mgb) mana_cost *= 2; - + // mana is checked for clients on the frontend. we need to recheck it for NPCs though // fix: items dont need mana :-/ // If you're at full mana, let it cast even if you dont have enough mana @@ -431,7 +431,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, casting_spell_mana = mana_cost; casting_spell_resist_adjust = resist_adjust; - + mlog(SPELLS__CASTING, "Spell %d: Casting time %d (orig %d), mana cost %d", orgcasttime, cast_time, mana_cost); // cast time is 0, just finish it right now and be done with it @@ -444,14 +444,14 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, // ok we know it has a cast time so we can start the timer now spellend_timer.Start(cast_time); - + if (IsAIControlled()) { SetRunAnimSpeed(0); if(this != pMob) this->FaceTarget(pMob); } - + // if we got here we didn't fizzle, and are starting our cast if (oSpellWillFinish) *oSpellWillFinish = Timer::GetCurrentTime() + cast_time + 100; @@ -577,7 +577,7 @@ bool Client::CheckFizzle(uint16 spell_id) { // GMs don't fizzle if (GetGM()) return(true); - + uint8 no_fizzle_level = 0; //Live AA - Spell Casting Expertise, Mastery of the Past @@ -585,12 +585,12 @@ bool Client::CheckFizzle(uint16 spell_id) if (spells[spell_id].classes[GetClass()-1] < no_fizzle_level) return true; - + //is there any sort of focus that affects fizzling? - + int par_skill; int act_skill; - + par_skill = spells[spell_id].classes[GetClass()-1] * 5 - 10;//IIRC even if you are lagging behind the skill levels you don't fizzle much if (par_skill > 235) par_skill = 235; @@ -599,7 +599,7 @@ bool Client::CheckFizzle(uint16 spell_id) act_skill = GetSkill(spells[spell_id].skill); act_skill += GetLevel(); // maximum of whatever the client can cheat - + //spell specialization float specialize = GetSpecializeSkillValue(spell_id); if(specialize > 0) { @@ -620,7 +620,7 @@ bool Client::CheckFizzle(uint16 spell_id) specialize = 0.0f; } } - + // == 0 --> on par // > 0 --> skill is lower, higher chance of fizzle // < 0 --> skill is better, lower chance of fizzle @@ -647,19 +647,19 @@ bool Client::CheckFizzle(uint16 spell_id) // always at least 1% chance to fail or 5% to succeed fizzlechance = fizzlechance < 1 ? 1 : (fizzlechance > 95 ? 95 : fizzlechance); - + /* if(IsBardSong(spell_id)) { //This was a channel chance modifier - no evidence for fizzle reduction - fizzlechance -= GetAA(aaInternalMetronome) * 1.5f; + fizzlechance -= GetAA(aaInternalMetronome) * 1.5f; } */ float fizzle_roll = MakeRandomFloat(0, 100); mlog(SPELLS__CASTING, "Check Fizzle %s spell %d fizzlechance: %0.2f%% diff: %0.2f roll: %0.2f", GetName(), spell_id, fizzlechance, diff, fizzle_roll); - + if(fizzle_roll > fizzlechance) return(true); return(false); @@ -708,7 +708,7 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid) if(casting_spell_id && IsNPC()) { CastToNPC()->AI_Event_SpellCastFinished(false, casting_spell_slot); } - + if(casting_spell_type == 1 && IsClient()) { //Rest AA Timer on failed cast CastToClient()->SendAATimer(casting_spell_timer - pTimerAAStart, 0, 0xFFFFFF); CastToClient()->Message_StringID(15,ABILITY_FAILED); @@ -785,13 +785,13 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid) // NOTE: do not put range checking, etc into this function. this should // just check timed spell specific things before passing off to SpellFinished // which figures out proper targets etc -void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, +void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, uint16 mana_used, uint32 inventory_slot, int16 resist_adjust) { _ZP(Mob_CastedSpellFinished); - + bool IsFromItem = false; - + if(IsClient() && slot != USE_ITEM_SPELL_SLOT && slot != POTION_BELT_SPELL_SLOT && spells[spell_id].recast_time > 1000) { // 10 is item if(!CastToClient()->GetPTimers().Expired(&database, pTimerSpellStart + spell_id, false)) { //should we issue a message or send them a spell gem packet? @@ -816,7 +816,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, } } } - + if(!IsValidSpell(spell_id)) { mlog(SPELLS__CASTING_ERR, "Casting of %d canceled: invalid spell id", spell_id); @@ -884,7 +884,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, // modify the chance based on how many times they were hit // but cap it so it's not that large a factor if(attacked_count > 15) attacked_count = 15; - + float channelchance, distance_moved, d_x, d_y, distancemod; if(IsClient()) @@ -899,9 +899,9 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, // max 93% chance at 252 skill channelchance = 30 + GetSkill(CHANNELING) / 400.0f * 100; - channelchance -= attacked_count * 2; + channelchance -= attacked_count * 2; channelchance += channelchance * channelbonuses / 100.0f; - } + } #ifdef BOTS else if(IsBot()) { float channelbonuses = 0.0f; @@ -913,7 +913,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, // max 93% chance at 252 skill channelchance = 30 + GetSkill(CHANNELING) / 400.0f * 100; - channelchance -= attacked_count * 2; + channelchance -= attacked_count * 2; channelchance += channelchance * channelbonuses / 100.0f; } #endif //BOTS @@ -943,7 +943,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, channelchance = 0; } } - + mlog(SPELLS__CASTING, "Checking Interruption: spell x: %f spell y: %f cur x: %f cur y: %f channelchance %f channeling skill %d\n", GetSpellX(), GetSpellY(), GetX(), GetY(), channelchance, GetSkill(CHANNELING)); if(MakeRandomFloat(0, 100) > channelchance) { @@ -985,7 +985,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, switch (InstComponent) { case -1: continue; // no instrument required, go to next component - + // percussion songs (13000 = hand drum) case 13000: if(itembonuses.percussionMod == 0) { // check for the appropriate instrument type @@ -993,7 +993,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, c->Message_StringID(13, SONG_NEEDS_DRUM); // send an error message if missing } break; - + // wind songs (13001 = wooden flute) case 13001: if(itembonuses.windMod == 0) { @@ -1001,7 +1001,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, c->Message_StringID(13, SONG_NEEDS_WIND); } break; - + // string songs (13011 = lute) case 13011: if(itembonuses.stringedMod == 0) { @@ -1009,7 +1009,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, c->Message_StringID(13, SONG_NEEDS_STRINGS); } break; - + // brass songs (13012 = horn) case 13012: if(itembonuses.brassMod == 0) { @@ -1017,11 +1017,11 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, c->Message_StringID(13, SONG_NEEDS_BRASS); } break; - + default: // some non-instrument component. Let it go, but record it in the log mlog(SPELLS__CASTING_ERR, "Something odd happened: Song %d required component %s", spell_id, component); } - + if(!HasInstrument) { // if the instrument is missing, log it and interrupt the song mlog(SPELLS__CASTING_ERR, "Song %d: Canceled. Missing required instrument %s", spell_id, component); if(c->GetGM()) @@ -1168,7 +1168,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, for (int buffSlot = 0; buffSlot < buff_max; buffSlot++) { if (buffs[buffSlot].spellid == 0 || buffs[buffSlot].spellid >= SPDAT_RECORDS) continue; - + if(spells[buffs[buffSlot].spellid].numhits > 0) CheckHitsRemaining(buffSlot, true); } @@ -1190,7 +1190,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, if(DeleteChargeFromSlot >= 0) CastToClient()->DeleteItemInInventory(DeleteChargeFromSlot, 1, true); - + // // at this point the spell has successfully been cast // @@ -1234,11 +1234,11 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, if(slot < MAX_PP_MEMSPELL) { c->CheckIncreaseSkill(spells[spell_id].skill, nullptr); - + // increased chance of gaining channel skill if you regained concentration c->CheckIncreaseSkill(CHANNELING, nullptr, regain_conc ? 5 : 0); - - c->CheckSpecializeIncrease(spell_id); + + c->CheckSpecializeIncrease(spell_id); } } } @@ -1249,25 +1249,25 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, // set the rapid recast timer for next time around delaytimer = true; spellend_timer.Start(400,true); - + mlog(SPELLS__CASTING, "Spell casting of %d is finished.", spell_id); - + } bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction) { - + /* The basic types of spells: - + Single target - some might be undead only, self only, etc, but these all affect the target of the caster. AE around caster - these affect entities close to the caster, and have no target. - + AE around target - these have a target, and affect the target as well as entities close to the target. - + AE on location - this is a tricky one that is cast on a mob target but has a special AE duration that keeps it recasting every 2.5 sec on the same location. These work the same as AE around target spells, except @@ -1285,7 +1285,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce // during this switch, this variable gets set to one of these things // and that causes the spell to be executed differently - + bodyType target_bt = BT_Humanoid; SpellTargetType targetType = spells[spell_id].targettype; bodyType mob_body = spell_target ? spell_target->GetBodyType() : BT_Humanoid; @@ -1322,7 +1322,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce // target required for these case ST_Undead: { if(!spell_target || ( - spell_target->GetBodyType() != BT_SummonedUndead + spell_target->GetBodyType() != BT_SummonedUndead && spell_target->GetBodyType() != BT_Undead && spell_target->GetBodyType() != BT_Vampire ) @@ -1336,7 +1336,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce CastAction = SingleTarget; break; } - + case ST_Summoned: { uint8 body_type = spell_target?spell_target->GetBodyType():0; if(!spell_target || (body_type != BT_Summoned && body_type != BT_Summoned2 && body_type != BT_Summoned3)) @@ -1349,7 +1349,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce CastAction = SingleTarget; break; } - + case ST_SummonedPet: { uint8 body_type = spell_target ? spell_target->GetBodyType() : 0; @@ -1372,7 +1372,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce case ST_Dragon: if(target_bt == BT_Humanoid) target_bt = BT_Dragon; case ST_Giant: if(target_bt == BT_Humanoid) target_bt = BT_Giant; case ST_Animal: if(target_bt == BT_Humanoid) target_bt = BT_Animal; - + // check for special case body types (Velious dragons/giants) if(mob_body == BT_RaidGiant) mob_body = BT_Giant; if(mob_body == BT_VeliousDragon) mob_body = BT_Dragon; @@ -1391,7 +1391,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce CastAction = SingleTarget; break; } - + case ST_Tap: case ST_LDoNChest_Cursed: case ST_Target: { @@ -1495,9 +1495,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce case ST_Group: { if(IsClient() && CastToClient()->TGB() && IsTGBCompatibleSpell(spell_id)) { - if( (!target) || + if( (!target) || (target->IsNPC() && !(target->GetOwner() && target->GetOwner()->IsClient())) || - (target->IsCorpse()) ) + (target->IsCorpse()) ) spell_target = this; else spell_target = target; @@ -1641,7 +1641,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce Mob *spell_target_tot = spell_target ? spell_target->GetTarget() : nullptr; if(!spell_target_tot) return false; - //Verfied from live - Target's Target needs to be in combat range to recieve the effect + //Verfied from live - Target's Target needs to be in combat range to recieve the effect if (!this->CombatRange(spell_target)) return false; @@ -1649,7 +1649,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce CastAction = SingleTarget; break; } - + default: { mlog(SPELLS__CASTING_ERR, "I dont know Target Type: %d Spell: (%d) %s", spells[spell_id].targettype, spell_id, spells[spell_id].name); @@ -1664,14 +1664,14 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce // only used from CastedSpellFinished, and procs // we can't interrupt in this, or anything called from this! // if you need to abort the casting, return false -bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 mana_used, +bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 mana_used, uint32 inventory_slot, int16 resist_adjust, bool isproc) { _ZP(Mob_SpellFinished); - + //EQApplicationPacket *outapp = nullptr; Mob *ae_center = nullptr; - + if(!IsValidSpell(spell_id)) return false; @@ -1705,13 +1705,13 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 Message(13, "You can't cast this spell here."); return false; } - + } } if ( - this->IsClient() && + this->IsClient() && (zone->GetZoneID() == 183 || zone->GetZoneID() == 184) && // load CastToClient()->Admin() < 80 ) @@ -1733,7 +1733,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 CastAction_type CastAction; if(!DetermineSpellTargets(spell_id, spell_target, ae_center, CastAction)) return(false); - + mlog(SPELLS__CASTING, "Spell %d: target type %d, target %s, AE center %s", spell_id, CastAction, spell_target?spell_target->GetName():"NONE", ae_center?ae_center->GetName():"NONE"); // if a spell has the AEDuration flag, it becomes an AE on target @@ -1758,7 +1758,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 Message_StringID(13,CANT_SEE_TARGET); return false; } - + // check to see if target is a caster mob before performing a mana tap if(spell_target && IsManaTapSpell(spell_id)) { if(spell_target->GetCasterClass() == 'N') { @@ -1766,7 +1766,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 return false; } } - + //range check our target, if we have one and it is not us float range = spells[spell_id].range; if(IsClient() && CastToClient()->TGB() && IsTGBCompatibleSpell(spell_id) && IsGroupSpell(spell_id)) @@ -1859,7 +1859,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 } if(ae_center && ae_center == this && IsBeneficialSpell(spell_id)) SpellOnTarget(spell_id, this); - + bool affect_caster = !IsNPC(); //NPC AE spells do not affect the NPC caster entity_list.AESpell(this, ae_center, spell_id, affect_caster, resist_adjust); } @@ -1921,7 +1921,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 //pet too if (GetPet() && HasPetAffinity() && !GetPet()->IsCharmed()) SpellOnTarget(spell_id, GetPet()); - #endif + #endif } SpellOnTarget(spell_id, spell_target); @@ -1948,16 +1948,16 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 { float angle_start = spells[spell_id].directional_start + (GetHeading() * 360.0f / 256.0f); float angle_end = spells[spell_id].directional_end + (GetHeading() * 360.0f / 256.0f); - + while(angle_start > 360.0f) angle_start -= 360.0f; - + while(angle_end > 360.0f) angle_end -= 360.0f; list targets_in_range; list::iterator iter; - + entity_list.GetTargetsForConeArea(this, spells[spell_id].aoerange, spells[spell_id].aoerange / 2, targets_in_range); iter = targets_in_range.begin(); while(iter != targets_in_range.end()) @@ -1965,7 +1965,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 float heading_to_target = (CalculateHeadingToTarget((*iter)->GetX(), (*iter)->GetY()) * 360.0f / 256.0f); while(heading_to_target < 0.0f) heading_to_target += 360.0f; - + while(heading_to_target > 360.0f) heading_to_target -= 360.0f; @@ -1993,7 +1993,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 } DoAnim(spells[spell_id].CastingAnim, 0, true, IsClient() ? FilterPCSpells : FilterNPCSpells); - + // Set and send the nimbus effect if this spell has one int NimbusEffect = GetNimbusEffect(spell_id); if(NimbusEffect) { @@ -2010,7 +2010,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 if (!DoHPToManaCovert(mana_used)) SetMana(GetMana() - mana_used); } - + //set our reuse timer on long ass reuse_time spells... if(IsClient()) { @@ -2045,21 +2045,21 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 CastToClient()->GetPTimers().Start((pTimerItemStart + itm->GetItem()->RecastType), itm->GetItem()->RecastDelay); } } - + if(IsNPC()) CastToNPC()->AI_Event_SpellCastFinished(true, slot); - return true; + return true; } /* * handle bard song pulses... - * + * * we make several assumptions that SpellFinished does not: * - there are no AEDuration (beacon) bard songs * - there are no recourse spells on bard songs * - there is no long recast delay on bard songs - * + * * return false to stop the song */ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { @@ -2068,7 +2068,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { mlog(SPELLS__BARDS, "Bard Song Pulse %d: Supposidly cast from an item. Killing song.", spell_id); return(false); } - + //determine the type of spell target we have Mob *ae_center = nullptr; CastAction_type CastAction; @@ -2076,12 +2076,12 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { mlog(SPELLS__BARDS, "Bard Song Pulse %d: was unable to determine target. Stopping.", spell_id); return(false); } - + if(ae_center != nullptr && ae_center->IsBeacon()) { mlog(SPELLS__BARDS, "Bard Song Pulse %d: Unsupported Beacon NPC AE spell", spell_id); return(false); } - + //use mana, if this spell has a mana cost int mana_used = spells[spell_id].mana; if(mana_used > 0) { @@ -2090,12 +2090,12 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { mlog(SPELLS__BARDS, "Ran out of mana while singing song %d", spell_id); return(false); } - + mlog(SPELLS__CASTING, "Bard Song Pulse %d: consuming %d mana (have %d)", spell_id, mana_used, GetMana()); SetMana(GetMana() - mana_used); } - - + + // check line of sight to target if it's a detrimental spell if(spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target)) { @@ -2103,7 +2103,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { Message_StringID(13, CANT_SEE_TARGET); return(false); } - + //range check our target, if we have one and it is not us float range = 0.00f; @@ -2119,7 +2119,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { return(false); } } - + // // Switch #2 - execute the spell // @@ -2142,10 +2142,10 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { { if(IsBeneficialSpell(spell_id)) SpellOnTarget(spell_id, this); - + bool affect_caster = !IsNPC(); //NPC AE spells do not affect the NPC caster entity_list.AEBardPulse(this, this, spell_id, affect_caster); - break; + break; } case AETarget: { @@ -2204,7 +2204,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot) { break; } } - + //do we need to do this??? DoAnim(spells[spell_id].CastingAnim, 0, true, IsClient() ? FilterPCSpells : FilterNPCSpells); if(IsClient()) @@ -2228,7 +2228,7 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) { buffs[buffs_i].ticsremaining += 3; mlog(SPELLS__BARDS, "Bard Song Pulse %d: extending duration in slot %d to %d tics", spell_id, buffs_i, buffs[buffs_i].ticsremaining); } - + //should we send this buff update to the client... seems like it would //be a lot of traffic for no reason... //this may be the wrong packet... @@ -2245,7 +2245,7 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) { action->level = buffs[buffs_i].casterlevel; action->type = SpellDamageType; entity_list.QueueCloseClients(this, packet, false, 200, 0, true, IsClient() ? FilterPCSpells : FilterNPCSpells); - + action->buff_unknown = 4; if(IsEffectInSpell(spell_id, SE_TossUp)) @@ -2263,7 +2263,7 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) { action->buff_unknown = 0; EQApplicationPacket* outapp_push = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct)); PlayerPositionUpdateServer_Struct* spu = (PlayerPositionUpdateServer_Struct*)outapp_push->pBuffer; - + double look_heading = caster->CalculateHeadingToTarget(GetX(), GetY()); look_heading /= 256; look_heading *= 360; @@ -2304,7 +2304,7 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) { { CastToClient()->QueuePacket(packet); } - + EQApplicationPacket *message_packet = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); CombatDamage_Struct *cd = (CombatDamage_Struct *)message_packet->pBuffer; cd->target = action->target; @@ -2319,7 +2319,7 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) { } safe_delete(message_packet); safe_delete(packet); - + } //we are done... return; @@ -2345,10 +2345,10 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste if(!IsValidSpell(spell_id) || (!caster && !target)) return 0; - + if(!caster && !target) return 0; - + // if we have at least one, we can make do, we'll just pretend they're the same if(!caster) caster = target; @@ -2365,9 +2365,9 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste int res = CalcBuffDuration_formula(castlevel, formula, duration); // Only need this for clients, since the change was for bard songs, I assume we should keep non bard songs getting +1 // However if its bard or not and is mez, charm or fear, we need to add 1 so that client is in sync - if(!IsShortDurationBuff(spell_id) || - IsFearSpell(spell_id) || - IsCharmSpell(spell_id) || + if(!IsShortDurationBuff(spell_id) || + IsFearSpell(spell_id) || + IsCharmSpell(spell_id) || IsMezSpell(spell_id) || IsBlindSpell(spell_id)) res += 1; @@ -2376,7 +2376,7 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste mlog(SPELLS__CASTING, "Spell %d: Casting level %d, formula %d, base_duration %d: result %d", spell_id, castlevel, formula, duration, res); - + return(res); } @@ -2463,7 +2463,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, { const SPDat_Spell_Struct &sp1 = spells[spellid1]; const SPDat_Spell_Struct &sp2 = spells[spellid2]; - + int i, effect1, effect2, sp1_value, sp2_value; int blocked_effect, blocked_below_value, blocked_slot; int overwrite_effect, overwrite_below_value, overwrite_slot; @@ -2496,11 +2496,11 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, case 5249: return (0); } - + /* One of these is a bard song and one isn't and they're both beneficial so they should stack. */ - if(IsBardSong(spellid1) != IsBardSong(spellid2)) + if(IsBardSong(spellid1) != IsBardSong(spellid2)) { if(!IsDetrimentalSpell(spellid1) && !IsDetrimentalSpell(spellid2)) { @@ -2526,11 +2526,11 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, blocked_effect = sp1.base[i]; blocked_slot = sp1.formula[i] - 201; //they use base 1 for slots, we use base 0 blocked_below_value = sp1.max[i]; - + if(sp2.effectid[blocked_slot] == blocked_effect) { sp2_value = CalcSpellEffectValue(spellid2, blocked_slot, caster_level2); - + mlog(SPELLS__STACKING, "%s (%d) blocks effect %d on slot %d below %d. New spell has value %d on that slot/effect. %s.", sp1.name, spellid1, blocked_effect, blocked_slot, blocked_below_value, sp2_value, (sp2_value < blocked_below_value)?"Blocked":"Not blocked"); @@ -2561,7 +2561,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, mlog(SPELLS__STACKING, "%s (%d) overwrites existing spell if effect %d on slot %d is below %d. Old spell has value %d on that slot/effect. %s.", sp2.name, spellid2, overwrite_effect, overwrite_slot, overwrite_below_value, sp1_value, (sp1_value < overwrite_below_value)?"Overwriting":"Not overwriting"); - + if(sp1_value < overwrite_below_value) { mlog(SPELLS__STACKING, "Overwrite spell because sp1_value < overwrite_below_value"); @@ -2574,7 +2574,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, } } } - + bool sp1_detrimental = IsDetrimentalSpell(spellid1); bool sp2_detrimental = IsDetrimentalSpell(spellid2); bool sp_det_mismatch; @@ -2583,7 +2583,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, sp_det_mismatch = false; else sp_det_mismatch = true; - + // now compare matching effects // arbitration takes place if 2 spells have the same effect at the same // effect slot, otherwise they're stackable, even if it's the same effect @@ -2654,7 +2654,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, mlog(SPELLS__STACKING, "The effects are the same but the spell types are not, passing the effect"); continue; } - + /* If the spells aren't the same and the effect is a dot we can go ahead and stack it @@ -2666,7 +2666,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, sp1_value = CalcSpellEffectValue(spellid1, i, caster_level1); sp2_value = CalcSpellEffectValue(spellid2, i, caster_level2); - + // some spells are hard to compare just on value. attack speed spells // have a value that's a percentage for instance if @@ -2679,12 +2679,12 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, sp1_value -= 100; sp2_value -= 100; } - + if(sp1_value < 0) sp1_value = 0 - sp1_value; if(sp2_value < 0) sp2_value = 0 - sp2_value; - + if(sp2_value < sp1_value) { mlog(SPELLS__STACKING, "Spell %s (value %d) is not as good as %s (value %d). Rejecting %s.", sp2.name, sp2_value, sp1.name, sp1_value, sp2.name); @@ -2697,14 +2697,14 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, sp1.name, sp1_value, sp2.name, sp2_value, sp1.name); will_overwrite = true; } - + //if we get here, then none of the values on the new spell are "worse" //so now we see if this new spell is any better, or if its not related at all if(will_overwrite) { mlog(SPELLS__STACKING, "Stacking code decided that %s should overwrite %s.", sp2.name, sp1.name); return(1); } - + mlog(SPELLS__STACKING, "Stacking code decided that %s is not affected by %s.", sp2.name, sp1.name); return 0; } @@ -2716,16 +2716,16 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, // the level of the mob int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_override) { - + int buffslot, ret, caster_level, emptyslot = -1; bool will_overwrite = false; vector overwrite_slots; - + if(level_override > 0) caster_level = level_override; else caster_level = caster ? caster->GetCasterLevel(spell_id) : GetCasterLevel(spell_id); - + if(duration == 0) { duration = CalcBuffDuration(caster, this, spell_id); @@ -2738,7 +2738,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid mlog(SPELLS__BUFFS, "Buff %d failed to add because its duration came back as 0.", spell_id); return -2; // no duration? this isn't a buff } - + mlog(SPELLS__BUFFS, "Trying to add buff %d cast by %s (cast level %d) with duration %d", spell_id, caster?caster->GetName():"UNKNOWN", caster_level, duration); @@ -2795,7 +2795,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid } } } - + // we didn't find an empty slot to put it in, and it's not overwriting // anything so there must not be any room left. if(emptyslot == -1 && !will_overwrite) @@ -2845,7 +2845,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid // now add buff at emptyslot assert(buffs[emptyslot].spellid == SPELL_UNKNOWN); // sanity check - + buffs[emptyslot].spellid = spell_id; buffs[emptyslot].casterlevel = caster_level; if(caster && caster->IsClient()) { @@ -2866,16 +2866,16 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid { buffs[emptyslot].UpdateClient = true; } - else{ + else{ if(buffs[emptyslot].ticsremaining > (1+CalcBuffDuration_formula(caster_level, spells[spell_id].buffdurationformula, spells[spell_id].buffduration))) buffs[emptyslot].UpdateClient = true; } - + mlog(SPELLS__BUFFS, "Buff %d added to slot %d with caster level %d", spell_id, emptyslot, caster_level); if(IsPet() && GetOwner() && GetOwner()->IsClient()) { SendPetBuffsToClient(); } - + if((IsClient() && !CastToClient()->GetPVP()) || (IsPet() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP()) || (IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP())) @@ -2883,7 +2883,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid EQApplicationPacket *outapp = MakeBuffsPacket(); entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, BIT_SoDAndLater); - + if(GetTarget() == this) { CastToClient()->QueuePacket(outapp); } @@ -2899,15 +2899,15 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid // used by some MobAI stuff // NOT USED BY SPELL CODE -// note that this should not be used for determining which slot to place a +// note that this should not be used for determining which slot to place a // buff into // returns -1 on stack failure, -2 if all slots full, the slot number if the buff should overwrite another buff, or a free buff slot int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite) { int i, ret, firstfree = -2; - + mlog(AI__BUFFS, "Checking if buff %d cast at level %d can stack on me.%s", spellid, caster_level, iFailIfOverwrite?" failing if we would overwrite something":""); - + uint32 buff_count = GetMaxTotalSlots(); for (i=0; i < buff_count; i++) { @@ -2935,13 +2935,13 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite) } if(firstfree == -2) firstfree = i; - } + } if(ret == -1) { mlog(AI__BUFFS, "Buff %d would conflict with %d in slot %d, reporting stack failure", spellid, curbuf.spellid, i); return -1; // stop the spell, can't stack it } } - + mlog(AI__BUFFS, "Reporting that buff %d could successfully be placed into slot %d", spellid, firstfree); return firstfree; @@ -3007,9 +3007,9 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r return false; uint16 caster_level = GetCasterLevel(spell_id); - + mlog(SPELLS__CASTING, "Casting spell %d on %s with effective caster level %d", spell_id, spelltar->GetName(), caster_level); - + // Actual cast action - this causes the caster animation and the particles // around the target // we do this first, that way we get the particles even if the spell @@ -3041,18 +3041,18 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r } // select target - if // Bind Sight line of spells + if // Bind Sight line of spells ( spell_id == 500 || // bind sight spell_id == 407 // cast sight ) - { - action->target = GetID(); - } + { + action->target = GetID(); + } else - { - action->target = spelltar->GetID(); - } + { + action->target = spelltar->GetID(); + } action->level = caster_level; // caster level, for animation only action->type = 231; // 231 means a spell @@ -3060,7 +3060,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r action->sequence = (uint32) (GetHeading() * 2); // just some random number action->instrument_mod = GetInstrumentMod(spell_id); action->buff_unknown = 0; - + if(spelltar != this && spelltar->IsClient()) // send to target spelltar->CastToClient()->QueuePacket(action_packet); if(IsClient()) // send to caster @@ -3077,14 +3077,14 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r } // now check if the spell is allowed to land - + // invuln mobs can't be affected by any spells, good or bad if(spelltar->GetInvul() || spelltar->DivineAura()) { mlog(SPELLS__CASTING_ERR, "Casting spell %d on %s aborted: they are invulnerable.", spell_id, spelltar->GetName()); safe_delete(action_packet); return false; } - + //cannot hurt untargetable mobs bodyType bt = spelltar->GetBodyType(); if(bt == BT_NoTarget || bt == BT_NoTarget2) { @@ -3138,7 +3138,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r return false; } } - + if(!(IsClient() && CastToClient()->GetGM()) && !IsHarmonySpell(spell_id)) // GMs can cast on anything { // Beneficial spells check @@ -3156,7 +3156,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r Client* pClientTarget = 0; Raid* pRaidTarget = 0; Group* pBasicGroupTarget = 0; - uint32 nGroupTarget = 0; //raid group + uint32 nGroupTarget = 0; //raid group Client* pClientTargetPet = 0; Raid* pRaidTargetPet = 0; @@ -3171,7 +3171,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r pBasicGroup = entity_list.GetGroupByMob(this); if(pRaid) nGroup = pRaid->GetGroup(pClient) + 1; - + //Target client pointers if(spelltar->IsClient()) { @@ -3245,8 +3245,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r //check for AE_Undead if(spells[spell_id].targettype == ST_UndeadAE){ - if(spelltar->GetBodyType() != BT_SummonedUndead && - spelltar->GetBodyType() != BT_Undead && + if(spelltar->GetBodyType() != BT_SummonedUndead && + spelltar->GetBodyType() != BT_Undead && spelltar->GetBodyType() != BT_Vampire) { return false; @@ -3274,7 +3274,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r { case 0: break; - + case 1: { if(spells[spell_id].targettype == ST_Target) { @@ -3295,14 +3295,14 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r } case 3: { - if(spells[spell_id].targettype == ST_Target) + if(spells[spell_id].targettype == ST_Target) reflect_chance = 1; - + break; } case 4: reflect_chance = 1; - + default: break; } @@ -3312,7 +3312,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r return false; } } - + // resist check - every spell can be resisted, beneficial or not // add: ok this isn't true, eqlive's spell data is fucked up, buffs are // not all unresistable, so changing this to only check certain spells @@ -3443,7 +3443,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r if (GetPet()) SpellOnTarget(recourse_spell, GetPet()); #endif - } + } } else @@ -3456,10 +3456,10 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r spelltar->DamageShield(this, true); spelltar->CheckHitsRemaining(0, false, false, SE_DamageShield); } - + TrySpellTrigger(spelltar, spell_id); TryApplyEffect(spelltar, spell_id); - + if(spell_id == 982) // Cazic Touch, hehe =P { @@ -3581,9 +3581,9 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r } safe_delete(action_packet); safe_delete(message_packet); - + mlog(SPELLS__CASTING, "Cast of %d by %s on %s complete successfully.", spell_id, GetName(), spelltar->GetName()); - + return true; } @@ -3670,7 +3670,7 @@ void Mob::BuffFadeDetrimentalByCaster(Mob *caster) if(buffs[j].spellid != SPELL_UNKNOWN) { if(IsDetrimentalSpell(buffs[j].spellid)) { - //this is a pretty terrible way to do this but + //this is a pretty terrible way to do this but //there really isn't another way till I rewrite the basics Mob * c = entity_list.GetMob(buffs[j].casterid); if(c && c == caster) @@ -3684,7 +3684,7 @@ void Mob::BuffFadeBySitModifier() { bool r_bonus = false; uint32 buff_count = GetMaxTotalSlots(); - for(uint32 j = 0; j < buff_count; ++j) + for(uint32 j = 0; j < buff_count; ++j) { if(buffs[j].spellid != SPELL_UNKNOWN) { @@ -3743,19 +3743,19 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster) if(caster == nullptr) return(false); - - //TODO: this function loops through the effect list for + + //TODO: this function loops through the effect list for //this spell like 10 times, this could easily be consolidated //into one loop through with a switch statement. - + mlog(SPELLS__RESISTS, "Checking to see if we are immune to spell %d cast by %s", spell_id, caster->GetName()); - + if(!IsValidSpell(spell_id)) return true; - + if(IsBeneficialSpell(spell_id) && (caster->GetNPCTypeID())) //then skip the rest, stop NPCs aggroing each other with buff spells. 2013-03-05 return false; - + if(IsMezSpell(spell_id)) { if(SpecAttacks[UNMEZABLE]) { @@ -3910,7 +3910,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster) } mlog(SPELLS__RESISTS, "No immunities to spell %d found.", spell_id); - + return false; } @@ -3935,7 +3935,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use { return 0; } - + if(SpecAttacks[IMMUNE_CASTING_FROM_RANGE]) { if(!caster->CombatRange(this)) @@ -3944,7 +3944,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use } } - if(SpecAttacks[IMMUNE_MAGIC]) + if(SpecAttacks[IMMUNE_MAGIC]) { mlog(SPELLS__RESISTS, "We are immune to magic, so we fully resist the spell %d", spell_id); return(0); @@ -4042,7 +4042,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use { target_resist = temp; } - + temp = GetPR(); if(temp < target_resist) { @@ -4190,7 +4190,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use partial_modifier -= 5; } } - + if(caster->IsNPC()) { if((GetLevel() - caster->GetLevel()) >= 20) @@ -4217,13 +4217,13 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use int16 Mob::CalcResistChanceBonus() { int resistchance = spellbonuses.ResistSpellChance + itembonuses.ResistSpellChance; - - if(IsClient()) + + if(IsClient()) resistchance += aabonuses.ResistSpellChance; if (spellbonuses.ResistSpellChance) CheckHitsRemaining(0, false, false, SE_ResistSpellChance); - + return resistchance; } @@ -4237,19 +4237,19 @@ int16 Mob::CalcFearResistChance() } if(spellbonuses.Fearless == true || itembonuses.Fearless == true) resistchance = 100; - + return resistchance; } float Mob::GetAOERange(uint16 spell_id) { float range; - + range = spells[spell_id].aoerange; if(range == 0) //for TGB spells, they prolly do not have an aoe range range = spells[spell_id].range; if(range == 0) range = 10; //something.... - + if (IsClient()) { if(IsBardSong(spell_id) && IsBeneficialSpell(spell_id)) { @@ -4257,10 +4257,10 @@ float Mob::GetAOERange(uint16 spell_id) { float song_bonus = aabonuses.SongRange + spellbonuses.SongRange + itembonuses.SongRange; range += range*song_bonus /100.0f; } - + range = CastToClient()->GetActSpellRange(spell_id, range); } - + return(range); } @@ -4306,7 +4306,7 @@ void Mob::SendSpellBarDisable() { if (!IsClient()) return; - + CastToClient()->MemorizeSpell(0, SPELLBAR_UNLOCK, memSpellSpellbar); } @@ -4331,12 +4331,12 @@ void Mob::Stun(int duration) //make sure a shorter stun does not overwrite a longer one. if(stunned && stunned_timer.GetRemainingTime() > uint32(duration)) return; - + if(casting_spell_id) { int persistent_casting = spellbonuses.PersistantCasting + itembonuses.PersistantCasting; if(IsClient()) persistent_casting += aabonuses.PersistantCasting; - + if(MakeRandomInt(1,99) > persistent_casting) InterruptSpell(); } @@ -4347,14 +4347,14 @@ void Mob::Stun(int duration) stunned_timer.Start(duration); } } - + void Mob::UnStun() { if(stunned && stunned_timer.Enabled()) { stunned = false; stunned_timer.Disable(); } } - + // Stuns "this" void Client::Stun(int duration) { @@ -4415,7 +4415,7 @@ void Mob::Mesmerize() void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message) { EQApplicationPacket* outapp; - + outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffFade_Struct)); SpellBuffFade_Struct* sbf = (SpellBuffFade_Struct*) outapp->pBuffer; @@ -4446,7 +4446,7 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message) #endif QueuePacket(outapp); safe_delete(outapp); - + if(send_message) { const char *fadetext = spells[spell_id].spell_fades; @@ -4497,7 +4497,7 @@ void Client::UnmemSpell(int slot, bool update_client) void Client::UnmemSpellAll(bool update_client) { int i; - + for(i = 0; i < MAX_PP_MEMSPELL; i++) if(m_pp.mem_spells[i] != 0xFFFFFFFF) UnmemSpell(i, update_client); @@ -4615,14 +4615,14 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { Spell_Global_Name = row[0]; Spell_Global_Value = atoi(row[1]); - mysql_free_result(result); + mysql_free_result(result); if (Spell_Global_Name.empty()) { // If the entry in the spell_globals table has nothing set for the qglobal name return true; } else if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT value FROM quest_globals WHERE charid=%i AND name='%s'", Char_ID, Spell_Global_Name.c_str()), errbuf, &result)) { safe_delete_array(query); - + if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); @@ -4650,7 +4650,7 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { else { return true; // Spell ID isn't listed in the spells_global table, so it is not restricted from scribing } - mysql_free_result(result); + mysql_free_result(result); } else { LogFile->write(EQEMuLog::Error, "Error while querying Spell ID %i spell_globals table query '%s': %s", Spell_ID, query, errbuf); @@ -4663,10 +4663,10 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { //this is one nasty function... FindType and FindSpell are rather complex operations... /*void Mob::CheckBuffs() { if (!IsCasting()) { - + //try to summon a pet if we havent yet CheckPet(); - + uint8 newtype[15] = { SE_ArmorClass, SE_STR, SE_DEX, SE_AGI, SE_WIS, SE_INT, SE_CHA, SE_AttackSpeed, SE_MovementSpeed, SE_DamageShield, SE_ResistFire, SE_ResistCold, @@ -5030,9 +5030,9 @@ int16 Mob::GetBuffSlotFromType(uint16 type) { return -1; } -uint16 Mob::GetSpellIDFromSlot(uint8 slot) +uint16 Mob::GetSpellIDFromSlot(uint8 slot) { - if (buffs[slot].spellid != SPELL_UNKNOWN) + if (buffs[slot].spellid != SPELL_UNKNOWN) return buffs[slot].spellid; return 0; } @@ -5047,12 +5047,12 @@ bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) { // adjustments necessary for offensive npc casting behavior if (bOffensive) { if (spells[buffs[i].spellid].effectid[j] == type) { - int16 value = + int16 value = CalcSpellEffectValue_formula(spells[buffs[i].spellid].buffdurationformula, spells[buffs[i].spellid].base[j], spells[buffs[i].spellid].max[j], buffs[i].casterlevel, buffs[i].spellid); - LogFile->write(EQEMuLog::Normal, + LogFile->write(EQEMuLog::Normal, "FindType: type = %d; value = %d; threshold = %d", type, value, threshold); if (value < threshold) @@ -5116,7 +5116,7 @@ bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id { if(spell_id == SPELL_UNKNOWN) return(false); - + int i; for (i = 0; i < MAX_PROCS; i++) { if (DefensiveProcs[i].spellID == SPELL_UNKNOWN) { @@ -5148,7 +5148,7 @@ bool Mob::AddSkillProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) { if(spell_id == SPELL_UNKNOWN) return(false); - + int i; for (i = 0; i < MAX_PROCS; i++) { if (SkillProcs[i].spellID == SPELL_UNKNOWN) { @@ -5179,7 +5179,7 @@ bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) { if(spell_id == SPELL_UNKNOWN) return(false); - + int i; for (i = 0; i < MAX_PROCS; i++) { if (RangedProcs[i].spellID == SPELL_UNKNOWN) { @@ -5329,7 +5329,7 @@ EQApplicationPacket *Mob::MakeBuffsPacket(bool for_target) } EQApplicationPacket* outapp = nullptr; - + //Create it for a targeting window, else create it for a create buff packet. if(for_target) { @@ -5410,7 +5410,7 @@ void Mob::UpdateRuneFlags() default: break; - } + } } } } diff --git a/zone/tasks.cpp b/zone/tasks.cpp index 34b64c1db..73a2a8004 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -122,10 +122,10 @@ bool TaskManager::LoadSingleTask(int TaskID) { return LoadTasks(TaskID); } - + void TaskManager::ReloadGoalLists() { - if(!GoalListManager.LoadLists()) + if(!GoalListManager.LoadLists()) _log(TASKS__GLOBALLOAD,"TaskManager::LoadTasks LoadLists failed"); } @@ -168,10 +168,10 @@ bool TaskManager::LoadTasks(int SingleTask) { MYSQL_RES *result; MYSQL_ROW row; - _log(TASKS__GLOBALLOAD, "TaskManager::LoadTasks Called"); + _log(TASKS__GLOBALLOAD, "TaskManager::LoadTasks Called"); if(SingleTask == 0) { - if(!GoalListManager.LoadLists()) + if(!GoalListManager.LoadLists()) _log(TASKS__GLOBALLOAD,"TaskManager::LoadTasks LoadLists failed"); if(!LoadTaskSets()) @@ -241,7 +241,7 @@ bool TaskManager::LoadTasks(int SingleTask) { int Step = atoi(row[1]); int ActivityID = atoi(row[2]); - + if((TaskID <= 0) || (TaskID >= MAXTASKS) || (ActivityID < 0) || (ActivityID >= MAXACTIVITIESPERTASK)) { // This shouldn't happen, as the SELECT is bounded by MAXTASKS LogFile->write(EQEMuLog::Error, ERR_TASK_OR_ACTIVITY_OOR, TaskID, ActivityID); @@ -257,7 +257,7 @@ bool TaskManager::LoadTasks(int SingleTask) { Tasks[TaskID]->SequenceMode = ActivitiesStepped; if(Step >Tasks[TaskID]->LastStep) Tasks[TaskID]->LastStep = Step; - + // Task Activities MUST be numbered sequentially from 0. If not, log an error // and set the task to nullptr. Subsequent activities for this task will raise // ERR_NOTASK errors. @@ -299,7 +299,7 @@ bool TaskManager::LoadTasks(int SingleTask) { Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Optional = atoi(row[12]); _log(TASKS__GLOBALLOAD, "Activity Slot %2i: ID %i for Task %5i. Type: %3i, GoalID: %8i, " - "GoalMethod: %i, GoalCount: %3i, ZoneID:%3i", + "GoalMethod: %i, GoalCount: %3i, ZoneID:%3i", Tasks[TaskID]->ActivityCount, ActivityID, TaskID, Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Type, Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalID, @@ -307,11 +307,11 @@ bool TaskManager::LoadTasks(int SingleTask) { Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalCount, Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].ZoneID); - _log(TASKS__GLOBALLOAD, " Text1: %s", + _log(TASKS__GLOBALLOAD, " Text1: %s", Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text1); - _log(TASKS__GLOBALLOAD, " Text2: %s", + _log(TASKS__GLOBALLOAD, " Text2: %s", Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text2); - _log(TASKS__GLOBALLOAD, " Text3: %s", + _log(TASKS__GLOBALLOAD, " Text3: %s", Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text3); Tasks[TaskID]->ActivityCount++; @@ -333,7 +333,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { // I am saving the slot in the ActiveTasks table, because unless a Task is cancelled/completed, the client doesn't // seem to like tasks moving slots between zoning and you can end up with 'bogus' activities if the task previously - // in that slot had more activities than the one now occupying it. Hopefully retaining the slot number for the + // in that slot had more activities than the one now occupying it. Hopefully retaining the slot number for the // duration of a session will overcome this. // const char *TaskQuery="REPLACE INTO character_tasks (charid, taskid, slot, acceptedtime) " @@ -363,8 +363,8 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(TaskID==TASKSLOTEMPTY) continue; if(state->ActiveTasks[Task].Updated) { - _log(TASKS__CLIENTSAVE, "TaskManager::SaveClientState for character ID %d, Updating TaskIndex %i TaskID %i", - CharacterID, Task, TaskID); + _log(TASKS__CLIENTSAVE, "TaskManager::SaveClientState for character ID %d, Updating TaskIndex %i TaskID %i", + CharacterID, Task, TaskID); if(!database.RunQuery(query,MakeAnyLenString(&query, TaskQuery, CharacterID, @@ -374,7 +374,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR, errbuf); } - else + else state->ActiveTasks[Task].Updated = false; safe_delete_array(query); @@ -389,21 +389,21 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(state->ActiveTasks[Task].Activity[Activity].Updated) { _log(TASKS__CLIENTSAVE, "TaskManager::SaveClientSate for character ID %d, " - "Updating Activity %i, %i", - CharacterID, Task, Activity); - + "Updating Activity %i, %i", + CharacterID, Task, Activity); + if(UpdatedActivityCount==0) { MakeAnyLenString(&buf, "(%i, %i, %i, %i, %i)", CharacterID, TaskID, Activity, state->ActiveTasks[Task].Activity[Activity].DoneCount, - state->ActiveTasks[Task].Activity[Activity].State == + state->ActiveTasks[Task].Activity[Activity].State == ActivityCompleted); } else { MakeAnyLenString(&buf, ", (%i, %i, %i, %i, %i)", CharacterID, TaskID, Activity, state->ActiveTasks[Task].Activity[Activity].DoneCount, - state->ActiveTasks[Task].Activity[Activity].State == + state->ActiveTasks[Task].Activity[Activity].State == ActivityCompleted); } UpdateActivityQuery = UpdateActivityQuery + buf; @@ -421,7 +421,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { } else { state->ActiveTasks[Task].Updated=false; - for(int Activity=0; ActivityActivityCount; Activity++) + for(int Activity=0; ActivityActivityCount; Activity++) state->ActiveTasks[Task].Activity[Activity].Updated=false; } @@ -431,7 +431,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { } } - if(RuleB(TaskSystem, RecordCompletedTasks) && + if(RuleB(TaskSystem, RecordCompletedTasks) && (state->CompletedTasks.size() > (unsigned int)state->LastCompletedTaskLoaded)) { for(unsigned int i=state->LastCompletedTaskLoaded; iCompletedTasks.size(); i++) { @@ -458,7 +458,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(!RuleB(TaskSystem, RecordCompletedOptionalActivities)) continue; // Insert one record for each completed optional task. - + for(int j=0; jActivityCount; j++) { if(Tasks[TaskID]->Activity[j].Optional && state->CompletedTasks[i].ActivityDone[j]) { @@ -495,7 +495,7 @@ void Client::LoadClientTaskState() { taskmanager->SendCompletedTasksToClient(this, taskstate); } } - + } void Client::RemoveClientTaskState() { @@ -505,7 +505,7 @@ void Client::RemoveClientTaskState() { safe_delete(taskstate); } } - + bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { const char *TaskQuery = "SELECT `taskid`, `slot`, `acceptedtime` from `character_tasks` " @@ -530,7 +530,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { state->ActiveTaskCount = 0; - _log(TASKS__CLIENTLOAD, "TaskManager::LoadClientSate for character ID %d", CharacterID); + _log(TASKS__CLIENTLOAD, "TaskManager::LoadClientSate for character ID %d", CharacterID); if(database.RunQuery(query,MakeAnyLenString(&query, TaskQuery, CharacterID), errbuf, &result)) { @@ -589,7 +589,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { } // Load Activities - + const char *ActivityQuery = "SELECT `taskid`, `activityid`, `donecount`, `completed` " " from `character_activities` WHERE `charid` = %i " "ORDER BY `taskid` ASC, `activityid` ASC"; @@ -602,11 +602,11 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { const char *ERR_MYSQLERROR2 = "[TASKS]Error in TaskManager::LoadClientState load Activities: %s"; - _log(TASKS__CLIENTLOAD, "LoadClientState. Loading activities for character ID %d", CharacterID); + _log(TASKS__CLIENTLOAD, "LoadClientState. Loading activities for character ID %d", CharacterID); - - if(database.RunQuery(query,MakeAnyLenString(&query, ActivityQuery, + + if(database.RunQuery(query,MakeAnyLenString(&query, ActivityQuery, CharacterID), errbuf, &result)) { @@ -671,10 +671,10 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { const char *ERR_MYSQLERROR3 = "[TASKS]Error in TaskManager::LoadClientState load completed tasks: %s"; - + if(RuleB(TaskSystem, RecordCompletedTasks)) { - if(database.RunQuery(query,MakeAnyLenString(&query, CompletedTaskQuery, + if(database.RunQuery(query,MakeAnyLenString(&query, CompletedTaskQuery, CharacterID), errbuf, &result)) { CompletedTaskInformation cti; @@ -703,7 +703,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { } int CompletedTime = atoi(row[2]); - if((PreviousTaskID != -1) && ((TaskID != PreviousTaskID) || + if((PreviousTaskID != -1) && ((TaskID != PreviousTaskID) || (CompletedTime != PreviousCompletedTime))) { state->CompletedTasks.push_back(cti); @@ -712,7 +712,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { } cti.TaskID = PreviousTaskID = TaskID; cti.CompletedTime = PreviousCompletedTime = CompletedTime; - + // If ActivityID is -1, Mark all the non-optional tasks as completed. if(ActivityID < 0) { TaskInformation* Task = Tasks[TaskID]; @@ -744,10 +744,10 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { const char *EnabledTaskQuery = "SELECT `taskid` FROM character_enabledtasks WHERE `charid` = %i " "AND `taskid` >0 AND `taskid` < %i ORDER BY `taskid` ASC"; - + const char *ERR_MYSQLERROR4 = "[TASKS]Error in TaskManager::LoadClientState load enabled tasks: %s"; - if(database.RunQuery(query,MakeAnyLenString(&query, EnabledTaskQuery, + if(database.RunQuery(query,MakeAnyLenString(&query, EnabledTaskQuery, CharacterID, MAXTASKS), errbuf, &result)) { while((row = mysql_fetch_row(result))) { @@ -766,7 +766,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { // Check that there is an entry in the client task state for every activity in each task // This should only break if a ServerOP adds or deletes activites for a task that players already // have active, or due to a bug. - + const char *ERR_NOTASK2 = "[TASKS]Character %i has task %i which does not exist."; @@ -800,11 +800,11 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { } - for(int i=0; iActiveTasks[i].TaskID != TASKSLOTEMPTY) state->UnlockActivities(CharacterID, i); - _log(TASKS__CLIENTLOAD, "LoadClientState for Character ID %d DONE!", CharacterID); + _log(TASKS__CLIENTLOAD, "LoadClientState for Character ID %d DONE!", CharacterID); return true; } @@ -853,7 +853,7 @@ void ClientTaskState::EnableTask(int CharID, int TaskCount, int *TaskList) { char *buf = 0; for(unsigned int i=0; i TasksDisabled; vector::iterator Iterator; - + for(int i=0; iTaskSets[TaskSetID].size(); i++) + for(unsigned int i=0; iTaskSets[TaskSetID].size(); i++) if(IsTaskActive(taskmanager->TaskSets[TaskSetID][i])) Count++; @@ -1002,7 +1002,7 @@ int ClientTaskState::CompletedTasksInSet(int TaskSetID) { int Count = 0; - for(unsigned int i=0; iTaskSets[TaskSetID].size(); i++) + for(unsigned int i=0; iTaskSets[TaskSetID].size(); i++) if(IsTaskCompleted(taskmanager->TaskSets[TaskSetID][i])) Count++; @@ -1068,14 +1068,14 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i int TaskListIndex = 0; int PlayerLevel = c->GetLevel(); - _log(TASKS__UPDATE, "TaskSetSelector called for taskset %i. EnableTaskSize is %i", TaskSetID, + _log(TASKS__UPDATE, "TaskSetSelector called for taskset %i. EnableTaskSize is %i", TaskSetID, state->EnabledTasks.size()); if((TaskSetID<=0) || (TaskSetID>=MAXTASKSETS)) return; if(TaskSets[TaskSetID].size() > 0) { // A TaskID of 0 in a TaskSet indicates that all Tasks in the set are enabled for all players. - + if(TaskSets[TaskSetID][0] == 0) { _log(TASKS__UPDATE, "TaskSets[%i][0] == 0. All Tasks in Set enabled.", TaskSetID); @@ -1083,12 +1083,12 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i while((Iterator != TaskSets[TaskSetID].end()) && (TaskListIndex < MAXCHOOSERENTRIES)) { if(AppropriateLevel((*Iterator), PlayerLevel) && !state->IsTaskActive((*Iterator)) && - (IsTaskRepeatable((*Iterator)) || !state->IsTaskCompleted((*Iterator)))) + (IsTaskRepeatable((*Iterator)) || !state->IsTaskCompleted((*Iterator)))) TaskList[TaskListIndex++] = (*Iterator); Iterator++; } - if(TaskListIndex > 0) + if(TaskListIndex > 0) { SendTaskSelector(c, mob, TaskListIndex, TaskList); } @@ -1152,7 +1152,7 @@ void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *Task // Check if any of the tasks exist - + for(int i=0; iunknown2 = 0; Ptr = (char *)AvailableTaskData1 + sizeof(AvailableTaskData1_Struct); - + sprintf(Ptr, "%s", Tasks[TaskList[i]]->Title); Ptr = Ptr + strlen(Ptr) + 1; @@ -1250,7 +1250,7 @@ void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *Task AvailableTaskTrailer->StartZone = Tasks[TaskList[i]]->StartZone; Ptr = (char *)AvailableTaskTrailer + sizeof(AvailableTaskTrailer_Struct); - + // In some packets, this next string looks like a short task summary, however it doesn't // appear anywhere in the client window. sprintf(Ptr, "ABCD"); @@ -1275,7 +1275,7 @@ void TaskManager::SendTaskSelectorNew(Client *c, Mob *mob, int TaskCount, int *T { if(Tasks[TaskList[i]] != nullptr) break; } - + int PacketLength = 12; // Header int ValidTasks = 0; @@ -1295,10 +1295,10 @@ void TaskManager::SendTaskSelectorNew(Client *c, Mob *mob, int TaskCount, int *T PacketLength += 21; // Task Data - strings PacketLength += strlen(Tasks[TaskList[i]]->Title) + 1 + strlen(Tasks[TaskList[i]]->Description) + 1; - - sprintf(StartZone, "%i", Tasks[TaskList[i]]->StartZone); + + sprintf(StartZone, "%i", Tasks[TaskList[i]]->StartZone); /* - PacketLength += strlen(Tasks[TaskList[i]]->Activity[ActivityID].Text1) + 1 + + PacketLength += strlen(Tasks[TaskList[i]]->Activity[ActivityID].Text1) + 1 + strlen(Tasks[TaskList[i]]->Activity[ActivityID].Text2) + strlen(Tasks[TaskList[i]]->Activity[ActivityID].Text3) + 1 + strlen(itoa(Tasks[TaskList[i]]->Activity[ActivityID].ZoneID)) + 1 + @@ -1311,7 +1311,7 @@ void TaskManager::SendTaskSelectorNew(Client *c, Mob *mob, int TaskCount, int *T if(ValidTasks == 0) return; EQApplicationPacket* outapp = new EQApplicationPacket(OP_OpenNewTasksWindow, PacketLength); - + outapp->WriteUInt32(ValidTasks); // TaskCount outapp->WriteUInt32(2); // Unknown2 outapp->WriteUInt32(mob->GetID()); // TaskGiver @@ -1328,16 +1328,16 @@ void TaskManager::SendTaskSelectorNew(Client *c, Mob *mob, int TaskCount, int *T outapp->WriteFloat(1.0f); outapp->WriteUInt32(Tasks[TaskList[i]]->Duration); outapp->WriteUInt32(0); // Unknown7 - + outapp->WriteString(Tasks[TaskList[i]]->Title); outapp->WriteString(Tasks[TaskList[i]]->Description); - + outapp->WriteUInt8(0); // Unknown10 - Empty string ? outapp->WriteUInt32(1); // ActivityCount - Hard set to 1 for now // Activity stuff below - Will need to iterate through each task // Currently hard set for testing - + sprintf(StartZone, "%i", Tasks[TaskList[i]]->StartZone); @@ -1368,7 +1368,7 @@ int TaskManager::GetActivityCount(int TaskID) { // Return the total number of activities in a particular task. - if((TaskID>0) && (TaskID0) && (TaskIDActivityCount; return 0; @@ -1399,7 +1399,7 @@ void TaskManager::ExplainTask(Client*c, int TaskID) { c->Message(0, "%3i Activities", Tasks[TaskID]->ActivityCount); ptr = Explanation; for(int i=0; iActivityCount; i++) { - + sprintf(ptr, "Act: %3i: ", i); ptr = ptr + strlen(ptr); switch(Tasks[TaskID]->Activity[i].Type) { case ActivityDeliver: @@ -1409,7 +1409,7 @@ void TaskManager::ExplainTask(Client*c, int TaskID) { } } - + ClientTaskState::ClientTaskState() { ActiveTaskCount = 0; @@ -1442,7 +1442,7 @@ static void DeleteCompletedTaskFromDatabase(int CharID, int TaskID) { _log(TASKS__UPDATE, "DeleteCompletedTasksFromDatabase. CharID = %i, TaskID = %i", CharID, TaskID); - + if(!database.RunQuery(query,MakeAnyLenString(&query, TaskQuery, CharID, TaskID), errbuf)) { LogFile->write(EQEMuLog::Error, "[TASKS]Error in CientTaskState::CancelTask %s, %s", query, errbuf); @@ -1464,8 +1464,8 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { // On loading the client state, all activities that are not completed, are // marked as hidden. For Sequential (non-stepped) mode, we mark the first // activity as active if not complete. - _log(TASKS__UPDATE, "CharID: %i Task: %i Sequence mode is %i", - CharID, ActiveTasks[TaskIndex].TaskID, Task->SequenceMode); + _log(TASKS__UPDATE, "CharID: %i Task: %i Sequence mode is %i", + CharID, ActiveTasks[TaskIndex].TaskID, Task->SequenceMode); if(Task->SequenceMode == ActivitiesSequential) { if(ActiveTasks[TaskIndex].Activity[0].State != ActivityCompleted) @@ -1521,7 +1521,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { // Stepped Mode // TODO: This code is probably more complex than it needs to be - + bool CurrentStepComplete = true; _log(TASKS__UPDATE, "Current Step is %i, Last Step is %i", ActiveTasks[TaskIndex].CurrentStep, Task->LastStep); @@ -1529,7 +1529,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { // client state. Unlock all activities with a step number of 0 if(ActiveTasks[TaskIndex].CurrentStep == -1) { for(int i=0; iActivityCount; i++) { - + if((Task->Activity[i].StepNumber == 0) && (ActiveTasks[TaskIndex].Activity[i].State == ActivityHidden)) { ActiveTasks[TaskIndex].Activity[i].State = ActivityActive; @@ -1624,7 +1624,7 @@ bool ClientTaskState::UpdateTasksByNPC(Client *c, int ActivityType, int NPCTypeI _log(TASKS__UPDATE, "ClientTaskState::UpdateTasks for NPCTypeID: %d", NPCTypeID); // If the client has no tasks, there is nothing further to check. - + if(!taskmanager || ActiveTaskCount == 0) return false; for(int i=0; iGoalListManager.IsInList(Task->Activity[j].GoalID, + if(!taskmanager->GoalListManager.IsInList(Task->Activity[j].GoalID, NPCTypeID)) continue; break; @@ -1669,7 +1669,7 @@ bool ClientTaskState::UpdateTasksByNPC(Client *c, int ActivityType, int NPCTypeI Ret = true; } } - + return Ret; } @@ -1742,7 +1742,7 @@ void ClientTaskState::UpdateTasksForItem(Client *c, ActivityType Type, int ItemI // Type should be one of ActivityLoot, ActivityTradeSkill, ActivityFish or ActivityForage // If the client has no tasks, there is nothing further to check. - + _log(TASKS__UPDATE, "ClientTaskState::UpdateTasksForItem(%d,%d)", Type, ItemID); if(ActiveTaskCount == 0) return; @@ -1788,14 +1788,14 @@ void ClientTaskState::UpdateTasksForItem(Client *c, ActivityType Type, int ItemI IncrementDoneCount(c, Task, i, j, Count); } } - + return; } void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) { // If the client has no tasks, there is nothing further to check. - + _log(TASKS__UPDATE, "ClientTaskState::UpdateTasksOnExplore(%i)", ExploreID); if(ActiveTaskCount == 0) return; @@ -1826,7 +1826,7 @@ void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) { break; case METHODLIST: - if(!taskmanager->GoalListManager.IsInList(Task->Activity[j].GoalID, + if(!taskmanager->GoalListManager.IsInList(Task->Activity[j].GoalID, ExploreID)) continue; break; @@ -1837,12 +1837,12 @@ void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) { // We found an active task to explore this area, so set done count to goal count // (Only a goal count of 1 makes sense for explore activities?) _log(TASKS__UPDATE, "Increment on explore"); - IncrementDoneCount(c, Task, i, j, + IncrementDoneCount(c, Task, i, j, Task->Activity[j].GoalCount - ActiveTasks[i].Activity[j].DoneCount); } } - + return; } @@ -1898,7 +1898,7 @@ bool ClientTaskState::UpdateTasksOnDeliver(Client *c, uint32 *Items, int Cash, i Items[k])) continue; break; - + default: // If METHODQUEST, don't update the activity here continue; @@ -1910,15 +1910,15 @@ bool ClientTaskState::UpdateTasksOnDeliver(Client *c, uint32 *Items, int Cash, i } } } - } - + } + return Ret; } void ClientTaskState::UpdateTasksOnTouch(Client *c, int ZoneID) { // If the client has no tasks, there is nothing further to check. - + _log(TASKS__UPDATE, "ClientTaskState::UpdateTasksOnTouch(%i)", ZoneID); if(ActiveTaskCount == 0) return; @@ -1945,17 +1945,17 @@ void ClientTaskState::UpdateTasksOnTouch(Client *c, int ZoneID) { // We found an active task to zone into this zone, so set done count to goal count // (Only a goal count of 1 makes sense for touch activities?) _log(TASKS__UPDATE, "Increment on Touch"); - IncrementDoneCount(c, Task, i, j, + IncrementDoneCount(c, Task, i, j, Task->Activity[j].GoalCount - ActiveTasks[i].Activity[j].DoneCount); } } - + return; } void ClientTaskState::IncrementDoneCount(Client *c, TaskInformation* Task, int TaskIndex, int ActivityID, int Count) { _log(TASKS__UPDATE, "IncrementDoneCount"); - + ActiveTasks[TaskIndex].Activity[ActivityID].DoneCount += Count; if(ActiveTasks[TaskIndex].Activity[ActivityID].DoneCount > Task->Activity[ActivityID].GoalCount) @@ -2016,7 +2016,7 @@ void ClientTaskState::IncrementDoneCount(Client *c, TaskInformation* Task, int T } else // Send an update packet for this single activity - taskmanager->SendTaskActivityLong(c, ActiveTasks[TaskIndex].TaskID, ActivityID, + taskmanager->SendTaskActivityLong(c, ActiveTasks[TaskIndex].TaskID, ActivityID, TaskIndex, Task->Activity[ActivityID].Optional); } @@ -2039,7 +2039,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) { } break; } - case METHODLIST: + case METHODLIST: { RewardList = taskmanager->GoalListManager.GetListContents(Task->RewardID); for(unsigned int i=0; i= Task->ActivityCount) return false; _log(TASKS__UPDATE, "ClientTaskState IsTaskActivityActive(%i, %i). State is %i ", TaskID, ActivityID, - ActiveTasks[ActiveTaskIndex].Activity[ActivityID].State); + ActiveTasks[ActiveTaskIndex].Activity[ActivityID].State); return (ActiveTasks[ActiveTaskIndex].Activity[ActivityID].State == ActivityActive); @@ -2263,16 +2263,16 @@ void ClientTaskState::ResetTaskActivity(Client *c, int TaskID, int ActivityID) { ActiveTasks[ActiveTaskIndex].Activity[ActivityID].Updated=true; // Send an update packet for this single activity - taskmanager->SendTaskActivityLong(c, ActiveTasks[ActiveTaskIndex].TaskID, ActivityID, + taskmanager->SendTaskActivityLong(c, ActiveTasks[ActiveTaskIndex].TaskID, ActivityID, ActiveTaskIndex, Task->Activity[ActivityID].Optional); } void ClientTaskState::ShowClientTasks(Client *c) { - + c->Message(0, "Task Information:"); //for(int i=0; iMessage(0, "Task: %i %s", ActiveTasks[i].TaskID, taskmanager->Tasks[ActiveTasks[i].TaskID]->Title); @@ -2304,9 +2304,9 @@ int ClientTaskState::TaskTimeLeft(int TaskID) { if(!Task->Duration) return -1; int TimeLeft = (ActiveTasks[i].AcceptedTime + Task->Duration - Now); - + // If Timeleft is negative, return 0, else return the number of seconds left - + return (TimeLeft>0 ? TimeLeft : 0); } @@ -2375,7 +2375,7 @@ void ClientTaskState::TaskPeriodicChecks(Client *c) { c->CancelTask(i); // It is a conscious decision to only fail one task per call to this method, // otherwise the player will not see all the failed messages where multiple - // tasks fail at the same time. + // tasks fail at the same time. break; } @@ -2396,20 +2396,20 @@ void ClientTaskState::TaskPeriodicChecks(Client *c) { void Client::SendTaskComplete(int TaskIndex) { // 0x4c8c - + TaskComplete_Struct* tcs; - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_TaskComplete, sizeof(TaskComplete_Struct)); tcs = (TaskComplete_Struct*)outapp->pBuffer; // I have seen unknown0 as non-zero. It always seems to match the value in the first word of the // Task Activity Complete packet sent immediately prior to it. - //tcs->unknown00 = 0x00000000; + //tcs->unknown00 = 0x00000000; tcs->unknown00 = TaskIndex; // I have only seen 0x00000002 in the next field. This is a common 'unknown' value in the task packets. // I suspect this is the type field to indicate this is a quest task, as opposed to other types. - tcs->unknown04 = 0x00000002; + tcs->unknown04 = 0x00000002; _log("[TASKS]SendTasksComplete"); DumpPacket(outapp); fflush(stdout); @@ -2463,7 +2463,7 @@ void ClientTaskState::SendTaskHistory(Client *c, int TaskIndex) { strlen(Task->Activity[i].Text3) + 1; } } - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_TaskHistoryReply, PacketLength); @@ -2512,7 +2512,7 @@ void Client::SendTaskActivityComplete(int TaskID, int ActivityID, int TaskIndex, // 0x54eb TaskActivityComplete_Struct* tac; - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_TaskActivityComplete, sizeof(TaskActivityComplete_Struct)); tac = (TaskActivityComplete_Struct*)outapp->pBuffer; @@ -2543,7 +2543,7 @@ void Client::SendTaskFailed(int TaskID, int TaskIndex) { parse->EventPlayer(EVENT_TASK_FAIL, this, buf, 0); TaskActivityComplete_Struct* tac; - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_TaskActivityComplete, sizeof(TaskActivityComplete_Struct)); tac = (TaskActivityComplete_Struct*)outapp->pBuffer; @@ -2577,10 +2577,10 @@ void TaskManager::SendCompletedTasksToClient(Client *c, ClientTaskState *State) int FirstTaskToSend = 0; int LastTaskToSend = State->CompletedTasks.size(); - if(State->CompletedTasks.size() > 50) + if(State->CompletedTasks.size() > 50) FirstTaskToSend = State->CompletedTasks.size() - 50; - _log(TASKS__UPDATE, "Completed Task Count: %i, First Task to send is %i, Last is %i", + _log(TASKS__UPDATE, "Completed Task Count: %i, First Task to send is %i, Last is %i", State->CompletedTasks.size(), FirstTaskToSend, LastTaskToSend); /* for(iterator=State->CompletedTasks.begin(); iterator!=State->CompletedTasks.end(); iterator++) { @@ -2623,7 +2623,7 @@ void TaskManager::SendCompletedTasksToClient(Client *c, ClientTaskState *State) } - + void TaskManager::SendTaskActivityShort(Client *c, int TaskID, int ActivityID, int ClientTaskIndex) { // This Activity Packet is sent for activities that have not yet been unlocked and appear as ??? @@ -2642,7 +2642,7 @@ void TaskManager::SendTaskActivityShort(Client *c, int TaskID, int ActivityID, i outapp->WriteUInt32(0xffffffff); outapp->WriteUInt8(0); c->FastQueuePacket(&outapp); - + return; } @@ -2681,7 +2681,7 @@ void TaskManager::SendTaskActivityLong(Client *c, int TaskID, int ActivityID, in TaskActivityTrailer_Struct* tat; long PacketLength = sizeof(TaskActivityHeader_Struct) + +sizeof(TaskActivityData1_Struct) + sizeof(TaskActivityTrailer_Struct); - PacketLength = PacketLength + strlen(Tasks[TaskID]->Activity[ActivityID].Text1) + 1 + + PacketLength = PacketLength + strlen(Tasks[TaskID]->Activity[ActivityID].Text1) + 1 + strlen(Tasks[TaskID]->Activity[ActivityID].Text2) + 1 + strlen(Tasks[TaskID]->Activity[ActivityID].Text3) + 1; @@ -2755,13 +2755,13 @@ void TaskManager::SendTaskActivityLong(Client *c, int TaskID, int ActivityID, in // Used only by RoF+ Clients void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int ClientTaskIndex, bool Optional, bool TaskComplete) { - + uint32 String2Len = 3; if(TaskComplete) String2Len = 4; - + long PacketLength = 29 + 4 + 8 + 4 + 4 + 5; - PacketLength = PacketLength + strlen(Tasks[TaskID]->Activity[ActivityID].Text1) + 1 + + PacketLength = PacketLength + strlen(Tasks[TaskID]->Activity[ActivityID].Text1) + 1 + strlen(Tasks[TaskID]->Activity[ActivityID].Text2) + 1 + strlen(Tasks[TaskID]->Activity[ActivityID].Text3) + 1 + ((strlen(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID)) + 1) * 2) + @@ -2796,7 +2796,7 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int outapp->WriteUInt32(Tasks[TaskID]->Activity[ActivityID].GoalCount); else outapp->WriteUInt32(1); // GoalCount - + outapp->WriteUInt32(3); // String Length - Add in null terminator outapp->WriteString("-1"); @@ -2809,12 +2809,12 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int outapp->WriteUInt32(4); // String Length - Add in null terminator outapp->WriteString("-54"); } - + outapp->WriteString(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID)); outapp->WriteUInt32(0); // unknown7 outapp->WriteString(Tasks[TaskID]->Activity[ActivityID].Text3); - + if(Tasks[TaskID]->Activity[ActivityID].Type != ActivityGiveCash) outapp->WriteUInt32(c->GetTaskActivityDoneCount(ClientTaskIndex, ActivityID)); // DoneCount else @@ -2822,7 +2822,7 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int outapp->WriteUInt32((c->GetTaskActivityDoneCount(ClientTaskIndex, ActivityID) >= Tasks[TaskID]->Activity[ActivityID].GoalCount)); outapp->WriteUInt8(1); // unknown9 - + outapp->WriteString(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID)); _pkt(TASKS__PACKETS, outapp); @@ -2839,7 +2839,7 @@ void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) { int TaskID = c->GetActiveTaskID(TaskIndex); if((TaskID==0) || (Tasks[TaskID] ==0)) continue; int StartTime = c->GetTaskStartTime(TaskIndex); - + SendActiveTaskDescription(c, TaskID, TaskIndex, StartTime, Tasks[TaskID]->Duration, false); _log(TASKS__UPDATE, "SendActiveTasksToClient: Task %i, Activities: %i", TaskID, GetActivityCount(TaskID)); @@ -2848,11 +2848,11 @@ void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) { if(c->GetTaskActivityState(TaskIndex, Activity) != ActivityHidden) { _log(TASKS__UPDATE, " Long: %i, %i, %i Complete=%i", TaskID, Activity, TaskIndex, TaskComplete); if(Activity==GetActivityCount(TaskID)-1) - SendTaskActivityLong(c, TaskID, Activity, TaskIndex, + SendTaskActivityLong(c, TaskID, Activity, TaskIndex, Tasks[TaskID]->Activity[Activity].Optional, TaskComplete); else - SendTaskActivityLong(c, TaskID, Activity, TaskIndex, + SendTaskActivityLong(c, TaskID, Activity, TaskIndex, Tasks[TaskID]->Activity[Activity].Optional, 0); } else { @@ -2861,7 +2861,7 @@ void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) { } Sequence++; } - + } } @@ -2885,10 +2885,10 @@ void TaskManager::SendSingleActiveTaskToClient(Client *c, int TaskIndex, bool Ta if(c->GetTaskActivityState(TaskIndex, Activity) != ActivityHidden) { _log(TASKS__UPDATE, " Long: %i, %i, %i Complete=%i", TaskID, Activity, TaskIndex, TaskComplete); if(Activity==GetActivityCount(TaskID)-1) - SendTaskActivityLong(c, TaskID, Activity, TaskIndex, + SendTaskActivityLong(c, TaskID, Activity, TaskIndex, Tasks[TaskID]->Activity[Activity].Optional, TaskComplete); else - SendTaskActivityLong(c, TaskID, Activity, TaskIndex, + SendTaskActivityLong(c, TaskID, Activity, TaskIndex, Tasks[TaskID]->Activity[Activity].Optional, 0); } else { @@ -2932,26 +2932,26 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN case EQClient62: { - MakeAnyLenString(&RewardTmp, "%c%07i-00001-00001-00001-00001-000013E0ABA6B%s%c", + MakeAnyLenString(&RewardTmp, "%c%07i-00001-00001-00001-00001-000013E0ABA6B%s%c", 0x12, ItemID, Tasks[TaskID]->Reward,0x12); break; } case EQClientTitanium: { - MakeAnyLenString(&RewardTmp, "%c%06X000000000000000000000000000000014505DC2%s%c", + MakeAnyLenString(&RewardTmp, "%c%06X000000000000000000000000000000014505DC2%s%c", 0x12, ItemID, Tasks[TaskID]->Reward,0x12); break; } case EQClientRoF: { - MakeAnyLenString(&RewardTmp, "%c%06X0000000000000000000000000000000000000000014505DC2%s%c", + MakeAnyLenString(&RewardTmp, "%c%06X0000000000000000000000000000000000000000014505DC2%s%c", 0x12, ItemID, Tasks[TaskID]->Reward,0x12); break; } default: { // All clients after Titanium - MakeAnyLenString(&RewardTmp, "%c%06X00000000000000000000000000000000000014505DC2%s%c", + MakeAnyLenString(&RewardTmp, "%c%06X00000000000000000000000000000000000014505DC2%s%c", 0x12, ItemID, Tasks[TaskID]->Reward,0x12); } } @@ -2966,26 +2966,26 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN case EQClient62: { - MakeAnyLenString(&RewardTmp, "%c%07i-00001-00001-00001-00001-000013E0ABA6B%s%c", + MakeAnyLenString(&RewardTmp, "%c%07i-00001-00001-00001-00001-000013E0ABA6B%s%c", 0x12, ItemID, Item->Name,0x12); break; } case EQClientTitanium: { - MakeAnyLenString(&RewardTmp, "%c%06X000000000000000000000000000000014505DC2%s%c", + MakeAnyLenString(&RewardTmp, "%c%06X000000000000000000000000000000014505DC2%s%c", 0x12, ItemID, Item->Name ,0x12); break; } case EQClientRoF: { - MakeAnyLenString(&RewardTmp, "%c%06X0000000000000000000000000000000000000000014505DC2%s%c", + MakeAnyLenString(&RewardTmp, "%c%06X0000000000000000000000000000000000000000014505DC2%s%c", 0x12, ItemID, Item->Name ,0x12); break; } default: { // All clients after Titanium - MakeAnyLenString(&RewardTmp, "%c%06X00000000000000000000000000000000000014505DC2%s%c", + MakeAnyLenString(&RewardTmp, "%c%06X00000000000000000000000000000000000014505DC2%s%c", 0x12, ItemID, Item->Name ,0x12); } } @@ -2996,12 +2996,12 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN safe_delete_array(RewardTmp); } else { - RewardText += Tasks[TaskID]->Reward; + RewardText += Tasks[TaskID]->Reward; } } else { - RewardText += Tasks[TaskID]->Reward; + RewardText += Tasks[TaskID]->Reward; } PacketLength += strlen(RewardText.c_str()) + 1; @@ -3036,7 +3036,7 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN tdd1->Duration = Duration; tdd1->unknown2 = 0x00000000; - + tdd1->StartTime = StartTime; Ptr = (char *) tdd1 + sizeof(TaskDescriptionData1_Struct); @@ -3048,8 +3048,8 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN // This next field may not be a reward count. It is always 1 in the packets I have seen. Setting it to 2 and trying // to include multiple item links has so far proven futile. Setting it to 0 ends the packet after the next byte. - tdd2->RewardCount = 1; - + tdd2->RewardCount = 1; + if(Tasks[TaskID]->XPReward) tdd2->unknown1 = 0x00000100; else @@ -3063,7 +3063,7 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN Ptr = Ptr + strlen(Ptr) + 1; tdt = (TaskDescriptionTrailer_Struct*)Ptr; - tdt->Points = 0x00000000; // Points Count + tdt->Points = 0x00000000; // Points Count _pkt(TASKS__PACKETS, outapp); @@ -3073,7 +3073,7 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN } bool ClientTaskState::IsTaskActivityCompleted(int index, int ActivityID) { - + return (ActiveTasks[index].Activity[ActivityID].State == ActivityCompleted); } @@ -3109,15 +3109,15 @@ int ClientTaskState::GetTaskStartTime(int index) { void ClientTaskState::CancelAllTasks(Client *c) { // This method exists solely to be called during #task reloadall - // It removes tasks from the in-game client state ready for them to be + // It removes tasks from the in-game client state ready for them to be // resent to the client, in case an updated task fails to load - for(int i=0; i=MAXTASKS) { c->Message(13, "Task system not functioning, or TaskID %i out of range.", TaskID); return; @@ -3223,13 +3223,13 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID) { c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVETASKS); return; } - + ActiveTasks[FreeSlot].TaskID = TaskID; ActiveTasks[FreeSlot].AcceptedTime = time(nullptr); ActiveTasks[FreeSlot].Updated = true; ActiveTasks[FreeSlot].CurrentStep = -1; - + for(int i=0; iTasks[TaskID]->ActivityCount; i++) { ActiveTasks[FreeSlot].Activity[i].ActivityID = i; ActiveTasks[FreeSlot].Activity[i].DoneCount = 0; @@ -3276,7 +3276,7 @@ void ClientTaskState::ProcessTaskProximities(Client *c, float X, float Y, float } - + TaskGoalListManager::TaskGoalListManager() { @@ -3311,7 +3311,7 @@ bool TaskGoalListManager::LoadLists() { MYSQL_RES *result; MYSQL_ROW row; - _log(TASKS__GLOBALLOAD, "TaskGoalListManager::LoadLists Called"); + _log(TASKS__GLOBALLOAD, "TaskGoalListManager::LoadLists Called"); for(int i=0; i< NumberOfLists; i++) { @@ -3328,7 +3328,7 @@ bool TaskGoalListManager::LoadLists() { _log(TASKS__GLOBALLOAD, "Database returned a count of %i lists", NumberOfLists); TaskGoalLists = new TaskGoalList_Struct[NumberOfLists]; - + int ListIndex = 0; while((row = mysql_fetch_row(result))) { @@ -3361,7 +3361,7 @@ bool TaskGoalListManager::LoadLists() { // This should only happen if a row is deleted in between us retrieving the counts // at the start of this method and getting to here. It should not be possible for // an INSERT to cause a problem, as the SELECT is used with a LIMIT - if(mysql_num_rows(result) < Size) + if(mysql_num_rows(result) < Size) TaskGoalLists[ListIndex].Size = mysql_num_rows(result); int EntryIndex = 0; @@ -3396,7 +3396,7 @@ bool TaskGoalListManager::LoadLists() { int TaskGoalListManager::GetListByID(int ListID) { // Find the list with the specified ListID and return the index - + int FirstEntry = 0; int LastEntry = NumberOfLists - 1; @@ -3435,7 +3435,7 @@ vector TaskGoalListManager::GetListContents(int ListID) { if((ListIndex < 0) || (ListIndex >= NumberOfLists)) return ListContents; - for(int i=0; im_inst; - } + } else { // Check to see if they have an inventory container type 53 that is used for this. Inventory& user_inv = user->GetInv(); ItemInst* inst = nullptr; - + inst = user_inv.GetItem(in_augment->container_slot); if (inst) { @@ -91,7 +91,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme user->Message(13, "Error: This item is not a container!"); return; } - + ItemInst *tobe_auged, *auged_with = nullptr; int8 slot=-1; @@ -179,7 +179,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme } else { - // Delete items in our inventory container... + // Delete items in our inventory container... for (uint8 i=0; i<10; i++) { const ItemInst* inst = container->GetItem(i); @@ -212,7 +212,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob LogFile->write(EQEMuLog::Error, "Client or NewCombine_Struct not set in Object::HandleCombine"); return; } - + Inventory& user_inv = user->GetInv(); PlayerProfile_Struct& user_pp = user->GetPP(); ItemInst* container = nullptr; @@ -220,7 +220,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob uint8 c_type = 0xE8; uint32 some_id = 0; bool worldcontainer=false; - + if (in_combine->container_slot == SLOT_TRADESKILL) { if(!worldo) { user->Message(13, "Error: Server is not aware of the tradeskill container you are attempting to use"); @@ -240,14 +240,14 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob } } } - + if (!inst || !inst->IsType(ItemClassContainer)) { user->Message(13, "Error: Server does not recognize specified tradeskill container"); return; } - + container = inst; - + DBTradeskillRecipe_Struct spec; if (!database.GetTradeRecipe(container, c_type, some_id, user->CharacterID(), &spec)) { user->Message_StringID(MT_Emote,TRADESKILL_NOCOMBINE); @@ -256,7 +256,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob safe_delete(outapp); return; } - + // Character hasn't learnt the recipe yet. // must_learn: // bit 1 (0x01): recipe can't be experimented @@ -280,7 +280,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob safe_delete(outapp); return; } - + //changing from a switch to string of if's since we don't need to iterate through all of the skills in the SkillType enum if (spec.tradeskill == ALCHEMY) { if (user_pp.class_ != SHAMAN) { @@ -304,7 +304,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob return; } } - + // Send acknowledgement packets to client EQApplicationPacket* outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0); user->QueuePacket(outapp); @@ -339,10 +339,10 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob } database.UpdateRecipeMadecount(spec.recipe_id, user->CharacterID(), spec.madecount+1); } - + // Replace the container on success if required. // - + if(success && spec.replace_container) { if(worldcontainer){ //should report this error, but we dont have the recipe ID, so its not very useful @@ -351,14 +351,14 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob else user->DeleteItemInInventory(in_combine->container_slot, 0, true); } - if (success) + if (success) parse->EventPlayer(EVENT_COMBINE_SUCCESS, user, spec.name.c_str(), spec.recipe_id); else - parse->EventPlayer(EVENT_COMBINE_FAILURE, user, spec.name.c_str(), spec.recipe_id); + parse->EventPlayer(EVENT_COMBINE_FAILURE, user, spec.name.c_str(), spec.recipe_id); } void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac) { - + //get our packet ready, gotta send one no matter what... EQApplicationPacket* outapp = new EQApplicationPacket(OP_RecipeAutoCombine, sizeof(RecipeAutoCombine_Struct)); RecipeAutoCombine_Struct *outp = (RecipeAutoCombine_Struct *)outapp->pBuffer; @@ -367,8 +367,8 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac outp->unknown1 = rac->unknown1; outp->recipe_id = rac->recipe_id; outp->reply_code = 0xFFFFFFF5; //default fail. - - + + //ask the database for the recipe to make sure it exists... DBTradeskillRecipe_Struct spec; if (!database.GetTradeRecipe(rac->recipe_id, rac->object_type, rac->some_id, user->CharacterID(), &spec)) { @@ -388,12 +388,12 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac return; } - + char errbuf[MYSQL_ERRMSG_SIZE]; MYSQL_RES *result; MYSQL_ROW row; char *query = 0; - + uint32 qlen = 0; uint8 qcount = 0; @@ -410,7 +410,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac return; } safe_delete_array(query); - + qcount = mysql_num_rows(result); if(qcount < 1) { LogFile->write(EQEMuLog::Error, "Error in HandleAutoCombine: no components returned"); @@ -424,13 +424,13 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac safe_delete(outapp); return; } - + uint32 items[10]; memset(items, 0, sizeof(items)); uint8 counts[10]; memset(counts, 0, sizeof(counts)); - - + + //search for all the items in their inventory Inventory& user_inv = user->GetInv(); uint8 count = 0; @@ -443,9 +443,9 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac row = mysql_fetch_row(result); uint32 item = (uint32)atoi(row[0]); uint8 num = (uint8) atoi(row[1]); - + needcount += num; - + //because a HasItem on items with num > 1 only returns the //last-most slot... the results of this are useless to us //when we go to delete them because we cannot assume it is in a single stack. @@ -459,7 +459,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac counts[r] = num; } mysql_free_result(result); - + //make sure we found it all... if(count != needcount) { @@ -479,15 +479,15 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac return; } - + //now we know they have everything... - + //remove all the items from the players inventory, with updates... int16 slot; for(r = 0; r < qcount; r++) { if(items[r] == 0 || counts[r] == 0) continue; //skip empties, could prolly break here - + //we have to loop here to delete 1 at a time in case its in multiple stacks. for(k = 0; k < counts[r]; k++) { slot = user_inv.HasItem(items[r], 1, invWherePersonal); @@ -512,35 +512,35 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac } } } - + //otherwise, we found it all... outp->reply_code = 0x00000000; //success for finding it... - + user->QueuePacket(outapp); safe_delete(outapp); - - + + //now actually try to make something... - + bool success = user->TradeskillExecute(&spec); - + if (success) { if (!spec.has_learnt && ((spec.must_learn & 0x10) != 0x10)) { user->Message_StringID(4, TRADESKILL_LEARN_RECIPE, spec.name.c_str()); } database.UpdateRecipeMadecount(spec.recipe_id, user->CharacterID(), spec.madecount+1); } - - + + //TODO: find in-pack containers in inventory, make sure they are really //there, and then use that slot to handle replace_container too. if(success && spec.replace_container) { // user->DeleteItemInInventory(in_combine->container_slot, 0, true); } - if (success) - parse->EventPlayer(EVENT_COMBINE_SUCCESS, user, spec.name.c_str(), spec.recipe_id); + if (success) + parse->EventPlayer(EVENT_COMBINE_SUCCESS, user, spec.name.c_str(), spec.recipe_id); else - parse->EventPlayer(EVENT_COMBINE_FAILURE, user, spec.name.c_str(), spec.recipe_id); + parse->EventPlayer(EVENT_COMBINE_FAILURE, user, spec.name.c_str(), spec.recipe_id); } SkillType Object::TypeToSkill(uint32 type) { @@ -607,20 +607,20 @@ SkillType Object::TypeToSkill(uint32 type) { return(tradeskill); } -void Client::TradeskillSearchResults(const char *query, unsigned long qlen, +void Client::TradeskillSearchResults(const char *query, unsigned long qlen, unsigned long objtype, unsigned long someid) { - + char errbuf[MYSQL_ERRMSG_SIZE]; MYSQL_RES *result; MYSQL_ROW row; - + if (!database.RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in TradeskillSearchResults query '%s': %s", query, errbuf); return; } - + uint8 qcount = 0; - + qcount = mysql_num_rows(result); if(qcount < 1) { //search gave no results... not an error @@ -628,9 +628,9 @@ void Client::TradeskillSearchResults(const char *query, unsigned long qlen, } if(mysql_num_fields(result) != 6) { LogFile->write(EQEMuLog::Error, "Error in TradeskillSearchResults query '%s': Invalid column count in result", query); - return; + return; } - + uint8 r; for(r = 0; r < qcount; r++) { row = mysql_fetch_row(result); @@ -641,7 +641,7 @@ void Client::TradeskillSearchResults(const char *query, unsigned long qlen, uint32 trivial = (uint32) atoi(row[2]); uint32 comp_count = (uint32) atoi(row[3]); uint32 tradeskill = (uint16) atoi(row[5]); - + // Skip the recipes that exceed the threshold in skill difference // Recipes that have either been made before or were // explicitly learned are excempt from that limit @@ -652,11 +652,11 @@ void Client::TradeskillSearchResults(const char *query, unsigned long qlen, continue; } } - - + + EQApplicationPacket* outapp = new EQApplicationPacket(OP_RecipeReply, sizeof(RecipeReply_Struct)); RecipeReply_Struct *reply = (RecipeReply_Struct *) outapp->pBuffer; - + reply->object_type = objtype; reply->some_id = someid; reply->component_count = comp_count; @@ -674,7 +674,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { MYSQL_RES *result; MYSQL_ROW row; char *query = 0; - + uint32 qlen = 0; uint8 qcount = 0; @@ -690,7 +690,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { return; } safe_delete_array(query); - + qcount = mysql_num_rows(result); if(qcount < 1) { LogFile->write(EQEMuLog::Error, "Error in SendTradeskillDetails: no components returned"); @@ -700,19 +700,19 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { LogFile->write(EQEMuLog::Error, "Error in SendTradeskillDetails: too many components returned (%u)", qcount); return; } - + //biggest this packet can ever be: // 64 * 10 + 8 * 10 + 4 + 4 * 10 = 764 char *buf = new char[775]; //dynamic so we can just give it to EQApplicationPacket uint8 r,k; - + uint32 *header = (uint32 *) buf; //Hell if I know why this is in the wrong byte order.... *header = htonl(recipe_id); - + char *startblock = buf; startblock += sizeof(uint32); - + uint32 *ffff_start = (uint32 *) startblock; //fill in the FFFF's as if there were 0 items for(r = 0; r < 10; r++) { @@ -721,7 +721,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { } char * datastart = (char *) ffff_start; char * cblock = (char *) ffff_start; - + uint32 *itemptr; uint32 *iconptr; uint32 len; @@ -729,27 +729,27 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { uint8 count = 0; for(r = 0; r < qcount; r++) { row = mysql_fetch_row(result); - + //watch for references to items which are not in the //items table, which the left join will make nullptr... if(row[2] == nullptr || row[3] == nullptr) { continue; } - + uint32 item = (uint32)atoi(row[0]); uint8 num = (uint8) atoi(row[1]); - - + + uint32 icon = (uint32) atoi(row[2]); const char *name = row[3]; len = strlen(name); if(len > 63) len = 63; - + //Hell if I know why these are in the wrong byte order.... item = htonl(item); icon = htonl(icon); - + //if we get more than 10 items, just start skipping them... for(k = 0; k < num && count < 10; k++) { itemptr = (uint32 *) cblock; @@ -758,7 +758,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { iconptr = (uint32 *) cblock; cblock += sizeof(uint32); datalen += sizeof(uint32); - + *itemptr = item; *iconptr = icon; strncpy(cblock, name, len); @@ -768,17 +768,17 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { datalen += len + 1; //get the null count++; } - + } mysql_free_result(result); - + //now move the item data over top of the FFFFs uint8 dist = sizeof(uint32) * (10 - count); startblock += dist; memmove(startblock, datastart, datalen); - + uint32 total = sizeof(uint32) + dist + datalen; - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_RecipeDetails); outapp->size = total; outapp->pBuffer = (uchar*) buf; @@ -791,7 +791,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if(spec == nullptr) return(false); - + uint16 user_skill = GetSkill(spec->tradeskill); float chance = 0.0; float skillup_modifier = 0.0; @@ -840,10 +840,10 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { thirdstat = GetSTR(); stat_modifier = 0; } - + int16 higher_from_int_wis = (GetINT() > GetWIS()) ? GetINT() : GetWIS(); int16 bonusstat = (higher_from_int_wis > thirdstat) ? higher_from_int_wis : thirdstat; - + vector< pair >::iterator itr; @@ -855,7 +855,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { } else { chance = (user_skill - spec->trivial) + 66; } - + int16 over_trivial = (int16)GetRawSkill(spec->tradeskill) - (int16)spec->trivial; //handle caps @@ -880,10 +880,10 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { //cap is 95, shouldent reach this before trivial, but just in case. chance = 95; } - + _log(TRADESKILLS__TRACE, "...Current skill: %d , Trivial: %d , Success chance: %f percent", user_skill , spec->trivial , chance); _log(TRADESKILLS__TRACE, "...Bonusstat: %d , INT: %d , WIS: %d , DEX: %d , STR: %d", bonusstat , GetINT() , GetWIS() , GetDEX() , GetSTR()); - + float res = MakeRandomFloat(0, 99); int AAChance = 0; @@ -1001,7 +1001,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { break; } } - + if (spec->tradeskill == RESEARCH) { switch(GetAA(aaArcaneTongues)) { case 1: @@ -1020,10 +1020,10 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { if (((spec->tradeskill==75) || GetGM() || (chance > res)) || MakeRandomInt(0, 99) < AAChance){ success_modifier = 1; - + if(over_trivial < 0) CheckIncreaseTradeskill(bonusstat, stat_modifier, skillup_modifier, success_modifier, spec->tradeskill); - + Message_StringID(4,TRADESKILL_SUCCEED,spec->name.c_str()); _log(TRADESKILLS__TRACE, "Tradeskill success"); @@ -1044,10 +1044,10 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { return(true); } else { success_modifier = 2; // Halves the chance - + if(over_trivial < 0) CheckIncreaseTradeskill(bonusstat, stat_modifier, skillup_modifier, success_modifier, spec->tradeskill); - + Message_StringID(MT_Emote,TRADESKILL_FAILED); _log(TRADESKILLS__TRACE, "Tradeskill failed"); @@ -1055,7 +1055,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { { entity_list.MessageGroup(this,true,MT_Skills,"%s was unsuccessful in %s tradeskill attempt.",GetName(),this->GetGender() == 0 ? "his" : this->GetGender() == 1 ? "her" : "its"); } - + itr = spec->onfail.begin(); while(itr != spec->onfail.end()) { //should we check these arguments? @@ -1125,7 +1125,7 @@ void Client::CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float _log(TRADESKILLS__TRACE, "...Stage2 chance was: %f percent. 0 percent means stage1 failed", chance_stage2); } -bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint32 some_id, +bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec) { char errbuf[MYSQL_ERRMSG_SIZE]; @@ -1133,12 +1133,12 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 MYSQL_ROW row; char *query = 0; char buf2[4096]; - + uint32 sum = 0; uint32 count = 0; uint32 qcount = 0; uint32 qlen = 0; - + // make where clause segment for container(s) char containers[30]; if (some_id == 0) { @@ -1148,9 +1148,9 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 // container in inventory snprintf(containers,29, "in (%u,%u)", c_type, some_id); } - + buf2[0] = '\0'; - + //Could prolly watch for stacks in this loop and handle them properly... //just increment sum and count accordingly bool first = true; @@ -1173,7 +1173,7 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 } } *pos = '\0'; - + if(count < 1) { return(false); //no items == no recipe } @@ -1192,13 +1192,13 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 return(false); } safe_delete_array(query); - + qcount = mysql_num_rows(result); if(qcount > 1) { //multiple recipes, partial match... do an extra query to get it exact. //this happens when combining components for a smaller recipe //which is completely contained within another recipe - + first = true; pos = buf2; for (i = 0; i < qcount; i++) { @@ -1216,13 +1216,13 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 break; } } - + qlen = MakeAnyLenString(&query, "SELECT tre.recipe_id" " FROM tradeskill_recipe_entries AS tre" " WHERE tre.recipe_id IN (%s)" " GROUP BY tre.recipe_id HAVING sum(tre.componentcount) = %u" " AND sum(tre.item_id * tre.componentcount) = %u", buf2, count, sum); - + if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecipe, re-query: %s", query); safe_delete_array(query); @@ -1230,13 +1230,13 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 return(false); } safe_delete_array(query); - + qcount = mysql_num_rows(result); } - + if(qcount < 1) return(false); - + if(qcount > 1) { //The recipe is not unique, so we need to compare the container were using. @@ -1255,7 +1255,7 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 qlen = MakeAnyLenString(&query,"SELECT tre.recipe_id FROM tradeskill_recipe_entries as tre WHERE tre.recipe_id IN (%s)" " AND tre.item_id = %u;",buf2,containerId); - + if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecipe, re-query: %s", query); safe_delete_array(query); @@ -1264,8 +1264,8 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 } safe_delete_array(query); - uint32 resultRowTotal = mysql_num_rows(result); - + uint32 resultRowTotal = mysql_num_rows(result); + if(resultRowTotal == 0) { //Recipe contents matched more than 1 recipe, but not in this container LogFile->write(EQEMuLog::Error, "Combine error: Incorrect container is being used!"); return(false); @@ -1294,7 +1294,7 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 const ItemInst* inst = container->GetItem(x); if(inst){ const Item_Struct* item = GetItem(inst->GetItem()->ID); - if (item) { + if (item) { if(item->ID == atoi(TSrow[0])){ ccnt++; } @@ -1306,28 +1306,28 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 } mysql_free_result(TSresult); } else { - LogFile->write(EQEMuLog::Error, "Error in tradeskill verify query: '%s': %s", TSquery, TSerrbuf); + LogFile->write(EQEMuLog::Error, "Error in tradeskill verify query: '%s': %s", TSquery, TSerrbuf); } safe_delete_array(TSquery); if(has_components == false){ - + return false; } return(GetTradeRecipe(recipe_id, c_type, some_id, char_id, spec)); } -bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id, +bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec) -{ +{ char errbuf[MYSQL_ERRMSG_SIZE]; MYSQL_RES *result; MYSQL_ROW row; char *query = 0; - + uint32 qcount = 0; uint32 qlen; - + // make where clause segment for container(s) char containers[30]; if (some_id == 0) { @@ -1337,7 +1337,7 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id // container in inventory snprintf(containers,29, "in (%u,%u)", c_type, some_id); } - + qlen = MakeAnyLenString(&query, "SELECT tr.id, tr.tradeskill, tr.skillneeded," " tr.trivial, tr.nofail, tr.replace_container, tr.name, tr.must_learn, tr.quest, crl.madecount" " FROM tradeskill_recipe AS tr inner join tradeskill_recipe_entries as tre" @@ -1346,7 +1346,7 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id " ON tr.id = crl.recipe_id " " WHERE tr.id = %lu AND tre.item_id %s" " GROUP BY tr.id", char_id, (unsigned long)recipe_id, containers); - + if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecipe, query: %s", query); safe_delete_array(query); @@ -1354,13 +1354,13 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id return(false); } safe_delete_array(query); - + qcount = mysql_num_rows(result); if(qcount != 1) { //just not found i guess.. return(false); } - + row = mysql_fetch_row(result); spec->tradeskill = (SkillType)atoi(row[1]); spec->skill_needed = (int16)atoi(row[2]); @@ -1379,18 +1379,18 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id } spec->recipe_id = recipe_id; mysql_free_result(result); - + //Pull the on-success items... qlen = MakeAnyLenString(&query, "SELECT item_id,successcount FROM tradeskill_recipe_entries" " WHERE successcount>0 AND recipe_id=%u", recipe_id); - + if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecept success query '%s': %s", query, errbuf); safe_delete_array(query); return(false); } safe_delete_array(query); - + qcount = mysql_num_rows(result); if(qcount < 1) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecept success: no success items returned"); @@ -1405,14 +1405,14 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id spec->onsuccess.push_back(pair(item, num)); } mysql_free_result(result); - + //Pull the on-fail items... qlen = MakeAnyLenString(&query, "SELECT item_id,failcount FROM tradeskill_recipe_entries" " WHERE failcount>0 AND recipe_id=%u", recipe_id); spec->onfail.clear(); if (RunQuery(query, qlen, errbuf, &result)) { - + qcount = mysql_num_rows(result); uint8 r; for(r = 0; r < qcount; r++) { @@ -1452,7 +1452,7 @@ void ZoneDatabase::UpdateRecipeMadecount(uint32 recipe_id, uint32 char_id, uint3 char *query = 0; uint32 qlen; char errbuf[MYSQL_ERRMSG_SIZE]; - + qlen = MakeAnyLenString(&query, "INSERT INTO char_recipe_list " " SET recipe_id = %u, char_id = %u, madecount = %u " " ON DUPLICATE KEY UPDATE madecount = %u;" @@ -1472,19 +1472,19 @@ void Client::LearnRecipe(uint32 recipeID) char errbuf[MYSQL_ERRMSG_SIZE]; MYSQL_RES *result; MYSQL_ROW row; - + qlen = MakeAnyLenString(&query, "SELECT tr.name, crl.madecount " " FROM tradeskill_recipe as tr " " LEFT JOIN (SELECT recipe_id, madecount FROM char_recipe_list WHERE char_id = %u) AS crl " " ON tr.id = crl.recipe_id " " WHERE tr.id = %u ;", CharacterID(), recipeID); - + if (!database.RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in Client::LearnRecipe query '%s': %s", query, errbuf); safe_delete_array(query); return; } - + qcount = mysql_num_rows(result); if (qcount != 1) { LogFile->write(EQEMuLog::Normal, "Client::LearnRecipe - RecipeID: %d had %d occurences.", recipeID, qcount); @@ -1495,7 +1495,7 @@ void Client::LearnRecipe(uint32 recipeID) safe_delete_array(query); row = mysql_fetch_row(result); - + if (row != nullptr && row[0] != nullptr) { // Only give Learn message if character doesn't know the recipe if (row[1] == nullptr) { @@ -1512,9 +1512,9 @@ void Client::LearnRecipe(uint32 recipeID) safe_delete_array(query); } } - + mysql_free_result(result); - + } bool Client::CanIncreaseTradeskill(SkillType tradeskill) { @@ -1533,7 +1533,7 @@ bool Client::CanIncreaseTradeskill(SkillType tradeskill) { uint8 Tailoring = (GetRawSkill(TAILORING) > 200) ? 1 : 0; uint8 SkillTotal = Baking + Smithing + Brewing + Fletching + Jewelry + Pottery + Tailoring; //Tradeskills above 200 uint32 aaLevel = GetAA(aaNewTanaanCraftingMastery); //New Tanaan AA: Each level allows an additional tradeskill above 200 (first one is free) - + switch (tradeskill) { case BAKING: case BLACKSMITHING: diff --git a/zone/trading.cpp b/zone/trading.cpp index 363faff69..14b81173d 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -61,7 +61,7 @@ void Trade::Start(uint32 mob_id, bool initiate_with) Reset(); state = Trading; with_id = mob_id; - + // Autostart on other mob? if (initiate_with) { Mob* with = With(); @@ -78,13 +78,13 @@ void Trade::AddEntity(uint16 from_slot_id, uint16 trade_slot_id) LogFile->write(EQEMuLog::Debug, "Programming error: NPC's should not call Trade::AddEntity()"); return; } - + // If one party accepted the trade then an item was added, their state needs to be reset owner->trade->state = Trading; Mob* with = With(); if (with) with->trade->state = Trading; - + // Item always goes into trade bucket from cursor Client* client = owner->CastToClient(); const ItemInst* inst = client->GetInv().GetItem(SLOT_CURSOR); @@ -92,9 +92,9 @@ void Trade::AddEntity(uint16 from_slot_id, uint16 trade_slot_id) client->Message(13, "Error: Could not find item on your cursor!"); return; } - + _log(TRADING__HOLDER, "%s added item '%s' to trade slot %i", owner->GetName(), inst->GetItem()->Name, trade_slot_id); - + ItemInst* inst2 = client->GetInv().GetItem(trade_slot_id); int new_charges = 0; if (!inst2 || !inst2->GetItem()) { @@ -142,7 +142,7 @@ void Trade::SendItemData(const ItemInst* inst, int16 dest_slot_id) Mob* mob = With(); if (!mob->IsClient()) return; // Not sending packets to NPCs! - + Client* with = mob->CastToClient(); Client* trader = owner->CastToClient(); if (with && with->IsClient()) { @@ -156,7 +156,7 @@ void Trade::SendItemData(const ItemInst* inst, int16 dest_slot_id) } } } - + //safe_delete(outapp); } } @@ -167,23 +167,23 @@ void Trade::LogTrade() Mob* with = With(); if (!owner->IsClient() || !with) return; // Should never happen - + Client* trader = owner->CastToClient(); bool logtrade = false; int admin_level = 0; uint8 item_count = 0; - + if (zone->tradevar != 0) { for (uint16 i=3000; i<=3007; i++) { if (trader->GetInv().GetItem(i)) item_count++; } - + if (((this->cp + this->sp + this->gp + this->pp)>0) || (item_count>0)) admin_level = trader->Admin(); else admin_level = 999; - + if (zone->tradevar == 7) { logtrade = true; } @@ -209,38 +209,38 @@ void Trade::LogTrade() } else if (admin_level<=255){ if ((zone->tradevar<8) && (zone->tradevar>0)) - logtrade = true; + logtrade = true; } } - + if (logtrade == true) { char logtext[1000] = {0}; uint32 cash = 0; bool comma = false; - + // Log items offered by owner cash = this->cp + this->sp + this->gp + this->pp; if ((cash>0) || (item_count>0)) { sprintf(logtext, "%s gave %s ", trader->GetName(), with->GetName()); - + if (item_count > 0) { strcat(logtext, "items {"); - + for (uint16 i=3000; i<=3007; i++) { const ItemInst* inst = trader->GetInv().GetItem(i); - + if (!comma) comma = true; else { if (inst) strcat(logtext, ","); } - + if (inst) { char item_num[15] = {0}; sprintf(item_num, "%i", inst->GetItem()->ID); strcat(logtext, item_num); - + if (inst->IsType(ItemClassContainer)) { for (uint8 j=0; j<10; j++) { inst = trader->GetInv().GetItem(i, j); @@ -254,13 +254,13 @@ void Trade::LogTrade() } } } - - if (cash > 0) { + + if (cash > 0) { char money[100] = {0}; sprintf(money, " %ipp, %igp, %isp, %icp", trader->trade->pp, trader->trade->gp, trader->trade->sp, trader->trade->cp); strcat(logtext, money); } - + database.logevents(trader->AccountName(), trader->AccountID(), trader->Admin(), trader->GetName(), with->GetName(), "Trade", logtext, 6); } @@ -273,19 +273,19 @@ void Trade::DumpTrade() Mob* with = With(); LogFile->write(EQEMuLog::Debug, "Dumping trade data: '%s' in TradeState %i with '%s'", this->owner->GetName(), state, ((with==nullptr)?"(null)":with->GetName())); - + if (!owner->IsClient()) return; - + Client* trader = owner->CastToClient(); for (uint16 i=3000; i<=3007; i++) { const ItemInst* inst = trader->GetInv().GetItem(i); - + if (inst) { LogFile->write(EQEMuLog::Debug, "Item %i (Charges=%i, Slot=%i, IsBag=%s)", inst->GetItem()->ID, inst->GetCharges(), i, ((inst->IsType(ItemClassContainer)) ? "True" : "False")); - + if (inst->IsType(ItemClassContainer)) { for (uint8 j=0; j<10; j++) { inst = trader->GetInv().GetItem(i, j); @@ -298,7 +298,7 @@ void Trade::DumpTrade() } } } - + LogFile->write(EQEMuLog::Debug, "\tpp:%i, gp:%i, sp:%i, cp:%i", pp, gp, sp, cp); } #endif @@ -382,17 +382,17 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(finalizer) { qsaudit->char2_count++; } else { qsaudit->char1_count++; } - + if(inst->IsType(ItemClassContainer)) { // Pseudo-Slot ID's are generated based on how the db saves bag items... for(uint8 j = 0; j < inst->GetItem()->BagSlots; j++) { const ItemInst* baginst = inst->GetItem(j); if(baginst == nullptr) { continue; } - + int16 k=Inventory::CalcSlotId(i, j); item_count = qsaudit->char1_count + qsaudit->char2_count; - + qsaudit->items[item_count].from_id = this->character_id; qsaudit->items[item_count].from_slot = k; qsaudit->items[item_count].to_id = other->CharacterID(); @@ -422,7 +422,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(QSPLT) { qsaudit->items[parent_offset].to_slot = slot_id; - + if(inst->IsType(ItemClassContainer)) { for(uint8 bagslot_idx = 0; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { const ItemInst* bag_inst = inst->GetItem(bagslot_idx); @@ -442,7 +442,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(QSPLT) { qsaudit->items[parent_offset].to_id = this->character_id; qsaudit->items[parent_offset].to_slot = SLOT_CURSOR; - + if(inst->IsType(ItemClassContainer)) { for(uint8 bagslot_idx = 0; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { const ItemInst* bag_inst = inst->GetItem(bagslot_idx); @@ -466,7 +466,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(QSPLT) { qsaudit->items[parent_offset].to_id = this->character_id; qsaudit->items[parent_offset].to_slot = SLOT_CURSOR; - + if(inst->IsType(ItemClassContainer)) { for(uint8 bagslot_idx = 0; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { const ItemInst* bag_inst = inst->GetItem(bagslot_idx); @@ -500,7 +500,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) qsaudit->char1_money.copper = this->trade->cp; } } - + //Do not reset the trade here, done by the caller. } } @@ -868,17 +868,17 @@ void Client::SendTraderItem(uint32 ItemID, uint16 Quantity) { _log(TRADING__CLIENT, "Bogus item deleted in Client::SendTraderItem!\n"); return; } - + ItemInst* inst = database.CreateItem(item, Quantity); - if (inst) + if (inst) { bool is_arrow = (inst->GetItem()->ItemType == ItemTypeArrow) ? true : false; FreeSlotID = m_inv.FindFreeSlot(false, true, inst->GetItem()->Size, is_arrow); PutItemInInventory(FreeSlotID, *inst); Save(); - + SendItemPacket(FreeSlotID, inst, ItemPacketTrade); safe_delete(inst); @@ -906,7 +906,7 @@ void Client::BulkSendTraderInventory(uint32 char_id) { } else item=database.GetItem(TraderItems->ItemID[i]); - + if (item && (item->NoDrop!=0)) { ItemInst* inst = database.CreateItem(item); if (inst) { @@ -943,7 +943,7 @@ ItemInst* Client::FindTraderItemBySerialNumber(int32 SerialNumber){ SlotID = (((22 + i + 3) * 10) + x + 1); item = this->GetInv().GetItem(SlotID); if(item) { - if(item->GetSerialNumber() == SerialNumber) + if(item->GetSerialNumber() == SerialNumber) return item; } } @@ -998,7 +998,7 @@ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){ item = this->GetInv().GetItem(SlotID); - if(item && item->GetSerialNumber() == SerialNumber && + if(item && item->GetSerialNumber() == SerialNumber && (item->GetCharges() >= Quantity || (item->GetCharges() <= 0 && Quantity == 1))){ return SlotID; @@ -1006,7 +1006,7 @@ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){ } } } - _log(TRADING__CLIENT, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n", + _log(TRADING__CLIENT, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n", SerialNumber , Quantity, this->GetName()); return 0; @@ -1096,7 +1096,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client* Stackable = item->IsStackable(); - if(!Stackable) + if(!Stackable) Quantity = (Charges > 0) ? Charges : 1; _log(TRADING__CLIENT, "FindAndNuke %s, Charges %i, Quantity %i", item->GetItem()->Name, Charges, Quantity); @@ -1121,7 +1121,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client* else if(GetSlot->ItemID[y] > 0) Count++; } - if(Count == 0) + if(Count == 0) Trader_EndTrader(); return; @@ -1135,7 +1135,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client* } } - _log(TRADING__CLIENT, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n",SerialNumber, + _log(TRADING__CLIENT, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n",SerialNumber, Quantity,this->GetName()); } @@ -1217,7 +1217,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs,Client* Trader,const EQApplicat if(!BuyItem) { _log(TRADING__CLIENT, "Unable to find item on trader."); - TradeRequestFailed(app); + TradeRequestFailed(app); safe_delete(outapp); return; } @@ -1225,7 +1225,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs,Client* Trader,const EQApplicat _log(TRADING__CLIENT, "Buyitem: Name: %s, IsStackable: %i, Requested Quantity: %i, Charges on Item %i", BuyItem->GetItem()->Name, BuyItem->IsStackable(), tbs->Quantity, BuyItem->GetCharges()); // If the item is not stackable, then we can only be buying one of them. - if(!BuyItem->IsStackable()) + if(!BuyItem->IsStackable()) outtbs->Quantity = tbs->Quantity; else { // Stackable items, arrows, diamonds, etc @@ -1400,7 +1400,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint sprintf(Tmp," and trader.char_id=%i",Trader->CharacterID()); Search.append(Tmp); } - + } string SearchrResults; @@ -1495,7 +1495,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint Search.append(" and items.astr>0"); Values.append(",items.astr"); break; - + case STAT_WIS: Search.append(" and items.awis>0"); Values.append(",items.awis"); @@ -1505,12 +1505,12 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint Search.append(" and items.cr>0"); Values.append(",items.cr"); break; - + case STAT_DISEASE: Search.append(" and items.dr>0"); Values.append(",items.dr"); break; - + case STAT_FIRE: Search.append(" and items.fr>0"); Values.append(",items.fr"); @@ -1683,7 +1683,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint _pkt(TRADING__PACKETS,outapp2); safe_delete(outapp2); - + } else{ _log(TRADING__CLIENT, "Failed to retrieve Bazaar Search!! %s %s\n", Query, errbuf); @@ -1795,8 +1795,8 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_S Customer->Message(13, "The Trader has changed the price of %s.", item->Name); for(int i = 0; i < 80; i++) { - if((gis->ItemID[i] != ItemID) || - ((!item->Stackable) && (gis->Charges[i] != Charges))) + if((gis->ItemID[i] != ItemID) || + ((!item->Stackable) && (gis->Charges[i] != Charges))) continue; inst->SetSerialNumber(gis->SerialNumber[i]); @@ -1863,7 +1863,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { // If the item is not currently in the trader table for this Trader, then they must have removed it from sale while // still in Trader mode. Check if the item is in their Trader Satchels, and if so, put it back up. - + // Quick Sanity check. If the item is not currently up for sale, and the new price is zero, just ack the packet // and do nothing. if(tpus->NewPrice == 0) { @@ -1886,7 +1886,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { if((newgis->Items[i] > 0) && (newgis->SerialNumber[i] == tpus->SerialNumber)) { - _log(TRADING__CLIENT, "Found new Item to Add, ItemID is %i, Charges is %i", newgis->Items[i], + _log(TRADING__CLIENT, "Found new Item to Add, ItemID is %i, Charges is %i", newgis->Items[i], newgis->Charges[i]); IDOfItemToAdd = newgis->Items[i]; @@ -1950,7 +1950,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { gis->ItemCost[i] = tpus->NewPrice; _log(TRADING__CLIENT, "Adding new item for %s. ItemID %i, SerialNumber %i, Charges %i, Price: %i, Slot %i", - GetName(), newgis->Items[i], newgis->SerialNumber[i], newgis->Charges[i], + GetName(), newgis->Items[i], newgis->SerialNumber[i], newgis->Charges[i], tpus->NewPrice, i); } } @@ -1985,13 +1985,13 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { } // Send Acknowledgement back to the client. - if(OldPrice == 0) + if(OldPrice == 0) tpus->SubAction = BazaarPriceChange_AddItem; - else if(tpus->NewPrice != 0) + else if(tpus->NewPrice != 0) tpus->SubAction = BazaarPriceChange_UpdatePrice; else tpus->SubAction = BazaarPriceChange_RemoveItem; - + QueuePacket(app); if(OldPrice == tpus->NewPrice) { @@ -2005,7 +2005,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { database.UpdateTraderItemPrice(CharacterID(), IDOfItemToUpdate, ChargesOnItemToUpdate, tpus->NewPrice); // If a customer is browsing our goods, send them the updated prices / remove the items from the Merchant window - if(CustomerID) + if(CustomerID) UpdateTraderCustomerPriceChanged(CustomerID, gis, IDOfItemToUpdate, ChargesOnItemToUpdate, tpus->NewPrice); safe_delete(gis); @@ -2039,7 +2039,7 @@ void Client::SendBuyerResults(char* SearchString, uint32 SearchID) { if(strlen(SearchString) == 0) Message(10, "There are %i Buy Lines.", NumberOfRows); else - Message(10, "There are %i Buy Lines that match the search string '%s'.", + Message(10, "There are %i Buy Lines that match the search string '%s'.", NumberOfRows, SearchString); } @@ -2061,7 +2061,7 @@ void Client::SendBuyerResults(char* SearchString, uint32 SearchID) { uint32 Quantity = atoi(Row[4]); uint32 Price = atoi(Row[5]); - // Each item in the search results is sent as a single fixed length packet, although the position of + // Each item in the search results is sent as a single fixed length packet, although the position of // the fields varies due to the use of variable length strings. The reason the packet is so big, is // to allow item compensation, e.g. a buyer could offer to buy a Blade Of Carnage for 10000pp plus // other items in exchange. Item compensation is not currently supported in EQEmu. @@ -2142,7 +2142,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) { BuyerBrowsing_Struct* bb = (BuyerBrowsing_Struct*)outapp->pBuffer; - // This packet produces the SoandSo is browsing your Buy Lines message + // This packet produces the SoandSo is browsing your Buy Lines message bb->Action = Barter_SellerBrowsing; sprintf(bb->PlayerName, GetName()); @@ -2210,7 +2210,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) { void Client::SellToBuyer(const EQApplicationPacket *app) { char* Buf = (char *)app->pBuffer; - + char ItemName[64]; /*uint32 Action =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused @@ -2302,7 +2302,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(!ItemToTransfer || !Buyer->MoveItemToInventory(ItemToTransfer, true)) { _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); Message(13, "Internal error while processing transaction."); - + if(ItemToTransfer) safe_delete(ItemToTransfer); @@ -2418,7 +2418,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { } } - + Buyer->TakeMoneyFromPP(Quantity * Price); AddMoneyToPP(Quantity * Price, false); @@ -2433,7 +2433,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { // length as used on Live. The extra space in the packet is also likely to be used for Item compensation, if we ever // implement that. // - uint32 PacketLength = 1016; + uint32 PacketLength = 1016; EQApplicationPacket* outapp = new EQApplicationPacket(OP_Barter, PacketLength); @@ -2461,7 +2461,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { // This next packet goes to the Buyer and produces the 'You've bought from for ' // - + Buf = (char *)outapp->pBuffer; VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerTransactionComplete); @@ -2737,7 +2737,7 @@ void Client::BuyerItemSearch(const EQApplicationPacket *app) { } bool Client::StoreTurnInItems(Mob* tradingWith) { - + if ( !tradingWith || !tradingWith->IsNPC() ) return false; diff --git a/zone/trap.cpp b/zone/trap.cpp index 9a8a143cd..db118dca0 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -79,7 +79,7 @@ Trap::~Trap() bool Trap::Process() { - if (chkarea_timer.Enabled() && chkarea_timer.Check() + if (chkarea_timer.Enabled() && chkarea_timer.Check() /*&& zone->GetClientCount() > 0*/ ) { Mob* trigger = entity_list.GetTrapTrigger(this); @@ -127,7 +127,7 @@ void Trap::Trigger(Mob* trigger) entity_list.MessageClose(trigger,false,effectvalue,13,"%s",message.c_str()); } - entity_list.SendAlarm(this,trigger,effectvalue); + entity_list.SendAlarm(this,trigger,effectvalue); break; case trapTypeMysticSpawn: if (message.empty()) @@ -206,7 +206,7 @@ Trap* EntityList::FindNearbyTrap(Mob* searcher, float max_dist) { iterator.Reset(); float dist = 999999; Trap* current_trap = nullptr; - + float max_dist2 = max_dist*max_dist; Trap *cur; while(iterator.MoreElements()) @@ -220,7 +220,7 @@ Trap* EntityList::FindNearbyTrap(Mob* searcher, float max_dist) { curdist += tmp*tmp; tmp = searcher->GetZ() - cur->z; curdist += tmp*tmp; - + if (curdist < max_dist2 && curdist < dist) { dist = curdist; @@ -237,17 +237,17 @@ Mob* EntityList::GetTrapTrigger(Trap* trap) { Mob* savemob = 0; iterator.Reset(); - + float xdiff, ydiff, zdiff; - + float maxdist = trap->radius * trap->radius; - + while(iterator.MoreElements()) { Client* cur = iterator.GetData(); zdiff = cur->GetZ() - trap->z; if(zdiff < 0) zdiff = 0 - zdiff; - + xdiff = cur->GetX() - trap->x; ydiff = cur->GetY() - trap->y; if ((xdiff*xdiff + ydiff*ydiff) <= maxdist diff --git a/zone/trap.h b/zone/trap.h index d8570a633..b5de69748 100644 --- a/zone/trap.h +++ b/zone/trap.h @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -42,13 +42,13 @@ public: virtual bool Process(); virtual bool IsTrap() const { return true; } void Trigger(Mob* trigger); - + void SpellOnTarget(Mob* trigger, uint32 spell_id); NPC * GetHiddenTrigger() { return hiddenTrigger; } void SetHiddenTrigger(NPC* n) { hiddenTrigger = n; } void CreateHiddenTrigger(); - + //Trap data, leave this unprotected Timer respawn_timer; //Respawn Time when Trap's been disarmed Timer chkarea_timer; diff --git a/zone/tribute.cpp b/zone/tribute.cpp index 8cf493969..45f9bffac 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -75,39 +75,39 @@ void Client::ToggleTribute(bool enabled) { uint32 tid = m_pp.tributes[r].tribute; if(tid == TRIBUTE_NONE) continue; - + if(tribute_list.count(tid) != 1) continue; - + if(m_pp.tributes[r].tier >= MAX_TRIBUTE_TIERS) { m_pp.tributes[r].tier = 0; //sanity check. continue; } - + TributeData &d = tribute_list[tid]; - + TributeLevel_Struct &tier = d.tiers[m_pp.tributes[r].tier]; - + if(level < tier.level) { Message(0, "You are not high enough level to activate this tribute!"); ToggleTribute(false); continue; } - + cost += tier.cost; } - + if(cost > m_pp.tribute_points) { Message(13, "You do not have enough tribute points to activate your tribute!"); ToggleTribute(false); return; } AddTributePoints(0-cost); - + //reset their timer, since they just paid for a full duration m_pp.tribute_time_remaining = Tribute_duration; //full duration tribute_timer.Start(m_pp.tribute_time_remaining); - + m_pp.tribute_active = 1; } else { m_pp.tribute_active = 0; @@ -119,10 +119,10 @@ void Client::ToggleTribute(bool enabled) { void Client::DoTributeUpdate() { EQApplicationPacket outapp(OP_TributeUpdate, sizeof(TributeInfo_Struct)); TributeInfo_Struct *tis = (TributeInfo_Struct *) outapp.pBuffer; - + tis->active = m_pp.tribute_active ? 1 : 0; tis->tribute_master_id = tribute_master_id; //Dont know what this is for - + int r; for(r = 0; r < MAX_PLAYER_TRIBUTES; r++) { if(m_pp.tributes[r].tribute != TRIBUTE_NONE) { @@ -134,9 +134,9 @@ void Client::DoTributeUpdate() { } } QueuePacket(&outapp); - + SendTributeTimer(); - + if(m_pp.tribute_active) { //send and equip tribute items... for(r = 0; r < MAX_PLAYER_TRIBUTES; r++) { @@ -146,13 +146,13 @@ void Client::DoTributeUpdate() { DeleteItemInInventory(TRIBUTE_SLOT_START+r, 0, false); continue; } - + if(tribute_list.count(tid) != 1) { if(m_inv[TRIBUTE_SLOT_START+r]) DeleteItemInInventory(TRIBUTE_SLOT_START+r, 0, false); continue; } - + //sanity check if(m_pp.tributes[r].tier >= MAX_TRIBUTE_TIERS) { if(m_inv[TRIBUTE_SLOT_START+r]) @@ -160,11 +160,11 @@ void Client::DoTributeUpdate() { m_pp.tributes[r].tier = 0; continue; } - + TributeData &d = tribute_list[tid]; TributeLevel_Struct &tier = d.tiers[m_pp.tributes[r].tier]; uint32 item_id = tier.tribute_item_id; - + //summon the item for them const ItemInst* inst = database.CreateItem(item_id, 1); if(inst == nullptr) @@ -198,28 +198,28 @@ void Client::SendTributeTimer() { void Client::ChangeTributeSettings(TributeInfo_Struct *t) { int r; for(r = 0; r < MAX_PLAYER_TRIBUTES; r++) { - + m_pp.tributes[r].tribute = TRIBUTE_NONE; - + uint32 tid = t->tributes[r]; if(tid == TRIBUTE_NONE) continue; - + if(tribute_list.count(tid) != 1) continue; //print a cheater warning? - + TributeData &d = tribute_list[tid]; - + //make sure they chose a valid tier if(t->tiers[r] >= d.tier_count) continue; //print a cheater warning? - + //might want to check required level, even though its checked before activate - + m_pp.tributes[r].tribute = tid; m_pp.tributes[r].tier = t->tiers[r]; } - + DoTributeUpdate(); } @@ -233,22 +233,22 @@ void Client::SendTributeDetails(uint32 client_id, uint32 tribute_id) { int len = td.description.length(); EQApplicationPacket outapp(OP_SelectTribute, sizeof(SelectTributeReply_Struct)+len+1); SelectTributeReply_Struct *t = (SelectTributeReply_Struct *) outapp.pBuffer; - + t->client_id = client_id; t->tribute_id = tribute_id; memcpy(t->desc, td.description.c_str(), len); t->desc[len] = '\0'; - + QueuePacket(&outapp); } //returns the number of points received from the tribute int32 Client::TributeItem(uint32 slot, uint32 quantity) { const ItemInst*inst = m_inv[slot]; - + if(inst == nullptr) return(0); - + //figure out what its worth int32 pts = inst->GetItem()->Favor; @@ -258,7 +258,7 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) { Message(13, "This item is worthless for favor."); return(0); } - + //make sure they have enough of them //and remove it from inventory if(inst->IsStackable()) { @@ -269,9 +269,9 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) { quantity = 1; DeleteItemInInventory(slot, 0, false); } - + pts *= quantity; - + //add the tribute value in points AddTributePoints(pts); return(pts); @@ -283,7 +283,7 @@ int32 Client::TributeMoney(uint32 platinum) { Message(13, "You do not have that much money!"); return(0); } - + //add the tribute value in points AddTributePoints(platinum); return(platinum); @@ -292,14 +292,14 @@ int32 Client::TributeMoney(uint32 platinum) { void Client::AddTributePoints(int32 ammount) { EQApplicationPacket outapp(OP_TributePointUpdate, sizeof(TributePoint_Struct)); TributePoint_Struct *t = (TributePoint_Struct *) outapp.pBuffer; - + //change the point values. m_pp.tribute_points += ammount; - + //career only tracks points earned, not spent. if(ammount > 0) m_pp.career_tribute_points += ammount; - + //fill in the packet. t->career_tribute_points = m_pp.career_tribute_points; t->tribute_points = m_pp.tribute_points; @@ -308,21 +308,21 @@ void Client::AddTributePoints(int32 ammount) { } void Client::SendTributes() { - + map::iterator cur,end; cur = tribute_list.begin(); end = tribute_list.end(); - + for(; cur != end; cur++) { if(cur->second.is_guild) continue; //skip guild tributes here int len = cur->second.name.length(); EQApplicationPacket outapp(OP_TributeInfo, sizeof(TributeAbility_Struct) + len + 1); TributeAbility_Struct* tas = (TributeAbility_Struct*)outapp.pBuffer; - + tas->tribute_id = htonl(cur->first); tas->tier_count = htonl(cur->second.unknown); - + //gotta copy over the data from tiers, and flip all the //byte orders, no idea why its flipped here uint32 r, c; @@ -334,7 +334,7 @@ void Client::SendTributes() { dest->level = htonl(src->level); dest->tribute_item_id = htonl(src->tribute_item_id); } - + memcpy(tas->name, cur->second.name.c_str(), len); tas->name[len] = '\0'; QueuePacket(&outapp); @@ -342,27 +342,27 @@ void Client::SendTributes() { } void Client::SendGuildTributes() { - + map::iterator cur,end; cur = tribute_list.begin(); end = tribute_list.end(); - + for(; cur != end; cur++) { if(!cur->second.is_guild) continue; //skip guild tributes here int len = cur->second.name.length(); - + //guild tribute has an unknown uint32 at its begining, guild ID? EQApplicationPacket outapp(OP_TributeInfo, sizeof(TributeAbility_Struct) + len + 1 + 4); uint32 *unknown = (uint32 *) outapp.pBuffer; TributeAbility_Struct* tas = (TributeAbility_Struct*) (outapp.pBuffer+4); - + //this is prolly wrong in general, prolly for one specific guild *unknown = 0x8A110000; - + tas->tribute_id = htonl(cur->first); tas->tier_count = htonl(cur->second.unknown); - + //gotta copy over the data from tiers, and flip all the //byte orders, no idea why its flipped here uint32 r, c; @@ -374,10 +374,10 @@ void Client::SendGuildTributes() { dest->level = htonl(src->level); dest->tribute_item_id = htonl(src->tribute_item_id); } - + memcpy(tas->name, cur->second.name.c_str(), len); tas->name[len] = '\0'; - + QueuePacket(&outapp); } } @@ -386,13 +386,13 @@ bool ZoneDatabase::LoadTributes() { char errbuf[MYSQL_ERRMSG_SIZE]; MYSQL_RES *result; MYSQL_ROW row; - + TributeData t; memset(&t.tiers, 0, sizeof(t.tiers)); t.tier_count = 0; - + tribute_list.clear(); - + const char *query = "SELECT id,name,descr,unknown,isguild FROM tributes"; if (RunQuery(query, strlen(query), errbuf, &result)) { int r; @@ -403,7 +403,7 @@ bool ZoneDatabase::LoadTributes() { t.description = row[r++]; t.unknown = strtoul(row[r++], nullptr, 10); t.is_guild = atol(row[r++])==0?false:true; - + tribute_list[id] = t; } mysql_free_result(result); @@ -411,7 +411,7 @@ bool ZoneDatabase::LoadTributes() { LogFile->write(EQEMuLog::Error, "Error in LoadTributes first query '%s': %s", query, errbuf); return false; } - + const char *query2 = "SELECT tribute_id,level,cost,item_id FROM tribute_levels ORDER BY tribute_id,level"; if (RunQuery(query2, strlen(query2), errbuf, &result)) { @@ -419,21 +419,21 @@ bool ZoneDatabase::LoadTributes() { while ((row = mysql_fetch_row(result))) { r = 0; uint32 id = atoul(row[r++]); - + if(tribute_list.count(id) != 1) { LogFile->write(EQEMuLog::Error, "Error in LoadTributes: unknown tribute %lu in tribute_levels", (unsigned long)id); continue; } - + TributeData &cur = tribute_list[id]; - + if(cur.tier_count >= MAX_TRIBUTE_TIERS) { LogFile->write(EQEMuLog::Error, "Error in LoadTributes: on tribute %lu: more tiers defined than permitted", (unsigned long)id); continue; } - + TributeLevel_Struct &s = cur.tiers[cur.tier_count]; - + s.level = atoul(row[r++]); s.cost = atoul(row[r++]); s.tribute_item_id = atoul(row[r++]); @@ -444,20 +444,20 @@ bool ZoneDatabase::LoadTributes() { LogFile->write(EQEMuLog::Error, "Error in LoadTributes level query '%s': %s", query, errbuf); return false; } - + return true; } /* -64.37.149.6:1353 == server +64.37.149.6:1353 == server 66.90.221.245:3173 == client 84 01 00 00 == NPC ID of tribute master 08 0B 00 00 == Client ID - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:09:07 GMT: 66.90.221.245:3173] 2004/08/19 04:09:07 GMT: Child Packet: [OPCode: OP_Tribute] [Raw OPCode: OP_Tribute] [Size: 144] @@ -475,13 +475,13 @@ bool ZoneDatabase::LoadTributes() { 2004/08/19 04:09:20 GMT: OPCode OP_StartTribute [Raw OPCode: OP_StartTribute] [Size: 12] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:09:20 GMT: 64.37.149.6:1353] 0: 08 0B 00 00 84 01 00 00 - A9 E1 94 42 | ...........B 2004/08/19 04:09:20 GMT: OPCode 0x02f2 [Raw OPCode: 0x72f2] [Size: 0] [Compressed Size: 65] - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:09:20 GMT: 66.90.221.245:3173] [Packet is compressed] [Packet is encrypted] @@ -503,7 +503,7 @@ bool ZoneDatabase::LoadTributes() { 2004/08/19 04:09:23 GMT: OPCode OP_SelectTribute [Raw OPCode: OP_SelectTribute] [Size: 12] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:09:23 GMT: 64.37.149.6:1353] 0: 01 00 00 00 04 00 00 00 - E3 00 00 00 | ............ @@ -511,19 +511,19 @@ bool ZoneDatabase::LoadTributes() { [OPCode: OP_SelectTribute] [Raw OPCode: OP_SelectTribute] [Size: 100] 0: 01 00 00 00 04 00 00 00 - 4F 75 72 20 67 72 65 61 | ........Our grea 16: 74 65 73 74 20 77 61 72 - 72 69 6F 72 73 20 66 6F | test warriors fo - 32: 63 75 73 20 74 6F 20 69 - 6E 63 72 65 61 73 65 20 | cus to increase + 32: 63 75 73 20 74 6F 20 69 - 6E 63 72 65 61 73 65 20 | cus to increase 48: 79 6F 75 72 20 73 74 72 - 65 6E 67 74 68 2E 3C 62 | your strength.Benefit -
2 80: 20 53 74 72 65 6E 67 74 - 68 20 70 65 72 20 74 69 | Strength per ti 96: 65 72 2E 00 | er.. 2004/08/19 04:09:28 GMT: OPCode OP_SelectTribute [Raw OPCode: OP_SelectTribute] [Size: 12] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:09:28 GMT: 64.37.149.6:1353] 0: 01 00 00 00 17 00 00 00 - E3 00 00 00 | ............ 2004/08/19 04:09:29 GMT: OPCode OP_SelectTribute [Raw OPCode: 0x72f7] [Size: 0] [Compressed Size: 205] - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:09:29 GMT: 66.90.221.245:3173] [Packet is compressed] [Packet is encrypted] @@ -531,18 +531,18 @@ bool ZoneDatabase::LoadTributes() { 2004/08/19 04:09:29 GMT: Child Packet: [OPCode: OP_SelectTribute] [Raw OPCode: OP_SelectTribute] [Size: 232] 0: 01 00 00 00 17 00 00 00 - 54 68 65 20 63 68 61 72 | ........The char - 16: 69 74 61 62 6C 65 20 74 - 61 6C 65 73 20 6F 66 20 | itable tales of - 32: 61 20 74 61 6C 65 6E 74 - 65 64 20 70 6F 65 74 20 | a talented poet - 48: 6C 65 6E 64 20 65 66 66 - 69 63 69 65 6E 63 79 20 | lend efficiency + 16: 69 74 61 62 6C 65 20 74 - 61 6C 65 73 20 6F 66 20 | itable tales of + 32: 61 20 74 61 6C 65 6E 74 - 65 64 20 70 6F 65 74 20 | a talented poet + 48: 6C 65 6E 64 20 65 66 66 - 69 63 69 65 6E 63 79 20 | lend efficiency 64: 74 6F 20 79 6F 75 72 20 - 62 65 6E 65 66 69 63 69 | to your benefici 80: 61 6C 20 73 70 65 6C 6C - 73 2E 3C 62 72 3E 42 65 | al spells.
Be - 96: 6E 65 66 69 74 20 2D 3C - 62 72 3E 54 69 65 72 20 | nefit -
Tier + 96: 6E 65 66 69 74 20 2D 3C - 62 72 3E 54 69 65 72 20 | nefit -
Tier 112: 31 3A 20 45 6E 68 61 6E - 63 65 6D 65 6E 74 20 48 | 1: Enhancement H 128: 61 73 74 65 20 49 3C 62 - 72 3E 54 69 65 72 20 32 | aste I
Tier 2 144: 3A 20 45 6E 68 61 6E 63 - 65 6D 65 6E 74 20 48 61 | : Enhancement Ha 160: 73 74 65 20 49 49 3C 62 - 72 3E 54 69 65 72 20 33 | ste II
Tier 3 176: 3A 20 45 6E 68 61 6E 63 - 65 6D 65 6E 74 20 48 61 | : Enhancement Ha - 192: 73 74 65 20 49 49 49 3C - 62 72 3E 54 69 65 72 20 | ste III
Tier + 192: 73 74 65 20 49 49 49 3C - 62 72 3E 54 69 65 72 20 | ste III
Tier 208: 34 3A 20 45 6E 68 61 6E - 63 65 6D 65 6E 74 20 48 | 4: Enhancement H 224: 61 73 74 65 20 49 56 00 | aste IV. @@ -553,11 +553,11 @@ Donating shoulderpads: 2004/08/19 04:09:50 GMT: OPCode 0x02f3 [Raw OPCode: 0x02f3] [Size: 16] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:09:50 GMT: 64.37.149.6:1353] 0: 1D 00 00 00 01 00 00 00 - 84 01 00 00 60 A9 D9 32 | ............`..2 - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:09:50 GMT: 66.90.221.245:3173] 2004/08/19 04:09:50 GMT: Child Packet: [OPCode: 0x02f3] [Raw OPCode: 0x02f3] [Size: 16] @@ -573,11 +573,11 @@ Donating shoulderpads: Donating Platinum: 2004/08/19 04:10:34 GMT: OPCode 0x02fe [Raw OPCode: 0x02fe] [Size: 12] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:10:34 GMT: 64.37.149.6:1353] 0: 12 00 00 00 84 01 00 00 - 5F A6 E7 77 | ........_..w - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:10:34 GMT: 66.90.221.245:3173] 2004/08/19 04:10:34 GMT: Child Packet: [OPCode: 0x02fe] [Raw OPCode: 0x02fe] [Size: 12] @@ -592,7 +592,7 @@ Donating Platinum: Upgrading: 2004/08/19 04:10:37 GMT: OPCode OP_SelectTribute [Raw OPCode: OP_SelectTribute] [Size: 12] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:10:37 GMT: 64.37.149.6:1353] 0: 01 00 00 00 28 00 00 00 - E3 00 00 00 | ....(....... @@ -600,8 +600,8 @@ server -> client 2004/08/19 04:10:38 GMT: Child Packet: [OPCode: OP_SelectTribute] [Raw OPCode: OP_SelectTribute] [Size: 128] 0: 01 00 00 00 28 00 00 00 - 4F 75 72 20 68 65 61 6C | ....(...Our heal - 16: 65 72 73 20 67 69 76 65 - 20 79 6F 75 20 61 6E 20 | ers give you an - 32: 61 6E 74 69 62 6F 64 79 - 2C 20 77 68 69 63 68 20 | antibody, which + 16: 65 72 73 20 67 69 76 65 - 20 79 6F 75 20 61 6E 20 | ers give you an + 32: 61 6E 74 69 62 6F 64 79 - 2C 20 77 68 69 63 68 20 | antibody, which 48: 68 65 6C 70 73 20 70 72 - 6F 74 65 63 74 20 79 6F | helps protect yo 64: 75 20 66 72 6F 6D 20 64 - 69 73 65 61 73 65 73 2E | u from diseases. 80: 3C 62 72 3E 42 65 6E 65 - 66 69 74 20 2D 3C 62 72 |
Benefit -
client request tribute 2004/08/19 04:10:49 GMT: OPCode 0x02f2 [Raw OPCode: 0x02f2] [Size: 48] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:10:49 GMT: 64.37.149.6:1353] 0: A1 F9 41 00 28 00 00 00 - FF FF FF FF FF FF FF FF | ..A.(........... 16: FF FF FF FF FF FF FF FF - 00 00 00 00 00 00 00 00 | ................ 32: 00 00 00 00 00 00 00 00 - 00 00 00 00 84 01 00 00 | ................ 2004/08/19 04:10:49 GMT: OPCode 0x02fa [Raw OPCode: 0x02fa] [Size: 12] - [66.90.221.245:3173 -> + [66.90.221.245:3173 -> 2004/08/19 04:10:49 GMT: 64.37.149.6:1353] 0: 08 0B 00 00 84 01 00 00 - F4 DE 12 00 | ............ ack tribute - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:10:50 GMT: 66.90.221.245:3173] 2004/08/19 04:10:50 GMT: Child Packet: [OPCode: 0x02f2] [Raw OPCode: 0x02f2] [Size: 48] @@ -635,12 +635,12 @@ ack tribute Activate Tribute: 2004/08/19 04:11:05 GMT: OPCode 0x0365 [Raw OPCode: 0x0365] [Size: 4] - [CLIENT:3173 -> + [CLIENT:3173 -> 2004/08/19 04:11:05 GMT: SERVER:1353] 0: 01 00 00 00 | .... - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:11:05 GMT: 66.90.221.245:3173] 2004/08/19 04:11:05 GMT: Child Packet: [OPCode: 0x02f8] [Raw OPCode: 0x02f8] [Size: 4] @@ -649,7 +649,7 @@ Activate Tribute: 2004/08/19 04:11:05 GMT: Child Packet: [OPCode: 0x02f4] [Raw OPCode: 0x02f4] [Size: 16] 0: 0D 00 00 00 00 00 00 00 - 14 00 00 00 00 00 00 00 | ................ - + 2004/08/19 04:11:05 GMT: Child Packet: [OPCode: 0x02f2] [Raw OPCode: 0x02f2] [Size: 48] 0: 01 00 00 00 28 00 00 00 - FF FF FF FF FF FF FF FF | ....(........... @@ -661,7 +661,7 @@ Activate Tribute: 0: 6C 00 00 00 31 7C 30 7C - 34 30 30 7C 30 7C 30 7C | l...1|0|400|0|0| 16: 31 30 39 32 36 36 32 7C - 30 7C 2D 31 7C 22 30 7C | 1092662|0|-1|"0| 32: 52 65 73 69 73 74 20 44 - 69 73 65 61 73 65 20 35 | Resist Disease 5 - 48: 20 42 65 6E 65 66 69 74 - 7C 52 65 73 69 73 74 20 | Benefit|Resist + 48: 20 42 65 6E 65 66 69 74 - 7C 52 65 73 69 73 74 20 | Benefit|Resist 64: 44 69 73 65 61 73 65 20 - 35 20 42 65 6E 65 66 69 | Disease 5 Benefi 80: 74 7C 30 7C 35 36 34 36 - 35 7C 30 7C 32 35 35 7C | t|0|56465|0|255| 96: 32 35 35 7C 30 7C 30 7C - 31 7C 39 34 37 7C 2D 31 | 255|0|0|1|947|-1 @@ -687,11 +687,11 @@ Deactivate Tribute: 2004/08/19 04:11:08 GMT: OPCode 0x0365 [Raw OPCode: 0x0365] [Size: 4] - [CLIENT:3173 -> + [CLIENT:3173 -> 2004/08/19 04:11:08 GMT: SERVER:1353] 0: 00 00 00 00 | .... - [64.37.149.6:1353 -> + [64.37.149.6:1353 -> 2004/08/19 04:11:09 GMT: 66.90.221.245:3173] [Packet is compressed] [Packet is encrypted] diff --git a/zone/updatemgr.cpp b/zone/updatemgr.cpp index bf71bd017..106a51978 100644 --- a/zone/updatemgr.cpp +++ b/zone/updatemgr.cpp @@ -27,7 +27,7 @@ //these values are pulled out of my ass, should be tuned some day const float UpdateManager::level_distances2[UPDATE_LEVELS] = { 50*50, 250*250, 500*500, 800*800 }; - + //delay between sending packets in each level, in ms //its best if they are all multiples of UPDATE_RESOLUTION //these values are pulled out of my ass, should be tuned some day @@ -45,14 +45,14 @@ const uint32 UpdateManager::level_timers[UPDATE_LEVELS+1] opcodes contain the same info at different times, and will prefer to send only the most recent packet. If this is bad, then this thing needs a redesign. - + */ //build a unique ID based on opcode and mob id.. #define MakeUpdateID(mob, app) (((mob->GetID())<<12) | (app->GetOpcode()&0xFFF)) UpdateManager::UpdateManager(EQStream *c) - : limiter(UPDATE_RESOLUTION) + : limiter(UPDATE_RESOLUTION) { net = c; int r; @@ -150,7 +150,7 @@ if(level > 0) } } }*/ - + UMMap::iterator cur,end; UMMap *curm; UMMap *om = levels + level; @@ -158,7 +158,7 @@ if(level > 0) end = om->end(); uint32 key; int r; - + while(cur != end) { key = cur->first; //relies on fast queue setting .app to null if it eats it @@ -167,7 +167,7 @@ if(level > 0) //EQApplicationPacket::PacketUsed(&cur->second.app); cur++; om->erase(key); - + //need to clear our any updates in slower levels //so mobs dont jump backwards from old updates curm = om + 1; diff --git a/zone/updatemgr.h b/zone/updatemgr.h index 5b3848b33..df6a7c375 100644 --- a/zone/updatemgr.h +++ b/zone/updatemgr.h @@ -50,7 +50,7 @@ public: UMType(EQApplicationPacket *_app, bool _ack) { app = _app; ack = _ack; } - + EQApplicationPacket *app; bool ack; }; @@ -61,24 +61,24 @@ class UpdateManager { protected: //squared distances for each level static const float level_distances2[UPDATE_LEVELS]; - + //delay between sending packets in each level, in ms static const uint32 level_timers[UPDATE_LEVELS+1]; - + public: UpdateManager(EQStream *c); ~UpdateManager(); - + //range2 is the range of 'from' to this client, squared void QueuePacket(EQApplicationPacket *app, bool ack_req, Mob *from, float range2); void Process(); void FlushQueues(); - + protected: void _SendLevel(int level); - + EQStream *net; - + UMMap levels[UPDATE_LEVELS+1]; Timer *timers[UPDATE_LEVELS+1]; Timer limiter; diff --git a/zone/watermap.cpp b/zone/watermap.cpp index 8196c360d..d42bc21de 100644 --- a/zone/watermap.cpp +++ b/zone/watermap.cpp @@ -46,23 +46,23 @@ WaterRegionType WaterMap::BSPReturnRegionType(int32 node_number, float y, float float distance; const ZBSP_Node *current_node = &BSP_Root[node_number-1]; - + // Are we at a leaf - + if((current_node->left==0)&& (current_node->right==0)) { return (WaterRegionType) current_node->special; } - - + + // No, so determine which side of the split plane we are on // - + distance = (x * current_node->normal[0]) + (y * current_node->normal[1]) + (z * current_node->normal[2]) + current_node->splitdistance; - + // If we are exactly on the split plane, I don't know what should happen. // if(distance == 0.0f) { @@ -80,7 +80,7 @@ WaterRegionType WaterMap::BSPReturnRegionType(int32 node_number, float y, float // This should't happen return(RegionTypeNormal); } - + return BSPReturnRegionType(current_node->right, y, x, z); } @@ -152,7 +152,7 @@ bool WaterMap::loadWaterMap(FILE *fp) { char EQWMagic[10]; uint32 BSPTreeSize; uint32 EQWVersion; - + if(fread(EQWMagic, 10, 1, fp)!=1) { printf("Error reading Water region map.\n"); return(false); @@ -169,25 +169,25 @@ bool WaterMap::loadWaterMap(FILE *fp) { printf("Incompatible Water region map version.\n"); return(false); } - + if(fread(&BSPTreeSize, sizeof(BSPTreeSize), 1, fp)!=1) { printf("Error reading Water region map.\n"); return(false); } - + BSP_Root = (ZBSP_Node *) new ZBSP_Node[BSPTreeSize]; - + if(BSP_Root==nullptr) { printf("Memory allocation failed while reading water map.\n"); return(false); } - + if(fread(BSP_Root, sizeof(ZBSP_Node), BSPTreeSize, fp) != BSPTreeSize) { printf("Error reading Water region map.\n"); safe_delete_array(BSP_Root); return(false); } - + printf("Water region map has %d nodes.\n", BSPTreeSize); return(true); } diff --git a/zone/watermap.h b/zone/watermap.h index 2f7466392..dc8b56d8b 100644 --- a/zone/watermap.h +++ b/zone/watermap.h @@ -58,7 +58,7 @@ public: private: bool loadWaterMap(FILE *fp); - + ZBSP_Node* BSP_Root; }; diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index d2bdd9616..1d40bef8c 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -64,18 +64,18 @@ void NPC::AI_SetRoambox(float iDist, float iMaxX, float iMinX, float iMaxY, floa void NPC::DisplayWaypointInfo(Client *c) { - c->Message(0, "Mob is on grid %d, in spawn group %d, on waypoint %d/%d", + c->Message(0, "Mob is on grid %d, in spawn group %d, on waypoint %d/%d", GetGrid(), GetSp2(), GetCurWp(), GetMaxWp() ); - - + + vector::iterator cur, end; cur = Waypoints.begin(); end = Waypoints.end(); for(; cur != end; cur++) { - c->Message(0,"Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d", + c->Message(0,"Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d", cur->index, cur->x, cur->y, @@ -121,13 +121,13 @@ void NPC::ResumeWandering() LogFile->write(EQEMuLog::Error, "NPC not paused - can't resume wandering: %lu", (unsigned long)GetNPCTypeID()); return; } - - if (cur_wp_x == GetX() && cur_wp_y == GetY()) + + if (cur_wp_x == GetX() && cur_wp_y == GetY()) { // are we we at a waypoint? if so, trigger event and start to next char temp[100]; itoa(cur_wp,temp,10); //do this before updating to next waypoint - CalculateNewWaypoint(); - SetAppearance(eaStanding, false); + CalculateNewWaypoint(); + SetAppearance(eaStanding, false); parse->EventNPC(EVENT_WAYPOINT_DEPART, this, nullptr, temp, 0); } // if not currently at a waypoint, we continue on to the one we were headed to before the stop } @@ -220,14 +220,14 @@ void NPC::UpdateWaypoint(int wp_index) vector::iterator cur; cur = Waypoints.begin(); cur += wp_index; - + cur_wp_x = cur->x; cur_wp_y = cur->y; cur_wp_z = cur->z; cur_wp_pause = cur->pause; cur_wp_heading = cur->heading; mlog(AI__WAYPOINTS, "Next waypoint %d: (%.3f, %.3f, %.3f, %.3f)", wp_index, cur_wp_x, cur_wp_y, cur_wp_z, cur_wp_heading); - + //fix up pathing Z if(zone->HasMap() && RuleB(Map, FixPathingZAtWaypoints)) { @@ -242,8 +242,8 @@ void NPC::UpdateWaypoint(int wp_index) if( (newz > -2000) && ABS(newz - dest.z) < RuleR(Map, FixPathingZMaxDeltaWaypoint)) cur_wp_z = newz + 1; } - } - + } + } void NPC::CalculateNewWaypoint() @@ -326,7 +326,7 @@ void NPC::CalculateNewWaypoint() cur_wp = cur_wp + 1; break; } - case 5: //pick random closest 5 and pick one that's in sight + case 5: //pick random closest 5 and pick one that's in sight { list closest; GetClosestWaypoint(closest, 5, GetX(), GetY(), GetZ()); @@ -411,29 +411,29 @@ void NPC::GetClosestWaypoint(list &wp_list, int count, float m_x, float } } -void NPC::SetWaypointPause() -{ - //Declare time to wait on current WP - - if (cur_wp_pause == 0) { - AIwalking_timer->Start(100); - } - else - { - - switch (pausetype) - { - case 0: //Random Half - AIwalking_timer->Start((cur_wp_pause - MakeRandomInt(0, cur_wp_pause-1)/2)*1000); - break; - case 1: //Full - AIwalking_timer->Start(cur_wp_pause*1000); - break; - case 2: //Random Full - AIwalking_timer->Start(MakeRandomInt(0, cur_wp_pause-1)*1000); - break; - } - } +void NPC::SetWaypointPause() +{ + //Declare time to wait on current WP + + if (cur_wp_pause == 0) { + AIwalking_timer->Start(100); + } + else + { + + switch (pausetype) + { + case 0: //Random Half + AIwalking_timer->Start((cur_wp_pause - MakeRandomInt(0, cur_wp_pause-1)/2)*1000); + break; + case 1: //Full + AIwalking_timer->Start(cur_wp_pause*1000); + break; + case 2: //Random Full + AIwalking_timer->Start(MakeRandomInt(0, cur_wp_pause-1)*1000); + break; + } + } } void NPC::SaveGuardSpot(bool iClearGuardSpot) { @@ -520,9 +520,9 @@ float Mob::CalculateHeadingToTarget(float in_x, float in_y) { bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, bool checkZ) { if(GetID()==0) return true; - + _ZP(Mob_CalculateNewPosition2); - + if ((x_pos-x == 0) && (y_pos-y == 0)) {//spawn is at target coords if(z_pos-z != 0) { z_pos = z; @@ -540,15 +540,15 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b z_pos = z; return true; } - + int compare_steps = IsBoat() ? 1 : 20; if(tar_ndx < compare_steps && tarx==x && tary==y){ x_pos = x_pos + tar_vx*tar_vector; y_pos = y_pos + tar_vy*tar_vector; z_pos = z_pos + tar_vz*tar_vector; - + mlog(AI__WAYPOINTS, "Calculating new position2 to (%.3f, %.3f, %.3f), old vector (%.3f, %.3f, %.3f)", x, y, z, tar_vx, tar_vy, tar_vz); - + uint8 NPCFlyMode = 0; if(IsNPC()) { @@ -581,13 +581,13 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b z_pos = newz + 1; } } - } - + } + tar_ndx++; return true; } - - + + if (tar_ndx>50) { tar_ndx--; } else { @@ -601,7 +601,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b float ny = this->y_pos; float nz = this->z_pos; // float nh = this->heading; - + tar_vx = x - nx; tar_vy = y - ny; tar_vz = z - nz; @@ -645,7 +645,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b z_pos = z; mlog(AI__WAYPOINTS, "Only a single step to get there... jumping."); - + } } @@ -657,7 +657,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b heading = CalculateHeadingToTarget(x, y); mlog(AI__WAYPOINTS, "Next position2 (%.3f, %.3f, %.3f) (%d steps)", x_pos, y_pos, z_pos, numsteps); } - + uint8 NPCFlyMode = 0; if(IsNPC()) { @@ -691,10 +691,10 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b } } } - + SetMoving(true); moved=true; - + delta_x=x_pos-nx; delta_y=y_pos-ny; delta_z=z_pos-nz; @@ -722,14 +722,14 @@ bool Mob::CalculateNewPosition2(float x, float y, float z, float speed, bool che bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool checkZ) { if(GetID()==0) return true; - + _ZP(Mob_CalculateNewPosition); - + float nx = x_pos; float ny = y_pos; float nz = z_pos; // float nh = heading; - + // if NPC is rooted if (speed == 0.0) { SetHeading(CalculateHeadingToTarget(x, y)); @@ -752,9 +752,9 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec return false; pRunAnimSpeed = (uint8)(speed*NPC_RUNANIM_RATIO); speed *= NPC_SPEED_MULTIPLIER; - + mlog(AI__WAYPOINTS, "Calculating new position to (%.3f, %.3f, %.3f) vector (%.3f, %.3f, %.3f) rate %.3f RAS %d", x, y, z, tar_vx, tar_vy, tar_vz, speed, pRunAnimSpeed); - + // -------------------------------------------------------------------------- // 2: get unit vector // -------------------------------------------------------------------------- @@ -774,7 +774,7 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec z_pos = z_pos + tar_vz*tar_vector; mlog(AI__WAYPOINTS, "Next position (%.3f, %.3f, %.3f)", x_pos, y_pos, z_pos); } - + uint8 NPCFlyMode = 0; if(IsNPC()) { @@ -794,7 +794,7 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec mlog(AI__WAYPOINTS, "BestZ returned %4.3f at %4.3f, %4.3f, %4.3f", newz,x_pos,y_pos,z_pos); - if( (newz > -2000) && ABS(newz - dest.z) < RuleR(Map, FixPathingZMaxDeltaMoving)) // Sanity check. + if( (newz > -2000) && ABS(newz - dest.z) < RuleR(Map, FixPathingZMaxDeltaMoving)) // Sanity check. { if(ABS(x - x_pos) < 0.5 && ABS(y - y_pos) < 0.5) { @@ -808,7 +808,7 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec } } } - + //OP_MobUpdate if((old_test_vector!=test_vector) || tar_ndx>20){ //send update tar_ndx=0; @@ -821,7 +821,7 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec SendPosUpdate(); } tar_ndx++; - + // now get new heading SetAppearance(eaStanding, false); // make sure they're standing pLastChange = Timer::GetCurrentTime(); @@ -837,7 +837,7 @@ void NPC::AssignWaypoints(int32 grid) { this->CastToNPC()->SetGrid(grid); return; } - + char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; @@ -884,7 +884,7 @@ void NPC::AssignWaypoints(int32 grid) { adverrorinfo = 7564; while((row = mysql_fetch_row(result))) - { + { if(row[0] != 0 && row[1] != 0 && row[2] != 0 && row[3] != 0) { wplist newwp; @@ -892,7 +892,7 @@ void NPC::AssignWaypoints(int32 grid) { newwp.x = atof(row[0]); newwp.y = atof(row[1]); newwp.z = atof(row[2]); - + if(zone->HasMap() && RuleB(Map, FixPathingZWhenLoading) ) { if(!RuleB(Watermap, CheckWaypointsInWaterWhenLoading) || !zone->HasWaterMap() || @@ -941,8 +941,8 @@ void Mob::SendTo(float new_x, float new_y, float new_z) { if(flymode == FlyMode1) return; - - //fix up pathing Z, this shouldent be needed IF our waypoints + + //fix up pathing Z, this shouldent be needed IF our waypoints //are corrected instead if(zone->HasMap() && RuleB(Map, FixPathingZOnSendTo) ) { @@ -967,8 +967,8 @@ void Mob::SendToFixZ(float new_x, float new_y, float new_z) { x_pos = new_x; y_pos = new_y; z_pos = new_z + 0.1; - - //fix up pathing Z, this shouldent be needed IF our waypoints + + //fix up pathing Z, this shouldent be needed IF our waypoints //are corrected instead if(zone->HasMap() && RuleB(Map, FixPathingZOnSendTo)) @@ -1146,7 +1146,7 @@ void ZoneDatabase::AssignGrid(Client *client, float x, float y, uint32 grid) { float difference; difference = sqrtf(pow(fabs(x-dbx),2) + pow(fabs(y-dby),2)); - client->Message(0, + client->Message(0, "Grid assign: spawn2 id = %d updated - fuzzy match: deviation %f", spawn2id, difference ); @@ -1176,7 +1176,7 @@ void ZoneDatabase::AssignGrid(Client *client, float x, float y, uint32 grid) * zoneid: The ID number of the zone the grid is being created/deleted in */ -void ZoneDatabase::ModifyGrid(Client *c, bool remove, uint32 id, uint8 type, uint8 type2, uint16 zoneid) { +void ZoneDatabase::ModifyGrid(Client *c, bool remove, uint32 id, uint8 type, uint8 type2, uint16 zoneid) { char *query = 0; char errbuf[MYSQL_ERRMSG_SIZE]; if (!remove) @@ -1211,7 +1211,7 @@ void ZoneDatabase::ModifyGrid(Client *c, bool remove, uint32 id, uint8 type, uin */ void ZoneDatabase::AddWP(Client *c, uint32 gridid, uint32 wpnum, float xpos, float ypos, float zpos, uint32 pause, uint16 zoneid, float heading) -{ +{ char *query = 0; char errbuf[MYSQL_ERRMSG_SIZE]; @@ -1265,7 +1265,7 @@ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float MYSQL_RES *result; MYSQL_ROW row; char errbuf[MYSQL_ERRMSG_SIZE]; - + // See what grid number our spawn is assigned if(RunQuery(query, MakeAnyLenString(&query,"SELECT pathgrid FROM spawn2 WHERE id=%i",spawn2id),errbuf,&result)) { @@ -1308,8 +1308,8 @@ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float } else // NPC had a grid assigned to it CreatedNewGrid = false; - - + + // Find out what the next waypoint is for this grid query = 0; if(RunQuery(query, MakeAnyLenString(&query,"SELECT max(`number`) FROM grid_entries WHERE zoneid='%i' AND gridid='%i'",zoneid,grid_num),errbuf,&result)) @@ -1335,10 +1335,10 @@ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float if(c) c->LogSQL(query); } safe_delete_array(query); - + if(CreatedNewGrid) return grid_num; - + return 0; } /*** END ZoneDatabase::AddWPForSpawn() ***/ @@ -1353,7 +1353,7 @@ uint32 ZoneDatabase::GetFreeGrid(uint16 zoneid) { if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); uint32 tmp=0; - if (row[0]) + if (row[0]) tmp = atoi(row[0]); mysql_free_result(result); tmp++; diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index c25af347e..abafb6ae4 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -4,13 +4,13 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -105,9 +105,9 @@ void WorldServer::SetZone(uint32 iZoneID, uint32 iInstanceID) { void WorldServer::OnConnected() { WorldConnection::OnConnected(); - + ServerPacket* pack; - + //tell the launcher what name we were started with. pack = new ServerPacket(ServerOP_SetLaunchName,sizeof(LaunchName_Struct)); LaunchName_Struct* ln = (LaunchName_Struct*)pack->pBuffer; @@ -121,7 +121,7 @@ void WorldServer::OnConnected() { sci->port = ZoneConfig::get()->ZonePort; SendPacket(pack); safe_delete(pack); - + if (ZoneLoaded) { this->SetZone(zone->GetZoneID(), zone->GetInstanceID()); entity_list.UpdateWho(true); @@ -130,7 +130,7 @@ void WorldServer::OnConnected() { } else { this->SetZone(0); } - + pack = new ServerPacket(ServerOP_LSZoneBoot,sizeof(ZoneBoot_Struct)); ZoneBoot_Struct* zbs = (ZoneBoot_Struct*)pack->pBuffer; strcpy(zbs->compile_time,LAST_MODIFIED); @@ -140,9 +140,9 @@ void WorldServer::OnConnected() { void WorldServer::Process() { _ZP(WorldServer_Process); - + WorldConnection::Process(); - + if (!Connected()) return; @@ -161,7 +161,7 @@ void WorldServer::Process() { // World is tellins us what port to use. case ServerOP_SetConnectInfo: { if (pack->size != sizeof(ServerConnectInfo)) - break; + break; ServerConnectInfo* sci = (ServerConnectInfo*) pack->pBuffer; _log(ZONE__WORLD,"World indicated port %d for this zone.",sci->port); ZoneConfig::SetZonePort(sci->port); @@ -201,7 +201,7 @@ void WorldServer::Process() { } case ServerOP_VoiceMacro: { - if (!ZoneLoaded) + if (!ZoneLoaded) break; ServerVoiceMacro_Struct* svm = (ServerVoiceMacro_Struct*) pack->pBuffer; @@ -217,7 +217,7 @@ void WorldServer::Process() { switch(svm->Type) { case VoiceMacroTell: { Client* c = entity_list.GetClientByName(svm->To); - if(!c) + if(!c) break; c->QueuePacket(outapp); @@ -227,7 +227,7 @@ void WorldServer::Process() { case VoiceMacroGroup: { Group* g = entity_list.GetGroupByID(svm->GroupID); - if(!g) + if(!g) break; for(unsigned int i = 0; i < MAX_GROUP_MEMBERS; i++) { @@ -241,7 +241,7 @@ void WorldServer::Process() { case VoiceMacroRaid: { Raid *r = entity_list.GetRaidByID(svm->RaidID); - if(!r) + if(!r) break; for(int i = 0; i < MAX_RAID_MEMBERS; i++) @@ -261,9 +261,9 @@ void WorldServer::Process() { if (!ZoneLoaded) break; ServerSpawnCondition_Struct* ssc = (ServerSpawnCondition_Struct*) pack->pBuffer; - + zone->spawn_conditions.SetCondition(zone->GetShortName(), zone->GetInstanceID(), ssc->condition_id, ssc->value, true); - break; + break; } case ServerOP_SpawnEvent: { if(pack->size != sizeof(ServerSpawnEvent_Struct)) @@ -271,10 +271,10 @@ void WorldServer::Process() { if (!ZoneLoaded) break; ServerSpawnEvent_Struct* sse = (ServerSpawnEvent_Struct*) pack->pBuffer; - + zone->spawn_conditions.ReloadEvent(sse->event_id); - - break; + + break; } case ServerOP_AcceptWorldEntrance: { if(pack->size != sizeof(WorldToZone_Struct)) @@ -289,7 +289,7 @@ void WorldServer::Process() { wtz->response = 1; SendPacket(pack); - break; + break; } case ServerOP_ZoneToZoneRequest: { if(pack->size != sizeof(ZoneToZone_Struct)) @@ -297,8 +297,8 @@ void WorldServer::Process() { if (!ZoneLoaded) break; ZoneToZone_Struct* ztz = (ZoneToZone_Struct*) pack->pBuffer; - - if(ztz->current_zone_id == zone->GetZoneID() + + if(ztz->current_zone_id == zone->GetZoneID() && ztz->current_instance_id == zone->GetInstanceID()) { // it's a response Entity* entity = entity_list.GetClientByName(ztz->name); @@ -372,8 +372,8 @@ void WorldServer::Process() { case ServerOP_WhoAllReply:{ if(!ZoneLoaded) break; - - + + WhoAllReturnStruct* wars= (WhoAllReturnStruct*)pack->pBuffer; if (wars && wars->id!=0 && wars->id<0xFFFFFFFF){ Client* client = entity_list.GetClientByID(wars->id); @@ -463,7 +463,7 @@ void WorldServer::Process() { } else { SendEmoteMessage(0, 0, 15, "Zone shutdown: %s", zone->GetLongName()); - + ServerZoneStateChange_struct* zst = (ServerZoneStateChange_struct *) pack->pBuffer; cout << "Zone shutdown by " << zst->adminname << endl; Zone::Shutdown(); @@ -487,10 +487,10 @@ void WorldServer::Process() { } break; } - + if (zst->adminname[0] != 0) cout << "Zone bootup by " << zst->adminname << endl; - + if (!(Zone::Bootup(zst->zoneid, zst->instanceid, zst->makestatic))) { SendChannelMessage(0, 0, 10, 0, 0, "%s:%i Zone::Bootup failed: %s", net.GetZoneAddress(), net.GetZonePort(), database.GetZoneName(zst->zoneid)); } @@ -570,7 +570,7 @@ void WorldServer::Process() { } break; } - + //hand all the guild related packets to the guild manager for processing. case ServerOP_OnlineGuildMembersResponse: case ServerOP_RefreshGuild: @@ -683,15 +683,15 @@ void WorldServer::Process() { //pendingrezexp is the amount of XP on the corpse. Setting it to a value >= 0 //also serves to inform Client::OPRezzAnswer to expect a packet. client->SetPendingRezzData(srs->exp, srs->dbid, srs->rez.spellid, srs->rez.corpse_name); - _log(SPELLS__REZ, "OP_RezzRequest in zone %s for %s, spellid:%i", + _log(SPELLS__REZ, "OP_RezzRequest in zone %s for %s, spellid:%i", zone->GetShortName(), client->GetName(), srs->rez.spellid); - EQApplicationPacket* outapp = new EQApplicationPacket(OP_RezzRequest, + EQApplicationPacket* outapp = new EQApplicationPacket(OP_RezzRequest, sizeof(Resurrect_Struct)); memcpy(outapp->pBuffer, &srs->rez, sizeof(Resurrect_Struct)); client->QueuePacket(outapp); _pkt(SPELLS__REZ, outapp); safe_delete(outapp); - break; + break; } } if (srs->rezzopcode == OP_RezzComplete){ @@ -708,7 +708,7 @@ void WorldServer::Process() { corpse->CompleteRezz(); } } - + break; } case ServerOP_RezzPlayerReject: @@ -733,17 +733,17 @@ void WorldServer::Process() { snprintf(buffer,200,". %s %i %s",zb->ip2, zb->port, inet_ntoa(in)); if(zb->zoneid != 0) { snprintf(buffer,200,"%s %s %i %s",database.GetZoneName(zb->zoneid),zb->ip2, zb->port ,inet_ntoa(in)); - cout << "executing: " << buffer; + cout << "executing: " << buffer; ShellExecute(0,"Open",net.GetZoneFileName(), buffer, 0, SW_SHOWDEFAULT); } else { - cout << "executing: " << net.GetZoneFileName() << " " << buffer; + cout << "executing: " << net.GetZoneFileName() << " " << buffer; ShellExecute(0,"Open",net.GetZoneFileName(), buffer, 0, SW_SHOWDEFAULT); } #else char buffer[5]; - snprintf(buffer,5,"%i",zb->port); //just to be sure that it will work on linux + snprintf(buffer,5,"%i",zb->port); //just to be sure that it will work on linux if(zb->zoneid != 0) execl(net.GetZoneFileName(),net.GetZoneFileName(),database.GetZoneName(zb->zoneid),zb->ip2, buffer,inet_ntoa(in), nullptr); else @@ -796,7 +796,7 @@ void WorldServer::Process() { oocmuted = *(pack->pBuffer); break; } - case ServerOP_Revoke: { + case ServerOP_Revoke: { RevokeStruct* rev = (RevokeStruct*) pack->pBuffer; Client* client = entity_list.GetClientByName(rev->name); if (client) @@ -858,7 +858,7 @@ void WorldServer::Process() { Group* group = entity_list.GetGroupByClient(Inviter->CastToClient()); if(!group){ - + group = new Group(Inviter); if(!group) @@ -892,9 +892,9 @@ void WorldServer::Process() { { // SoD and later // - Inviter->CastToClient()->SendGroupCreatePacket(); + Inviter->CastToClient()->SendGroupCreatePacket(); Inviter->CastToClient()->SendGroupLeaderChangePacket(Inviter->GetName()); - Inviter->CastToClient()->SendGroupJoinAcknowledge(); + Inviter->CastToClient()->SendGroupJoinAcknowledge(); } } if(!group) @@ -907,7 +907,7 @@ void WorldServer::Process() { strn0cpy(gg->name1, sgfs->gf.name1, sizeof(gg->name1)); strn0cpy(gg->name2, sgfs->gf.name2, sizeof(gg->name2)); - + Inviter->CastToClient()->QueuePacket(outapp); safe_delete(outapp); @@ -957,7 +957,7 @@ void WorldServer::Process() { if(!c) break; - + uint32 groupid = database.GetGroupID(c->GetName()); Group* group = nullptr; @@ -1007,7 +1007,7 @@ void WorldServer::Process() { Client *lc = entity_list.GetClientByName(ln); if(lc) group->SetLeader(lc); - + group->SetMainTank(MainTankName); group->SetMainAssist(AssistName); group->SetPuller(PullerName); @@ -1068,7 +1068,7 @@ void WorldServer::Process() { entity_list.GroupMessage(gcm->groupid, gcm->from, gcm->message); } - break; + break; } case ServerOP_DisbandGroup: { ServerDisbandGroup_Struct* sd = (ServerDisbandGroup_Struct*)pack->pBuffer; @@ -1087,7 +1087,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->LearnMembers(); @@ -1103,7 +1103,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->SendRaidRemoveAll(rga->playername); @@ -1112,7 +1112,7 @@ void WorldServer::Process() { r->SendRaidDisband(rem); } r->LearnMembers(); - r->VerifyRaid(); + r->VerifyRaid(); } } break; @@ -1123,7 +1123,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->SendRaidDisbandAll(); @@ -1139,7 +1139,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->GetRaidDetails(); //update our details @@ -1157,7 +1157,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->LearnMembers(); @@ -1186,7 +1186,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->GroupUpdate(rga->gid, false); @@ -1209,7 +1209,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ Client *c = entity_list.GetClientByName(rga->playername); @@ -1230,7 +1230,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->GetRaidDetails(); @@ -1246,7 +1246,7 @@ void WorldServer::Process() { if(zone){ if(rga->zoneid == zone->GetZoneID() && rga->instance_id == zone->GetInstanceID()) break; - + Client *c = entity_list.GetClientByName(rga->playername); if(c) { @@ -1262,14 +1262,14 @@ void WorldServer::Process() { } case ServerOP_RaidGroupAdd:{ - ServerRaidGroupAction_Struct* rga = (ServerRaidGroupAction_Struct*)pack->pBuffer; + ServerRaidGroupAction_Struct* rga = (ServerRaidGroupAction_Struct*)pack->pBuffer; if(zone){ Raid *r = entity_list.GetRaidByID(rga->rid); if(r){ r->LearnMembers(); r->VerifyRaid(); EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate, sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; + GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; strn0cpy(gj->membername, rga->membername, 64); gj->action = groupActJoin; @@ -1300,7 +1300,7 @@ void WorldServer::Process() { r->LearnMembers(); r->VerifyRaid(); EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate, sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; + GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; strn0cpy(gj->membername, rga->membername, 64); gj->action = groupActLeave; @@ -1324,7 +1324,7 @@ void WorldServer::Process() { } case ServerOP_RaidGroupSay:{ - ServerRaidMessage_Struct* rmsg = (ServerRaidMessage_Struct*)pack->pBuffer; + ServerRaidMessage_Struct* rmsg = (ServerRaidMessage_Struct*)pack->pBuffer; if(zone){ Raid *r = entity_list.GetRaidByID(rmsg->rid); if(r) @@ -1377,7 +1377,7 @@ void WorldServer::Process() { Corpse* NewCorpse = database.LoadPlayerCorpse(s->player_corpse_id); if(NewCorpse) NewCorpse->Spawn(); - else + else LogFile->write(EQEMuLog::Error,"Unable to load player corpse id %u for zone %s.", s->player_corpse_id, zone->GetShortName()); break; @@ -1451,7 +1451,7 @@ void WorldServer::Process() { UpdateSpawnTimer_Struct *ust = (UpdateSpawnTimer_Struct*)pack->pBuffer; LinkedListIterator iterator(zone->spawn2_list); iterator.Reset(); - while (iterator.MoreElements()) + while (iterator.MoreElements()) { if(iterator.GetData()->GetID() == ust->id) { @@ -1548,7 +1548,7 @@ void WorldServer::Process() { { break; } - + if(zone) { ServerQGlobalUpdate_Struct *qgu = (ServerQGlobalUpdate_Struct*)pack->pBuffer; @@ -1574,7 +1574,7 @@ void WorldServer::Process() { { break; } - + if(zone) { ServerQGlobalDelete_Struct *qgd = (ServerQGlobalDelete_Struct*)pack->pBuffer; @@ -1674,7 +1674,7 @@ void WorldServer::Process() { } break; } - + case ServerOP_AdventureLeaveReply: { Client *c = entity_list.GetClientByName((const char*)pack->pBuffer); @@ -1780,7 +1780,7 @@ void WorldServer::Process() { default: break; } - + break; } case ServerOP_CZSignalClient: @@ -1826,7 +1826,7 @@ void WorldServer::Process() { } safe_delete(pack); } - + return; } @@ -1835,15 +1835,15 @@ bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_nu return false; va_list argptr; char buffer[512]; - + va_start(argptr, message); vsnprintf(buffer, 512, message, argptr); va_end(argptr); buffer[511] = '\0'; - + ServerPacket* pack = new ServerPacket(ServerOP_ChannelMessage, sizeof(ServerChannelMessage_Struct) + strlen(buffer) + 1); ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*) pack->pBuffer; - + if (from == 0) { strcpy(scm->from, "ZServer"); scm->fromadmin = 0; @@ -1863,7 +1863,7 @@ bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_nu scm->guilddbid = guilddbid; scm->language = language; strcpy(scm->message, buffer); - + pack->Deflate(); bool ret = SendPacket(pack); safe_delete(pack); @@ -1873,18 +1873,18 @@ bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_nu bool WorldServer::SendEmoteMessage(const char* to, uint32 to_guilddbid, uint32 type, const char* message, ...) { va_list argptr; char buffer[256]; - + va_start(argptr, message); vsnprintf(buffer, 256, message, argptr); va_end(argptr); - + return SendEmoteMessage(to, to_guilddbid, 0, type, buffer); } bool WorldServer::SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...) { va_list argptr; char buffer[256]; - + va_start(argptr, message); vsnprintf(buffer, 256, message, argptr); va_end(argptr); @@ -1893,7 +1893,7 @@ bool WorldServer::SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to entity_list.MessageStatus(to_guilddbid, to_minstatus, type, buffer); return false; } - + ServerPacket* pack = new ServerPacket(ServerOP_EmoteMessage, sizeof(ServerEmoteMessage_Struct)+strlen(buffer)+1); ServerEmoteMessage_Struct* sem = (ServerEmoteMessage_Struct*) pack->pBuffer; sem->type = type; @@ -1913,11 +1913,11 @@ bool WorldServer::SendVoiceMacro(Client* From, uint32 Type, char* Target, uint32 if(!worldserver.Connected() || !From) return false; - + ServerPacket* pack = new ServerPacket(ServerOP_VoiceMacro, sizeof(ServerVoiceMacro_Struct)); ServerVoiceMacro_Struct* svm = (ServerVoiceMacro_Struct*) pack->pBuffer; - + strcpy(svm->From, From->GetName()); switch(Type) { @@ -1979,8 +1979,8 @@ void WorldServer::SendReloadTasks(int Command, int TaskID) { SendPacket(pack); } -void WorldServer::HandleReloadTasks(ServerPacket *pack) -{ +void WorldServer::HandleReloadTasks(ServerPacket *pack) +{ ReloadTasks_Struct* rts = (ReloadTasks_Struct*) pack->pBuffer; _log(TASKS__GLOBALLOAD, "Zone received ServerOP_ReloadTasks from World, Command %i", rts->Command); @@ -1994,7 +1994,7 @@ void WorldServer::HandleReloadTasks(ServerPacket *pack) safe_delete(taskmanager); taskmanager = new TaskManager; taskmanager->LoadTasks(); - if(zone) + if(zone) taskmanager->LoadProximities(zone->GetZoneID()); entity_list.ReloadAllClientsTaskState(); } @@ -2052,7 +2052,7 @@ uint32 WorldServer::NextGroupID() { return(cur_groupid++); } -void WorldServer::UpdateLFP(uint32 LeaderID, uint8 Action, uint8 MatchFilter, uint32 FromLevel, uint32 ToLevel, uint32 Classes, +void WorldServer::UpdateLFP(uint32 LeaderID, uint8 Action, uint8 MatchFilter, uint32 FromLevel, uint32 ToLevel, uint32 Classes, const char *Comments, GroupLFPMemberEntry *LFPMembers) { ServerPacket* pack = new ServerPacket(ServerOP_LFPUpdate, sizeof(ServerLFPUpdate_Struct)); @@ -2123,7 +2123,7 @@ void WorldServer::HandleLFGMatches(ServerPacket *pack) { client->QueuePacket(outapp); safe_delete(outapp); } -} +} void WorldServer::HandleLFPMatches(ServerPacket *pack) { @@ -2134,7 +2134,7 @@ void WorldServer::HandleLFPMatches(ServerPacket *pack) { int Entries = (pack->size - 4) / sizeof(ServerLFPMatchesResponse_Struct); uint32 EntityID = VARSTRUCT_DECODE_TYPE(uint32, Buffer); - + ServerLFPMatchesResponse_Struct* smrs = (ServerLFPMatchesResponse_Struct*)Buffer; Client* client = entity_list.GetClientByID(EntityID); @@ -2144,7 +2144,7 @@ void WorldServer::HandleLFPMatches(ServerPacket *pack) { PacketLength += strlen(smrs->Comments) + 11; for(unsigned int j=0; jMembers[j].Name[0] != '\0') + if(smrs->Members[j].Name[0] != '\0') PacketLength += strlen(smrs->Members[j].Name) + 9; } smrs++; @@ -2161,7 +2161,7 @@ void WorldServer::HandleLFPMatches(ServerPacket *pack) { int MemberCount = 0; - for(unsigned int j=0; jMembers[j].Name[0] != '\0') MemberCount++; diff --git a/zone/worldserver.h b/zone/worldserver.h index ab332bf74..4d14459fe 100644 --- a/zone/worldserver.h +++ b/zone/worldserver.h @@ -33,7 +33,7 @@ public: virtual ~WorldServer(); virtual void Process(); - + void SendGuildJoin(GuildJoin_Struct* gj); bool SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message, ...); bool SendEmoteMessage(const char* to, uint32 to_guilddbid, uint32 type, const char* message, ...); @@ -43,9 +43,9 @@ public: uint32 SendGroupIdRequest(); bool RezzPlayer(EQApplicationPacket* rpack, uint32 rezzexp, uint32 dbid, uint16 opcode); bool IsOOCMuted() const { return(oocmuted); } - + uint32 NextGroupID(); - + void SetLaunchedName(const char *n) { m_launchedName = n; } void SetLauncherName(const char *n) { m_launcherName = n; } void SendReloadTasks(int Command, int TaskID=0); @@ -56,15 +56,15 @@ public: void StopLFP(uint32 LeaderID); void HandleLFGMatches(ServerPacket *pack); void HandleLFPMatches(ServerPacket *pack); - + private: virtual void OnConnected(); - + std::string m_launchedName; std::string m_launcherName; - + bool oocmuted; - + uint32 cur_groupid; uint32 last_groupid; }; diff --git a/zone/zone.cpp b/zone/zone.cpp index 146da03c6..c49f66751 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -88,7 +88,7 @@ void CleanupLoadZoneState(uint32 spawn2_count, ZSDump_Spawn2** spawn2_dump, ZSDu bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { _ZP(Zone_Bootup); const char* zonename = database.GetZoneName(iZoneID); - + if (iZoneID == 0 || zonename == 0) return false; if (zone != 0 || ZoneLoaded) { @@ -96,12 +96,12 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { worldserver.SetZone(0); return false; } - + LogFile->write(EQEMuLog::Status, "Booting %s (%d:%d)", zonename, iZoneID, iInstanceID); - + numclients = 0; zone = new Zone(iZoneID, iInstanceID, zonename); - + //init the zone, loads all the data, etc if (!zone->Init(iStaticZone)) { safe_delete(zone); @@ -112,7 +112,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { zone->zonemap = Map::LoadMapfile(zone->map_name); zone->watermap = WaterMap::LoadWaterMapfile(zone->map_name); zone->pathing = PathManager::LoadPathFile(zone->map_name); - + char tmp[10]; //PlayerProfile_Struct* pp; //int char_num = 0; @@ -146,7 +146,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { zone->weather_type = database.GetZoneWeather(iZoneID, zone->GetInstanceVersion()); LogFile->write(EQEMuLog::Debug, "Zone: %s has weather of type %i.", zonename, zone->weather_type); - + if(zone->weather_type > 3 || zone->weather_type == 0) { zone->zone_weather = 0; zone->Weather_Timer->Disable(); @@ -182,12 +182,12 @@ bool Zone::LoadZoneObjects() { char* query = nullptr; MYSQL_RES *result; MYSQL_ROW row; - + uint32 len_query = MakeAnyLenString(&query, "SELECT " "id,zoneid,xpos,ypos,zpos,heading,itemid,charges,objectname,type,icon," "unknown08,unknown10,unknown20,unknown24,unknown76" " from object where zoneid=%i and (version=%u or version=-1)", zoneid, instanceversion); - + if (database.RunQuery(query, len_query, errbuf, &result)) { safe_delete_array(query); LogFile->write(EQEMuLog::Status, "Loading Objects from DB..."); @@ -217,9 +217,9 @@ bool Zone::LoadZoneObjects() { { d.door_name[len - 9] = '\0'; } - + memcpy(d.dest_zone, "NONE", 5); - + if ((d.size = atoi(row[11])) == 0) // unknown08 = optional size percentage { d.size = 100; @@ -251,7 +251,7 @@ bool Zone::LoadZoneObjects() { uint32 itemid = 0; uint32 idx = 0; int16 charges = 0; - + id = (uint32)atoi(row[idx++]); data.zone_id = atoi(row[idx++]); data.x = atof(row[idx++]); @@ -272,7 +272,7 @@ bool Zone::LoadZoneObjects() { data.unknown024 = (uint32)atoi(row[idx++]); data.unknown076 = (uint32)atoi(row[idx++]); data.unknown084 = 0; - + ItemInst* inst = nullptr; //FatherNitwit: this dosent seem to work... //tradeskill containers do not have an itemid of 0... at least what I am seeing @@ -284,17 +284,17 @@ bool Zone::LoadZoneObjects() { // Groundspawn object inst = database.CreateItem(itemid); } - + //Father Nitwit's fix... not perfect... if(inst == nullptr && type != OT_DROPPEDITEM) { inst = new ItemInst(ItemUseWorldContainer); } - + // Load child objects if container if (inst && inst->IsType(ItemClassContainer)) { database.LoadWorldContainer(id, inst); } - + Object* object = new Object(id, type, icon, data, inst); entity_list.AddObject(object, false); if(type == OT_DROPPEDITEM && itemid != 0) @@ -403,7 +403,7 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg if(sold) return ml.slot; - + } if(freeslot){ if(charges<0) //sanity check only, shouldnt happen @@ -424,10 +424,10 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg uint32 Zone::GetTempMerchantQuantity(uint32 NPCID, uint32 Slot) { - std::list TmpMerchantList = tmpmerchanttable[NPCID]; + std::list TmpMerchantList = tmpmerchanttable[NPCID]; std::list::const_iterator Iterator; - for(Iterator = TmpMerchantList.begin(); Iterator != TmpMerchantList.end(); Iterator++) + for(Iterator = TmpMerchantList.begin(); Iterator != TmpMerchantList.end(); Iterator++) if((*Iterator).slot == Slot) return (*Iterator).charges; @@ -443,7 +443,7 @@ void Zone::LoadTempMerchantData(){ workpt.w2_3() = 0; workpt.b1() = DBA_b1_Zone_MerchantListsTemp; DBAsyncWork* dbaw = new DBAsyncWork(&database, &MTdbafq, workpt, DBAsync::Read); - dbaw->AddQuery(1, &query, MakeAnyLenString(&query, + dbaw->AddQuery(1, &query, MakeAnyLenString(&query, "select ml.npcid,ml.slot,ml.itemid,ml.charges " "from " " merchantlist_temp ml, " @@ -466,7 +466,7 @@ void Zone::LoadTempMerchantData(){ if (database.RunQuery(query, MakeAnyLenString(&query, "select ml.npcid,ml.slot,ml.itemid,ml.charges from merchantlist_temp ml, npc_types nt, spawnentry se, spawn2 s2 where nt.id=ml.npcid and nt.id=se.npcid and se.spawngroupid=s2.spawngroupid and s2.zone='%s' group by ml.npcid,slot order by npcid,slot asc", GetShortName()), errbuf, &result)) { uint32 npcid = 0; while((row = mysql_fetch_row(result))) { - if(npcid != atoul(row[0])){ + if(npcid != atoul(row[0])){ if(npcid > 0) tmpmerchanttable[npcid] = merlist; npcid = atoul(row[0]); @@ -531,7 +531,7 @@ void Zone::LoadNewMerchantData(uint32 merchantid){ ml.slot = atoul(row[1]); ml.faction_required = atoul(row[2]); ml.level_required = atoul(row[3]); - ml.alt_currency_cost = atoul(row[3]); + ml.alt_currency_cost = atoul(row[3]); merlist.push_back(ml); } merchanttable[merchantid] = merlist; @@ -577,7 +577,7 @@ void Zone::LoadMerchantData_result(MYSQL_RES* result) { ml.item = atoul(row[2]); ml.faction_required = atoul(row[3]); ml.level_required = atoul(row[4]); - ml.alt_currency_cost = atoul(row[5]); + ml.alt_currency_cost = atoul(row[5]); cur->second.push_back(ml); } } @@ -590,7 +590,7 @@ void Zone::GetMerchantDataForZoneLoad(){ workpt.w2_3() = 0; workpt.b1() = DBA_b1_Zone_MerchantLists; DBAsyncWork* dbaw = new DBAsyncWork(&database, &MTdbafq, workpt, DBAsync::Read); - dbaw->AddQuery(1, &query, MakeAnyLenString(&query, + dbaw->AddQuery(1, &query, MakeAnyLenString(&query, "select ml.merchantid,ml.slot,ml.item,ml.faction_required,ml.level_required,ml.alt_currency_cost " "from merchantlist ml, npc_types nt, spawnentry se, spawn2 s2 " "where nt.merchant_id=ml.merchantid and nt.id=se.npcid " @@ -610,7 +610,7 @@ void Zone::GetMerchantDataForZoneLoad(){ if (database.RunQuery(query, MakeAnyLenString(&query, "select ml.merchantid,ml.slot,ml.item from merchantlist ml, npc_types nt, spawnentry se, spawn2 s2 where nt.merchant_id=ml.merchantid and nt.id=se.npcid and se.spawngroupid=s2.spawngroupid and s2.zone='%s' group by ml.merchantid,slot order by merchantid,slot asc", GetShortName()), errbuf, &result)) { uint32 npcid = 0; while((row = mysql_fetch_row(result))) { - if(npcid != atoul(row[0])){ + if(npcid != atoul(row[0])){ if(npcid > 0) merchanttable[npcid] = merlist; npcid = atoul(row[0]); @@ -762,7 +762,7 @@ void Zone::LoadMercSpells(){ tempMercSpellEntry.slot = atoi(DataRow[7]); tempMercSpellEntry.proc_chance = atoi(DataRow[8]); - merc_spells_list[classid].push_back(tempMercSpellEntry); + merc_spells_list[classid].push_back(tempMercSpellEntry); } mysql_free_result(DatasetResult); @@ -798,9 +798,9 @@ void Zone::DBAWComplete(uint8 workpt_b1, DBAsyncWork* dbaw) { LogFile->write(EQEMuLog::Error, "Zone::DBAWComplete(): Invalid query part for merchant lists"); break; } - + LoadMerchantData_result(result); - + pQueuedMerchantsWorkID = 0; break; } @@ -820,9 +820,9 @@ void Zone::DBAWComplete(uint8 workpt_b1, DBAsyncWork* dbaw) { LogFile->write(EQEMuLog::Error, "Zone::DBAWComplete(): Invalid query part for temp merchant lists"); break; } - + LoadTempMerchantData_result(result); - + pQueuedMerchantsWorkID = 0; break; } @@ -834,7 +834,7 @@ void Zone::DBAWComplete(uint8 workpt_b1, DBAsyncWork* dbaw) { } } -void Zone::Shutdown(bool quite) +void Zone::Shutdown(bool quite) { if (!ZoneLoaded) return; @@ -855,8 +855,8 @@ void Zone::Shutdown(bool quite) zone->adventure_entry_list_flavor.clear(); std::map::iterator itr4; - while(zone->ldon_trap_list.size()) - { + while(zone->ldon_trap_list.size()) + { itr4 = zone->ldon_trap_list.begin(); delete itr4->second; zone->ldon_trap_list.erase(itr4); @@ -887,22 +887,22 @@ void Zone::Shutdown(bool quite) void Zone::LoadZoneDoors(const char* zone, int16 version) { LogFile->write(EQEMuLog::Status, "Loading doors for %s ...", zone); - + uint32 maxid; int32 count = database.GetDoorsCount(&maxid, zone, version); if(count < 1) { LogFile->write(EQEMuLog::Status, "... No doors loaded."); return; } - + Door *dlist = new Door[count]; - + if(!database.LoadDoors(count, dlist, zone, version)) { LogFile->write(EQEMuLog::Error, "... Failed to load doors."); delete[] dlist; return; } - + int r; Door *d = dlist; for(r = 0; r < count; r++, d++) { @@ -923,9 +923,9 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name) zoneid = in_zoneid; instanceid = in_instanceid; instanceversion = database.GetInstanceVersion(instanceid); - zonemap = nullptr; - watermap = nullptr; - pathing = nullptr; + zonemap = nullptr; + watermap = nullptr; + pathing = nullptr; qGlobals = nullptr; default_ruleset = 0; @@ -977,7 +977,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name) aas = nullptr; totalAAs = 0; gottime = false; - + Instance_Shutdown_Timer = nullptr; bool is_perma = false; if(instanceid > 0) @@ -1028,7 +1028,7 @@ Zone::~Zone() { zone_point_list.Clear(); entity_list.Clear(); ClearBlockedSpells(); - + safe_delete(Instance_Timer); safe_delete(Instance_Shutdown_Timer); safe_delete(Instance_Warning_timer); @@ -1054,37 +1054,37 @@ Zone::~Zone() { //Modified for timezones. bool Zone::Init(bool iStaticZone) { SetStaticZone(iStaticZone); - + LogFile->write(EQEMuLog::Status, "Loading spawn conditions..."); if(!spawn_conditions.LoadSpawnConditions(short_name, instanceid)) { LogFile->write(EQEMuLog::Error, "Loading spawn conditions failed, continuing without them."); } - + LogFile->write(EQEMuLog::Status, "Loading static zone points..."); if (!database.LoadStaticZonePoints(&zone_point_list, short_name, GetInstanceVersion())) { LogFile->write(EQEMuLog::Error, "Loading static zone points failed."); return false; } - + LogFile->write(EQEMuLog::Status, "Loading spawn groups..."); if (!database.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) { LogFile->write(EQEMuLog::Error, "Loading spawn groups failed."); return false; } - + LogFile->write(EQEMuLog::Status, "Loading spawn2 points..."); if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion())) { LogFile->write(EQEMuLog::Error, "Loading spawn2 points failed."); return false; } - + LogFile->write(EQEMuLog::Status, "Loading player corpses..."); if (!database.LoadPlayerCorpses(zoneid, instanceid)) { LogFile->write(EQEMuLog::Error, "Loading player corpses failed."); return false; } - + LogFile->write(EQEMuLog::Status, "Loading traps..."); if (!database.LoadTraps(short_name, GetInstanceVersion())) { @@ -1094,23 +1094,23 @@ bool Zone::Init(bool iStaticZone) { LogFile->write(EQEMuLog::Status, "Loading adventure flavor text..."); LoadAdventureFlavor(); - + LogFile->write(EQEMuLog::Status, "Loading ground spawns..."); if (!LoadGroundSpawns()) { LogFile->write(EQEMuLog::Error, "Loading ground spawns failed. continuing."); } - + LogFile->write(EQEMuLog::Status, "Loading World Objects from DB..."); if (!LoadZoneObjects()) { LogFile->write(EQEMuLog::Error, "Loading World Objects failed. continuing."); } - + //load up the zone's doors (prints inside) zone->LoadZoneDoors(zone->GetShortName(), zone->GetInstanceVersion()); zone->LoadBlockedSpells(zone->GetZoneID()); - + //clear trader items if we are loading the bazaar if(strncasecmp(short_name,"bazaar",6)==0) { database.DeleteTraderItem(0); @@ -1126,11 +1126,11 @@ bool Zone::Init(bool iStaticZone) { //Load AA information adverrornum = 500; LoadAAs(); - + //Load merchant data adverrornum = 501; zone->GetMerchantDataForZoneLoad(); - + //Load temporary merchant data adverrornum = 502; zone->LoadTempMerchantData(); @@ -1147,7 +1147,7 @@ bool Zone::Init(bool iStaticZone) { adverrornum = 503; petition_list.ClearPetitions(); petition_list.ReadDatabase(); - + //load the zone config file. if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion(), true)) // try loading the zone name... LoadZoneCFG(zone->GetFileName(), zone->GetInstanceVersion()); // if that fails, try the file name, then load defaults @@ -1160,10 +1160,10 @@ bool Zone::Init(bool iStaticZone) { RuleManager::Instance()->LoadRules(&database, r_name.c_str()); } } - + LogFile->write(EQEMuLog::Status, "Loading timezone data..."); zone->zone_time.setEQTimeZone(database.GetZoneTZ(zoneid, GetInstanceVersion())); - + LogFile->write(EQEMuLog::Status, "Init Finished: ZoneID = %d, Time Offset = %d", zoneid, zone->zone_time.getEQTimeZone()); LoadTickItems(); @@ -1176,33 +1176,33 @@ bool Zone::Init(bool iStaticZone) { void Zone::ReloadStaticData() { LogFile->write(EQEMuLog::Status, "Reloading Zone Static Data..."); - + LogFile->write(EQEMuLog::Status, "Reloading static zone points..."); zone_point_list.Clear(); if (!database.LoadStaticZonePoints(&zone_point_list, GetShortName(), GetInstanceVersion())) { LogFile->write(EQEMuLog::Error, "Loading static zone points failed."); } - + LogFile->write(EQEMuLog::Status, "Reloading traps..."); entity_list.RemoveAllTraps(); if (!database.LoadTraps(GetShortName(), GetInstanceVersion())) { LogFile->write(EQEMuLog::Error, "Reloading traps failed."); } - + LogFile->write(EQEMuLog::Status, "Reloading ground spawns..."); if (!LoadGroundSpawns()) { LogFile->write(EQEMuLog::Error, "Reloading ground spawns failed. continuing."); } - + entity_list.RemoveAllObjects(); LogFile->write(EQEMuLog::Status, "Reloading World Objects from DB..."); if (!LoadZoneObjects()) { LogFile->write(EQEMuLog::Error, "Reloading World Objects failed. continuing."); } - + entity_list.RemoveAllDoors(); zone->LoadZoneDoors(zone->GetShortName(), zone->GetInstanceVersion()); entity_list.RespawnAllDoors(); @@ -1211,24 +1211,24 @@ void Zone::ReloadStaticData() { zone->LoadAlternateCurrencies(); NPCEmoteList.Clear(); zone->LoadNPCEmotes(&NPCEmoteList); - + //load the zone config file. if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion(), true)) // try loading the zone name... LoadZoneCFG(zone->GetFileName(), zone->GetInstanceVersion()); // if that fails, try the file name, then load defaults - + LogFile->write(EQEMuLog::Status, "Zone Static Data Reloaded."); } -bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDefault) +bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDefault) { memset(&newzone_data, 0, sizeof(NewZone_Struct)); if(instance_id == 0) { map_name = nullptr; - if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, - can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, default_ruleset, &map_name)) + if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, + can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, default_ruleset, &map_name)) { - LogFile->write(EQEMuLog::Error, "Error loading the Zone Config."); + LogFile->write(EQEMuLog::Error, "Error loading the Zone Config."); return false; } } @@ -1236,24 +1236,24 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDe { //Fall back to base zone if we don't find the instance version. map_name = nullptr; - if(!database.GetZoneCFG(database.GetZoneID(filename), instance_id, &newzone_data, can_bind, - can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, default_ruleset, &map_name)) + if(!database.GetZoneCFG(database.GetZoneID(filename), instance_id, &newzone_data, can_bind, + can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, default_ruleset, &map_name)) { safe_delete_array(map_name); - if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, - can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, default_ruleset, &map_name)) + if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, + can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, default_ruleset, &map_name)) { - LogFile->write(EQEMuLog::Error, "Error loading the Zone Config."); + LogFile->write(EQEMuLog::Error, "Error loading the Zone Config."); return false; } } } - + //overwrite with our internal variables strcpy(newzone_data.zone_short_name, GetShortName()); strcpy(newzone_data.zone_long_name, GetLongName()); strcpy(newzone_data.zone_short_name2, GetShortName()); - + LogFile->write(EQEMuLog::Status, "Successfully loaded Zone Config."); return true; } @@ -1464,7 +1464,7 @@ bool Zone::Process() { Weather_Timer->Start(weatherTime); - LogFile->write(EQEMuLog::Debug, "The next weather check for zone: %s will be in %i seconds.", zone->GetShortName(), Weather_Timer->GetRemainingTime()/1000); + LogFile->write(EQEMuLog::Debug, "The next weather check for zone: %s will be in %i seconds.", zone->GetShortName(), Weather_Timer->GetRemainingTime()/1000); } } @@ -1522,10 +1522,10 @@ std::map::iterator itr; } void Zone::Repop(uint32 delay) { - + if(!Depop()) return; - + LinkedListIterator iterator(spawn2_list); MZoneLock.lock(); @@ -1538,7 +1538,7 @@ void Zone::Repop(uint32 delay) { LogFile->write(EQEMuLog::Debug, "Error in Zone::Repop: database.PopulateZoneSpawnList failed"); MZoneLock.unlock(); - + initgrids_timer.Start(); //MODDING HOOK FOR REPOP @@ -1620,7 +1620,7 @@ ZonePoint* Zone::GetClosestZonePoint(float x, float y, float z, uint32 to, Clien } iterator.Advance(); } - + if(closest_dist > 400.0f && closest_dist < max_distance2) { if(client) @@ -1628,10 +1628,10 @@ ZonePoint* Zone::GetClosestZonePoint(float x, float y, float z, uint32 to, Clien LogFile->write(EQEMuLog::Status, "WARNING: Closest zone point for zone id %d is %f, you might need to update your zone_points table if you dont arrive at the right spot.", to, closest_dist); LogFile->write(EQEMuLog::Status, ". %f x %f y %f z ", x, y, z); } - + if(closest_dist > max_distance2) closest_zp = nullptr; - + if(!closest_zp) closest_zp = GetClosestZonePointWithoutZone(x, y, z, client); @@ -2250,11 +2250,11 @@ bool Zone::IsSpellBlocked(uint32 spell_id, float nx, float ny, float nz) { exception = true; } - + if (blocked_spells[x].spellid == 0) { block_all = true; - } + } } for (int x = 0; x < totalBS; x++) @@ -2361,9 +2361,9 @@ void Zone::LoadLDoNTraps() MYSQL_ROW row; if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, type, spell_id, " - "skill, locked FROM ldon_trap_templates"), errbuf, &result)) + "skill, locked FROM ldon_trap_templates"), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { uint8 x = 0; LDoNTrapTemplate *lt = new LDoNTrapTemplate; @@ -2393,7 +2393,7 @@ void Zone::LoadLDoNTrapEntries() MYSQL_ROW row; if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, trap_id FROM ldon_trap_entries"),errbuf,&result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { uint32 id = atoi(row[0]); uint32 trap_id = atoi(row[1]); @@ -2448,13 +2448,13 @@ void Zone::LoadVeteranRewards() uint8 idx = 0; current_reward.claim_id = 0; - + if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT claim_id, name, item_id, charges FROM" " veteran_reward_templates WHERE reward_slot < 8 and claim_id > 0 ORDER by claim_id, reward_slot"), - errbuf,&result)) + errbuf,&result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { uint32 claim = atoi(row[0]); if(claim != current_reward.claim_id) @@ -2502,9 +2502,9 @@ void Zone::LoadAlternateCurrencies() AltCurrencyDefinition_Struct current_currency; if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, item_id from alternate_currency"), - errbuf,&result)) + errbuf,&result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { current_currency.id = atoi(row[0]); current_currency.item_id = atoi(row[1]); @@ -2558,9 +2558,9 @@ void Zone::LoadAdventureFlavor() MYSQL_RES *result; MYSQL_ROW row; - if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, text FROM adventure_template_entry_flavor"), errbuf, &result)) + if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT id, text FROM adventure_template_entry_flavor"), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { uint32 id = atoi(row[0]); std::string in_str = row[1]; @@ -2642,9 +2642,9 @@ void Zone::LoadNPCEmotes(LinkedList* NPCEmoteList) MYSQL_ROW row; NPCEmoteList->Clear(); - if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT emoteid, event_, type, text FROM npc_emotes"), errbuf, &result)) + if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT emoteid, event_, type, text FROM npc_emotes"), errbuf, &result)) { - while((row = mysql_fetch_row(result))) + while((row = mysql_fetch_row(result))) { NPC_Emote_Struct* nes = new NPC_Emote_Struct; nes->emoteid = atoi(row[0]); diff --git a/zone/zone.h b/zone/zone.h index 8d9ed169b..58f969780 100644 --- a/zone/zone.h +++ b/zone/zone.h @@ -38,7 +38,7 @@ class Map; class WaterMap; -struct ZonePoint +struct ZonePoint { float x; float y; @@ -67,7 +67,7 @@ struct ZoneClientAuth_Struct { struct ZoneEXPModInfo { float ExpMod; - float AAExpMod; + float AAExpMod; }; struct item_tick_struct { @@ -90,7 +90,7 @@ class Zone public: static bool Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone = false); static void Shutdown(bool quite = false); - + Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name); ~Zone(); bool Init(bool iStaticZone); @@ -128,7 +128,7 @@ public: bool LoadZoneObjects(); bool LoadGroundSpawns(); void ReloadStaticData(); - + uint32 CountSpawn2(); ZonePoint* GetClosestZonePoint(float x, float y, float z, const char* to_name, Client *client, float max_distance = 40000.0f); ZonePoint* GetClosestZonePoint(float x, float y, float z, uint32 to, Client *client, float max_distance = 40000.0f); @@ -137,7 +137,7 @@ public: bool RemoveSpawnEntry(uint32 spawnid); bool RemoveSpawnGroup(uint32 in_id); - + bool Process(); void DumpAllSpawn2(ZSDump_Spawn2* spawn2dump, uint32* spawn2index); uint32 DumpSpawn2(ZSDump_Spawn2* spawn2dump, uint32* spawn2index, Spawn2* spawn2); @@ -165,9 +165,9 @@ public: inline bool IsStaticZone() { return staticzone; } inline void GotCurTime(bool time) { gottime = time; } void DBAWComplete(uint8 workpt_b1, DBAsyncWork* dbaw); - + void SpawnConditionChanged(const SpawnCondition &c, int16 old_value); - + void GetMerchantDataForZoneLoad(); void LoadNewMerchantData(uint32 merchantid); void LoadTempMerchantData(); @@ -184,7 +184,7 @@ public: void LoadLDoNTraps(); void LoadLDoNTrapEntries(); void LoadAdventureFlavor(); - + map npctable; map merctable; map > merchanttable; @@ -216,7 +216,7 @@ public: uint8 zone_weather; SpawnConditionManager spawn_conditions; - + EQTime zone_time; void GetTimeSync(); void SetDate(uint16 year, uint8 month, uint8 day, uint8 hour, uint8 minute); @@ -231,10 +231,10 @@ public: bool AllowMercs() const {return(allow_mercs);} bool IsHotzone() const { return(is_hotzone); } inline bool BuffTimersSuspended() const { return newzone_data.SuspendBuffs != 0; }; - + time_t weather_timer; uint8 weather_type; - + uint8 loglevelvar; uint8 merchantvar; uint8 tradevar; @@ -259,7 +259,7 @@ public: LinkedList spawn2_list; LinkedList zone_point_list; uint32 numzonepoints; - + LinkedList NPCEmoteList; void LoadTickItems(); @@ -295,10 +295,10 @@ private: int totalBS; ZoneSpellsBlocked *blocked_spells; - + int totalAAs; SendAA_Struct **aas; //array of AA structs - + /* Spawn related things */ @@ -308,7 +308,7 @@ private: bool staticzone; bool gottime; - + uint32 pQueuedMerchantsWorkID; uint32 pQueuedTempMerchantsWorkID; diff --git a/zone/zone_logsys.cpp b/zone/zone_logsys.cpp index efa09a855..da901d288 100644 --- a/zone/zone_logsys.cpp +++ b/zone/zone_logsys.cpp @@ -4,13 +4,13 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -26,11 +26,11 @@ void log_message_mob(LogType type, Mob *who, const char *fmt, ...) { if(!who->IsLoggingEnabled()) return; //could prolly put this in the macro, but it feels even dirtier than prototyping this in common - + char prefix_buffer[256]; snprintf(prefix_buffer, 255, "[%s] %s: ", log_type_info[type].name, who->GetName()); prefix_buffer[255] = '\0'; - + va_list args; va_start(args, fmt); LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args); @@ -40,11 +40,11 @@ void log_message_mob(LogType type, Mob *who, const char *fmt, ...) { void log_message_mobVA(LogType type, Mob *who, const char *fmt, va_list args) { if(!who->IsLoggingEnabled()) return; //could prolly put this in the macro, but it feels even dirtier than prototyping this in common - + char prefix_buffer[256]; snprintf(prefix_buffer, 255, "[%s] %s: ", log_type_info[type].name, who->GetName()); prefix_buffer[255] = '\0'; - + LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args); } @@ -58,7 +58,7 @@ void log_hex_mob(LogType type, Mob *who, const char *data, uint32 length, uint8 void log_packet_mob(LogType type, Mob *who, const BasePacket *p) { if(!who->IsLoggingEnabled()) return; //could prolly put this in the macro, but it feels even dirtier than prototyping this in common - + char buffer[80]; p->build_header_dump(buffer); log_message(type,"[%s] %s: %s", log_type_info[type].name, who->GetName(), buffer); diff --git a/zone/zone_profile.cpp b/zone/zone_profile.cpp index f26a5786d..3347f4b57 100644 --- a/zone/zone_profile.cpp +++ b/zone/zone_profile.cpp @@ -58,7 +58,7 @@ public: count = _count; dur = _dur; } - + const char *str; unsigned long long count; double dur; @@ -86,31 +86,31 @@ const char *__cp_names[CommonProfiler::MaxCommonProfilerId] = { "Database_DBLoadItems", "Database_GetWaypoints", "Database_DBLoadNPCFactionLists", - + "DBcore_RunQuery", - + "DBAsync_ProcessWork", "DBAsync_DispatchWork", "DBAsyncLoop_loop", - + "EQStreamServer_Process", - + "EQStream_Process", - + "EQStreamServerLoop", "EQStreamInLoop", "EQStreamOutLoop", "TCPServerLoop", "TCPConnectionLoop", - + "Inventory_GetItem", "Inventory_HasItem", - + "MakeRandomFloat", - + "Mutex_lock", "Timer_Check", - + "WorldConnection_Process" }; #endif @@ -126,15 +126,15 @@ const char *__zp_names[ZoneProfiler::MaxZoneProfilerId] = { "Client_GetFactionLevel", "Client_SetFactionLevel", "Client_SetFactionLevel2", - + "NPC_Attack", "NPC_GetReverseFactionCon", "NPC_Process", - "NPC_Death", + "NPC_Death", #ifdef EQBOTS "NPC_BotAttackMelee", #endif - + "EntityList_TrapProcess", "EntityList_GroupProcess", "EntityList_QueueToGroupsForNPCHealthAA", @@ -153,7 +153,7 @@ const char *__zp_names[ZoneProfiler::MaxZoneProfilerId] = { #ifdef EQBOTS "EntityList_Bot_AICheckCloseBeneficialSpells", #endif - + "HateList_Find", "HateList_GetDamageTop", "HateList_GetClosest", @@ -161,7 +161,7 @@ const char *__zp_names[ZoneProfiler::MaxZoneProfilerId] = { "HateList_GetTop", "HateList_IsEmpty", "HateList_GetMostHate", - + "Mob_CheckWillAggro", "Mob_CheckLosFN", "Mob_Dist", @@ -219,19 +219,19 @@ const char *__zp_names[ZoneProfiler::MaxZoneProfilerId] = { "Bot_AI_Process_engaged_cast", "NPC_Bot_AI_IdleCastCheck", #endif - + "Database_AddLootTableToNPC", - + "Zone_Bootup", "Zone_Process", - + "WorldServer_Process", - + "Spawn2_Process", - + "PerlembParser_SendCommands", "PerlXSParser_SendCommands", - + "command_realdispatch", "net_main" }; @@ -241,16 +241,16 @@ void DumpZoneProfile() { __DZP_timer.stop(); time_t aclock; struct tm *newtime; - + time( &aclock ); /* Get time in seconds */ newtime = localtime( &aclock ); /* Convert time to struct */ - LogFile->write(EQEMuLog::Debug, "Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", + LogFile->write(EQEMuLog::Debug, "Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, __DZP_timer.getTotalDuration()); - + vector<_DZP_Data> data; - - + + int r; #ifdef COMMON_PROFILE //Dump common profile @@ -258,28 +258,28 @@ void DumpZoneProfile() { data.push_back(_DZP_Data(__cp_names[r], _cp.getCount(r), _cp.getTotalDuration(r))); } #endif - + #ifdef ZONE_PROFILE //Dump zone profile for(r = 0; r < ZoneProfiler::MaxZoneProfilerId; r++) { data.push_back(_DZP_Data(__zp_names[r], _zp.getCount(r), _zp.getTotalDuration(r))); } #endif - + sort(data.begin(), data.end()); - + vector<_DZP_Data>::iterator cur,end; cur = data.begin(); end = data.end(); - + for(; cur != end; cur++) { if(cur->count == 0) continue; //dont print empty timers. - + LogFile->write(EQEMuLog::Debug, "..%s: %llu calls, %.4fms", cur->str, (unsigned long long)cur->count, cur->dur); } - LogFile->write(EQEMuLog::Debug, "End Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", + LogFile->write(EQEMuLog::Debug, "End Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, __DZP_timer.getTotalDuration()); diff --git a/zone/zone_profile.h b/zone/zone_profile.h index 04deea562..2ec1d6f78 100644 --- a/zone/zone_profile.h +++ b/zone/zone_profile.h @@ -50,12 +50,12 @@ public: Client_GetFactionLevel, Client_SetFactionLevel, Client_SetFactionLevel2, - + NPC_Attack, NPC_GetReverseFactionCon, NPC_Process, NPC_Death, - + EntityList_TrapProcess, EntityList_GroupProcess, EntityList_QueueToGroupsForNPCHealthAA, @@ -71,7 +71,7 @@ public: EntityList_CheckClientAggro, EntityList_CheckClientAggro_Loop, EntityList_AIYellForHelp, - + HateList_Find, HateList_GetDamageTop, HateList_GetClosest, @@ -79,7 +79,7 @@ public: HateList_GetTop, HateList_IsEmpty, HateList_GetMostHate, - + Mob_CheckWillAggro, Mob_CheckLosFN, Mob_Dist, @@ -101,7 +101,7 @@ public: Mob_GetWeaponDamageBonus, Mob_TryWeaponProcA, Mob_TryWeaponProcB, - + Map_LineIntersectsZone, Map_LineIntersectsNode, Map_FindBestZ, @@ -127,29 +127,29 @@ public: Mob_AI_Process_roamer, Mob_AI_Process_guard, - - + + Database_AddLootTableToNPC, - + Zone_Bootup, Zone_Process, - + WorldServer_Process, - + Spawn2_Process, - + PerlembParser_SendCommands, PerlXSParser_SendCommands, - + command_realdispatch, - + net_main, - + MaxZoneProfilerId }; - + inline ZoneProfiler() : GeneralProfiler(MaxZoneProfilerId) { } - + }; extern ZoneProfiler _zp; diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 36e74c5f2..0fe590a15 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -50,7 +50,7 @@ ZoneDatabase::~ZoneDatabase() { safe_delete_array(npc_spells_cache); } safe_delete_array(npc_spells_loadtried); - + if (faction_array != nullptr) { for (x=0; x <= max_faction; x++) { if (faction_array[x] != 0) @@ -100,12 +100,12 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct " from zone where zoneidnumber=%i and version=%i",zoneid, instance_id), errbuf, &result)) { safe_delete_array(query); row = mysql_fetch_row(result); - if(row) + if(row) { int r = 0; memset(zone_data,0,sizeof(NewZone_Struct)); zone_data->ztype=atoi(row[r++]); - + for(i=0;i<4;i++){ zone_data->fog_red[i]=atoi(row[r++]); zone_data->fog_green[i]=atoi(row[r++]); @@ -113,7 +113,7 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct zone_data->fog_minclip[i]=atof(row[r++]); zone_data->fog_maxclip[i]=atof(row[r++]); } - + zone_data->fog_density = atof(row[r++]);; zone_data->sky=atoi(row[r++]); zone_data->zone_exp_multiplier=atof(row[r++]); @@ -123,11 +123,11 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct zone_data->underworld=atof(row[r++]); zone_data->minclip=atof(row[r++]); zone_data->maxclip=atof(row[r++]); - + zone_data->time_type=atoi(row[r++]); //not in the DB yet: zone_data->gravity = 0.4; - + b = atoi(row[r++]); can_bind = b==0?false:true; is_city = b==2?true:false; @@ -157,9 +157,9 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct strcpy(*map_filename, "default"); } safe_delete_array(query); - + zone_data->zone_id = zoneid; - + return(good); } @@ -172,7 +172,7 @@ void ZoneDatabase::UpdateSpawn2Timeleft(uint32 id, uint16 instance_id, uint32 ti char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + //if we pass timeleft as 0 that means we clear from respawn time //otherwise we update with a REPLACE INTO if(timeleft == 0) @@ -206,7 +206,7 @@ uint32 ZoneDatabase::GetSpawnTimeLeft(uint32 id, uint16 instance_id) MakeAnyLenString(&query, "SELECT start, duration FROM respawn_times WHERE id=%lu AND instance_id=%lu", (unsigned long)id, (unsigned long)zone->GetInstanceID()); - + if (RunQuery(query, strlen(query), errbuf, &result)) { safe_delete_array(query); @@ -251,7 +251,7 @@ void ZoneDatabase::UpdateSpawn2Status(uint32 id, uint8 new_status) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + if(!RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET enabled=%i WHERE id=%lu", new_status, (unsigned long)id),errbuf)) { LogFile->write(EQEMuLog::Error, "Error in UpdateSpawn2Status query %s: %s", query, errbuf); @@ -286,7 +286,7 @@ bool ZoneDatabase::logevents(const char* accountname,uint32 accountid,uint8 stat void ZoneDatabase::UpdateBug(BugStruct* bug){ char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + uint32 len = strlen(bug->bug); char* bugtext = nullptr; @@ -317,15 +317,15 @@ void ZoneDatabase::UpdateBug(BugStruct* bug){ //x and y are intentionally swapped because eq is inversexy coords if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO bugs (zone, name, ui, x, y, z, type, flag, target, bug, date) " - "values('%s', '%s', '%s', '%.2f', '%.2f', '%.2f', '%s', %d, '%s', '%s', CURDATE())", zone->GetShortName(), bug->name, - uitext==nullptr?"":uitext, bug->y, bug->x, bug->z, bug->chartype, bug->type, targettext==nullptr?"Unknown Target":targettext, - bugtext==nullptr?"":bugtext), errbuf)) { + "values('%s', '%s', '%s', '%.2f', '%.2f', '%.2f', '%s', %d, '%s', '%s', CURDATE())", zone->GetShortName(), bug->name, + uitext==nullptr?"":uitext, bug->y, bug->x, bug->z, bug->chartype, bug->type, targettext==nullptr?"Unknown Target":targettext, + bugtext==nullptr?"":bugtext), errbuf)) { cerr << "Error in UpdateBug" << query << "' " << errbuf << endl; } safe_delete_array(query); safe_delete_array(bugtext); safe_delete_array(uitext); - safe_delete_array(targettext); + safe_delete_array(targettext); } void ZoneDatabase::UpdateBug(PetitionBug_Struct* bug){ @@ -381,17 +381,17 @@ bool ZoneDatabase::SetSpecialAttkFlag(uint8 id, const char* flag) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE npc_types SET npcspecialattks='%s' WHERE id=%i;",flag,id), errbuf, 0, &affected_rows)) { safe_delete_array(query); return false; } safe_delete_array(query); - + if (affected_rows == 0) { return false; } - + return true; } @@ -425,21 +425,21 @@ void ZoneDatabase::GetEventLogs(const char* name,char* target,uint32 account_id, sprintf(modifications,"charname=\'%s\'",name); else if(account_id != 0) sprintf(modifications,"accountid=%i",account_id); - + if(strlen(target) != 0) sprintf(modifications,"%s AND target like \'%%%s%%\'",modifications,target); - + if(strlen(detail) != 0) sprintf(modifications,"%s AND description like \'%%%s%%\'",modifications,detail); - + if(strlen(timestamp) != 0) sprintf(modifications,"%s AND time like \'%%%s%%\'",modifications,timestamp); - + if(eventid == 0) eventid =1; sprintf(modifications,"%s AND event_nid=%i",modifications,eventid); - - MakeAnyLenString(&query, "SELECT id,accountname,accountid,status,charname,target,time,descriptiontype,description FROM eventlog where %s",modifications); + + MakeAnyLenString(&query, "SELECT id,accountname,accountid,status,charname,target,time,descriptiontype,description FROM eventlog where %s",modifications); if (RunQuery(query, strlen(query), errbuf, &result)) { safe_delete_array(query); @@ -476,17 +476,17 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) LogFile->write(EQEMuLog::Error, "Programming error: LoadWorldContainer passed nullptr pointer"); return; } - + char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; MYSQL_RES *result; MYSQL_ROW row; //const Item_Struct* item = nullptr; //ItemInst* inst = nullptr; - + uint32 len_query = MakeAnyLenString(&query, "select " "bagidx,itemid,charges,augslot1,augslot2,augslot3,augslot4,augslot5 from object_contents where parentid=%i", parentid); - + if (RunQuery(query, len_query, errbuf, &result)) { while ((row = mysql_fetch_row(result))) { uint8 index = (uint8)atoi(row[0]); @@ -498,7 +498,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) aug[2] = (uint32)atoi(row[5]); aug[3] = (uint32)atoi(row[6]); aug[4] = (uint32)atoi(row[7]); - + ItemInst* inst = database.CreateItem(item_id, charges); if (inst) { if (inst->GetItem()->ItemClass == ItemClassCommon) { @@ -518,7 +518,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) else { LogFile->write(EQEMuLog::Error, "Error in DB::LoadWorldContainer: %s", errbuf); } - + safe_delete_array(query); } @@ -527,11 +527,11 @@ void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const It { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - + // Since state is not saved for each world container action, we'll just delete // all and save from scratch .. we may come back later to optimize //DeleteWorldContainer(parent_id); - + if (!container) { return; } @@ -553,7 +553,7 @@ void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const It "replace into object_contents (zoneid,parentid,bagidx,itemid,charges,augslot1,augslot2,augslot3,augslot4,augslot5,droptime) values (%i,%i,%i,%i,%i,%i,%i,%i,%i,%i,now())", zone_id, parent_id, index, item_id, inst->GetCharges(),augslot[0],augslot[1],augslot[2],augslot[3],augslot[4]); - + if (!RunQuery(query, len_query, errbuf)) { LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::SaveWorldContainer: %s", errbuf); } @@ -568,13 +568,13 @@ void ZoneDatabase::DeleteWorldContainer(uint32 parent_id,uint32 zone_id) { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - + uint32 len_query = MakeAnyLenString(&query, "delete from object_contents where parentid=%i and zoneid=%i", parent_id,zone_id); if (!RunQuery(query, len_query, errbuf)) { LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::DeleteWorldContainer: %s", errbuf); } - + safe_delete_array(query); } @@ -726,26 +726,26 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg if (!(RunQuery(Query,MakeAnyLenString(&Query, "delete from trader where char_id=%i and item_id=%i", CharID, ItemID),errbuf))) - + _log(TRADING__CLIENT, "Failed to remove trader item(s): %i for char_id: %i, the error was: %s\n", ItemID, CharID, errbuf); safe_delete_array(Query); - + return; } else { if(!item->Stackable) { if (!(RunQuery(Query,MakeAnyLenString(&Query, "update trader set item_cost=%i where char_id=%i and item_id=%i" " and charges=%i", NewPrice, CharID, ItemID, Charges),errbuf))) - + _log(TRADING__CLIENT, "Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, errbuf); } else { if (!(RunQuery(Query,MakeAnyLenString(&Query, "update trader set item_cost=%i where char_id=%i and item_id=%i", NewPrice, CharID, ItemID),errbuf))) - + _log(TRADING__CLIENT, "Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, errbuf); } @@ -823,7 +823,7 @@ void ZoneDatabase::UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity) char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - if (!(RunQuery(query,MakeAnyLenString(&query, "update buyer set quantity=%i where charid=%i and buyslot=%i", + if (!(RunQuery(query,MakeAnyLenString(&query, "update buyer set quantity=%i where charid=%i and buyslot=%i", Quantity, CharID, BuySlot), errbuf))) _log(TRADING__CLIENT, "Failed to update quantity in buyslot %i for charid: %i, the error was: %s\n", BuySlot, CharID, errbuf); @@ -831,20 +831,20 @@ void ZoneDatabase::UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity) } -bool ZoneDatabase::GetCharacterInfoForLogin(const char* name, uint32* character_id, -char* current_zone, PlayerProfile_Struct* pp, Inventory* inv, ExtendedProfile_Struct *ext, -uint32* pplen, uint32* guilddbid, uint8* guildrank, +bool ZoneDatabase::GetCharacterInfoForLogin(const char* name, uint32* character_id, +char* current_zone, PlayerProfile_Struct* pp, Inventory* inv, ExtendedProfile_Struct *ext, +uint32* pplen, uint32* guilddbid, uint8* guildrank, uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8 *firstlogon) { _CP(Database_GetCharacterInfoForLogin); char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 querylen; MYSQL_RES *result; - + bool ret = false; - + //DO NOT FORGET TO EDIT Client::Handle_Connect_OP_ZoneEntry if you change this. - + if (character_id && *character_id) { // searching by ID should be a lil bit faster querylen = MakeAnyLenString(&query, "SELECT id,profile,zonename,x,y,z,guild_id,rank,extprofile,class,level,lfp,lfg,instanceid,xtargets,firstlogon FROM character_ LEFT JOIN guild_members ON id=char_id WHERE id=%i", *character_id); @@ -852,7 +852,7 @@ uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8 *fi else { querylen = MakeAnyLenString(&query, "SELECT id,profile,zonename,x,y,z,guild_id,rank,extprofile,class,level,lfp,lfg,instanceid,xtargets,firstlogon FROM character_ LEFT JOIN guild_members ON id=char_id WHERE name='%s'", name); } - + if (RunQuery(query, querylen, errbuf, &result)) { ret = GetCharacterInfoForLogin_result(result, character_id, current_zone, pp, inv, ext, pplen, guilddbid, guildrank, class_, level, LFP, LFG, NumXTargets, firstlogon); mysql_free_result(result); @@ -860,7 +860,7 @@ uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8 *fi else { LogFile->write(EQEMuLog::Error, "GetCharacterInfoForLogin query '%s' %s", query, errbuf); } - + safe_delete_array(query); return ret; } @@ -869,15 +869,15 @@ uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8 *fi // Process results of GetCharacterInfoForLogin() // Query this processes: SELECT id,profile,zonename,x,y,z,guild,guildrank,extprofile,class,level FROM character_ WHERE id=%i -bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, - uint32* character_id, char* current_zone, PlayerProfile_Struct* pp, Inventory* inv, - ExtendedProfile_Struct *ext, uint32* pplen, uint32* guilddbid, uint8* guildrank, +bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, + uint32* character_id, char* current_zone, PlayerProfile_Struct* pp, Inventory* inv, + ExtendedProfile_Struct *ext, uint32* pplen, uint32* guilddbid, uint8* guildrank, uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8* firstlogon) { _CP(Database_GetCharacterInfoForLogin_result); - + MYSQL_ROW row; unsigned long* lengths; - + if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); lengths = mysql_fetch_lengths(result); @@ -889,21 +889,21 @@ bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, sizeof(PlayerProfile_Struct), lengths[1]); return false; } - + *pplen = lengths[1]; pp->zone_id = GetZoneID(row[2]); pp->zoneInstance = atoi(row[13]); - + pp->x = atof(row[3]); pp->y = atof(row[4]); pp->z = atof(row[5]); pp->lastlogin = time(nullptr); - + if (pp->x == -1 && pp->y == -1 && pp->z == -1) GetSafePoints(pp->zone_id, database.GetInstanceVersion(pp->zoneInstance), &pp->x, &pp->y, &pp->z); } - + uint32 char_id = atoi(row[0]); if (RuleB(Character, SharedBankPlat)) pp->platinum_shared = database.GetSharedPlatinum(GetAccountIDByChar(char_id)); @@ -924,21 +924,21 @@ bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, else *guildrank = GUILD_RANK_NONE; } - + if(ext) { //SetExtendedProfile handles any conversion SetExtendedProfile(ext, row[8], lengths[8]); } - + if(class_) *class_ = atoi(row[9]); - + if(level) *level = atoi(row[10]); if(LFP) *LFP = atoi(row[11]); - + if(LFG) *LFG = atoi(row[12]); @@ -957,11 +957,11 @@ bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, for(int i = 0; i<9; i++) if(pp->item_tint[i].rgb.use_tint == 1) pp->item_tint[i].rgb.use_tint = 0xFF; - + // Retrieve character inventory return GetInventory(char_id, inv); } - + return false; } @@ -993,7 +993,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { // If NPC is already in tree, return it. if((itr = zone->npctable.find(id)) != zone->npctable.end()) return itr->second; - + // Otherwise, get NPCs from database. char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; @@ -1094,10 +1094,10 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { NPCType *tmpNPCType; tmpNPCType = new NPCType; memset (tmpNPCType, 0, sizeof *tmpNPCType); - + int r = 0; tmpNPCType->npc_id = atoi(row[r++]); - + strn0cpy(tmpNPCType->name, row[r++], 50); tmpNPCType->level = atoi(row[r++]); @@ -1143,7 +1143,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { tmpNPCType->trackable = atoi(row[r++]) == 0? false : true; tmpNPCType->hp_regen = atoi(row[r++]); tmpNPCType->mana_regen = atoi(row[r++]); - + tmpNPCType->aggroradius = (int32)atoi(row[r++]); // set defaultvalue for aggroradius if (tmpNPCType->aggroradius <= 0) @@ -1154,9 +1154,9 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { else tmpNPCType->bodytype = 0; r++; - + tmpNPCType->npc_faction_id = atoi(row[r++]); - + tmpNPCType->luclinface = atoi(row[r++]); tmpNPCType->hairstyle = atoi(row[r++]); tmpNPCType->haircolor = atoi(row[r++]); @@ -1244,7 +1244,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { if (row[r] != nullptr) strn0cpy(tmpNPCType->lastname, row[r], 32); r++; - + tmpNPCType->qglobal = atoi(row[r++])==0?false:true; // qglobal tmpNPCType->AC = atoi(row[r++]); tmpNPCType->npc_aggro = atoi(row[r++])==0?false:true; @@ -1302,7 +1302,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client //If the NPC type is 0, return nullptr. (sanity check) if(id == 0) return nullptr; - + // Otherwise, get NPCs from database. char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; @@ -1404,10 +1404,10 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client NPCType *tmpNPCType; tmpNPCType = new NPCType; memset (tmpNPCType, 0, sizeof *tmpNPCType); - + int r = 0; tmpNPCType->npc_id = atoi(row[r++]); - + strn0cpy(tmpNPCType->name, row[r++], 50); tmpNPCType->level = atoi(row[r++]); @@ -1453,7 +1453,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client //tmpNPCType->trackable = atoi(row[r++]) == 0? false : true; tmpNPCType->hp_regen = atoi(row[r++]); tmpNPCType->mana_regen = atoi(row[r++]); - + //tmpNPCType->aggroradius = (int32)atoi(row[r++]); tmpNPCType->aggroradius = RuleI(Mercs, AggroRadius); // set defaultvalue for aggroradius @@ -1465,9 +1465,9 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client else tmpNPCType->bodytype = 1; r++; - + //tmpNPCType->npc_faction_id = atoi(row[r++]); - + //tmpNPCType->luclinface = atoi(row[r++]); //tmpNPCType->hairstyle = atoi(row[r++]); //tmpNPCType->haircolor = atoi(row[r++]); @@ -1555,7 +1555,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client //if (row[r] != nullptr) // strn0cpy(tmpNPCType->lastname, row[r], 32); //r++; - + //tmpNPCType->qglobal = atoi(row[r++])==0?false:true; // qglobal tmpNPCType->AC = atoi(row[r++]); //tmpNPCType->npc_aggro = atoi(row[r++])==0?false:true; @@ -1678,7 +1678,7 @@ bool ZoneDatabase::LoadCurrentMerc(Client *c) { errorMessage = std::string(TempErrorMessageBuffer); } else { - while(DataRow = mysql_fetch_row(DatasetResult)) { + while(DataRow = mysql_fetch_row(DatasetResult)) { c->GetMercInfo(slot).mercid = atoi(DataRow[0]); c->GetMercInfo(slot).slot = slot; snprintf(c->GetMercInfo(slot).merc_name, 64, "%s", std::string(DataRow[1]).c_str()); @@ -2000,7 +2000,7 @@ void ZoneDatabase::SaveMerchantTemp(uint32 npcid, uint32 slot, uint32 item, uint if (!RunQuery(query, MakeAnyLenString(&query, "replace into merchantlist_temp (npcid,slot,itemid,charges) values(%d,%d,%d,%d)", npcid, slot, item, charges), errbuf)) { cerr << "Error in SaveMerchantTemp query '" << query << "' " << errbuf << endl; } - safe_delete_array(query); + safe_delete_array(query); } void ZoneDatabase::DeleteMerchantTemp(uint32 npcid, uint32 slot){ char errbuf[MYSQL_ERRMSG_SIZE]; @@ -2009,7 +2009,7 @@ void ZoneDatabase::DeleteMerchantTemp(uint32 npcid, uint32 slot){ if (!RunQuery(query, MakeAnyLenString(&query, "delete from merchantlist_temp where npcid=%d and slot=%d", npcid, slot), errbuf)) { cerr << "Error in DeleteMerchantTemp query '" << query << "' " << errbuf << endl; } - safe_delete_array(query); + safe_delete_array(query); } @@ -2017,18 +2017,18 @@ bool ZoneDatabase::UpdateZoneSafeCoords(const char* zonename, float x=0, float y char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET safe_x='%f', safe_y='%f', safe_z='%f' WHERE short_name='%s';", x, y, z, zonename), errbuf, 0, &affected_rows)) { safe_delete_array(query); return false; } safe_delete_array(query); - + if (affected_rows == 0) { return false; } - + return true; } @@ -2058,14 +2058,14 @@ uint8 ZoneDatabase::GetUseCFGSafeCoords() } else { - + cerr << "Error in GetUseCFGSafeCoords query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + return 0; - + } @@ -2075,13 +2075,13 @@ uint32 ZoneDatabase::GetServerFilters(char* name, ServerSideFilters_Struct *ssfs MYSQL_RES *result; MYSQL_ROW row; - - + + unsigned long* lengths; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT serverfilters FROM account WHERE name='%s'", name), errbuf, &result)) { safe_delete_array(query); - if (mysql_num_rows(result) == 1) { + if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); lengths = mysql_fetch_lengths(result); if (lengths[0] == sizeof(ServerSideFilters_Struct)) { @@ -2107,7 +2107,7 @@ uint32 ZoneDatabase::GetServerFilters(char* name, ServerSideFilters_Struct *ssfs safe_delete_array(query); return 0; } - + return 0; } @@ -2115,35 +2115,35 @@ bool ZoneDatabase::SetServerFilters(char* name, ServerSideFilters_Struct *ssfs) char errbuf[MYSQL_ERRMSG_SIZE]; char query[256+sizeof(ServerSideFilters_Struct)*2+1]; char* end = query; - + //if (strlen(name) > 15) // return false; - + /*for (int i=0; i 'z') && - (name[i] < 'A' || name[i] > 'Z') && + if ((name[i] < 'a' || name[i] > 'z') && + (name[i] < 'A' || name[i] > 'Z') && (name[i] < '0' || name[i] > '9')) return 0; }*/ - - + + end += sprintf(end, "UPDATE account SET serverfilters="); *end++ = '\''; end += DoEscapeString(end, (char*)ssfs, sizeof(ServerSideFilters_Struct)); *end++ = '\''; end += sprintf(end," WHERE name='%s'", name); - + uint32 affected_rows = 0; if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { cerr << "Error in SetServerSideFilters query " << errbuf << endl; return false; } - + if (affected_rows == 0) { return false; } - + return true; } @@ -2154,7 +2154,7 @@ uint32 ZoneDatabase::GetZoneTZ(uint32 zoneid, uint32 version) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT timezone FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneid, version), errbuf, &result)) { safe_delete_array(query); @@ -2177,7 +2177,7 @@ bool ZoneDatabase::SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET timezone=%i WHERE zoneidnumber=%i AND version=%i", tz, zoneid, version), errbuf, 0, &affected_rows)) { safe_delete_array(query); @@ -2191,7 +2191,7 @@ bool ZoneDatabase::SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz) { safe_delete_array(query); return false; } - + return false; } //End new timezone functions. @@ -2203,7 +2203,7 @@ uint8 ZoneDatabase::GetZoneWeather(uint32 zoneid, uint32 version) { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT weather FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneid, version), errbuf, &result)) { safe_delete_array(query); @@ -2227,7 +2227,7 @@ bool ZoneDatabase::SetZoneWeather(uint32 zoneid, uint32 version, uint8 w) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - + if (RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET weather=%i WHERE zoneidnumber=%i AND version=%i", w, zoneid, version), errbuf, 0, &affected_rows)) { safe_delete_array(query); if (affected_rows == 1) @@ -2240,7 +2240,7 @@ bool ZoneDatabase::SetZoneWeather(uint32 zoneid, uint32 version, uint8 w) { safe_delete_array(query); return false; } - + return false; } //End weather functions. @@ -2253,7 +2253,7 @@ bool ZoneDatabase::GetAccountInfoForLogin(uint32 account_id, int16* admin, char* char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT status, name, lsaccount_id, gmspeed, revoked, hideme FROM account WHERE id=%i", account_id), errbuf, &result)) { safe_delete_array(query); bool ret = GetAccountInfoForLogin_result(result, admin, account_name, lsaccountid, gmspeed, revoked,gmhideme); @@ -2266,7 +2266,7 @@ bool ZoneDatabase::GetAccountInfoForLogin(uint32 account_id, int16* admin, char* safe_delete_array(query); return false; } - + return false; } @@ -2282,7 +2282,7 @@ void ZoneDatabase::RefreshGroupFromDB(Client *c){ } EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupUpdate2_Struct)); - GroupUpdate2_Struct* gu = (GroupUpdate2_Struct*)outapp->pBuffer; + GroupUpdate2_Struct* gu = (GroupUpdate2_Struct*)outapp->pBuffer; gu->action = groupActUpdate; char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; @@ -2313,7 +2313,7 @@ void ZoneDatabase::RefreshGroupFromDB(Client *c){ c->QueuePacket(outapp); safe_delete(outapp); - + if(c->GetClientVersion() >= EQClientSoD) { g->NotifyMainTank(c, 1); g->NotifyPuller(c, 1); @@ -2340,7 +2340,7 @@ uint8 ZoneDatabase::GroupCount(uint32 groupid){ count = atoi(row[0]); mysql_free_result(result); } else { - LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::GroupCount query '%s': %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::GroupCount query '%s': %s", query, errbuf); } safe_delete_array(query); return count; @@ -2358,7 +2358,7 @@ uint8 ZoneDatabase::GroupCount(uint32 groupid){ count = atoi(row[0]); mysql_free_result(result); } else { - LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::RaidGroupCount query '%s': %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::RaidGroupCount query '%s': %s", query, errbuf); } safe_delete_array(query); return count; @@ -2388,7 +2388,7 @@ int32 ZoneDatabase::GetBlockedSpellsCount(uint32 zoneid) safe_delete_array(query); return -1; } - + return -1; } @@ -2441,7 +2441,7 @@ int ZoneDatabase::getZoneShutDownDelay(uint32 zoneID, uint32 version) char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + if (RunQuery(query, MakeAnyLenString(&query, "SELECT shutdowndelay FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneID, version), errbuf, &result)) { if (mysql_num_rows(result) > 0) { @@ -2527,7 +2527,7 @@ void ZoneDatabase::ListAllInstances(Client* c, uint32 charid) c->Message(0, "%s is part of the following instances:", name); while(row = mysql_fetch_row(result)) { - c->Message(0, "%s - id: %lu, version: %lu", database.GetZoneName(atoi(row[1])), + c->Message(0, "%s - id: %lu, version: %lu", database.GetZoneName(atoi(row[1])), (unsigned long)atoi(row[0]), (unsigned long)atoi(row[2])); } @@ -2543,7 +2543,7 @@ void ZoneDatabase::QGlobalPurge() { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM quest_globals WHERE expdate < UNIX_TIMESTAMP()"), + database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM quest_globals WHERE expdate < UNIX_TIMESTAMP()"), errbuf); safe_delete_array(query); } @@ -2581,7 +2581,7 @@ void ZoneDatabase::UpdateAltCurrencyValue(uint32 char_id, uint32 currency_id, ui char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; database.RunQuery(query, MakeAnyLenString(&query, "REPLACE INTO character_alt_currency (char_id, currency_id, amount)" - " VALUES('%u', '%u', '%u')", char_id, currency_id, value), + " VALUES('%u', '%u', '%u')", char_id, currency_id, value), errbuf); safe_delete_array(query); } @@ -2590,7 +2590,7 @@ void ZoneDatabase::SaveBuffs(Client *c) { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_buffs` WHERE `character_id`='%u'", c->CharacterID()), + database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_buffs` WHERE `character_id`='%u'", c->CharacterID()), errbuf); uint32 buff_count = c->GetMaxBuffSlots(); @@ -2602,7 +2602,7 @@ void ZoneDatabase::SaveBuffs(Client *c) { "death_save_aa_chance) VALUES('%u', '%u', '%u', '%u', '%s', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", c->CharacterID(), i, buffs[i].spellid, buffs[i].casterlevel, buffs[i].caster_name, buffs[i].ticsremaining, buffs[i].counters, buffs[i].numhits, buffs[i].melee_rune, buffs[i].magic_rune, buffs[i].persistant_buff, - buffs[i].deathSaveSuccessChance, buffs[i].deathsaveCasterAARank), + buffs[i].deathSaveSuccessChance, buffs[i].deathsaveCasterAARank), errbuf)) { LogFile->write(EQEMuLog::Error, "Error in SaveBuffs query '%s': %s", query, errbuf); } @@ -2625,8 +2625,8 @@ void ZoneDatabase::LoadBuffs(Client *c) { MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT spell_id, slot_id, caster_level, caster_name, ticsremaining, counters, " "numhits, melee_rune, magic_rune, persistent, death_save_chance, death_save_aa_chance FROM `character_buffs` WHERE " - "`character_id`='%u'", - c->CharacterID()), errbuf, &result)) + "`character_id`='%u'", + c->CharacterID()), errbuf, &result)) { safe_delete_array(query); while ((row = mysql_fetch_row(result))) @@ -2678,8 +2678,8 @@ void ZoneDatabase::LoadBuffs(Client *c) { } else if(IsMagicRuneSpell(spell_id)) { c->SetHasSpellRune(true); - } - + } + /* if(IsDeathSaveSpell(spell_id)) { c->SetDeathSaveChance(true); @@ -2729,13 +2729,13 @@ void ZoneDatabase::SavePetInfo(Client *c) { PetInfo *petinfo = c->GetPetInfo(0); PetInfo *suspended = c->GetPetInfo(1); - if(!database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_pet_buffs` WHERE `char_id`=%u", c->CharacterID()), + if(!database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_pet_buffs` WHERE `char_id`=%u", c->CharacterID()), errbuf)) { safe_delete_array(query); return; } safe_delete_array(query); - if (!database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_pet_inventory` WHERE `char_id`=%u", c->CharacterID()), + if (!database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_pet_inventory` WHERE `char_id`=%u", c->CharacterID()), errbuf)) { safe_delete_array(query); // error report @@ -2749,7 +2749,7 @@ void ZoneDatabase::SavePetInfo(Client *c) { "ON DUPLICATE KEY UPDATE `petname`='%s', `petpower`=%i, `spell_id`=%u, `hp`=%u, `mana`=%u", c->CharacterID(), petinfo->Name, petinfo->petpower, petinfo->SpellID, petinfo->HP, petinfo->Mana, petinfo->Name, petinfo->petpower, petinfo->SpellID, petinfo->HP, petinfo->Mana), - errbuf)) + errbuf)) { safe_delete_array(query); return; @@ -2762,7 +2762,7 @@ void ZoneDatabase::SavePetInfo(Client *c) { "INSERT INTO `character_pet_buffs` (`char_id`, `pet`, `slot`, `spell_id`, `caster_level`, " "`ticsremaining`, `counters`) values " "(%u, 0, %u, %u, %u, %u, %d)", - c->CharacterID(), i, petinfo->Buffs[i].spellid, petinfo->Buffs[i].level, petinfo->Buffs[i].duration, + c->CharacterID(), i, petinfo->Buffs[i].spellid, petinfo->Buffs[i].level, petinfo->Buffs[i].duration, petinfo->Buffs[i].counters), errbuf); safe_delete_array(query); @@ -2772,7 +2772,7 @@ void ZoneDatabase::SavePetInfo(Client *c) { "INSERT INTO `character_pet_buffs` (`char_id`, `pet`, `slot`, `spell_id`, `caster_level`, " "`ticsremaining`, `counters`) values " "(%u, 1, %u, %u, %u, %u, %d)", - c->CharacterID(), i, suspended->Buffs[i].spellid, suspended->Buffs[i].level, suspended->Buffs[i].duration, + c->CharacterID(), i, suspended->Buffs[i].spellid, suspended->Buffs[i].level, suspended->Buffs[i].duration, suspended->Buffs[i].counters), errbuf); safe_delete_array(query); @@ -2789,14 +2789,14 @@ void ZoneDatabase::SavePetInfo(Client *c) { } } - + if(!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO `character_pet_info` (`char_id`, `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana`) " "values (%u, 1, '%s', %u, %u, %u, %u) " "ON DUPLICATE KEY UPDATE `petname`='%s', `petpower`=%i, `spell_id`=%u, `hp`=%u, `mana`=%u", c->CharacterID(), suspended->Name, suspended->petpower, suspended->SpellID, suspended->HP, suspended->Mana, suspended->Name, suspended->petpower, suspended->SpellID, suspended->HP, suspended->Mana), - errbuf)) + errbuf)) { safe_delete_array(query); return; @@ -2840,7 +2840,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) { memset(petinfo, 0, sizeof(PetInfo)); memset(suspended, 0, sizeof(PetInfo)); - if(database.RunQuery(query, MakeAnyLenString(&query, + if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana` from `character_pet_info` where `char_id`=%u", c->CharacterID()), errbuf, &result)) { @@ -2870,11 +2870,11 @@ void ZoneDatabase::LoadPetInfo(Client *c) { } - if (RunQuery(query, MakeAnyLenString(&query, + if (RunQuery(query, MakeAnyLenString(&query, "SELECT `pet`, `slot`, `spell_id`, `caster_level`, `castername`, " "`ticsremaining`, `counters` FROM `character_pet_buffs` " - "WHERE `char_id`=%u", - c->CharacterID()), errbuf, &result)) + "WHERE `char_id`=%u", + c->CharacterID()), errbuf, &result)) { safe_delete_array(query); while ((row = mysql_fetch_row(result))) @@ -2951,7 +2951,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) { bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race_mod, uint32 deity_mod, int32 faction_id) { if (faction_id <= 0 || faction_id > (int32) max_faction) - return false; + return false; if (faction_array[faction_id] == 0){ return false; @@ -3084,9 +3084,9 @@ bool ZoneDatabase::SetCharacterFactionLevel(uint32 char_id, int32 faction_id, in char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; uint32 affected_rows = 0; - - if (!RunQuery(query, MakeAnyLenString(&query, - "DELETE FROM faction_values WHERE char_id=%i AND faction_id = %i", + + if (!RunQuery(query, MakeAnyLenString(&query, + "DELETE FROM faction_values WHERE char_id=%i AND faction_id = %i", char_id, faction_id), errbuf)) { cerr << "Error in SetCharacterFactionLevel query '" << query << "' " << errbuf << endl; safe_delete_array(query); @@ -3105,21 +3105,21 @@ bool ZoneDatabase::SetCharacterFactionLevel(uint32 char_id, int32 faction_id, in if(temp == 3) temp = 1; - if (!RunQuery(query, MakeAnyLenString(&query, - "INSERT INTO faction_values (char_id,faction_id,current_value,temp) VALUES (%i,%i,%i,%i)", + if (!RunQuery(query, MakeAnyLenString(&query, + "INSERT INTO faction_values (char_id,faction_id,current_value,temp) VALUES (%i,%i,%i,%i)", char_id, faction_id,value,temp), errbuf, 0, &affected_rows)) { cerr << "Error in SetCharacterFactionLevel query '" << query << "' " << errbuf << endl; safe_delete_array(query); return false; } - + safe_delete_array(query); - + if (affected_rows == 0) { return false; } - + val_list[faction_id] = value; return(true); } @@ -3132,13 +3132,13 @@ bool ZoneDatabase::LoadFactionData() MYSQL_ROW row; query = new char[256]; strcpy(query, "SELECT MAX(id) FROM faction_list"); - - + + if (RunQuery(query, strlen(query), errbuf, &result)) { safe_delete_array(query); row = mysql_fetch_row(result); if (row && row[0]) - { + { max_faction = atoi(row[0]); faction_array = new Faction*[max_faction+1]; for(unsigned int i=0; iname, row[1], 50); + strn0cpy(faction_array[index]->name, row[1], 50); faction_array[index]->base = atoi(row[2]); char sec_errbuf[MYSQL_ERRMSG_SIZE]; @@ -3200,7 +3200,7 @@ bool ZoneDatabase::GetFactionIdsForNPC(uint32 nfl_id, list * struct NPCFaction* tmp = *cur; safe_delete(tmp); } - + faction_list->clear(); if (primary_faction) *primary_faction = nfl_id; @@ -3211,7 +3211,7 @@ bool ZoneDatabase::GetFactionIdsForNPC(uint32 nfl_id, list * return false; if (primary_faction) *primary_faction = nfl->primaryfaction; - + list::iterator cur,end; cur = faction_list->begin(); end = faction_list->end(); diff --git a/zone/zonedb.h b/zone/zonedb.h index d0f5dc9be..daf035d68 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -99,7 +99,7 @@ const int MaxMercStanceID = 9; struct MercStanceInfo { uint8 ProficiencyID; - uint8 ClassID; + uint8 ClassID; uint32 StanceID; uint8 IsDefault; }; @@ -162,7 +162,7 @@ struct MercSpellEntry { struct ClientMercEntry { uint32 id; - uint32 npcid; + uint32 npcid; }; class ItemInst; @@ -177,7 +177,7 @@ public: ZoneDatabase(); ZoneDatabase(const char* host, const char* user, const char* passwd, const char* database,uint32 port); virtual ~ZoneDatabase(); - + /* * Objects and World Containers */ @@ -188,7 +188,7 @@ public: void UpdateObject(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const ItemInst* inst); void DeleteObject(uint32 id); Ground_Spawns* LoadGroundSpawns(uint32 zone_id, int16 version, Ground_Spawns* gs); - + /* * Traders */ @@ -214,17 +214,17 @@ public: */ bool SetServerFilters(char* name, ServerSideFilters_Struct *ssfs); uint32 GetServerFilters(char* name, ServerSideFilters_Struct *ssfs); - bool GetAccountInfoForLogin(uint32 account_id, int16* admin = 0, char* account_name = 0, + bool GetAccountInfoForLogin(uint32 account_id, int16* admin = 0, char* account_name = 0, uint32* lsaccountid = 0, uint8* gmspeed = 0, bool* revoked = 0, bool* gmhideme = 0); - bool GetAccountInfoForLogin_result(MYSQL_RES* result, int16* admin = 0, char* account_name = 0, - uint32* lsaccountid = 0, uint8* gmspeed = 0, bool* revoked = 0, bool* gmhideme = false, + bool GetAccountInfoForLogin_result(MYSQL_RES* result, int16* admin = 0, char* account_name = 0, + uint32* lsaccountid = 0, uint8* gmspeed = 0, bool* revoked = 0, bool* gmhideme = false, uint32* account_creation = 0); - bool GetCharacterInfoForLogin_result(MYSQL_RES* result, uint32* character_id = 0, char* current_zone = 0, - PlayerProfile_Struct* pp = 0, Inventory* inv = 0, ExtendedProfile_Struct *ext = 0, uint32* pplen = 0, + bool GetCharacterInfoForLogin_result(MYSQL_RES* result, uint32* character_id = 0, char* current_zone = 0, + PlayerProfile_Struct* pp = 0, Inventory* inv = 0, ExtendedProfile_Struct *ext = 0, uint32* pplen = 0, uint32* guilddbid = 0, uint8* guildrank = 0, uint8 *class_= 0, uint8 *level = 0, bool *LFP = 0, bool *LFG = 0, uint8 *NumXTargets = 0, uint8* firstlogon = 0); - bool GetCharacterInfoForLogin(const char* name, uint32* character_id = 0, char* current_zone = 0, - PlayerProfile_Struct* pp = 0, Inventory* inv = 0, ExtendedProfile_Struct *ext = 0, uint32* pplen = 0, + bool GetCharacterInfoForLogin(const char* name, uint32* character_id = 0, char* current_zone = 0, + PlayerProfile_Struct* pp = 0, Inventory* inv = 0, ExtendedProfile_Struct *ext = 0, uint32* pplen = 0, uint32* guilddbid = 0, uint8* guildrank = 0, uint8 *class_ = 0, uint8 *level = 0, bool *LFP = 0, bool *LFG = 0, uint8 *NumXTargets = 0, uint8* firstlogon = 0); void SaveBuffs(Client *c); @@ -237,7 +237,7 @@ public: * Character Inventory */ bool NoRentExpired(const char* name); - + /* * Corpses */ @@ -265,7 +265,7 @@ public: uint32 GetPlayerCorpseID(uint32 char_id, uint8 corpse); uint32 GetPlayerCorpseItemAt(uint32 corpse_id, uint16 slotid); uint32 GetPlayerCorpseTimeLeft(uint8 corpse, uint8 type); - + /* * Faction */ @@ -277,7 +277,7 @@ public: bool LoadFactionData(); bool LoadFactionValues(uint32 char_id, faction_map & val_list); bool LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list); - + /* * AAs */ @@ -291,7 +291,7 @@ public: void LoadAAs(SendAA_Struct **load); uint32 CountAAEffects(); void FillAAEffects(SendAA_Struct* aa_struct); - + /* * Zone related */ @@ -303,7 +303,7 @@ public: bool UpdateZoneSafeCoords(const char* zonename, float x, float y, float z); uint8 GetUseCFGSafeCoords(); int getZoneShutDownDelay(uint32 zoneID, uint32 version); - + /* * Spawns and Spawn Points */ @@ -315,7 +315,7 @@ public: void UpdateSpawn2Timeleft(uint32 id, uint16 instance_id,uint32 timeleft); uint32 GetSpawnTimeLeft(uint32 id, uint16 instance_id); void UpdateSpawn2Status(uint32 id, uint8 new_status); - + /* * Grids/Paths */ @@ -333,7 +333,7 @@ public: void AssignGrid(Client *client, float x, float y, uint32 id); int GetHighestGrid(uint32 zoneid); int GetHighestWaypoint(uint32 zoneid, uint32 gridid); - + /* * NPCs */ @@ -371,14 +371,14 @@ public: void UpdatePetitionToDB(Petition* wpet); void InsertPetitionToDB(Petition* wpet); void RefreshPetitionsFromDB(); - - + + /* * Merchants */ void SaveMerchantTemp(uint32 npcid, uint32 slot, uint32 item, uint32 charges); void DeleteMerchantTemp(uint32 npcid, uint32 slot); - + /* * Tradeskills */ @@ -387,12 +387,12 @@ public: uint32 GetZoneForage(uint32 ZoneID, uint8 skill); /* for foraging - BoB */ uint32 GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint8 &npc_chance); void UpdateRecipeMadecount(uint32 recipe_id, uint32 char_id, uint32 madecount); - + /* * Tribute */ bool LoadTributes(); - + /* * Doors */ @@ -407,7 +407,7 @@ public: int32 GetDoorsCountPlusOne(const char *zone_name, int16 version); int32 GetDoorsDBCountPlusOne(const char *zone_name, int16 version); void InsertDoor(uint32 did, uint16 ddoorid, const char* ddoor_name, float dxpos, float dypos, float dzpos, float dheading, uint8 dopentype, uint16 dguildid, uint32 dlockpick, uint32 dkeyitem, uint8 ddoor_param, uint8 dinvert, int dincline, uint16 dsize); - + /* * Blocked Spells */ @@ -426,7 +426,7 @@ public: */ uint32 GetZoneTZ(uint32 zoneid, uint32 version); bool SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz); - + /* * Weather */ @@ -446,7 +446,7 @@ public: * Instancing */ void ListAllInstances(Client* c, uint32 charid); - + /* * QGlobals */ @@ -457,25 +457,25 @@ public: */ void LoadAltCurrencyValues(uint32 char_id, std::map ¤cy); void UpdateAltCurrencyValue(uint32 char_id, uint32 currency_id, uint32 value); - + /* * Misc stuff. - * PLEASE DO NOT ADD TO THIS COLLECTION OF CRAP UNLESS YOUR METHOD + * PLEASE DO NOT ADD TO THIS COLLECTION OF CRAP UNLESS YOUR METHOD * REALLY HAS NO BETTER SECTION */ bool logevents(const char* accountname,uint32 accountid,uint8 status,const char* charname,const char* target, const char* descriptiontype, const char* description,int event_nid); void GetEventLogs(const char* name,char* target,uint32 account_id=0,uint8 eventid=0,char* detail=0,char* timestamp=0, CharacterEventLog_Struct* cel=0); uint32 GetKarma(uint32 acct_id); void UpdateKarma(uint32 acct_id, uint32 amount); - + /* * Things which really dont belong here... */ int16 CommandRequirement(const char* commandname); - + protected: void ZDBInitVars(); - + uint32 max_faction; Faction** faction_array; uint32 npc_spells_maxid; diff --git a/zone/zonedbasync.cpp b/zone/zonedbasync.cpp index 587f94240..b30c29e52 100644 --- a/zone/zonedbasync.cpp +++ b/zone/zonedbasync.cpp @@ -108,7 +108,7 @@ bool DBAsyncCB_CharacterBackup(DBAsyncWork* iWork) { // return true means delete needtoinsert = true; } if (needtoinsert) { - if (!database.RunQuery(query, MakeAnyLenString(&query, + if (!database.RunQuery(query, MakeAnyLenString(&query, "Insert Delayed into character_backup (charid, account_id, name, profile, level, class, x, y, z, zoneid) " "select id, account_id, name, profile, level, class, x, y, z, zoneid " "from character_ where id=%u", iWork->WPT()), errbuf)) { diff --git a/zone/zonedump.h b/zone/zonedump.h index 7d94d17a7..a0f1ac793 100644 --- a/zone/zonedump.h +++ b/zone/zonedump.h @@ -19,8 +19,8 @@ Below are the blob structures for zone state dumping to the database -Quagmire -create table zone_state_dump (zonename varchar(16) not null primary key, spawn2_count int unsigned not null default 0, -npc_count int unsigned not null default 0, npcloot_count int unsigned not null default 0, gmspawntype_count int unsigned not null default 0, +create table zone_state_dump (zonename varchar(16) not null primary key, spawn2_count int unsigned not null default 0, +npc_count int unsigned not null default 0, npcloot_count int unsigned not null default 0, gmspawntype_count int unsigned not null default 0, spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob, time timestamp(14)); */ @@ -36,10 +36,10 @@ struct NPCType { char name[64]; char lastname[70]; - + int32 cur_hp; int32 max_hp; - + float size; float runspeed; uint8 gender; @@ -98,7 +98,7 @@ struct NPCType int32 mana_regen; int32 aggroradius; // added for AI improvement - neotokyo uint8 see_invis; // See Invis flag added - bool see_invis_undead; // See Invis vs. Undead flag added + bool see_invis_undead; // See Invis vs. Undead flag added bool see_hide; bool see_improved_hide; bool qglobal; @@ -156,7 +156,7 @@ struct ZSDump_NPC_Loot { Below are the blob structures for saving player corpses to the database -Quagmire -create table player_corpses (id int(11) unsigned not null auto_increment primary key, charid int(11) unsigned not null, +create table player_corpses (id int(11) unsigned not null auto_increment primary key, charid int(11) unsigned not null, charname varchar(30) not null, zonename varchar(16)not null, x float not null, y float not null, z float not null, heading float not null, data blob not null, time timestamp(14), index zonename (zonename)); */ diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 84c3e4e3a..eaaf680e2 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -55,7 +55,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { if(zc->zoneID == 0) { //client dosent know where they are going... //try to figure it out for them. - + switch(zone_mode) { case EvacToSafeCoords: case ZoneToSafeCoords: @@ -85,7 +85,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { } else { //unable to find a zone point... is there anything else //that can be a valid un-zolicited zone request? - + CheatDetected(MQZone, zc->x, zc->y, zc->z); Message(13, "Invalid unsolicited zone request."); LogFile->write(EQEMuLog::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%d'.", GetName(), target_zone_id); @@ -102,7 +102,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { target_zone_id = zonesummon_id; else target_zone_id = zc->zoneID; - + //if we are zoning to a specific zone unsolicied, //then until otherwise determined, they must be zoning //on a zone line. @@ -119,7 +119,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { //then we assume this is invalid. if(!zone_point || zone_point->target_zone_id != target_zone_id) { LogFile->write(EQEMuLog::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%d'.", GetName(), target_zone_id); - CheatDetected(MQGate, zc->x, zc->y, zc->z); + CheatDetected(MQGate, zc->x, zc->y, zc->z); SendZoneCancel(zc); return; } @@ -213,11 +213,11 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { break; case ZoneUnsolicited: //client came up with this on its own. //client requested a zoning... what are the cases when this could happen? - + //Handle zone point case: if(zone_point != nullptr) { //they are zoning using a valid zone point, figure out coords - + //999999 is a placeholder for 'same as where they were from' if(zone_point->target_x == 999999) dest_x = GetX(); @@ -235,12 +235,12 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { dest_h = GetHeading(); else dest_h = zone_point->target_heading; - + break; } - + //for now, there are no other cases... - + //could not find a valid reason for them to be zoning, stop it. CheatDetected(MQZoneUnknownDest, 0.0, 0.0, 0.0); LogFile->write(EQEMuLog::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%s'. Not near a zone point.", GetName(), target_zone_name); @@ -256,20 +256,20 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { //not sure when we would use ZONE_ERROR_NOTREADY //enforce min status and level - if (!ignorerestrictions && (Admin() < minstatus || GetLevel() < minlevel)) + if (!ignorerestrictions && (Admin() < minstatus || GetLevel() < minlevel)) { myerror = ZONE_ERROR_NOEXPERIENCE; } - + if(!ignorerestrictions && flag_needed[0] != '\0') { //the flag needed string is not empty, meaning a flag is required. - if(Admin() < minStatusToIgnoreZoneFlags && !HasZoneFlag(target_zone_id)) + if(Admin() < minStatusToIgnoreZoneFlags && !HasZoneFlag(target_zone_id)) { Message(13, "You do not have the flag to enter %s.", target_zone_name); myerror = ZONE_ERROR_NOEXPERIENCE; } } - + //TODO: ADVENTURE ENTRANCE CHECK if(myerror == 1) { @@ -293,15 +293,15 @@ void Client::SendZoneCancel(ZoneChange_Struct *zc) { zc2->success = 1; outapp->priority = 6; FastQueuePacket(&outapp); - + //reset to unsolicited. zone_mode = ZoneUnsolicited; } -void Client::SendZoneError(ZoneChange_Struct *zc, int8 err) +void Client::SendZoneError(ZoneChange_Struct *zc, int8 err) { LogFile->write(EQEMuLog::Error, "Zone %i is not available because target wasn't found or character insufficent level", zc->zoneID); - + SetPortExemption(true); EQApplicationPacket *outapp; @@ -312,7 +312,7 @@ void Client::SendZoneError(ZoneChange_Struct *zc, int8 err) zc2->success = err; outapp->priority = 6; FastQueuePacket(&outapp); - + //reset to unsolicited. zone_mode = ZoneUnsolicited; } @@ -320,15 +320,15 @@ void Client::SendZoneError(ZoneChange_Struct *zc, int8 err) void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instance_id, float dest_x, float dest_y, float dest_z, float dest_h, int8 ignore_r) { //this is called once the client is fully allowed to zone here //it takes care of all the activities which occur when a client zones out - + SendLogoutPackets(); - + //dont clear aggro until the zone is successful entity_list.RemoveFromHateLists(this); - + if(this->GetPet()) entity_list.RemoveFromHateLists(this->GetPet()); - + LogFile->write(EQEMuLog::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z); @@ -342,10 +342,10 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc m_pp.heading = dest_h; m_pp.zone_id = zone_id; m_pp.zoneInstance = instance_id; - + //Force a save so its waiting for them when they zone Save(2); - + if (zone_id == zone->GetZoneID() && instance_id == zone->GetInstanceID()) { // No need to ask worldserver if we're zoning to ourselves (most // likely to a bind point), also fixes a bug since the default response was failure @@ -357,7 +357,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc zc2->success = 1; outapp->priority = 6; FastQueuePacket(&outapp); - + zone->StartShutdownTimer(AUTHENTICATION_TIMEOUT * 1000); } else { // vesuvias - zoneing to another zone so we need to the let the world server @@ -376,7 +376,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc worldserver.SendPacket(pack); safe_delete(pack); } - + //reset to unsolicited. zone_mode = ZoneUnsolicited; zonesummon_x = 0; @@ -478,7 +478,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z return; } iZoneNameLength = strlen(pZoneName); - + switch(zm) { case EvacToSafeCoords: case ZoneToSafeCoords: @@ -492,7 +492,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z zonesummon_y = y_pos = y; zonesummon_z = z_pos = z; SetHeading(heading); - + zonesummon_id = zoneID; zonesummon_ignorerestrictions = 1; break; @@ -501,7 +501,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z zonesummon_y = y; zonesummon_z = z; SetHeading(heading); - + zonesummon_id = zoneID; zonesummon_ignorerestrictions = ignorerestrictions; break; @@ -516,7 +516,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z y = y_pos = m_pp.binds[0].y; z = z_pos = m_pp.binds[0].z; heading = m_pp.binds[0].heading; - + zonesummon_ignorerestrictions = 1; LogFile->write(EQEMuLog::Debug, "Player %s has died and will be zoned to bind point in zone: %s at LOC x=%f, y=%f, z=%f, heading=%f", GetName(), pZoneName, m_pp.binds[0].x, m_pp.binds[0].y, m_pp.binds[0].z, m_pp.binds[0].heading); break; @@ -603,7 +603,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z gmg->heading = heading; gmg->instance_id = instance_id; gmg->type = 0x01; // '0x01' was an observed value for the type field, not sure of meaning - + // we hide the real zoneid we want to evac/succor to here zonesummon_id = zoneID; @@ -618,19 +618,19 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z proximity_x = x_pos; proximity_y = y_pos; proximity_z = z_pos; - + //send out updates to people in zone. SendPosition(); - -#ifdef PACKET_UPDATE_MANAGER + +#ifdef PACKET_UPDATE_MANAGER //flush our position queues because we dont know where we will end up update_manager.FlushQueues(); #endif } - + EQApplicationPacket* outapp = new EQApplicationPacket(OP_RequestClientZoneChange, sizeof(RequestClientZoneChange_Struct)); RequestClientZoneChange_Struct* gmg = (RequestClientZoneChange_Struct*) outapp->pBuffer; - + gmg->zone_id = zoneID; gmg->x = x; gmg->y = y; @@ -703,9 +703,9 @@ void Client::SetBindPoint(int to_zone, float new_x, float new_y, float new_z) { void Client::GoToBind(uint8 bindnum) { // if the bind number is invalid, use the primary bind - if(bindnum > 4) + if(bindnum > 4) bindnum = 0; - + // move the client, which will zone them if needed. // ignore restrictions on the zone request..? if(bindnum == 0) @@ -721,13 +721,13 @@ void Client::GoToDeath() { void Client::SetZoneFlag(uint32 zone_id) { if(HasZoneFlag(zone_id)) return; - + zone_flags.insert(zone_id); - + //update the DB char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + // Retrieve all waypoints for this grid if(!database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO zone_flags (charID,zoneID) VALUES(%d,%d)", @@ -739,13 +739,13 @@ void Client::SetZoneFlag(uint32 zone_id) { void Client::ClearZoneFlag(uint32 zone_id) { if(!HasZoneFlag(zone_id)) return; - + zone_flags.erase(zone_id); - + //update the DB char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - + // Retrieve all waypoints for this grid if(!database.RunQuery(query,MakeAnyLenString(&query, "DELETE FROM zone_flags WHERE charID=%d AND zoneID=%d", @@ -759,7 +759,7 @@ void Client::LoadZoneFlags() { char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - + // Retrieve all waypoints for this grid if(database.RunQuery(query,MakeAnyLenString(&query, "SELECT zoneID from zone_flags WHERE charID=%d", @@ -786,24 +786,24 @@ void Client::SendZoneFlagInfo(Client *to) const { to->Message(0, "%s has no zone flags.", GetName()); return; } - + set::const_iterator cur, end; cur = zone_flags.begin(); end = zone_flags.end(); char empty[1] = { '\0' }; - + to->Message(0, "Flags for %s:", GetName()); - + for(; cur != end; cur++) { uint32 zoneid = *cur; - + const char *short_name = database.GetZoneName(zoneid); - + char *long_name = nullptr; database.GetZoneLongName(short_name, &long_name); if(long_name == nullptr) long_name = empty; - + float safe_x, safe_y, safe_z; int16 minstatus = 0; uint8 minlevel = 0; @@ -811,7 +811,7 @@ void Client::SendZoneFlagInfo(Client *to) const { if(!database.GetSafePoints(short_name, 0, &safe_x, &safe_y, &safe_z, &minstatus, &minlevel, flag_name)) { strcpy(flag_name, "(ERROR GETTING NAME)"); } - + to->Message(0, "Has Flag %s for zone %s (%d,%s)", flag_name, long_name, zoneid, short_name); if(long_name != empty) delete[] long_name; @@ -825,7 +825,7 @@ bool Client::CanBeInZone() { if(Admin() >= RuleI(GM, MinStatusToZoneAnywhere)) return(true); - + float safe_x, safe_y, safe_z; int16 minstatus = 0; uint8 minlevel = 0; @@ -835,7 +835,7 @@ bool Client::CanBeInZone() { _log(CLIENT__ERROR, "Unable to query zone info for ourself '%s'", zone->GetShortName()); return(false); } - + if(GetLevel() < minlevel) { _log(CLIENT__ERROR, "Character does not meet min level requirement (%d < %d)!", GetLevel(), minlevel); return(false); @@ -844,7 +844,7 @@ bool Client::CanBeInZone() { _log(CLIENT__ERROR, "Character does not meet min status requirement (%d < %d)!", Admin(), minstatus); return(false); } - + if(flag_needed[0] != '\0') { //the flag needed string is not empty, meaning a flag is required. if(Admin() < minStatusToIgnoreZoneFlags && !HasZoneFlag(zone->GetZoneID())) { From 4bdd8b2502c36afcbfea4d514b1bbe878849a219 Mon Sep 17 00:00:00 2001 From: j883376 Date: Thu, 9 May 2013 10:44:08 -0400 Subject: [PATCH 2/4] Change space indentation to tabs --- CMakeLists.txt | 164 +- cmake/FindMySQL.cmake | 92 +- common/BasePacket.cpp | 45 +- common/BasePacket.h | 26 +- common/CMakeLists.txt | 582 ++--- common/CRC16.cpp | 19 +- common/Condition.cpp | 38 +- common/Condition.h | 22 +- common/EQDB.cpp | 25 +- common/EQDB.h | 22 +- common/EQDBRes.cpp | 23 +- common/EQDBRes.h | 22 +- common/EQEMuError.cpp | 22 +- common/EQEMuError.h | 22 +- common/EQEmuConfig.cpp | 46 +- common/EQEmuConfig.h | 22 +- common/EQNetwork.cpp | 64 +- common/EQNetwork.h | 22 +- common/EQPacket.cpp | 96 +- common/EQPacket.h | 26 +- common/EQStream.cpp | 33 +- common/EQStream.h | 10 +- common/EQStreamFactory.cpp | 20 +- common/EQStreamFactory.h | 2 +- common/EQStreamIdent.cpp | 39 +- common/EQStreamIdent.h | 2 +- common/EQStreamLocator.h | 20 +- common/EQStreamProxy.cpp | 6 +- common/EQStreamProxy.h | 11 +- common/EmuTCPConnection.cpp | 87 +- common/EmuTCPConnection.h | 2 +- common/EmuTCPServer.cpp | 19 +- common/Item.cpp | 152 +- common/Item.h | 58 +- common/MaxSkill.cpp | 7 +- common/MiscFunctions.cpp | 278 +-- common/MiscFunctions.h | 72 +- common/Mutex.cpp | 22 +- common/Mutex.h | 22 +- common/ProcLauncher.cpp | 56 +- common/ProcLauncher.h | 61 +- common/TCPConnection.cpp | 60 +- common/TCPConnection.h | 30 +- common/TCPServer.cpp | 21 +- common/XMLParser.cpp | 40 +- common/XMLParser.h | 29 +- common/bodytypes.h | 24 +- common/breakdowns.h | 22 +- common/classes.cpp | 502 ++-- common/classes.h | 54 +- common/common_profile.h | 22 +- common/crash.cpp | 180 +- common/crc32.cpp | 22 +- common/database.cpp | 374 +-- common/database.h | 70 +- common/dbcore.cpp | 4 +- common/dbmemshare.cpp | 14 +- common/debug.cpp | 160 +- common/debug.h | 28 +- common/deity.h | 22 +- common/emu_opcodes.cpp | 28 +- common/emu_opcodes.h | 10 +- common/eq_constants.h | 462 ++-- common/eq_packet_structs.h | 865 ++++--- common/eqemu_exception.cpp | 94 +- common/eqemu_exception.h | 150 +- common/eqtime.cpp | 113 +- common/errmsg.h | 30 +- common/extprofile.cpp | 27 +- common/extprofile.h | 22 +- common/faction.cpp | 188 +- common/faction.h | 42 +- common/features.h | 24 +- common/fixed_memory_hash_set.h | 393 ++-- common/fixed_memory_variable_hash_set.h | 372 +-- common/guild_base.cpp | 52 +- common/guilds.cpp | 60 +- common/guilds.h | 24 +- common/ipc_mutex.cpp | 144 +- common/ipc_mutex.h | 88 +- common/item_struct.h | 60 +- common/languages.h | 82 +- common/linked_list.h | 310 +-- common/logsys.cpp | 27 +- common/logsys.h | 68 +- common/logsys_eqemu.cpp | 26 +- common/logtypes.h | 33 +- common/loottable.h | 24 +- common/md5.cpp | 252 +- common/memory_mapped_file.cpp | 260 +-- common/memory_mapped_file.h | 116 +- common/misc.cpp | 34 +- common/misc.h | 3 +- common/moremath.cpp | 22 +- common/moremath.h | 22 +- common/opcodemgr.cpp | 32 +- common/opcodemgr.h | 38 +- common/packet_dump.cpp | 29 +- common/packet_dump.h | 23 +- common/packet_dump_file.cpp | 36 +- common/packet_dump_file.h | 22 +- common/packet_functions.cpp | 112 +- common/packet_functions.h | 22 +- common/perl_EQDB.cpp | 22 +- common/perl_EQDBRes.cpp | 20 +- common/platform.cpp | 5 +- common/platform.h | 16 +- common/profiler.h | 22 +- common/ptimer.cpp | 70 +- common/ptimer.h | 24 +- common/queue.h | 156 +- common/queues.h | 54 +- common/races.cpp | 22 +- common/races.h | 834 ++++--- common/rdtsc.cpp | 26 +- common/rdtsc.h | 23 +- common/rulesys.cpp | 97 +- common/rulesys.h | 53 +- common/ruletypes.h | 76 +- common/seperator-2.h | 22 +- common/seperator.h | 22 +- common/serverinfo.cpp | 22 +- common/serverinfo.h | 30 +- common/servertalk.h | 166 +- common/shareddb.cpp | 1703 +++++++------- common/shareddb.h | 84 +- common/skills.h | 174 +- common/spdat.cpp | 134 +- common/spdat.h | 120 +- common/timeoutmgr.cpp | 22 +- common/timeoutmgr.h | 22 +- common/timer.cpp | 85 +- common/timer.h | 22 +- common/types.h | 34 +- common/unix.cpp | 25 +- common/unix.h | 23 +- common/useperl.h | 7 +- common/version.h | 22 +- common/worldconn.cpp | 27 +- common/worldconn.h | 24 +- eqlaunch/CMakeLists.txt | 28 +- eqlaunch/ZoneLaunch.cpp | 75 +- eqlaunch/ZoneLaunch.h | 31 +- eqlaunch/eqlaunch.cpp | 54 +- eqlaunch/worldserver.cpp | 28 +- eqlaunch/worldserver.h | 24 +- loginserver/CMakeLists.txt | 74 +- loginserver/Client.cpp | 26 +- loginserver/Client.h | 88 +- loginserver/ClientManager.cpp | 22 +- loginserver/ClientManager.h | 54 +- loginserver/Config.cpp | 44 +- loginserver/Config.h | 40 +- loginserver/Database.h | 62 +- loginserver/DatabaseMySQL.cpp | 22 +- loginserver/DatabaseMySQL.h | 74 +- loginserver/DatabasePostgreSQL.cpp | 46 +- loginserver/DatabasePostgreSQL.h | 66 +- loginserver/EQCryptoAPI.h | 23 +- loginserver/Encryption.cpp | 24 +- loginserver/Encryption.h | 80 +- loginserver/ErrorLog.cpp | 23 +- loginserver/ErrorLog.h | 38 +- loginserver/LoginServer.h | 34 +- loginserver/LoginStructures.h | 38 +- loginserver/Main.cpp | 26 +- loginserver/Options.h | 124 +- loginserver/ServerManager.cpp | 29 +- loginserver/ServerManager.h | 64 +- loginserver/WorldServer.cpp | 26 +- loginserver/WorldServer.h | 104 +- queryserv/CMakeLists.txt | 36 +- queryserv/database.cpp | 9 +- queryserv/database.h | 9 +- queryserv/lfguild.cpp | 5 +- queryserv/queryserv.cpp | 30 +- queryserv/queryservconfig.cpp | 9 +- queryserv/queryservconfig.h | 9 +- queryserv/worldserver.cpp | 24 +- queryserv/worldserver.h | 34 +- shared_memory/CMakeLists.txt | 40 +- shared_memory/items.cpp | 50 +- shared_memory/items.h | 22 +- shared_memory/loot.cpp | 72 +- shared_memory/loot.h | 22 +- shared_memory/main.cpp | 242 +- shared_memory/npc_faction.cpp | 50 +- shared_memory/npc_faction.h | 22 +- shared_memory/skill_caps.cpp | 42 +- shared_memory/skill_caps.h | 23 +- shared_memory/spells.cpp | 49 +- shared_memory/spells.h | 22 +- tests/CMakeLists.txt | 28 +- tests/cppunit/CMakeLists.txt | 10 +- tests/fixed_memory_test.h | 378 +-- tests/fixed_memory_variable_test.h | 192 +- tests/ipc_mutex_test.h | 82 +- tests/main.cpp | 48 +- tests/memory_mapped_file_test.h | 70 +- ucs/CMakeLists.txt | 40 +- ucs/chatchannel.cpp | 15 +- ucs/clientlist.cpp | 47 +- ucs/clientlist.h | 78 +- ucs/database.cpp | 57 +- ucs/database.h | 9 +- ucs/ucs.cpp | 30 +- ucs/ucsconfig.cpp | 9 +- ucs/ucsconfig.h | 9 +- ucs/worldserver.cpp | 42 +- ucs/worldserver.h | 22 +- world/Adventure.cpp | 7 +- world/AdventureManager.cpp | 40 +- world/CMakeLists.txt | 132 +- world/EQLConfig.cpp | 87 +- world/EQLConfig.h | 30 +- world/EQW.cpp | 138 +- world/EQW.h | 34 +- world/EQWHTTPHandler.cpp | 30 +- world/EQWHTTPHandler.h | 25 +- world/EQWParser.cpp | 92 +- world/EQWParser.h | 31 +- world/HTTPRequest.cpp | 33 +- world/HTTPRequest.h | 26 +- world/LauncherLink.cpp | 36 +- world/LauncherLink.h | 33 +- world/LauncherList.cpp | 48 +- world/LauncherList.h | 33 +- world/LoginServer.cpp | 191 +- world/LoginServer.h | 22 +- world/LoginServerList.cpp | 26 +- world/WorldConfig.cpp | 22 +- world/WorldConfig.h | 22 +- world/WorldTCPConnection.h | 22 +- world/client.cpp | 1045 ++++----- world/client.h | 25 +- world/cliententry.cpp | 51 +- world/cliententry.h | 8 +- world/clientlist.cpp | 67 +- world/clientlist.h | 6 +- world/console.cpp | 57 +- world/console.h | 23 +- world/lfplist.cpp | 12 +- world/lfplist.h | 9 +- world/net.cpp | 84 +- world/net.h | 24 +- world/perl_EQLConfig.cpp | 41 +- world/perl_EQW.cpp | 148 +- world/perl_HTTPRequest.cpp | 41 +- world/queryserv.cpp | 5 +- world/ucs.cpp | 5 +- world/wguild_mgr.cpp | 48 +- world/worlddb.cpp | 158 +- world/worlddb.h | 27 +- world/zonelist.cpp | 51 +- world/zonelist.h | 15 +- world/zoneserver.cpp | 2089 +++++++++-------- world/zoneserver.h | 30 +- zone/AA.cpp | 182 +- zone/AA.h | 2788 +++++++++++------------ zone/CMakeLists.txt | 308 +-- zone/Map.cpp | 108 +- zone/MobAI.cpp | 619 ++--- zone/NpcAI.h | 24 +- zone/Object.cpp | 46 +- zone/PlayerCorpse.cpp | 356 +-- zone/PlayerCorpse.h | 24 +- zone/Quest.cpp | 24 +- zone/Quest.h | 22 +- zone/QuestInterface.h | 20 +- zone/QuestParserCollection.cpp | 932 ++++---- zone/QuestParserCollection.h | 52 +- zone/StringIDs.h | 61 +- zone/ZoneConfig.cpp | 22 +- zone/ZoneConfig.h | 22 +- zone/aggro.cpp | 168 +- zone/attack.cpp | 263 +-- zone/basic_functions.h | 86 +- zone/beacon.cpp | 26 +- zone/beacon.h | 22 +- zone/bonuses.cpp | 125 +- zone/bot.cpp | 312 +-- zone/bot.h | 62 +- zone/botspellsai.cpp | 148 +- zone/client.cpp | 772 ++++--- zone/client.h | 316 ++- zone/client_logs.cpp | 22 +- zone/client_logs.h | 24 +- zone/client_mods.cpp | 26 +- zone/client_packet.cpp | 1198 +++++----- zone/client_packet.h | 4 +- zone/client_process.cpp | 62 +- zone/command.cpp | 1050 ++++----- zone/command.h | 32 +- zone/common.h | 234 +- zone/doors.cpp | 89 +- zone/effects.cpp | 40 +- zone/embparser.cpp | 102 +- zone/embparser.h | 32 +- zone/embperl.cpp | 44 +- zone/embperl.h | 26 +- zone/embxs.cpp | 84 +- zone/entity.cpp | 176 +- zone/entity.h | 120 +- zone/errmsg.h | 27 +- zone/event_codes.h | 2 +- zone/exp.cpp | 158 +- zone/fearpath.cpp | 52 +- zone/forage.cpp | 69 +- zone/forage.h | 22 +- zone/groups.cpp | 512 ++--- zone/groups.h | 24 +- zone/guild.cpp | 24 +- zone/guild_mgr.cpp | 61 +- zone/hate_list.cpp | 218 +- zone/hate_list.h | 86 +- zone/horse.cpp | 31 +- zone/horse.h | 26 +- zone/inventory.cpp | 449 ++-- zone/loottables.cpp | 74 +- zone/map.h | 30 +- zone/masterentity.h | 4 +- zone/merc.cpp | 650 +++--- zone/merc.h | 66 +- zone/mob.cpp | 455 ++-- zone/mob.h | 1990 ++++++++-------- zone/net.cpp | 82 +- zone/net.h | 22 +- zone/npc.cpp | 516 ++--- zone/npc.h | 98 +- zone/object.h | 32 +- zone/oldcode.cpp | 342 +-- zone/oldcode.h | 25 +- zone/parser.h | 36 +- zone/pathing.cpp | 61 +- zone/perl_PlayerCorpse.cpp | 24 +- zone/perl_client.cpp | 58 +- zone/perl_doors.cpp | 28 +- zone/perl_entity.cpp | 26 +- zone/perl_groups.cpp | 28 +- zone/perl_hateentry.cpp | 9 +- zone/perl_mob.cpp | 64 +- zone/perl_npc.cpp | 32 +- zone/perl_object.cpp | 24 +- zone/perl_perlpacket.cpp | 32 +- zone/perl_questitem.cpp | 24 +- zone/perl_raids.cpp | 28 +- zone/perlpacket.cpp | 30 +- zone/perlpacket.h | 25 +- zone/perlparser.cpp | 370 +-- zone/perlparser.h | 22 +- zone/petitions.cpp | 34 +- zone/petitions.h | 48 +- zone/pets.cpp | 44 +- zone/pets.h | 15 +- zone/questmgr.cpp | 157 +- zone/questmgr.h | 50 +- zone/queues.h | 54 +- zone/raid.h | 204 +- zone/raids.cpp | 253 +- zone/raids.h | 30 +- zone/skills.h | 22 +- zone/spawn2.cpp | 65 +- zone/spawn2.h | 26 +- zone/spawngroup.cpp | 24 +- zone/spawngroup.h | 30 +- zone/special_attacks.cpp | 158 +- zone/spell_effects.cpp | 122 +- zone/spells.cpp | 648 +++--- zone/tasks.cpp | 352 ++- zone/tasks.h | 62 +- zone/titles.cpp | 122 +- zone/titles.h | 22 +- zone/tradeskills.cpp | 296 ++- zone/trading.cpp | 449 ++-- zone/trap.cpp | 64 +- zone/trap.h | 24 +- zone/tribute.cpp | 28 +- zone/updatemgr.cpp | 35 +- zone/updatemgr.h | 22 +- zone/watermap.cpp | 60 +- zone/watermap.h | 54 +- zone/waypoints.cpp | 234 +- zone/worldserver.cpp | 84 +- zone/worldserver.h | 26 +- zone/zone.cpp | 264 +-- zone/zone.h | 40 +- zone/zone_logsys.cpp | 33 +- zone/zone_profile.cpp | 48 +- zone/zone_profile.h | 22 +- zone/zonedb.cpp | 741 +++--- zone/zonedb.h | 189 +- zone/zonedump.h | 116 +- zone/zoning.cpp | 72 +- 393 files changed, 22463 insertions(+), 23238 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b2bfd03b..3867d10ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,96 +15,96 @@ PROJECT(EQEmu) #Default build type is set to RelWithDebInfo for generators that honor that like makefiles IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE) + SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) #Add our various windows definitions IF(MSVC OR MINGW) - ADD_DEFINITIONS(-D_WINDOWS) - IF(CMAKE_CL_64) - ADD_DEFINITIONS(-DWIN64) - ELSE(CMAKE_CL_64) - ADD_DEFINITIONS(-DWIN32) - ENDIF(CMAKE_CL_64) + ADD_DEFINITIONS(-D_WINDOWS) + IF(CMAKE_CL_64) + ADD_DEFINITIONS(-DWIN64) + ELSE(CMAKE_CL_64) + ADD_DEFINITIONS(-DWIN32) + ENDIF(CMAKE_CL_64) ENDIF(MSVC OR MINGW) IF(MSVC) - #Set our default locations for zlib/mysql based on x86/x64 - IF(CMAKE_CL_64) - SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x64") - SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x64") - ELSE(CMAKE_CL_64) - SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x86") - SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x86") - ENDIF(CMAKE_CL_64) + #Set our default locations for zlib/mysql based on x86/x64 + IF(CMAKE_CL_64) + SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x64") + SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x64") + ELSE(CMAKE_CL_64) + SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x86") + SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x86") + ENDIF(CMAKE_CL_64) - #disable CRT warnings on windows cause they're annoying as shit and we use C functions everywhere - OPTION(EQEMU_DISABLE_CRT_SECURE_WARNINGS "Disable Secure CRT Warnings" ON) - IF(EQEMU_DISABLE_CRT_SECURE_WARNINGS) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) - ENDIF(EQEMU_DISABLE_CRT_SECURE_WARNINGS) + #disable CRT warnings on windows cause they're annoying as shit and we use C functions everywhere + OPTION(EQEMU_DISABLE_CRT_SECURE_WARNINGS "Disable Secure CRT Warnings" ON) + IF(EQEMU_DISABLE_CRT_SECURE_WARNINGS) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) + ENDIF(EQEMU_DISABLE_CRT_SECURE_WARNINGS) - #fast FP if you'd like it - OPTION(EQEMU_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON) - IF(EQEMU_FAST_FLOATINGPOINT) + #fast FP if you'd like it + OPTION(EQEMU_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON) + IF(EQEMU_FAST_FLOATINGPOINT) ADD_DEFINITIONS(/fp:fast) ENDIF(EQEMU_FAST_FLOATINGPOINT) - #crash logging currently only works on windows x86/x64 - OPTION(EQEMU_ENABLE_CRASH_LOGGING "Enable crash logging" ON) - IF(EQEMU_ENABLE_CRASH_LOGGING) - ADD_DEFINITIONS(-DCRASH_LOGGING) - ENDIF(EQEMU_ENABLE_CRASH_LOGGING) + #crash logging currently only works on windows x86/x64 + OPTION(EQEMU_ENABLE_CRASH_LOGGING "Enable crash logging" ON) + IF(EQEMU_ENABLE_CRASH_LOGGING) + ADD_DEFINITIONS(-DCRASH_LOGGING) + ENDIF(EQEMU_ENABLE_CRASH_LOGGING) - #Disable safe SEH or not? - OPTION(EQEMU_DISABLE_SAFESEH "Disable Safe SEH (Needed for Strawberry Perl)" OFF) - IF(EQEMU_DISABLE_SAFESEH) - SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /SAFESEH:NO") - SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /SAFESEH:NO") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /SAFESEH:NO") - SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") - SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /SAFESEH:NO") - SET(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} /SAFESEH:NO") - SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /SAFESEH:NO") - SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") - SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /SAFESEH:NO") - SET(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL "${CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL} /SAFESEH:NO") - SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /SAFESEH:NO") - SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") - ENDIF(EQEMU_DISABLE_SAFESEH) + #Disable safe SEH or not? + OPTION(EQEMU_DISABLE_SAFESEH "Disable Safe SEH (Needed for Strawberry Perl)" OFF) + IF(EQEMU_DISABLE_SAFESEH) + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /SAFESEH:NO") + SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /SAFESEH:NO") + SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /SAFESEH:NO") + SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") + SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /SAFESEH:NO") + SET(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} /SAFESEH:NO") + SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /SAFESEH:NO") + SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") + SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /SAFESEH:NO") + SET(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL "${CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL} /SAFESEH:NO") + SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /SAFESEH:NO") + SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") + ENDIF(EQEMU_DISABLE_SAFESEH) - #We want to compile /MT not /MD so we change that - FOREACH(flag_var CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO) - IF(${flag_var} MATCHES "/MD") - STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - ENDIF(${flag_var} MATCHES "/MD") - ENDFOREACH(flag_var) + #We want to compile /MT not /MD so we change that + FOREACH(flag_var CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO) + IF(${flag_var} MATCHES "/MD") + STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + ENDIF(${flag_var} MATCHES "/MD") + ENDFOREACH(flag_var) ELSE(MSVC) - #Normally set by perl but we don't use the perl flags anymore so we set it. - ADD_DEFINITIONS(-DHAS_UNION_SEMUN) + #Normally set by perl but we don't use the perl flags anymore so we set it. + ADD_DEFINITIONS(-DHAS_UNION_SEMUN) ENDIF(MSVC) #use stdint.h types if they exist for this platform (we have to guess otherwise) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) IF(HAVE_STDINT_H) - ADD_DEFINITIONS(-DEQEMU_USE_STDINT) + ADD_DEFINITIONS(-DEQEMU_USE_STDINT) ENDIF(HAVE_STDINT_H) -#debug level, 5 is default. Most people wont ever change this but it's there if you want to +#debug level, 5 is default. Most people wont ever change this but it's there if you want to SET(EQEMU_DEBUG_LEVEL 5 CACHE STRING "EQEmu debug level: - 0 - Quiet mode Errors to file Status and Normal ignored - 1 - Status and Normal to console, Errors to logfile - 2 - Status, Normal, and Error to console and logfile - 3 - Light debug release errors and status - 4 - Moderate debug release errors and status - 5 - Maximum debug release errors and status - 10 - More errors than you ever wanted to see" + 0 - Quiet mode Errors to file Status and Normal ignored + 1 - Status and Normal to console, Errors to logfile + 2 - Status, Normal, and Error to console and logfile + 3 - Light debug release errors and status + 4 - Moderate debug release errors and status + 5 - Maximum debug release errors and status + 10 - More errors than you ever wanted to see" ) #Bots are a compile time option so on/off OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF) IF(EQEMU_ENABLE_BOTS) - ADD_DEFINITIONS(-DBOTS) + ADD_DEFINITIONS(-DBOTS) ENDIF(EQEMU_ENABLE_BOTS) #What to build @@ -116,22 +116,22 @@ OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON) #C++11 stuff IF(NOT MSVC) - ADD_DEFINITIONS(-std=c++0x) - #Rvalue-Move - todo: auto set this based on gcc version - OPTION(EQEMU_ENABLE_RVALUE_MOVE "Enable EQEmu RValue References (Enable if GCC 4.3 or higher)" OFF) + ADD_DEFINITIONS(-std=c++0x) + #Rvalue-Move - todo: auto set this based on gcc version + OPTION(EQEMU_ENABLE_RVALUE_MOVE "Enable EQEmu RValue References (Enable if GCC 4.3 or higher)" OFF) ELSE(NOT MSVC) - #Rvalue-Move - todo: auto set this based on msvc version - OPTION(EQEMU_ENABLE_RVALUE_MOVE "Enable EQEmu RValue References (Enable if Visual Studio 2010 or higher)" OFF) + #Rvalue-Move - todo: auto set this based on msvc version + OPTION(EQEMU_ENABLE_RVALUE_MOVE "Enable EQEmu RValue References (Enable if Visual Studio 2010 or higher)" OFF) ENDIF(NOT MSVC) IF(EQEMU_ENABLE_RVALUE_MOVE) - ADD_DEFINITIONS(-DEQEMU_RVALUE_MOVE) + ADD_DEFINITIONS(-DEQEMU_RVALUE_MOVE) ENDIF(EQEMU_ENABLE_RVALUE_MOVE) #Various definitions IF(EQEMU_BUILD_PERL) - ADD_DEFINITIONS(-DEMBPERL) - ADD_DEFINITIONS(-DEMBPERL_PLUGIN) + ADD_DEFINITIONS(-DEMBPERL) + ADD_DEFINITIONS(-DEMBPERL_PLUGIN) ENDIF(EQEMU_BUILD_PERL) ADD_DEFINITIONS(-DEQDEBUG=${EQEMU_DEBUG_LEVEL}) ADD_DEFINITIONS(-DINVERSEXY) @@ -142,30 +142,30 @@ ADD_DEFINITIONS(-DMAP_DIR="./Maps") FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(MySQL REQUIRED) IF(EQEMU_BUILD_PERL) - FIND_PACKAGE(PerlLibs REQUIRED) - INCLUDE_DIRECTORIES("${PERL_INCLUDE_PATH}") + FIND_PACKAGE(PerlLibs REQUIRED) + INCLUDE_DIRECTORIES("${PERL_INCLUDE_PATH}") ENDIF(EQEMU_BUILD_PERL) INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}" "${MySQL_INCLUDE_DIR}") IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS) - ADD_SUBDIRECTORY(common) + ADD_SUBDIRECTORY(common) ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS) IF(EQEMU_BUILD_SERVER) - ADD_SUBDIRECTORY(shared_memory) - ADD_SUBDIRECTORY(world) - ADD_SUBDIRECTORY(zone) - ADD_SUBDIRECTORY(ucs) - ADD_SUBDIRECTORY(queryserv) - ADD_SUBDIRECTORY(eqlaunch) + ADD_SUBDIRECTORY(shared_memory) + ADD_SUBDIRECTORY(world) + ADD_SUBDIRECTORY(zone) + ADD_SUBDIRECTORY(ucs) + ADD_SUBDIRECTORY(queryserv) + ADD_SUBDIRECTORY(eqlaunch) ENDIF(EQEMU_BUILD_SERVER) IF(EQEMU_BUILD_LOGIN) - ADD_SUBDIRECTORY(loginserver) + ADD_SUBDIRECTORY(loginserver) ENDIF(EQEMU_BUILD_LOGIN) IF(EQEMU_BUILD_AZONE) - ADD_SUBDIRECTORY(utils) + ADD_SUBDIRECTORY(utils) ENDIF(EQEMU_BUILD_AZONE) IF(EQEMU_BUILD_TESTS) - ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(tests) ENDIF(EQEMU_BUILD_TESTS) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 8027ef9a0..14d08b695 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -4,65 +4,65 @@ # # Find the native MySQL includes and library # -# MySQL_INCLUDE_DIR - where to find mysql.h, etc. -# MySQL_LIBRARIES - List of libraries when using MySQL. -# MySQL_FOUND - True if MySQL found. -# The following can be used as a hint as to where to search: -# MYSQL_ROOT +# MySQL_INCLUDE_DIR - where to find mysql.h, etc. +# MySQL_LIBRARIES - List of libraries when using MySQL. +# MySQL_FOUND - True if MySQL found. +# The following can be used as a hint as to where to search: +# MYSQL_ROOT IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES) - # Already in cache, be silent - SET(MySQL_FIND_QUIETLY TRUE) + # Already in cache, be silent + SET(MySQL_FIND_QUIETLY TRUE) ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES) # Include dir IF(MYSQL_ROOT) - FIND_PATH(MySQL_INCLUDE_DIR - NAMES mysql.h - PATHS ${MYSQL_ROOT}/include - PATH_SUFFIXES mysql - ) + FIND_PATH(MySQL_INCLUDE_DIR + NAMES mysql.h + PATHS ${MYSQL_ROOT}/include + PATH_SUFFIXES mysql + ) ELSE(MYSQL_ROOT) - FIND_PATH(MySQL_INCLUDE_DIR - NAMES mysql.h - PATH_SUFFIXES mysql - ) + FIND_PATH(MySQL_INCLUDE_DIR + NAMES mysql.h + PATH_SUFFIXES mysql + ) ENDIF(MYSQL_ROOT) # Library SET(MySQL_NAMES mysqlclient_r mysqlclient) IF(MYSQL_ROOT) - FIND_LIBRARY(MySQL_LIBRARY_DEBUG - NAMES ${MySQL_NAMES} - PATHS ${MYSQL_ROOT}/lib/debug /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 - PATH_SUFFIXES mysql - ) + FIND_LIBRARY(MySQL_LIBRARY_DEBUG + NAMES ${MySQL_NAMES} + PATHS ${MYSQL_ROOT}/lib/debug /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 + PATH_SUFFIXES mysql + ) - FIND_LIBRARY(MySQL_LIBRARY_RELEASE - NAMES ${MySQL_NAMES} - PATHS ${MYSQL_ROOT}/lib /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 - PATH_SUFFIXES mysql - ) + FIND_LIBRARY(MySQL_LIBRARY_RELEASE + NAMES ${MySQL_NAMES} + PATHS ${MYSQL_ROOT}/lib /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 + PATH_SUFFIXES mysql + ) ELSE(MYSQL_ROOT) - FIND_LIBRARY(MySQL_LIBRARY_DEBUG - NAMES ${MySQL_NAMES} - PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 - PATH_SUFFIXES mysql - ) + FIND_LIBRARY(MySQL_LIBRARY_DEBUG + NAMES ${MySQL_NAMES} + PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 + PATH_SUFFIXES mysql + ) - FIND_LIBRARY(MySQL_LIBRARY_RELEASE - NAMES ${MySQL_NAMES} - PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 - PATH_SUFFIXES mysql - ) + FIND_LIBRARY(MySQL_LIBRARY_RELEASE + NAMES ${MySQL_NAMES} + PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 + PATH_SUFFIXES mysql + ) ENDIF(MYSQL_ROOT) IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY_DEBUG AND MySQL_LIBRARY_RELEASE) - SET(MySQL_FOUND TRUE) - SET( MySQL_LIBRARIES ${MySQL_LIBRARY_DEBUG} ${MySQL_LIBRARY_RELEASE} ) + SET(MySQL_FOUND TRUE) + SET( MySQL_LIBRARIES ${MySQL_LIBRARY_DEBUG} ${MySQL_LIBRARY_RELEASE} ) ELSE (MySQL_INCLUDE_DIR AND MySQL_LIBRARY_DEBUG AND MySQL_LIBRARY_RELEASE) - SET(MySQL_FOUND FALSE) - SET( MySQL_LIBRARIES ) + SET(MySQL_FOUND FALSE) + SET( MySQL_LIBRARIES ) ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY_DEBUG AND MySQL_LIBRARY_RELEASE) @@ -72,13 +72,13 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MySQL DEFAULT_MSG MySQL_LIBRARY_DEBUG MySQL_LIBRARY_RELEASE MySQL_INCLUDE_DIR) IF(MySQL_FOUND) - SET( MySQL_LIBRARIES ${MySQL_LIBRARY_DEBUG} ${MySQL_LIBRARY_RELEASE} ) + SET( MySQL_LIBRARIES ${MySQL_LIBRARY_DEBUG} ${MySQL_LIBRARY_RELEASE} ) ELSE(MySQL_FOUND) - SET( MySQL_LIBRARIES ) + SET( MySQL_LIBRARIES ) ENDIF(MySQL_FOUND) MARK_AS_ADVANCED( - MySQL_LIBRARY_DEBUG - MySQL_LIBRARY_RELEASE - MySQL_INCLUDE_DIR - ) + MySQL_LIBRARY_DEBUG + MySQL_LIBRARY_RELEASE + MySQL_INCLUDE_DIR + ) diff --git a/common/BasePacket.cpp b/common/BasePacket.cpp index 838e6454b..12d48ee3b 100644 --- a/common/BasePacket.cpp +++ b/common/BasePacket.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "BasePacket.h" @@ -34,7 +34,7 @@ BasePacket::BasePacket(const unsigned char *buf, uint32 len) pBuffer= new unsigned char[len]; if (buf) { memcpy(this->pBuffer,buf,len); - } else { + } else { memset(this->pBuffer,0,len); } } @@ -124,24 +124,3 @@ void DumpPacketBin(const BasePacket* app) { DumpPacketBin(app->pBuffer, app->size); } - - - - - - - - - - - - - - - - - - - - - diff --git a/common/BasePacket.h b/common/BasePacket.h index 2d4e88ec6..4952e29d2 100644 --- a/common/BasePacket.h +++ b/common/BasePacket.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef BASEPACKET_H_ #define BASEPACKET_H_ @@ -50,7 +50,7 @@ public: void setSrcInfo(uint32 sip, uint16 sport) { src_ip=sip; src_port=sport; } void setDstInfo(uint32 dip, uint16 dport) { dst_ip=dip; dst_port=dport; } void setTimeInfo(uint32 ts_sec, uint32 ts_usec) { timestamp.tv_sec=ts_sec; timestamp.tv_usec=ts_usec; } - void copyInfo(const BasePacket *p) { src_ip=p->src_ip; src_port=p->src_port; dst_ip=p->dst_ip; dst_port=p->dst_port; timestamp.tv_sec=p->timestamp.tv_sec; timestamp.tv_usec=p->timestamp.tv_usec; } + void copyInfo(const BasePacket *p) { src_ip=p->src_ip; src_port=p->src_port; dst_ip=p->dst_ip; dst_port=p->dst_port; timestamp.tv_sec=p->timestamp.tv_sec; timestamp.tv_usec=p->timestamp.tv_usec; } inline bool operator<(const BasePacket &rhs) { return (timestamp.tv_sec < rhs.timestamp.tv_sec || (timestamp.tv_sec==rhs.timestamp.tv_sec && timestamp.tv_usec < rhs.timestamp.tv_usec)); @@ -89,5 +89,3 @@ extern void DumpPacketBin(const BasePacket* app); #endif /*BASEPACKET_H_*/ - - diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 2cb7a8a70..49ab43f20 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,312 +1,312 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(common_sources - BasePacket.cpp - classes.cpp - Condition.cpp - crash.cpp - CRC16.cpp - crc32.cpp - database.cpp - dbasync.cpp - dbcore.cpp - DBMemLeak.cpp - debug.cpp - emu_opcodes.cpp - EmuTCPConnection.cpp - EmuTCPServer.cpp - EQDB.cpp - EQDBRes.cpp - eqemu_exception.cpp - EQEmuConfig.cpp - EQEMuError.cpp - EQPacket.cpp - EQStream.cpp - EQStreamFactory.cpp - EQStreamIdent.cpp - EQStreamProxy.cpp - eqtime.cpp - extprofile.cpp + BasePacket.cpp + classes.cpp + Condition.cpp + crash.cpp + CRC16.cpp + crc32.cpp + database.cpp + dbasync.cpp + dbcore.cpp + DBMemLeak.cpp + debug.cpp + emu_opcodes.cpp + EmuTCPConnection.cpp + EmuTCPServer.cpp + EQDB.cpp + EQDBRes.cpp + eqemu_exception.cpp + EQEmuConfig.cpp + EQEMuError.cpp + EQPacket.cpp + EQStream.cpp + EQStreamFactory.cpp + EQStreamIdent.cpp + EQStreamProxy.cpp + eqtime.cpp + extprofile.cpp faction.cpp - guild_base.cpp - guilds.cpp - ipc_mutex.cpp - Item.cpp - logsys.cpp - logsys_eqemu.cpp - md5.cpp - memory_mapped_file.cpp - misc.cpp - MiscFunctions.cpp - moremath.cpp - Mutex.cpp - opcode_map.cpp - opcodemgr.cpp - packet_dump.cpp - packet_dump_file.cpp - packet_functions.cpp - perl_EQDB.cpp - perl_EQDBRes.cpp - ProcLauncher.cpp - ptimer.cpp - races.cpp - rdtsc.cpp - rulesys.cpp - serverinfo.cpp - shareddb.cpp - spdat.cpp - StructStrategy.cpp - TCPConnection.cpp - TCPServer.cpp - timeoutmgr.cpp - timer.cpp - unix.cpp - worldconn.cpp - XMLParser.cpp - platform.cpp - patches/Client62.cpp - patches/patches.cpp - patches/SoD.cpp - patches/SoF.cpp - patches/RoF.cpp - patches/Titanium.cpp - patches/Underfoot.cpp - SocketLib/Base64.cpp - SocketLib/File.cpp - SocketLib/HttpdCookies.cpp - SocketLib/HttpdForm.cpp - SocketLib/HttpdSocket.cpp - SocketLib/HTTPSocket.cpp - SocketLib/MemFile.cpp - SocketLib/Mime.cpp - SocketLib/Parse.cpp - SocketLib/socket_include.cpp - SocketLib/Utility.cpp - StackWalker/StackWalker.cpp - tinyxml/tinystr.cpp - tinyxml/tinyxml.cpp - tinyxml/tinyxmlerror.cpp - tinyxml/tinyxmlparser.cpp + guild_base.cpp + guilds.cpp + ipc_mutex.cpp + Item.cpp + logsys.cpp + logsys_eqemu.cpp + md5.cpp + memory_mapped_file.cpp + misc.cpp + MiscFunctions.cpp + moremath.cpp + Mutex.cpp + opcode_map.cpp + opcodemgr.cpp + packet_dump.cpp + packet_dump_file.cpp + packet_functions.cpp + perl_EQDB.cpp + perl_EQDBRes.cpp + ProcLauncher.cpp + ptimer.cpp + races.cpp + rdtsc.cpp + rulesys.cpp + serverinfo.cpp + shareddb.cpp + spdat.cpp + StructStrategy.cpp + TCPConnection.cpp + TCPServer.cpp + timeoutmgr.cpp + timer.cpp + unix.cpp + worldconn.cpp + XMLParser.cpp + platform.cpp + patches/Client62.cpp + patches/patches.cpp + patches/SoD.cpp + patches/SoF.cpp + patches/RoF.cpp + patches/Titanium.cpp + patches/Underfoot.cpp + SocketLib/Base64.cpp + SocketLib/File.cpp + SocketLib/HttpdCookies.cpp + SocketLib/HttpdForm.cpp + SocketLib/HttpdSocket.cpp + SocketLib/HTTPSocket.cpp + SocketLib/MemFile.cpp + SocketLib/Mime.cpp + SocketLib/Parse.cpp + SocketLib/socket_include.cpp + SocketLib/Utility.cpp + StackWalker/StackWalker.cpp + tinyxml/tinystr.cpp + tinyxml/tinyxml.cpp + tinyxml/tinyxmlerror.cpp + tinyxml/tinyxmlparser.cpp ) SET(common_headers - BasePacket.h - bodytypes.h - breakdowns.h - classes.h - common_profile.h - Condition.h - crash.h - CRC16.h - crc32.h - database.h - dbasync.h - dbcore.h - DBMemLeak.h - debug.h - deity.h - emu_opcodes.h - emu_oplist.h - EmuTCPConnection.h - EmuTCPServer.h - eq_constants.h - eq_packet_structs.h - EQDB.h - EQDBRes.h - eqemu_exception.h - EQEmuConfig.h - EQEmuConfig_elements.h - EQEMuError.h - EQPacket.h - EQStream.h - EQStreamFactory.h - EQStreamIdent.h - EQStreamIntf.h - EQStreamLocator.h - EQStreamProxy.h - EQStreamType.h - eqtime.h - errmsg.h - extprofile.h + BasePacket.h + bodytypes.h + breakdowns.h + classes.h + common_profile.h + Condition.h + crash.h + CRC16.h + crc32.h + database.h + dbasync.h + dbcore.h + DBMemLeak.h + debug.h + deity.h + emu_opcodes.h + emu_oplist.h + EmuTCPConnection.h + EmuTCPServer.h + eq_constants.h + eq_packet_structs.h + EQDB.h + EQDBRes.h + eqemu_exception.h + EQEmuConfig.h + EQEmuConfig_elements.h + EQEMuError.h + EQPacket.h + EQStream.h + EQStreamFactory.h + EQStreamIdent.h + EQStreamIntf.h + EQStreamLocator.h + EQStreamProxy.h + EQStreamType.h + eqtime.h + errmsg.h + extprofile.h faction.h - features.h - fixed_memory_hash_set.h - fixed_memory_variable_hash_set.h - guild_base.h - guilds.h - ipc_mutex.h - Item.h - item_fieldlist.h - item_struct.h - languages.h - linked_list.h - logsys.h - logtypes.h - loottable.h - mail_oplist.h - md5.h - memory_mapped_file.h - misc.h - MiscFunctions.h - moremath.h - Mutex.h - op_codes.h - opcode_dispatch.h - opcodemgr.h - packet_dump.h - packet_dump_file.h - packet_functions.h - ProcLauncher.h - profiler.h - ptimer.h - queue.h - races.h - rdtsc.h - rulesys.h - ruletypes.h - seperator.h - serverinfo.h - servertalk.h - shareddb.h - skills.h - spdat.h - StructStrategy.h - TCPBasicServer.h - TCPConnection.h - TCPServer.h - timeoutmgr.h - timer.h - types.h - unix.h - useperl.h - version.h - worldconn.h - XMLParser.h - ZoneNumbers.h - platform.h - patches/Client62.h - patches/Client62_itemfields.h - patches/Client62_ops.h - patches/Client62_structs.h - patches/patches.h - patches/SoD.h - patches/SoD_itemfields.h - patches/SoD_ops.h - patches/SoD_structs.h - patches/SoF.h - patches/SoF_itemfields.h - patches/SoF_opcode_list.h - patches/SoF_ops.h - patches/SoF_structs.h - patches/SSDeclare.h - patches/SSDefine.h - patches/SSRegister.h - patches/RoF.h - patches/RoF_itemfields.h - patches/RoF_ops.h - patches/RoF_structs.h - patches/Titanium.h - patches/Titanium_itemfields.h - patches/Titanium_ops.h - patches/Titanium_structs.h - patches/Underfoot.h - patches/Underfoot_itemfields.h - patches/Underfoot_ops.h - patches/Underfoot_structs.h - SocketLib/Base64.h - SocketLib/File.h - SocketLib/HttpdCookies.h - SocketLib/HttpdForm.h - SocketLib/HttpdSocket.h - SocketLib/HTTPSocket.h - SocketLib/IFile.h - SocketLib/MemFile.h - SocketLib/Mime.h - SocketLib/Parse.h - SocketLib/socket_include.h - SocketLib/Utility.h - StackWalker/StackWalker.h - tinyxml/tinystr.h - tinyxml/tinyxml.h + features.h + fixed_memory_hash_set.h + fixed_memory_variable_hash_set.h + guild_base.h + guilds.h + ipc_mutex.h + Item.h + item_fieldlist.h + item_struct.h + languages.h + linked_list.h + logsys.h + logtypes.h + loottable.h + mail_oplist.h + md5.h + memory_mapped_file.h + misc.h + MiscFunctions.h + moremath.h + Mutex.h + op_codes.h + opcode_dispatch.h + opcodemgr.h + packet_dump.h + packet_dump_file.h + packet_functions.h + ProcLauncher.h + profiler.h + ptimer.h + queue.h + races.h + rdtsc.h + rulesys.h + ruletypes.h + seperator.h + serverinfo.h + servertalk.h + shareddb.h + skills.h + spdat.h + StructStrategy.h + TCPBasicServer.h + TCPConnection.h + TCPServer.h + timeoutmgr.h + timer.h + types.h + unix.h + useperl.h + version.h + worldconn.h + XMLParser.h + ZoneNumbers.h + platform.h + patches/Client62.h + patches/Client62_itemfields.h + patches/Client62_ops.h + patches/Client62_structs.h + patches/patches.h + patches/SoD.h + patches/SoD_itemfields.h + patches/SoD_ops.h + patches/SoD_structs.h + patches/SoF.h + patches/SoF_itemfields.h + patches/SoF_opcode_list.h + patches/SoF_ops.h + patches/SoF_structs.h + patches/SSDeclare.h + patches/SSDefine.h + patches/SSRegister.h + patches/RoF.h + patches/RoF_itemfields.h + patches/RoF_ops.h + patches/RoF_structs.h + patches/Titanium.h + patches/Titanium_itemfields.h + patches/Titanium_ops.h + patches/Titanium_structs.h + patches/Underfoot.h + patches/Underfoot_itemfields.h + patches/Underfoot_ops.h + patches/Underfoot_structs.h + SocketLib/Base64.h + SocketLib/File.h + SocketLib/HttpdCookies.h + SocketLib/HttpdForm.h + SocketLib/HttpdSocket.h + SocketLib/HTTPSocket.h + SocketLib/IFile.h + SocketLib/MemFile.h + SocketLib/Mime.h + SocketLib/Parse.h + SocketLib/socket_include.h + SocketLib/Utility.h + StackWalker/StackWalker.h + tinyxml/tinystr.h + tinyxml/tinyxml.h ) SOURCE_GROUP(Patches FILES - patches/Client62.h - patches/Client62_itemfields.h - patches/Client62_ops.h - patches/Client62_structs.h - patches/patches.h - patches/SoD.h - patches/SoD_itemfields.h - patches/SoD_ops.h - patches/SoD_structs.h - patches/SoF.h - patches/SoF_itemfields.h - patches/SoF_opcode_list.h - patches/SoF_ops.h - patches/SoF_structs.h - patches/SSDeclare.h - patches/SSDefine.h - patches/SSRegister.h - patches/RoF.h - patches/RoF_itemfields.h - patches/RoF_ops.h - patches/RoF_structs.h - patches/Titanium.h - patches/Titanium_itemfields.h - patches/Titanium_ops.h - patches/Titanium_structs.h - patches/Underfoot.h - patches/Underfoot_itemfields.h - patches/Underfoot_ops.h - patches/Underfoot_structs.h - patches/Client62.cpp - patches/patches.cpp - patches/SoD.cpp - patches/SoF.cpp - patches/RoF.cpp - patches/Titanium.cpp - patches/Underfoot.cpp + patches/Client62.h + patches/Client62_itemfields.h + patches/Client62_ops.h + patches/Client62_structs.h + patches/patches.h + patches/SoD.h + patches/SoD_itemfields.h + patches/SoD_ops.h + patches/SoD_structs.h + patches/SoF.h + patches/SoF_itemfields.h + patches/SoF_opcode_list.h + patches/SoF_ops.h + patches/SoF_structs.h + patches/SSDeclare.h + patches/SSDefine.h + patches/SSRegister.h + patches/RoF.h + patches/RoF_itemfields.h + patches/RoF_ops.h + patches/RoF_structs.h + patches/Titanium.h + patches/Titanium_itemfields.h + patches/Titanium_ops.h + patches/Titanium_structs.h + patches/Underfoot.h + patches/Underfoot_itemfields.h + patches/Underfoot_ops.h + patches/Underfoot_structs.h + patches/Client62.cpp + patches/patches.cpp + patches/SoD.cpp + patches/SoF.cpp + patches/RoF.cpp + patches/Titanium.cpp + patches/Underfoot.cpp ) SOURCE_GROUP(SocketLib FILES - SocketLib/Base64.h - SocketLib/File.h - SocketLib/HttpdCookies.h - SocketLib/HttpdForm.h - SocketLib/HttpdSocket.h - SocketLib/HTTPSocket.h - SocketLib/IFile.h - SocketLib/MemFile.h - SocketLib/Mime.h - SocketLib/Parse.h - SocketLib/socket_include.h - SocketLib/Utility.h - SocketLib/Base64.cpp - SocketLib/File.cpp - SocketLib/HttpdCookies.cpp - SocketLib/HttpdForm.cpp - SocketLib/HttpdSocket.cpp - SocketLib/HTTPSocket.cpp - SocketLib/MemFile.cpp - SocketLib/Mime.cpp - SocketLib/Parse.cpp - SocketLib/socket_include.cpp - SocketLib/Utility.cpp + SocketLib/Base64.h + SocketLib/File.h + SocketLib/HttpdCookies.h + SocketLib/HttpdForm.h + SocketLib/HttpdSocket.h + SocketLib/HTTPSocket.h + SocketLib/IFile.h + SocketLib/MemFile.h + SocketLib/Mime.h + SocketLib/Parse.h + SocketLib/socket_include.h + SocketLib/Utility.h + SocketLib/Base64.cpp + SocketLib/File.cpp + SocketLib/HttpdCookies.cpp + SocketLib/HttpdForm.cpp + SocketLib/HttpdSocket.cpp + SocketLib/HTTPSocket.cpp + SocketLib/MemFile.cpp + SocketLib/Mime.cpp + SocketLib/Parse.cpp + SocketLib/socket_include.cpp + SocketLib/Utility.cpp ) SOURCE_GROUP(StackWalker FILES - StackWalker/StackWalker.h - StackWalker/StackWalker.cpp + StackWalker/StackWalker.h + StackWalker/StackWalker.cpp ) SOURCE_GROUP(TinyXML FILES - tinyxml/tinystr.h - tinyxml/tinyxml.h - tinyxml/tinystr.cpp - tinyxml/tinyxml.cpp - tinyxml/tinyxmlerror.cpp - tinyxml/tinyxmlparser.cpp + tinyxml/tinystr.h + tinyxml/tinyxml.h + tinyxml/tinystr.cpp + tinyxml/tinyxml.cpp + tinyxml/tinyxmlerror.cpp + tinyxml/tinyxmlparser.cpp ) INCLUDE_DIRECTORIES(Patches SocketLib StackWalker TinyXML) @@ -315,8 +315,8 @@ ADD_LIBRARY(Common ${common_sources} ${common_headers}) IF(UNIX) - ADD_DEFINITIONS(-fPIC) - SET_SOURCE_FILES_PROPERTIES("patches/SoD.cpp" "patches/SoF.cpp" "patches/RoF.cpp" "patches/Underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0) + ADD_DEFINITIONS(-fPIC) + SET_SOURCE_FILES_PROPERTIES("patches/SoD.cpp" "patches/SoF.cpp" "patches/RoF.cpp" "patches/Underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0) ENDIF(UNIX) SET(LIBRARY_OUTPUT_PATH ../Bin) diff --git a/common/CRC16.cpp b/common/CRC16.cpp index 401ff4ad1..9e79dc470 100644 --- a/common/CRC16.cpp +++ b/common/CRC16.cpp @@ -2,13 +2,14 @@ uint16 CRC16(const unsigned char *buf, int size, int key) { - // This is computed as the lowest 16 bits of an Ethernet CRC32 checksum - // where the key is prepended to the data in little endian order. - uint8 keyBuf[] = {(uint8)((key >> 0) & 0xff), - (uint8)((key >> 8) & 0xff), - (uint8)((key >> 16) & 0xff), - (uint8)((key >> 24) & 0xff)}; - uint32 crc = CRC32::Update(keyBuf, sizeof(uint32)); - crc = CRC32::Update(buf, size, crc); - return CRC32::Finish(crc) & 0xffff; + // This is computed as the lowest 16 bits of an Ethernet CRC32 checksum + // where the key is prepended to the data in little endian order. + uint8 keyBuf[] = {(uint8)((key >> 0) & 0xff), + (uint8)((key >> 8) & 0xff), + (uint8)((key >> 16) & 0xff), + (uint8)((key >> 24) & 0xff)}; + uint32 crc = CRC32::Update(keyBuf, sizeof(uint32)); + crc = CRC32::Update(buf, size, crc); + return CRC32::Finish(crc) & 0xffff; } + diff --git a/common/Condition.cpp b/common/Condition.cpp index 29a3425e0..bb4dba96e 100644 --- a/common/Condition.cpp +++ b/common/Condition.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" @@ -31,14 +31,14 @@ Condition::Condition() { - m_events[SignalEvent] = CreateEvent (nullptr, // security - FALSE, // is auto-reset event? - FALSE, // is signaled initially? - nullptr); // name - m_events[BroadcastEvent] = CreateEvent (nullptr, // security - TRUE, // is auto-reset event? - FALSE, // is signaled initially? - nullptr); // name + m_events[SignalEvent] = CreateEvent (nullptr, // security + FALSE, // is auto-reset event? + FALSE, // is signaled initially? + nullptr); // name + m_events[BroadcastEvent] = CreateEvent (nullptr, // security + TRUE, // is auto-reset event? + FALSE, // is signaled initially? + nullptr); // name m_waiters = 0; InitializeCriticalSection(&CSMutex); } diff --git a/common/Condition.h b/common/Condition.h index e66b28551..bfbffe760 100644 --- a/common/Condition.h +++ b/common/Condition.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __CONDITION_H #define __CONDITION_H diff --git a/common/EQDB.cpp b/common/EQDB.cpp index d729eaee7..124f2e817 100644 --- a/common/EQDB.cpp +++ b/common/EQDB.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "EQDB.h" @@ -73,6 +73,3 @@ Const_char *EQDB::escape_string(Const_char *from) { return(m_escapeBuffer.c_str()); } - - - diff --git a/common/EQDB.h b/common/EQDB.h index 700ca5584..5da63fdc3 100644 --- a/common/EQDB.h +++ b/common/EQDB.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQDB_H_ #define EQDB_H_ diff --git a/common/EQDBRes.cpp b/common/EQDBRes.cpp index ed6bb6ba2..57db0b381 100644 --- a/common/EQDBRes.cpp +++ b/common/EQDBRes.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "EQDBRes.h" @@ -49,3 +49,4 @@ map EQDBRes::fetch_row_hash() { return rowhash; } + diff --git a/common/EQDBRes.h b/common/EQDBRes.h index 19f9ee685..5af684da4 100644 --- a/common/EQDBRes.h +++ b/common/EQDBRes.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQDBRes_H_ #define EQDBRes_H_ diff --git a/common/EQEMuError.cpp b/common/EQEMuError.cpp index 04836c4dc..6dc5f9e96 100644 --- a/common/EQEMuError.cpp +++ b/common/EQEMuError.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef _WINDOWS #include diff --git a/common/EQEMuError.h b/common/EQEMuError.h index edd0fdaf5..ffc5d69ed 100644 --- a/common/EQEMuError.h +++ b/common/EQEMuError.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMuError_H #define EQEMuError_H diff --git a/common/EQEmuConfig.cpp b/common/EQEmuConfig.cpp index dded129cc..8bc7b0a46 100644 --- a/common/EQEmuConfig.cpp +++ b/common/EQEmuConfig.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "EQEmuConfig.h" @@ -446,27 +446,3 @@ void EQEmuConfig::Dump() const // cout << "DynamicCount = " << DynamicCount << endl; } - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/EQEmuConfig.h b/common/EQEmuConfig.h index 08ea3bfec..b4417a2dd 100644 --- a/common/EQEmuConfig.h +++ b/common/EQEmuConfig.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEmuConfig_H #define __EQEmuConfig_H diff --git a/common/EQNetwork.cpp b/common/EQNetwork.cpp index 0aa3db4c2..8cdb200fe 100644 --- a/common/EQNetwork.cpp +++ b/common/EQNetwork.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* * EQStream classes, by Quagmire @@ -60,18 +60,18 @@ using namespace std; #define LOG_RAW_PACKETS_IN 0 //#define PRIORITYTEST -template // LO_BYTE -type LO_BYTE (type a) {return (a&=0xff);} -template // HI_BYTE -type HI_BYTE (type a) {return (a&=0xff00);} -template // LO_WORD -type LO_WORD (type a) {return (a&=0xffff);} -template // HI_WORD -type HI_WORD (type a) {return (a&=0xffff0000);} -template // HI_LOSWAPshort -type HI_LOSWAPshort (type a) {return (LO_BYTE(a)<<8) | (HI_BYTE(a)>>8);} -template // HI_LOSWAPlong -type HI_LOSWAPlong (type x) {return (LO_WORD(a)<<16) | (HIWORD(a)>>16);} +template // LO_BYTE +type LO_BYTE (type a) {return (a&=0xff);} +template // HI_BYTE +type HI_BYTE (type a) {return (a&=0xff00);} +template // LO_WORD +type LO_WORD (type a) {return (a&=0xffff);} +template // HI_WORD +type HI_WORD (type a) {return (a&=0xffff0000);} +template // HI_LOSWAPshort +type HI_LOSWAPshort (type a) {return (LO_BYTE(a)<<8) | (HI_BYTE(a)>>8);} +template // HI_LOSWAPlong +type HI_LOSWAPlong (type x) {return (LO_WORD(a)<<16) | (HIWORD(a)>>16);} EQStreamServer::EQStreamServer(uint16 iPort) { RunLoop = false; @@ -125,8 +125,8 @@ bool EQStreamServer::Open(uint16 iPort) { unsigned long nonblocking = 1; #endif - /* Setup internet address information. - This is used with the bind() call */ + /* Setup internet address information. + This is used with the bind() call */ memset((char *) &address, 0, sizeof(address)); address.sin_family = AF_INET; address.sin_port = htons(pPort); @@ -206,14 +206,14 @@ void EQStreamServer::Process() { return; } - uchar buffer[1518]; + uchar buffer[1518]; - int status; - struct sockaddr_in from; - unsigned int fromlen; + int status; + struct sockaddr_in from; + unsigned int fromlen; - from.sin_family = AF_INET; - fromlen = sizeof(from); + from.sin_family = AF_INET; + fromlen = sizeof(from); while (1) { #ifdef WIN32 @@ -285,7 +285,7 @@ void EQStreamServer::RecvData(uchar* data, uint32 size, uint32 irIP, uint16 irPo tmp->RecvData(data, size); return; } - else if(tmp != NULL && tmp->GetrPort() != irPort) + else if(tmp != NULL && tmp->GetrPort() != irPort) { printf("Conflicting IPs & Ports: IP %i and Port %i is conflicting with IP %i and Port %i\n",irIP,irPort,tmp->GetrIP(),tmp->GetrPort()); return; diff --git a/common/EQNetwork.h b/common/EQNetwork.h index 71e288ab7..f7df21276 100644 --- a/common/EQNetwork.h +++ b/common/EQNetwork.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQNETWORK_H #define EQNETWORK_H diff --git a/common/EQPacket.cpp b/common/EQPacket.cpp index 452aefe94..4d106f619 100644 --- a/common/EQPacket.cpp +++ b/common/EQPacket.cpp @@ -1,19 +1,19 @@ /* Copyright (C) 2005 Michael S. Finger - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include @@ -35,8 +35,8 @@ using namespace std; EQPacket::EQPacket(EmuOpcode op, const unsigned char *buf, uint32 len) -: BasePacket(buf, len), - emu_opcode(op) +: BasePacket(buf, len), + emu_opcode(op) { } @@ -200,7 +200,7 @@ void EQRawApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const uint32 EQProtocolPacket::serialize(unsigned char *dest) const { - if (opcode>0xff) { + if (opcode>0xff) { *(uint16 *)dest=opcode; } else { *(dest)=0; @@ -235,8 +235,8 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const } /*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len) -: BasePacket(buf, len), - opcode(op) +: BasePacket(buf, len), + opcode(op) { uint32 offset; @@ -364,7 +364,7 @@ uint32 flag_offset=0; } else flag_offset=1; - if (length>2 && buffer[flag_offset]==0x5a) { + if (length>2 && buffer[flag_offset]==0x5a) { newlen=InflatePacket(buffer+flag_offset+1,length-(flag_offset+1)-2,newbuf+flag_offset,newbufsize-flag_offset)+2; newbuf[newlen++]=buffer[length-2]; newbuf[newlen++]=buffer[length-1]; @@ -409,7 +409,7 @@ void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey buffer+=2; size-=2; - int i; + int i; for (i = 0 ; i+4 <= size ; i+=4) { int pt = (*(int*)&buffer[i])^(Key); @@ -461,43 +461,43 @@ EQRawApplicationPacket *EQProtocolPacket::MakeAppPacket() const { } EQRawApplicationPacket::EQRawApplicationPacket(uint16 opcode, const unsigned char *buf, const uint32 len) -: EQApplicationPacket(OP_Unknown, buf, len), - opcode(opcode) +: EQApplicationPacket(OP_Unknown, buf, len), + opcode(opcode) { } EQRawApplicationPacket::EQRawApplicationPacket(const unsigned char *buf, const uint32 len) : EQApplicationPacket(OP_Unknown, buf+sizeof(uint16), len-sizeof(uint16)) { - if(GetExecutablePlatform() != ExePlatformUCS) { - opcode = *((const uint16 *) buf); - if(opcode == 0x0000) - { - if(len >= 3) - { - opcode = *((const uint16 *) (buf + 1)); - const unsigned char *packet_start = (buf + 3); - const int32 packet_length = len - 3; - safe_delete_array(pBuffer); - if(len >= 0) - { - size = packet_length; - pBuffer = new unsigned char[size]; - memcpy(pBuffer, packet_start, size); - } - else - { - size = 0; - } - } - else - { - safe_delete_array(pBuffer); - size = 0; - } - } - } else { - opcode = *((const uint8 *) buf); - } + if(GetExecutablePlatform() != ExePlatformUCS) { + opcode = *((const uint16 *) buf); + if(opcode == 0x0000) + { + if(len >= 3) + { + opcode = *((const uint16 *) (buf + 1)); + const unsigned char *packet_start = (buf + 3); + const int32 packet_length = len - 3; + safe_delete_array(pBuffer); + if(len >= 0) + { + size = packet_length; + pBuffer = new unsigned char[size]; + memcpy(pBuffer, packet_start, size); + } + else + { + size = 0; + } + } + else + { + safe_delete_array(pBuffer); + size = 0; + } + } + } else { + opcode = *((const uint8 *) buf); + } } void DumpPacket(const EQApplicationPacket* app, bool iShowInfo) { diff --git a/common/EQPacket.h b/common/EQPacket.h index 74fe871af..3925f5c71 100644 --- a/common/EQPacket.h +++ b/common/EQPacket.h @@ -1,19 +1,19 @@ /* Copyright (C) 2005 Michael S. Finger - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQPACKET_H #define _EQPACKET_H @@ -103,13 +103,13 @@ class EQApplicationPacket : public EQPacket { friend class EQStream; public: EQApplicationPacket() : EQPacket(OP_Unknown,nullptr,0) - { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } + { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } EQApplicationPacket(const EmuOpcode op) : EQPacket(op,nullptr,0) - { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } + { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } EQApplicationPacket(const EmuOpcode op, const uint32 len) : EQPacket(op,nullptr,len) - { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } + { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } EQApplicationPacket(const EmuOpcode op, const unsigned char *buf, const uint32 len) : EQPacket(op,buf,len) - { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } + { app_opcode_size = GetExecutablePlatform() == ExePlatformUCS ? 1 : 2; } bool combine(const EQApplicationPacket *rhs); uint32 serialize (uint16 opcode, unsigned char *dest) const; uint32 Size() const { return size+app_opcode_size; } diff --git a/common/EQStream.cpp b/common/EQStream.cpp index 1593d3ec5..2b8b2488c 100644 --- a/common/EQStream.cpp +++ b/common/EQStream.cpp @@ -1,19 +1,19 @@ /* Copyright (C) 2005 Michael S. Finger - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include @@ -121,7 +121,7 @@ uint32 processed=0,subpacket_length=0; return; // Raw Application packet if (p->opcode > 0xff) { - p->opcode = htons(p->opcode); //byte order is backwards in the protocol packet + p->opcode = htons(p->opcode); //byte order is backwards in the protocol packet EQRawApplicationPacket *ap=MakeApplicationPacket(p); if (ap) InboundQueuePush(ap); @@ -192,7 +192,7 @@ uint32 processed=0,subpacket_length=0; } else if (check == SeqPast) { _log(NET__DEBUG, _L "Duplicate OP_Packet: Expecting Seq=%d, but got Seq=%d" __L, NextInSeq, seq); _raw(NET__DEBUG, seq, p); - SendOutOfOrderAck(seq); //we already got this packet but it was out of order + SendOutOfOrderAck(seq); //we already got this packet but it was out of order } else { // In case we did queue one before as well. EQProtocolPacket *qp=RemoveQueue(seq); @@ -418,7 +418,7 @@ if(NextSequencedSend > SequencedQueue.size()) { _log(NET__NET_TRACE, _L "Received OP_OutOfOrderAck for sequence %d, starting retransmit at the start of our unacked buffer (seq %d, was %d)." __L, seq, SequencedBase, SequencedBase+NextSequencedSend); #ifdef RETRANSMITS - if (!RuleB(EQStream, RetransmitAckedPackets)) { + if (!RuleB(EQStream, RetransmitAckedPackets)) { #endif uint16 sqsize = SequencedQueue.size(); uint16 index = seq - SequencedBase; @@ -431,7 +431,7 @@ if(NextSequencedSend > SequencedQueue.size()) { } #ifdef RETRANSMITS } - if (RuleR(EQStream, RetransmitTimeoutMult)) { // only choose new behavior if multiplier is set + if (RuleR(EQStream, RetransmitTimeoutMult)) { // only choose new behavior if multiplier is set retransmittimer = Timer::GetCurrentTime(); } #endif @@ -686,7 +686,7 @@ deque::iterator sitr; sitr += NextSequencedSend; // Loop until both are empty or MaxSends is reached - while(!SeqEmpty || !NonSeqEmpty) { + while(!SeqEmpty || !NonSeqEmpty) { // See if there are more non-sequenced packets left if (!NonSequencedQueue.empty()) { @@ -1308,7 +1308,7 @@ EQStream::SeqOrder EQStream::CompareSequence(uint16 expected_seq , uint16 seq) if (expected_seq==seq) { // Curent return SeqInOrder; - } else if ((seq > expected_seq && (uint32)seq < ((uint32)expected_seq + EQStream::MaxWindowSize)) || seq < (expected_seq - EQStream::MaxWindowSize)) { + } else if ((seq > expected_seq && (uint32)seq < ((uint32)expected_seq + EQStream::MaxWindowSize)) || seq < (expected_seq - EQStream::MaxWindowSize)) { // Future return SeqFuture; } else { @@ -1448,6 +1448,3 @@ EQStream::MatchState EQStream::CheckSignature(const Signature *sig) { return(res); } - - - diff --git a/common/EQStream.h b/common/EQStream.h index 73d0c4265..09bd604eb 100644 --- a/common/EQStream.h +++ b/common/EQStream.h @@ -89,7 +89,7 @@ class EQStream : public EQStreamInterface { uint32 Session, Key; uint16 NextInSeq; - uint32 MaxLen; + uint32 MaxLen; uint16 MaxSends; uint8 active_users; //how many things are actively using this @@ -167,7 +167,7 @@ class EQStream : public EQStreamInterface { // virtual void DispatchPacket(EQApplicationPacket *p) { p->DumpRaw(); } - bool Stale(uint32 now, uint32 timeout=30) { return (LastPacket && (now-LastPacket) > timeout); } + bool Stale(uint32 now, uint32 timeout=30) { return (LastPacket && (now-LastPacket) > timeout); } void InboundQueuePush(EQRawApplicationPacket *p); EQRawApplicationPacket *PeekPacket(); //for collector. @@ -264,9 +264,9 @@ class EQStream : public EQStreamInterface { class Signature { public: //this object could get more complicated if needed... - uint16 ignore_eq_opcode; //0=dont ignore + uint16 ignore_eq_opcode; //0=dont ignore uint16 first_eq_opcode; - uint32 first_length; //0=dont check length + uint32 first_length; //0=dont check length }; typedef enum { MatchNotReady, @@ -277,5 +277,5 @@ class EQStream : public EQStreamInterface { }; - #endif + diff --git a/common/EQStreamFactory.cpp b/common/EQStreamFactory.cpp index c91d5da77..c5e37b690 100644 --- a/common/EQStreamFactory.cpp +++ b/common/EQStreamFactory.cpp @@ -56,7 +56,7 @@ ThreadReturnType EQStreamFactoryWriterLoop(void *eqfs) } EQStreamFactory::EQStreamFactory(EQStreamType type, int port, uint32 timeout) - : Timeoutable(5000), stream_timeout(timeout) + : Timeoutable(5000), stream_timeout(timeout) { StreamType=type; Port=port; @@ -314,7 +314,6 @@ Timer DecayTimer(20); (*cur)->ReleaseFromUse(); } - Sleep(10); MStreams.lock(); @@ -328,20 +327,3 @@ Timer DecayTimer(20); } } - - - - - - - - - - - - - - - - - diff --git a/common/EQStreamFactory.h b/common/EQStreamFactory.h index 82cdaa7b9..66911bc3f 100644 --- a/common/EQStreamFactory.h +++ b/common/EQStreamFactory.h @@ -34,7 +34,7 @@ class EQStreamFactory : private Timeoutable { Timer *DecayTimer; - uint32 stream_timeout; + uint32 stream_timeout; public: EQStreamFactory(EQStreamType type, uint32 timeout = 135000) : Timeoutable(5000), stream_timeout(timeout) { ReaderRunning=false; WriterRunning=false; StreamType=type; sock=-1; } diff --git a/common/EQStreamIdent.cpp b/common/EQStreamIdent.cpp index a04a0bfb9..7d5fa2449 100644 --- a/common/EQStreamIdent.cpp +++ b/common/EQStreamIdent.cpp @@ -1,4 +1,3 @@ - #include "debug.h" #include "EQStreamIdent.h" #include "EQStreamProxy.h" @@ -158,42 +157,8 @@ EQStreamInterface *EQStreamIdentifier::PopIdentified() { } EQStreamIdentifier::Record::Record(EQStream *s) -: stream(s), - expire(STREAM_IDENT_WAIT_MS) +: stream(s), + expire(STREAM_IDENT_WAIT_MS) { } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/EQStreamIdent.h b/common/EQStreamIdent.h index 6ab734fb5..855838c86 100644 --- a/common/EQStreamIdent.h +++ b/common/EQStreamIdent.h @@ -30,7 +30,7 @@ protected: class Patch { public: std::string name; - EQStream::Signature signature; + EQStream::Signature signature; OpcodeManager ** opcodes; const StructStrategy *structs; }; diff --git a/common/EQStreamLocator.h b/common/EQStreamLocator.h index 1724e77c6..7e41aa12b 100644 --- a/common/EQStreamLocator.h +++ b/common/EQStreamLocator.h @@ -1,19 +1,19 @@ /* Copyright (C) 2005 EQEmulator Team - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQSTREAM_LOCATOR_H #define _EQSTREAM_LOCATOR_H @@ -170,6 +170,4 @@ protected: map streams; }; - - #endif diff --git a/common/EQStreamProxy.cpp b/common/EQStreamProxy.cpp index 2791ad4e3..90ea6ffce 100644 --- a/common/EQStreamProxy.cpp +++ b/common/EQStreamProxy.cpp @@ -6,9 +6,9 @@ EQStreamProxy::EQStreamProxy(EQStream *&stream, const StructStrategy *structs, OpcodeManager **opcodes) -: m_stream(stream), - m_structs(structs), - m_opcodes(opcodes) +: m_stream(stream), + m_structs(structs), + m_opcodes(opcodes) { stream = nullptr; //take the stream. m_stream->SetOpcodeManager(m_opcodes); diff --git a/common/EQStreamProxy.h b/common/EQStreamProxy.h index 68681899d..cecdf9f38 100644 --- a/common/EQStreamProxy.h +++ b/common/EQStreamProxy.h @@ -35,21 +35,12 @@ public: virtual const uint32 GetBytesRecvPerSecond() const; protected: - EQStream *const m_stream; //we own this stream object. + EQStream *const m_stream; //we own this stream object. const StructStrategy *const m_structs; //we do not own this object. //this is a pointer to a pointer to make it less likely that a packet will //reference an invalid opcode manager when they are being reloaded. OpcodeManager **const m_opcodes; //we do not own this object. }; - - - - - - - - #endif /*EQSTREAMPROXY_H_*/ - diff --git a/common/EmuTCPConnection.cpp b/common/EmuTCPConnection.cpp index e696efee2..b3f044363 100644 --- a/common/EmuTCPConnection.cpp +++ b/common/EmuTCPConnection.cpp @@ -1,47 +1,27 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* - * - * - * - * - * There are really two or three different objects shoe-hored into this - * connection object. Sombody really needs to factor out the relay link - * crap into its own subclass of this object, it will clean things up - * tremendously. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ +There are really two or three different objects shoe-hored into this +connection object. Sombody really needs to factor out the relay link +crap into its own subclass of this object, it will clean things up +tremendously. +*/ #include "../common/debug.h" @@ -71,9 +51,9 @@ using namespace std; //server side case EmuTCPConnection::EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, SOCKET in_socket, uint32 irIP, uint16 irPort, bool iOldFormat) -: TCPConnection(ID, in_socket, irIP, irPort), - keepalive_timer(SERVER_TIMEOUT), - timeout_timer(SERVER_TIMEOUT * 2) +: TCPConnection(ID, in_socket, irIP, irPort), + keepalive_timer(SERVER_TIMEOUT), + timeout_timer(SERVER_TIMEOUT * 2) { id = 0; Server = nullptr; @@ -97,9 +77,9 @@ EmuTCPConnection::EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, SOCKET in_s //client outgoing connection case (and client side relay) EmuTCPConnection::EmuTCPConnection(bool iOldFormat, EmuTCPServer* iRelayServer, eTCPMode iMode) -: TCPConnection(), - keepalive_timer(SERVER_TIMEOUT), - timeout_timer(SERVER_TIMEOUT * 2) +: TCPConnection(), + keepalive_timer(SERVER_TIMEOUT), + timeout_timer(SERVER_TIMEOUT * 2) { Server = iRelayServer; if (Server) @@ -119,9 +99,9 @@ EmuTCPConnection::EmuTCPConnection(bool iOldFormat, EmuTCPServer* iRelayServer, //server side relay case EmuTCPConnection::EmuTCPConnection(uint32 ID, EmuTCPServer* iServer, EmuTCPConnection* iRelayLink, uint32 iRemoteID, uint32 irIP, uint16 irPort) -: TCPConnection(ID, 0, irIP, irPort), - keepalive_timer(SERVER_TIMEOUT), - timeout_timer(SERVER_TIMEOUT * 2) +: TCPConnection(ID, 0, irIP, irPort), + keepalive_timer(SERVER_TIMEOUT), + timeout_timer(SERVER_TIMEOUT * 2) { Server = iServer; RelayLink = iRelayLink; @@ -141,7 +121,6 @@ EmuTCPConnection::~EmuTCPConnection() { //the queues free their content right now I believe. } - EmuTCPNetPacket_Struct* EmuTCPConnection::MakePacket(ServerPacket* pack, uint32 iDestination) { int32 size = sizeof(EmuTCPNetPacket_Struct) + pack->size; if (pack->compressed) { @@ -473,7 +452,6 @@ void EmuTCPConnection::ClearBuffers() { timeout_timer.Start(); } - void EmuTCPConnection::SendNetErrorPacket(const char* reason) { #if TCPC_DEBUG >= 1 struct in_addr in; @@ -820,9 +798,9 @@ bool EmuTCPConnection::SendData(bool &sent_something, char* errbuf) { #if TCPN_DEBUG >= 5 cout << "Sending TCP keepalive packet. (timeout=" << timeout_timer.GetRemainingTime() << " remaining)" << endl; #endif - } + } - return(true); + return(true); } bool EmuTCPConnection::RecvData(char* errbuf) { @@ -842,14 +820,3 @@ bool EmuTCPConnection::RecvData(char* errbuf) { return(true); } - - - - - - - - - - - diff --git a/common/EmuTCPConnection.h b/common/EmuTCPConnection.h index 1c64c2196..ff7dd8995 100644 --- a/common/EmuTCPConnection.h +++ b/common/EmuTCPConnection.h @@ -49,7 +49,7 @@ public: void SetPacketMode(ePacketMode mode) { PacketMode = mode; } eTCPMode GetMode() const { return TCPMode; } - ePacketMode GetPacketMode() const { return(PacketMode); } + ePacketMode GetPacketMode() const { return(PacketMode); } //relay crap: inline bool IsRelayServer() const { return RelayServer; } diff --git a/common/EmuTCPServer.cpp b/common/EmuTCPServer.cpp index 362e462af..3549abacd 100644 --- a/common/EmuTCPServer.cpp +++ b/common/EmuTCPServer.cpp @@ -1,14 +1,10 @@ - - - - #include "debug.h" #include "EmuTCPServer.h" #include "EmuTCPConnection.h" EmuTCPServer::EmuTCPServer(uint16 iPort, bool iOldFormat) -: TCPServer(iPort), - pOldFormat(iOldFormat) +: TCPServer(iPort), + pOldFormat(iOldFormat) { } @@ -83,14 +79,3 @@ EmuTCPConnection *EmuTCPServer::FindConnection(uint32 iID) { return(nullptr); } - - - - - - - - - - - diff --git a/common/Item.cpp b/common/Item.cpp index 74fa9579a..0a05d8bff 100644 --- a/common/Item.cpp +++ b/common/Item.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef _WINDOWS @@ -172,12 +172,12 @@ ItemInst::ItemInst(const ItemInst& copy) m_contents[it->first] = inst_new; } } - std::map::const_iterator iter; - for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); iter++) { - m_custom_data[iter->first] = iter->second; - } + std::map::const_iterator iter; + for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); iter++) { + m_custom_data[iter->first] = iter->second; + } m_SerialNumber = copy.m_SerialNumber; - m_custom_data = copy.m_custom_data; + m_custom_data = copy.m_custom_data; } // Clean up container contents @@ -316,9 +316,9 @@ bool ItemInst::IsAmmo() const { if(!m_item) return false; if((m_item->ItemType == ItemTypeArrow) || - (m_item->ItemType == ItemTypeThrowing) || - (m_item->ItemType == ItemTypeThrowingv2)) - return true; + (m_item->ItemType == ItemTypeThrowing) || + (m_item->ItemType == ItemTypeThrowingv2)) + return true; return false; @@ -579,64 +579,64 @@ ItemInst* Inventory::GetItem(int16 slot_id) const } std::string ItemInst::GetCustomDataString() const { - std::string ret_val; - map::const_iterator iter = m_custom_data.begin(); - while(iter != m_custom_data.end()) { - if(ret_val.length() > 0) { - ret_val += "^"; - } - ret_val += iter->first; - ret_val += "^"; - ret_val += iter->second; - iter++; + std::string ret_val; + map::const_iterator iter = m_custom_data.begin(); + while(iter != m_custom_data.end()) { + if(ret_val.length() > 0) { + ret_val += "^"; + } + ret_val += iter->first; + ret_val += "^"; + ret_val += iter->second; + iter++; - if(ret_val.length() > 0) { - ret_val += "^"; - } - } - return ret_val; + if(ret_val.length() > 0) { + ret_val += "^"; + } + } + return ret_val; } void ItemInst::SetCustomData(std::string identifier, std::string value) { - DeleteCustomData(identifier); - m_custom_data[identifier] = value; + DeleteCustomData(identifier); + m_custom_data[identifier] = value; } void ItemInst::SetCustomData(std::string identifier, int value) { - DeleteCustomData(identifier); - std::stringstream ss; - ss << value; - m_custom_data[identifier] = ss.str(); + DeleteCustomData(identifier); + std::stringstream ss; + ss << value; + m_custom_data[identifier] = ss.str(); } void ItemInst::SetCustomData(std::string identifier, float value) { - DeleteCustomData(identifier); - std::stringstream ss; - ss << value; - m_custom_data[identifier] = ss.str(); + DeleteCustomData(identifier); + std::stringstream ss; + ss << value; + m_custom_data[identifier] = ss.str(); } void ItemInst::SetCustomData(std::string identifier, bool value) { - DeleteCustomData(identifier); - std::stringstream ss; - ss << value; - m_custom_data[identifier] = ss.str(); + DeleteCustomData(identifier); + std::stringstream ss; + ss << value; + m_custom_data[identifier] = ss.str(); } void ItemInst::DeleteCustomData(std::string identifier) { - map::iterator iter = m_custom_data.find(identifier); - if(iter != m_custom_data.end()) { - m_custom_data.erase(iter); - } + map::iterator iter = m_custom_data.find(identifier); + if(iter != m_custom_data.end()) { + m_custom_data.erase(iter); + } } std::string ItemInst::GetCustomData(std::string identifier) { - map::const_iterator iter = m_custom_data.find(identifier); - if(iter != m_custom_data.end()) { - return iter->second; - } + map::const_iterator iter = m_custom_data.find(identifier); + if(iter != m_custom_data.end()) { + return iter->second; + } - return ""; + return ""; } // Retrieve item at specified position within bag @@ -857,7 +857,7 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { InvItem = GetItem(BaseSlotID + BagSlot); if(InvItem && (InvItem->GetItem()->ID == ItemToTry->ID) && - (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { + (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); @@ -940,17 +940,17 @@ bool Inventory::DeleteItem(int16 slot_id, uint8 quantity) // If there are no charges left on the item, if(item_to_delete->GetCharges() <= 0) { // If the item is stackable (e.g arrows), or - // the item is not stackable, and is not a charged item, or is expendable, delete it + // the item is not stackable, and is not a charged item, or is expendable, delete it if(item_to_delete->IsStackable() || - (!item_to_delete->IsStackable() && - ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))) { + (!item_to_delete->IsStackable() && + ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))) { // Item can now be destroyed safe_delete(item_to_delete); return true; } } - // Charges still exist, or it is a charged item that is not expendable. Put back into inventory + // Charges still exist, or it is a charged item that is not expendable. Put back into inventory _PutItem(slot_id, item_to_delete); return false; } @@ -963,7 +963,7 @@ bool Inventory::DeleteItem(int16 slot_id, uint8 quantity) // Checks All items in a bag for No Drop bool Inventory::CheckNoDrop(int16 slot_id) { - ItemInst* inst = GetItem(slot_id); + ItemInst* inst = GetItem(slot_id); if (!inst) return false; if (!inst->GetItem()->NoDrop) return true; if (inst->GetItem()->ItemClass == 1) { @@ -1700,10 +1700,10 @@ EvoItemInst::EvoItemInst(const EvoItemInst ©) { m_contents[it->first] = inst_new; } } - std::map::const_iterator iter; - for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); iter++) { - m_custom_data[iter->first] = iter->second; - } + std::map::const_iterator iter; + for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); iter++) { + m_custom_data[iter->first] = iter->second; + } m_SerialNumber = copy.m_SerialNumber; m_exp = copy.m_exp; m_evolveLvl = copy.m_evolveLvl; @@ -1742,10 +1742,10 @@ EvoItemInst::EvoItemInst(const ItemInst &basecopy) { } } - std::map::const_iterator iter; - for (iter = copy->m_custom_data.begin(); iter != copy->m_custom_data.end(); iter++) { - m_custom_data[iter->first] = iter->second; - } + std::map::const_iterator iter; + for (iter = copy->m_custom_data.begin(); iter != copy->m_custom_data.end(); iter++) { + m_custom_data[iter->first] = iter->second; + } m_SerialNumber = copy->m_SerialNumber; m_exp = 0; m_evolveLvl = 0; @@ -1924,9 +1924,9 @@ bool Item_Struct::IsEquipable(uint16 Race, uint16 Class_) const { if (Classes_ % 2 == 1) { - if (CurrentClass == Class_) + if (CurrentClass == Class_) { - IsClass = true; + IsClass = true; break; } } @@ -1939,11 +1939,11 @@ bool Item_Struct::IsEquipable(uint16 Race, uint16 Class_) const { if (Races_ % 2 == 1) { - if (CurrentRace == Race_) + if (CurrentRace == Race_) { - IsRace = true; + IsRace = true; break; - } + } } Races_ >>= 1; } diff --git a/common/Item.h b/common/Item.h index 7a677edf6..c5d43f25e 100644 --- a/common/Item.h +++ b/common/Item.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // @merth notes: @@ -86,7 +86,7 @@ typedef enum { //FatherNitwit: location bits for searching specific //places with HasItem() and HasItemByUse() enum { - invWhereWorn = 0x01, + invWhereWorn = 0x01, invWherePersonal = 0x02, //in the character's inventory invWhereBank = 0x04, invWhereSharedBank = 0x08, @@ -113,7 +113,7 @@ public: void push_front(ItemInst* inst); ItemInst* pop(); ItemInst* peek_front() const; - inline int size() { return static_cast(m_list.size()); } + inline int size() { return static_cast(m_list.size()); } protected: ///////////////////////// @@ -199,10 +199,10 @@ public: void dumpInventory(); void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value); - void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value); - void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value); - void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value); - std::string GetCustomItemData(int16 slot_id, std::string identifier); + void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value); + void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value); + void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value); + std::string GetCustomItemData(int16 slot_id, std::string identifier); protected: /////////////////////////////// // Protected Methods @@ -339,7 +339,7 @@ public: void SetMerchantCount(int32 count) { m_merchantcount = count; } int16 GetCurrentSlot() const { return m_currentslot; } - void SetCurrentSlot(int16 curr_slot) { m_currentslot = curr_slot; } + void SetCurrentSlot(int16 curr_slot) { m_currentslot = curr_slot; } @@ -348,13 +348,13 @@ public: bool IsInstNoDrop() const { return m_instnodrop; } void SetInstNoDrop(bool flag) { m_instnodrop=flag; } - std::string GetCustomDataString() const; - void SetCustomData(std::string identifier, std::string value); - void SetCustomData(std::string identifier, int value); - void SetCustomData(std::string identifier, float value); - void SetCustomData(std::string identifier, bool value); - std::string GetCustomData(std::string identifier); - void DeleteCustomData(std::string identifier); + std::string GetCustomDataString() const; + void SetCustomData(std::string identifier, std::string value); + void SetCustomData(std::string identifier, int value); + void SetCustomData(std::string identifier, float value); + void SetCustomData(std::string identifier, bool value); + std::string GetCustomData(std::string identifier); + void DeleteCustomData(std::string identifier); // Allows treatment of this object as though it were a pointer to m_item operator bool() const { return (m_item != nullptr); } @@ -379,8 +379,8 @@ protected: ////////////////////////// // Protected Members ////////////////////////// - iter_contents _begin() { return m_contents.begin(); } - iter_contents _end() { return m_contents.end(); } + iter_contents _begin() { return m_contents.begin(); } + iter_contents _end() { return m_contents.end(); } friend class Inventory; @@ -394,13 +394,13 @@ protected: uint32 m_color; uint32 m_merchantslot; int16 m_currentslot; - bool m_instnodrop; + bool m_instnodrop; int32 m_merchantcount; //number avaliable on the merchant, -1=unlimited int32 m_SerialNumber; // Unique identifier for this instance of an item. Needed for Bazaar. // // Items inside of this item (augs or contents); map m_contents; // Zero-based index: min=0, max=9 - map m_custom_data; + map m_custom_data; }; class EvoItemInst: public ItemInst { diff --git a/common/MaxSkill.cpp b/common/MaxSkill.cpp index 3b914b611..d24ffbc91 100644 --- a/common/MaxSkill.cpp +++ b/common/MaxSkill.cpp @@ -643,9 +643,8 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { // Melee case MONK: case MONKGM:{ // 1 252 252 - r_value = level*7; // This can't be right can it? - break -; + r_value = level*7; // This can't be right can it? + break; } case WARRIOR: case WARRIORGM: case ROGUE: case ROGUEGM: { @@ -1894,7 +1893,7 @@ uint8 MaxSkillTable(uint16 skillid, uint16 race, uint16 eqclass, uint16 level) { break; } } // end switch (skillid) - // NO skill may go over 252 +// NO skill may go over 252 if (r_value > 252) r_value = 252; return r_value; diff --git a/common/MiscFunctions.cpp b/common/MiscFunctions.cpp index a08fd1f3d..94a03dba0 100644 --- a/common/MiscFunctions.cpp +++ b/common/MiscFunctions.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "MiscFunctions.h" @@ -42,7 +42,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #include @@ -50,9 +50,9 @@ using namespace std; #include #include #ifdef FREEBSD //Timothy Whitman - January 7, 2003 - #include - #include - #endif + #include + #include +#endif #include #include #include @@ -83,8 +83,8 @@ void CoutTimestamp(bool ms) { time(&rawtime); gmt_t = gmtime(&rawtime); - struct timeval read_time; - gettimeofday(&read_time,0); + struct timeval read_time; + gettimeofday(&read_time,0); cout << (gmt_t->tm_year + 1900) << "/" << setw(2) << setfill('0') << (gmt_t->tm_mon + 1) << "/" << setw(2) << setfill('0') << gmt_t->tm_mday << " " << setw(2) << setfill('0') << gmt_t->tm_hour << ":" << setw(2) << setfill('0') << gmt_t->tm_min << ":" << setw(2) << setfill('0') << gmt_t->tm_sec; if (ms) @@ -121,50 +121,50 @@ bool strn0cpyt(char* dest, const char* source, uint32 size) { } const char *MakeUpperString(const char *source) { - static char str[128]; - if (!source) - return nullptr; - MakeUpperString(source, str); - return str; + static char str[128]; + if (!source) + return nullptr; + MakeUpperString(source, str); + return str; } void MakeUpperString(const char *source, char *target) { - if (!source || !target) { + if (!source || !target) { *target=0; - return; - } - while (*source) - { - *target = toupper(*source); - target++;source++; - } - *target = 0; + return; + } + while (*source) + { + *target = toupper(*source); + target++;source++; + } + *target = 0; } const char *MakeLowerString(const char *source) { - static char str[128]; - if (!source) - return nullptr; - MakeLowerString(source, str); - return str; + static char str[128]; + if (!source) + return nullptr; + MakeLowerString(source, str); + return str; } void MakeLowerString(const char *source, char *target) { - if (!source || !target) { + if (!source || !target) { *target=0; - return; - } - while (*source) - { - *target = tolower(*source); - target++;source++; - } - *target = 0; + return; + } + while (*source) + { + *target = tolower(*source); + target++;source++; + } + *target = 0; } int MakeAnyLenString(char** ret, const char* format, ...) { int buf_len = 128; - int chars = -1; + int chars = -1; va_list argptr, tmpargptr; va_start(argptr, format); while (chars == -1 || chars >= buf_len) { @@ -186,7 +186,7 @@ uint32 AppendAnyLenString(char** ret, uint32* bufsize, uint32* strlen, const cha *bufsize = 256; if (*ret == 0) *strlen = 0; - int chars = -1; + int chars = -1; char* oldret = 0; va_list argptr, tmpargptr; va_start(argptr, format); @@ -314,7 +314,7 @@ uint32 ResolveIP(const char* hostname, char* errbuf) { snprintf(errbuf, ERRBUF_SIZE, "ResolveIP(): hostname == 0"); return 0; } - struct sockaddr_in server_sin; + struct sockaddr_in server_sin; #ifdef _WINDOWS PHOSTENT phostent = nullptr; #else @@ -394,7 +394,7 @@ int MakeRandomInt(int low, int high) return(low); //return (rand()%(high-low+1) + (low)); - if(!WELLRNG_init) { + if(!WELLRNG_init) { WELLRNG_init = true; oneseed( rnd_hash( time(nullptr), clock() ) ); WELLRNG19937 = case_1; @@ -412,7 +412,7 @@ double MakeRandomFloat(double low, double high) return(low); //return (rand() / (double)RAND_MAX * (high - low) + low); - if(!WELLRNG_init) { + if(!WELLRNG_init) { WELLRNG_init = true; oneseed( rnd_hash( time(nullptr), clock() ) ); WELLRNG19937 = case_1; @@ -422,41 +422,41 @@ double MakeRandomFloat(double low, double high) uint32 rnd_hash( time_t t, clock_t c ) { - // Get a uint32 from t and c - // Better than uint32(x) in case x is floating point in [0,1] - // Based on code by Lawrence Kirby (fred@genesis.demon.co.uk) + // Get a uint32 from t and c + // Better than uint32(x) in case x is floating point in [0,1] + // Based on code by Lawrence Kirby (fred@genesis.demon.co.uk) - static uint32 differ = 0; // guarantee time-based seeds will change + static uint32 differ = 0; // guarantee time-based seeds will change - uint32 h1 = 0; - unsigned char *p = (unsigned char *) &t; - for( size_t i = 0; i < sizeof(t); ++i ) - { - h1 *= 255 + 2U; - h1 += p[i]; - } - uint32 h2 = 0; - p = (unsigned char *) &c; - for( size_t j = 0; j < sizeof(c); ++j ) - { - h2 *= 255 + 2U; - h2 += p[j]; - } - return ( h1 + differ++ ) ^ h2; + uint32 h1 = 0; + unsigned char *p = (unsigned char *) &t; + for( size_t i = 0; i < sizeof(t); ++i ) + { + h1 *= 255 + 2U; + h1 += p[i]; + } + uint32 h2 = 0; + p = (unsigned char *) &c; + for( size_t j = 0; j < sizeof(c); ++j ) + { + h2 *= 255 + 2U; + h2 += p[j]; + } + return ( h1 + differ++ ) ^ h2; } void oneseed( const uint32 seed ) { - // Initialize generator state with seed - // See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier. - // In previous versions, most significant bits (MSBs) of the seed affect - // only MSBs of the state array. Modified 9 Jan 2002 by Makoto Matsumoto. - register int j = 0; - STATE[j] = seed & 0xffffffffUL; + // Initialize generator state with seed + // See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier. + // In previous versions, most significant bits (MSBs) of the seed affect + // only MSBs of the state array. Modified 9 Jan 2002 by Makoto Matsumoto. + register int j = 0; + STATE[j] = seed & 0xffffffffUL; for (j = 1; j < R; j++) - { - STATE[j] = ( 1812433253UL * ( STATE[j-1] ^ (STATE[j-1] >> 30) ) + j ) & 0xffffffffUL; - } + { + STATE[j] = ( 1812433253UL * ( STATE[j-1] ^ (STATE[j-1] >> 30) ) + j ) & 0xffffffffUL; + } } // WELL RNG code @@ -472,79 +472,79 @@ void oneseed( const uint32 seed ) /* ***************************************************************************** */ unsigned int case_1 (void){ - // state_i == 0 - z0 = (VRm1Under & MASKL) | (VRm2Under & MASKU); - z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); - z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3); - newV1 = z1 ^ z2; - newV0Under = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); - state_i = R - 1; - WELLRNG19937 = case_3; - return (STATE[state_i] ^ (newVM2Over & BITMASK)); + // state_i == 0 + z0 = (VRm1Under & MASKL) | (VRm2Under & MASKU); + z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); + z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3); + newV1 = z1 ^ z2; + newV0Under = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); + state_i = R - 1; + WELLRNG19937 = case_3; + return (STATE[state_i] ^ (newVM2Over & BITMASK)); } static unsigned int case_2 (void){ - // state_i == 1 - z0 = (VRm1 & MASKL) | (VRm2Under & MASKU); - z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); - z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3); - newV1 = z1 ^ z2; - newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); - state_i = 0; - WELLRNG19937 = case_1; - return (STATE[state_i] ^ (newVM2 & BITMASK)); + // state_i == 1 + z0 = (VRm1 & MASKL) | (VRm2Under & MASKU); + z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); + z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3); + newV1 = z1 ^ z2; + newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); + state_i = 0; + WELLRNG19937 = case_1; + return (STATE[state_i] ^ (newVM2 & BITMASK)); } static unsigned int case_3 (void){ - // state_i+M1 >= R - z0 = (VRm1 & MASKL) | (VRm2 & MASKU); - z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1Over); - z2 = MAT3POS (9, VM2Over) ^ MAT0POS (1, VM3Over); - newV1 = z1 ^ z2; - newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); - state_i--; - if (state_i + M1 < R) - WELLRNG19937 = case_5; - return (STATE[state_i] ^ (newVM2Over & BITMASK)); + // state_i+M1 >= R + z0 = (VRm1 & MASKL) | (VRm2 & MASKU); + z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1Over); + z2 = MAT3POS (9, VM2Over) ^ MAT0POS (1, VM3Over); + newV1 = z1 ^ z2; + newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); + state_i--; + if (state_i + M1 < R) + WELLRNG19937 = case_5; + return (STATE[state_i] ^ (newVM2Over & BITMASK)); } static unsigned int case_4 (void){ - // state_i+M3 >= R - z0 = (VRm1 & MASKL) | (VRm2 & MASKU); - z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); - z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3Over); - newV1 = z1 ^ z2; - newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); - state_i--; - if (state_i + M3 < R) - WELLRNG19937 = case_6; - return (STATE[state_i] ^ (newVM2 & BITMASK)); + // state_i+M3 >= R + z0 = (VRm1 & MASKL) | (VRm2 & MASKU); + z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); + z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3Over); + newV1 = z1 ^ z2; + newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); + state_i--; + if (state_i + M3 < R) + WELLRNG19937 = case_6; + return (STATE[state_i] ^ (newVM2 & BITMASK)); } static unsigned int case_5 (void){ - // state_i+M2 >= R - z0 = (VRm1 & MASKL) | (VRm2 & MASKU); - z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); - z2 = MAT3POS (9, VM2Over) ^ MAT0POS (1, VM3Over); - newV1 = z1 ^ z2; - newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); - state_i--; - if (state_i + M2 < R) - WELLRNG19937 = case_4; - return (STATE[state_i] ^ (newVM2Over & BITMASK)); + // state_i+M2 >= R + z0 = (VRm1 & MASKL) | (VRm2 & MASKU); + z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); + z2 = MAT3POS (9, VM2Over) ^ MAT0POS (1, VM3Over); + newV1 = z1 ^ z2; + newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); + state_i--; + if (state_i + M2 < R) + WELLRNG19937 = case_4; + return (STATE[state_i] ^ (newVM2Over & BITMASK)); } static unsigned int case_6 (void){ - // 2 <= state_i <= (R - M3 - 1) - z0 = (VRm1 & MASKL) | (VRm2 & MASKU); - z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); - z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3); - newV1 = z1 ^ z2; - newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); - state_i--; - if (state_i == 1) - WELLRNG19937 = case_2; - return (STATE[state_i] ^ (newVM2 & BITMASK)); + // 2 <= state_i <= (R - M3 - 1) + z0 = (VRm1 & MASKL) | (VRm2 & MASKU); + z1 = MAT0NEG (-25, V0) ^ MAT0POS (27, VM1); + z2 = MAT3POS (9, VM2) ^ MAT0POS (1, VM3); + newV1 = z1 ^ z2; + newV0 = MAT1 (z0) ^ MAT0NEG (-9, z1) ^ MAT0NEG (-21, z2) ^ MAT0POS (21, newV1); + state_i--; + if (state_i == 1) + WELLRNG19937 = case_2; + return (STATE[state_i] ^ (newVM2 & BITMASK)); } // end WELL RNG code @@ -556,7 +556,7 @@ char *CleanMobName(const char *in, char *out) for(i = j = 0; i < strlen(in); i++) { - // convert _ to space.. any other conversions like this? I *think* this + // convert _ to space.. any other conversions like this? I *think* this // is the only non alpha char that's not stripped but converted. if(in[i] == '_') { @@ -632,7 +632,7 @@ void RemoveApostrophes(std::string &s) { for(unsigned int i = 0; i < s.length(); ++i) if(s[i] == '\'') - s[i] = '_'; + s[i] = '_'; } char *RemoveApostrophes(const char *s) @@ -643,7 +643,7 @@ char *RemoveApostrophes(const char *s) for(unsigned int i = 0 ; i < strlen(NewString); ++i) if(NewString[i] == '\'') - NewString[i] = '_'; + NewString[i] = '_'; return NewString; } diff --git a/common/MiscFunctions.h b/common/MiscFunctions.h index 037ffbefc..d25a57dab 100644 --- a/common/MiscFunctions.h +++ b/common/MiscFunctions.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef MISCFUNCTIONS_H #define MISCFUNCTIONS_H @@ -32,7 +32,7 @@ // These are helper macros for dealing with packets of variable length, typically those that contain // variable length strings where it is not convenient to use a fixed length struct. // -#define VARSTRUCT_DECODE_TYPE(Type, Buffer) *(Type *)Buffer; Buffer += sizeof(Type); +#define VARSTRUCT_DECODE_TYPE(Type, Buffer) *(Type *)Buffer; Buffer += sizeof(Type); #define VARSTRUCT_DECODE_STRING(String, Buffer) strcpy(String, Buffer); Buffer += strlen(String)+1; #define VARSTRUCT_ENCODE_STRING(Buffer, String) { sprintf(Buffer, String); Buffer += strlen(String) + 1; } #define VARSTRUCT_ENCODE_INTSTRING(Buffer, Number) { sprintf(Buffer, "%i", Number); Buffer += strlen(Buffer) + 1; } @@ -63,41 +63,41 @@ #define MAT1(v) v #define MAT3POS(t,v) (v>>t) -#define V0 STATE[state_i] -#define VM1Over STATE[state_i+M1-R] -#define VM1 STATE[state_i+M1] -#define VM2Over STATE[state_i+M2-R] -#define VM2 STATE[state_i+M2] -#define VM3Over STATE[state_i+M3-R] -#define VM3 STATE[state_i+M3] -#define VRm1 STATE[state_i-1] -#define VRm1Under STATE[state_i+R-1] -#define VRm2 STATE[state_i-2] -#define VRm2Under STATE[state_i+R-2] +#define V0 STATE[state_i] +#define VM1Over STATE[state_i+M1-R] +#define VM1 STATE[state_i+M1] +#define VM2Over STATE[state_i+M2-R] +#define VM2 STATE[state_i+M2] +#define VM3Over STATE[state_i+M3-R] +#define VM3 STATE[state_i+M3] +#define VRm1 STATE[state_i-1] +#define VRm1Under STATE[state_i+R-1] +#define VRm2 STATE[state_i-2] +#define VRm2Under STATE[state_i+R-2] -#define newV0 STATE[state_i-1] -#define newV0Under STATE[state_i-1+R] -#define newV1 STATE[state_i] -#define newVRm1 STATE[state_i-2] -#define newVRm1Under STATE[state_i-2+R] +#define newV0 STATE[state_i-1] +#define newV0Under STATE[state_i-1+R] +#define newV1 STATE[state_i] +#define newVRm1 STATE[state_i-2] +#define newVRm1Under STATE[state_i-2+R] -#define newVM2Over STATE[state_i+M2-R+1] -#define newVM2 STATE[state_i+M2+1] +#define newVM2Over STATE[state_i+M2-R+1] +#define newVM2 STATE[state_i+M2+1] #define BITMASK 0x41180000 ////////////////////////////////////////////////////////////////////// // -// MakeUpperString -// i : source - allocated null-terminated string -// return: pointer to static buffer with the target string +// MakeUpperString +// i: source - allocated null-terminated string +// return: pointer to static buffer with the target string const char *MakeUpperString(const char *source); const char *MakeLowerString(const char *source); ////////////////////////////////////////////////////////////////////// // -// MakeUpperString -// i : source - allocated null-terminated string -// io: target - allocated buffer, at least of size strlen(source)+1 +// MakeUpperString +// i : source - allocated null-terminated string +// io: target - allocated buffer, at least of size strlen(source)+1 void MakeUpperString(const char *source, char *target); void MakeLowerString(const char *source, char *target); diff --git a/common/Mutex.cpp b/common/Mutex.cpp index df481a68b..5e06d08c9 100644 --- a/common/Mutex.cpp +++ b/common/Mutex.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/Mutex.h" diff --git a/common/Mutex.h b/common/Mutex.h index 32c29ece8..b1a71c331 100644 --- a/common/Mutex.h +++ b/common/Mutex.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef MYMUTEX_H #define MYMUTEX_H diff --git a/common/ProcLauncher.cpp b/common/ProcLauncher.cpp index 584dece69..18413b260 100644 --- a/common/ProcLauncher.cpp +++ b/common/ProcLauncher.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "ProcLauncher.h" @@ -145,7 +145,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { // Set up our log file to redirect output into. SECURITY_ATTRIBUTES saAttr; saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; //we want this handle to be inherited by the child. + saAttr.bInheritHandle = TRUE; //we want this handle to be inherited by the child. saAttr.lpSecurityDescriptor = nullptr; logOut = CreateFile( it->logFile.c_str(), //lpFileName @@ -178,15 +178,15 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) { } bFuncRetn = CreateProcess(it->program.c_str(), - const_cast(args.c_str()), // command line - nullptr, // process security attributes - nullptr, // primary thread security attributes - inherit_handles, // handles are not inherited - 0, // creation flags (CREATE_NEW_PROCESS_GROUP maybe) - nullptr, // use parent's environment - nullptr, // use parent's current directory - &siStartInfo, // STARTUPINFO pointer - &it->proc_info); // receives PROCESS_INFORMATION + const_cast(args.c_str()), // command line + nullptr, // process security attributes + nullptr, // primary thread security attributes + inherit_handles, // handles are not inherited + 0, // creation flags (CREATE_NEW_PROCESS_GROUP maybe) + nullptr, // use parent's environment + nullptr, // use parent's current directory + &siStartInfo, // STARTUPINFO pointer + &it->proc_info); // receives PROCESS_INFORMATION if (bFuncRetn == 0) { safe_delete(it); @@ -352,17 +352,3 @@ ProcLauncher::Spec &ProcLauncher::Spec::operator=(const Spec &other) { return(*this); } - - - - - - - - - - - - - - diff --git a/common/ProcLauncher.h b/common/ProcLauncher.h index dcdc25191..64133481e 100644 --- a/common/ProcLauncher.h +++ b/common/ProcLauncher.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PROCLAUNCHER_H_ #define PROCLAUNCHER_H_ @@ -65,25 +65,18 @@ public: virtual void OnTerminate(const ProcRef &ref, const Spec *spec) = 0; }; - /* - * The main launch method, call to start a new background process. - */ + /* The main launch method, call to start a new background process. */ ProcRef Launch(Spec *&to_launch); //takes ownership of the pointer - /* - * The terminate method - */ + /* The terminate method */ bool Terminate(const ProcRef &proc, bool graceful = true); void TerminateAll(bool final = true); - /* - * The main processing method. Call regularly to check for terminated - * background processes. - */ + /* The main processing method. Call regularly to check for terminated background processes. */ void Process(); protected: -// std::vector m_specs; + //std::vector m_specs; std::map m_running; //we own the pointers in this map void ProcessTerminated(std::map::iterator &it); @@ -96,29 +89,5 @@ private: #endif }; - - - - - - - - #endif /*PROCLAUNCHER_H_*/ - - - - - - - - - - - - - - - - diff --git a/common/TCPConnection.cpp b/common/TCPConnection.cpp index a1a96ac09..2c4867efd 100644 --- a/common/TCPConnection.cpp +++ b/common/TCPConnection.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -47,11 +47,11 @@ InitWinsock winsock; //client version TCPConnection::TCPConnection() -: ConnectionType(Outgoing), - connection_socket(0), - id(0), - rIP(0), - rPort(0) +: ConnectionType(Outgoing), + connection_socket(0), + id(0), + rIP(0), + rPort(0) { pState = TCPS_Ready; pFree = false; @@ -69,11 +69,11 @@ TCPConnection::TCPConnection() //server version TCPConnection::TCPConnection(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort) -: ConnectionType(Incomming), - connection_socket(in_socket), - id(ID), - rIP(irIP), - rPort(irPort) +: ConnectionType(Incomming), + connection_socket(in_socket), + id(ID), + rIP(irIP), + rPort(irPort) { pState = TCPS_Connected; pFree = false; @@ -438,8 +438,8 @@ bool TCPConnection::ConnectIP(uint32 in_ip, uint16 in_port, char* errbuf) { } connection_socket = INVALID_SOCKET; - struct sockaddr_in server_sin; -// struct in_addr in; + struct sockaddr_in server_sin; + //struct in_addr in; if ((connection_socket = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET || connection_socket == 0) { #ifdef _WINDOWS @@ -539,7 +539,7 @@ bool TCPConnection::Process() { case TCPS_Connected: // only receive data in the connected state, no others... if (!RecvData(errbuf)) { - struct in_addr in; + struct in_addr in; in.s_addr = GetrIP(); //cout << inet_ntoa(in) << ":" << GetrPort() << ": " << errbuf << endl; return false; @@ -585,7 +585,7 @@ bool TCPConnection::Process() { bool sent_something = false; if (!SendData(sent_something, errbuf)) { - struct in_addr in; + struct in_addr in; in.s_addr = GetrIP(); cout << inet_ntoa(in) << ":" << GetrPort() << ": " << errbuf << endl; return false; @@ -621,9 +621,9 @@ bool TCPConnection::RecvData(char* errbuf) { } } - status = recv(connection_socket, (char *) &recvbuf[recvbuf_used], (recvbuf_size - recvbuf_used), 0); + status = recv(connection_socket, (char *) &recvbuf[recvbuf_used], (recvbuf_size - recvbuf_used), 0); - if (status >= 1) { + if (status >= 1) { #if TCPN_LOG_RAW_DATA_IN >= 1 struct in_addr in; in.s_addr = GetrIP(); @@ -642,7 +642,7 @@ bool TCPConnection::RecvData(char* errbuf) { recvbuf_used += status; if (!ProcessReceivedData(errbuf)) return false; - } + } else if (status == SOCKET_ERROR) { #ifdef _WINDOWS if (!(WSAGetLastError() == WSAEWOULDBLOCK)) { @@ -943,7 +943,3 @@ bool TCPConnection::RunLoop() { return ret; } - - - - diff --git a/common/TCPConnection.h b/common/TCPConnection.h index 1078d58db..7473db1c6 100644 --- a/common/TCPConnection.h +++ b/common/TCPConnection.h @@ -1,25 +1,25 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef TCP_CONNECTION_H #define TCP_CONNECTION_H /* - Parent classes for interserver TCP Communication. - -Quagmire + Parent classes for interserver TCP Communication. + -Quagmire */ #ifdef _WINDOWS @@ -28,7 +28,7 @@ #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #include #else @@ -177,5 +177,3 @@ private: #endif - - diff --git a/common/TCPServer.cpp b/common/TCPServer.cpp index 5abb591b7..415587b81 100644 --- a/common/TCPServer.cpp +++ b/common/TCPServer.cpp @@ -1,5 +1,3 @@ - - #include "debug.h" #include "TCPServer.h" #include @@ -18,12 +16,8 @@ #define SOCKET_ERROR -1 #endif - #define SERVER_LOOP_GRANULARITY 3 //# of ms between checking our socket/queues - - - BaseTCPServer::BaseTCPServer(uint16 in_port) { NextID = 1; pPort = in_port; @@ -95,14 +89,14 @@ void BaseTCPServer::Process() { } void BaseTCPServer::ListenNewConnections() { - SOCKET tmpsock; - struct sockaddr_in from; - struct in_addr in; - unsigned int fromlen; - unsigned short port; + SOCKET tmpsock; + struct sockaddr_in from; + struct in_addr in; + unsigned int fromlen; + unsigned short port; - from.sin_family = AF_INET; - fromlen = sizeof(from); + from.sin_family = AF_INET; + fromlen = sizeof(from); LockMutex lock(&MSock); if (!sock) return; @@ -230,4 +224,3 @@ bool BaseTCPServer::IsOpen() { return ret; } - diff --git a/common/XMLParser.cpp b/common/XMLParser.cpp index 0b56b6b47..44626f82f 100644 --- a/common/XMLParser.cpp +++ b/common/XMLParser.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "XMLParser.h" @@ -49,15 +49,15 @@ bool XMLParser::ParseFile(const char *file, const char *root_ele) { ElementHandler h=handler->second; /* - * - * This is kinda a sketchy operation here, since all of these - * element handler methods will be functions in child classes. - * This essentially causes us to do an un-checkable (and hence - * un-handle-properly-able) cast down to the child class. This - * WILL BREAK if any children classes do multiple inheritance. - * - * - */ + * + * This is kinda a sketchy operation here, since all of these + * element handler methods will be functions in child classes. + * This essentially causes us to do an un-checkable (and hence + * un-handle-properly-able) cast down to the child class. This + * WILL BREAK if any children classes do multiple inheritance. + * + * + */ (this->*h)(ele); } else { diff --git a/common/XMLParser.h b/common/XMLParser.h index 54f7d09ee..503b96e19 100644 --- a/common/XMLParser.h +++ b/common/XMLParser.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef XMLParser_H #define XMLParser_H @@ -29,8 +29,8 @@ using namespace std; /* - * See note in XMLParser::ParseFile() before inheriting this class. - */ +* See note in XMLParser::ParseFile() before inheriting this class. +*/ class XMLParser { public: typedef void (XMLParser::*ElementHandler)(TiXmlElement *ele); @@ -54,6 +54,3 @@ protected: #endif - - - diff --git a/common/bodytypes.h b/common/bodytypes.h index 5975ed54d..804506e7a 100644 --- a/common/bodytypes.h +++ b/common/bodytypes.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef BODYTYPES_H #define BODYTYPES_H @@ -45,7 +45,7 @@ typedef enum { BT_Dragon = 26, BT_Summoned2 = 27, BT_Summoned3 = 28, - // 29 + //29 BT_VeliousDragon = 30, //might not be a tight set // ... BT_Dragon3 = 32, diff --git a/common/breakdowns.h b/common/breakdowns.h index 5e56b1e9b..18dfb803f 100644 --- a/common/breakdowns.h +++ b/common/breakdowns.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef BREAKDOWNS_H_ #define BREAKDOWNS_H_ diff --git a/common/classes.cpp b/common/classes.cpp index 98ad290c3..a1a3bf05a 100644 --- a/common/classes.cpp +++ b/common/classes.cpp @@ -1,279 +1,279 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/classes.h" const char* GetEQClassName(uint8 class_, uint8 level) { switch(class_) { - case WARRIOR: - if (level >= 70) - return "Vanquisher"; - else if (level >= 65) - return "Overlord"; //Baron-Sprite: LEAVE MY CLASSES ALONE. - else if (level >= 60) - return "Warlord"; - else if (level >= 55) - return "Myrmidon"; - else if (level >= 51) - return "Champion"; - else - return "Warrior"; - case CLERIC: - if (level >= 70) - return "Prelate"; - else if (level >= 65) - return "Archon"; - else if (level >= 60) - return "High Priest"; - else if (level >= 55) - return "Templar"; - else if (level >= 51) - return "Vicar"; - else - return "Cleric"; - case PALADIN: - if (level >= 70) - return "Lord"; - else if (level >= 65) - return "Lord Protector"; - else if (level >= 60) - return "Crusader"; - else if (level >= 55) - return "Knight"; - else if (level >= 51) - return "Cavalier"; - else - return "Paladin"; - case RANGER: - if (level >= 70) - return "Plainswalker"; - else if (level >= 65) - return "Forest Stalker"; - else if (level >= 60) - return "Warder"; - else if (level >= 55) - return "Outrider"; - else if (level >= 51) - return "Pathfinder"; - else - return "Ranger"; - case SHADOWKNIGHT: - if (level >= 70) - return "Scourge Knight"; - else if (level >= 65) - return "Dread Lord"; - else if (level >= 60) - return "Grave Lord"; - else if (level >= 55) - return "Revenant"; - else if (level >= 51) - return "Reaver"; - else - return "Shadowknight"; - case DRUID: - if (level >= 70) - return "Natureguard"; - else if (level >= 65) - return "Storm Warden"; - else if (level >= 60) - return "Hierophant"; - else if (level >= 55) - return "Preserver"; - else if (level >= 51) - return "Wanderer"; - else - return "Druid"; - case MONK: - if (level >= 70) - return "Stone Fist"; - else if (level >= 65) - return "Transcendent"; - else if (level >= 60) - return "Grandmaster"; - else if (level >= 55) - return "Master"; - else if (level >= 51) - return "Disciple"; - else - return "Monk"; - case BARD: - if (level >= 70) - return "Performer"; - else if (level >= 65) - return "Maestro"; - else if (level >= 60) - return "Virtuoso"; - else if (level >= 55) - return "Troubadour"; - else if (level >= 51) - return "Minstrel"; - else - return "Bard"; - case ROGUE: - if (level >= 70) - return "Nemesis"; - else if (level >= 65) - return "Deceiver"; - else if (level >= 60) - return "Assassin"; - else if (level >= 55) - return "Blackguard"; - else if (level >= 51) - return "Rake"; - else - return "Rogue"; - case SHAMAN: - if (level >= 70) - return "Soothsayer"; - else if (level >= 65) - return "Prophet"; - else if (level >= 60) - return "Oracle"; - else if (level >= 55) - return "Luminary"; - else if (level >= 51) - return "Mystic"; - else - return "Shaman"; - case NECROMANCER: - if (level >= 70) - return "Wraith"; - else if (level >= 65) - return "Arch Lich"; - else if (level >= 60) - return "Warlock"; - else if (level >= 55) - return "Defiler"; - else if (level >= 51) - return "Heretic"; - else - return "Necromancer"; - case WIZARD: - if (level >= 70) - return "Grand Arcanist"; - else if (level >= 65) - return "Arcanist"; - else if (level >= 60) - return "Sorcerer"; - else if (level >= 55) - return "Evoker"; - else if (level >= 51) - return "Channeler"; - else - return "Wizard"; - case MAGICIAN: - if (level >= 70) - return "Arch Magus"; - else if (level >= 65) - return "Arch Convoker"; - else if (level >= 60) - return "Arch Mage"; - else if (level >= 55) - return "Conjurer"; - if (level >= 51) - return "Elementalist"; - else - return "Magician"; - case ENCHANTER: - if (level >= 70) - return "Bedazzler"; - else if (level >= 65) - return "Coercer"; - else if (level >= 60) - return "Phantasmist"; - else if (level >= 55) - return "Beguiler"; - else if (level >= 51) - return "Illusionist"; - else - return "Enchanter"; - case BEASTLORD: - if (level >= 70) - return "Wildblood"; - else if (level >= 65) - return "Feral Lord"; - else if (level >= 60) - return "Savage Lord"; - else if (level >= 55) - return "Animist"; - else if (level >= 51) - return "Primalist"; - else - return "Beastlord"; - case BERSERKER: - if (level >= 70) - return "Ravager"; - else if (level >= 65) - return "Fury"; - else if (level >= 60) - return "Rager"; - else if (level >= 55) - return "Vehement"; - else if (level >= 51) - return "Brawler"; - else - return "Berserker"; - case BANKER: - if (level >= 70) - return "Master Banker"; - else if (level >= 65) - return "Elder Banker"; - else if (level >= 60) - return "Oldest Banker"; - else if (level >= 55) - return "Older Banker"; - else if (level >= 51) - return "Old Banker"; - else - return "Banker"; - case WARRIORGM: + case WARRIOR: + if (level >= 70) + return "Vanquisher"; + else if (level >= 65) + return "Overlord"; //Baron-Sprite: LEAVE MY CLASSES ALONE. + else if (level >= 60) + return "Warlord"; + else if (level >= 55) + return "Myrmidon"; + else if (level >= 51) + return "Champion"; + else + return "Warrior"; + case CLERIC: + if (level >= 70) + return "Prelate"; + else if (level >= 65) + return "Archon"; + else if (level >= 60) + return "High Priest"; + else if (level >= 55) + return "Templar"; + else if (level >= 51) + return "Vicar"; + else + return "Cleric"; + case PALADIN: + if (level >= 70) + return "Lord"; + else if (level >= 65) + return "Lord Protector"; + else if (level >= 60) + return "Crusader"; + else if (level >= 55) + return "Knight"; + else if (level >= 51) + return "Cavalier"; + else + return "Paladin"; + case RANGER: + if (level >= 70) + return "Plainswalker"; + else if (level >= 65) + return "Forest Stalker"; + else if (level >= 60) + return "Warder"; + else if (level >= 55) + return "Outrider"; + else if (level >= 51) + return "Pathfinder"; + else + return "Ranger"; + case SHADOWKNIGHT: + if (level >= 70) + return "Scourge Knight"; + else if (level >= 65) + return "Dread Lord"; + else if (level >= 60) + return "Grave Lord"; + else if (level >= 55) + return "Revenant"; + else if (level >= 51) + return "Reaver"; + else + return "Shadowknight"; + case DRUID: + if (level >= 70) + return "Natureguard"; + else if (level >= 65) + return "Storm Warden"; + else if (level >= 60) + return "Hierophant"; + else if (level >= 55) + return "Preserver"; + else if (level >= 51) + return "Wanderer"; + else + return "Druid"; + case MONK: + if (level >= 70) + return "Stone Fist"; + else if (level >= 65) + return "Transcendent"; + else if (level >= 60) + return "Grandmaster"; + else if (level >= 55) + return "Master"; + else if (level >= 51) + return "Disciple"; + else + return "Monk"; + case BARD: + if (level >= 70) + return "Performer"; + else if (level >= 65) + return "Maestro"; + else if (level >= 60) + return "Virtuoso"; + else if (level >= 55) + return "Troubadour"; + else if (level >= 51) + return "Minstrel"; + else + return "Bard"; + case ROGUE: + if (level >= 70) + return "Nemesis"; + else if (level >= 65) + return "Deceiver"; + else if (level >= 60) + return "Assassin"; + else if (level >= 55) + return "Blackguard"; + else if (level >= 51) + return "Rake"; + else + return "Rogue"; + case SHAMAN: + if (level >= 70) + return "Soothsayer"; + else if (level >= 65) + return "Prophet"; + else if (level >= 60) + return "Oracle"; + else if (level >= 55) + return "Luminary"; + else if (level >= 51) + return "Mystic"; + else + return "Shaman"; + case NECROMANCER: + if (level >= 70) + return "Wraith"; + else if (level >= 65) + return "Arch Lich"; + else if (level >= 60) + return "Warlock"; + else if (level >= 55) + return "Defiler"; + else if (level >= 51) + return "Heretic"; + else + return "Necromancer"; + case WIZARD: + if (level >= 70) + return "Grand Arcanist"; + else if (level >= 65) + return "Arcanist"; + else if (level >= 60) + return "Sorcerer"; + else if (level >= 55) + return "Evoker"; + else if (level >= 51) + return "Channeler"; + else + return "Wizard"; + case MAGICIAN: + if (level >= 70) + return "Arch Magus"; + else if (level >= 65) + return "Arch Convoker"; + else if (level >= 60) + return "Arch Mage"; + else if (level >= 55) + return "Conjurer"; + if (level >= 51) + return "Elementalist"; + else + return "Magician"; + case ENCHANTER: + if (level >= 70) + return "Bedazzler"; + else if (level >= 65) + return "Coercer"; + else if (level >= 60) + return "Phantasmist"; + else if (level >= 55) + return "Beguiler"; + else if (level >= 51) + return "Illusionist"; + else + return "Enchanter"; + case BEASTLORD: + if (level >= 70) + return "Wildblood"; + else if (level >= 65) + return "Feral Lord"; + else if (level >= 60) + return "Savage Lord"; + else if (level >= 55) + return "Animist"; + else if (level >= 51) + return "Primalist"; + else + return "Beastlord"; + case BERSERKER: + if (level >= 70) + return "Ravager"; + else if (level >= 65) + return "Fury"; + else if (level >= 60) + return "Rager"; + else if (level >= 55) + return "Vehement"; + else if (level >= 51) + return "Brawler"; + else + return "Berserker"; + case BANKER: + if (level >= 70) + return "Master Banker"; + else if (level >= 65) + return "Elder Banker"; + else if (level >= 60) + return "Oldest Banker"; + else if (level >= 55) + return "Older Banker"; + else if (level >= 51) + return "Old Banker"; + else + return "Banker"; + case WARRIORGM: return "Warrior Guildmaster"; - case CLERICGM: + case CLERICGM: return "Cleric Guildmaster"; - case PALADINGM: + case PALADINGM: return "Paladin Guildmaster"; - case RANGERGM: + case RANGERGM: return "Ranger Guildmaster"; - case SHADOWKNIGHTGM: + case SHADOWKNIGHTGM: return "Shadowknight Guildmaster"; - case DRUIDGM: - return "Druid Guildmaster"; - case MONKGM: + case DRUIDGM: + return "Druid Guildmaster"; + case MONKGM: return "Monk Guildmaster"; - case BARDGM: + case BARDGM: return "Bard Guildmaster"; - case ROGUEGM: + case ROGUEGM: return "Rogue Guildmaster"; - case SHAMANGM: + case SHAMANGM: return "Shaman Guildmaster"; - case NECROMANCERGM: + case NECROMANCERGM: return "Necromancer Guildmaster"; - case WIZARDGM: + case WIZARDGM: return "Wizard Guildmaster"; - case MAGICIANGM: + case MAGICIANGM: return "Magician Guildmaster"; - case ENCHANTERGM: + case ENCHANTERGM: return "Enchanter Guildmaster"; - case BEASTLORDGM: + case BEASTLORDGM: return "Beastlord Guildmaster"; - case BERSERKERGM: + case BERSERKERGM: return "Berserker Guildmaster"; - case MERCHANT: + case MERCHANT: return "Merchant"; case ADVENTURERECRUITER: return "Adventure Recruiter"; @@ -285,7 +285,7 @@ const char* GetEQClassName(uint8 class_, uint8 level) { return "Tribute Master"; case GUILD_TRIBUTE_MASTER: return "Guild Tribute Master"; - default: + default: return "Unknown"; } } diff --git a/common/classes.h b/common/classes.h index 6b9803b6d..b70609379 100644 --- a/common/classes.h +++ b/common/classes.h @@ -1,41 +1,41 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef CLASSES_CH #define CLASSES_CH #include "../common/types.h" #define Array_Class_UNKNOWN 0 -#define WARRIOR 1 -#define CLERIC 2 -#define PALADIN 3 -#define RANGER 4 -#define SHADOWKNIGHT 5 -#define DRUID 6 -#define MONK 7 -#define BARD 8 -#define ROGUE 9 -#define SHAMAN 10 -#define NECROMANCER 11 -#define WIZARD 12 -#define MAGICIAN 13 -#define ENCHANTER 14 -#define BEASTLORD 15 -#define BERSERKER 16 +#define WARRIOR 1 +#define CLERIC 2 +#define PALADIN 3 +#define RANGER 4 +#define SHADOWKNIGHT 5 +#define DRUID 6 +#define MONK 7 +#define BARD 8 +#define ROGUE 9 +#define SHAMAN 10 +#define NECROMANCER 11 +#define WIZARD 12 +#define MAGICIAN 13 +#define ENCHANTER 14 +#define BEASTLORD 15 +#define BERSERKER 16 #define PLAYER_CLASS_COUNT 16 // used for array defines, must be the count of playable classes #define WARRIORGM 20 #define CLERICGM 21 diff --git a/common/common_profile.h b/common/common_profile.h index 2ecc37020..3dba80cbc 100644 --- a/common/common_profile.h +++ b/common/common_profile.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef COMMON_PROFILE_H #define COMMON_PROFILE_H diff --git a/common/crash.cpp b/common/crash.cpp index 6d8e92a8b..5ce1229a5 100644 --- a/common/crash.cpp +++ b/common/crash.cpp @@ -7,107 +7,107 @@ class EQEmuStackWalker : public StackWalker { public: - EQEmuStackWalker() : StackWalker() { } - EQEmuStackWalker(DWORD dwProcessId, HANDLE hProcess) : StackWalker(dwProcessId, hProcess) { } - virtual void OnOutput(LPCSTR szText) { - char buffer[4096]; - for(int i = 0; i < 4096; ++i) { - if(szText[i] == 0) { - buffer[i] = '\0'; - break; - } + EQEmuStackWalker() : StackWalker() { } + EQEmuStackWalker(DWORD dwProcessId, HANDLE hProcess) : StackWalker(dwProcessId, hProcess) { } + virtual void OnOutput(LPCSTR szText) { + char buffer[4096]; + for(int i = 0; i < 4096; ++i) { + if(szText[i] == 0) { + buffer[i] = '\0'; + break; + } - if(szText[i] == '\n' || szText[i] == '\r') { - buffer[i] = ' '; - } else { - buffer[i] = szText[i]; - } - } + if(szText[i] == '\n' || szText[i] == '\r') { + buffer[i] = ' '; + } else { + buffer[i] = szText[i]; + } + } - LogFile->write(EQEMuLog::Crash, buffer); - StackWalker::OnOutput(szText); - } + LogFile->write(EQEMuLog::Crash, buffer); + StackWalker::OnOutput(szText); + } }; LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo) { - switch(ExceptionInfo->ExceptionRecord->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_ACCESS_VIOLATION"); - break; - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_ARRAY_BOUNDS_EXCEEDED"); - break; - case EXCEPTION_BREAKPOINT: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_BREAKPOINT"); - break; - case EXCEPTION_DATATYPE_MISALIGNMENT: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_DATATYPE_MISALIGNMENT"); - break; - case EXCEPTION_FLT_DENORMAL_OPERAND: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_DENORMAL_OPERAND"); - break; - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_DIVIDE_BY_ZERO"); - break; - case EXCEPTION_FLT_INEXACT_RESULT: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_INEXACT_RESULT"); - break; - case EXCEPTION_FLT_INVALID_OPERATION: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_INVALID_OPERATION"); - break; - case EXCEPTION_FLT_OVERFLOW: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_OVERFLOW"); - break; - case EXCEPTION_FLT_STACK_CHECK: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_STACK_CHECK"); - break; - case EXCEPTION_FLT_UNDERFLOW: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_UNDERFLOW"); - break; - case EXCEPTION_ILLEGAL_INSTRUCTION: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_ILLEGAL_INSTRUCTION"); - break; - case EXCEPTION_IN_PAGE_ERROR: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_IN_PAGE_ERROR"); - break; - case EXCEPTION_INT_DIVIDE_BY_ZERO: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_INT_DIVIDE_BY_ZERO"); - break; - case EXCEPTION_INT_OVERFLOW: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_INT_OVERFLOW"); - break; - case EXCEPTION_INVALID_DISPOSITION: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_INVALID_DISPOSITION"); - break; - case EXCEPTION_NONCONTINUABLE_EXCEPTION: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_NONCONTINUABLE_EXCEPTION"); - break; - case EXCEPTION_PRIV_INSTRUCTION: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_PRIV_INSTRUCTION"); - break; - case EXCEPTION_SINGLE_STEP: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_SINGLE_STEP"); - break; - case EXCEPTION_STACK_OVERFLOW: - LogFile->write(EQEMuLog::Crash, "EXCEPTION_STACK_OVERFLOW"); - break; - default: - LogFile->write(EQEMuLog::Crash, "Unknown Exception"); - break; - } + switch(ExceptionInfo->ExceptionRecord->ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_ACCESS_VIOLATION"); + break; + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_ARRAY_BOUNDS_EXCEEDED"); + break; + case EXCEPTION_BREAKPOINT: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_BREAKPOINT"); + break; + case EXCEPTION_DATATYPE_MISALIGNMENT: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_DATATYPE_MISALIGNMENT"); + break; + case EXCEPTION_FLT_DENORMAL_OPERAND: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_DENORMAL_OPERAND"); + break; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_DIVIDE_BY_ZERO"); + break; + case EXCEPTION_FLT_INEXACT_RESULT: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_INEXACT_RESULT"); + break; + case EXCEPTION_FLT_INVALID_OPERATION: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_INVALID_OPERATION"); + break; + case EXCEPTION_FLT_OVERFLOW: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_OVERFLOW"); + break; + case EXCEPTION_FLT_STACK_CHECK: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_STACK_CHECK"); + break; + case EXCEPTION_FLT_UNDERFLOW: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_FLT_UNDERFLOW"); + break; + case EXCEPTION_ILLEGAL_INSTRUCTION: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_ILLEGAL_INSTRUCTION"); + break; + case EXCEPTION_IN_PAGE_ERROR: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_IN_PAGE_ERROR"); + break; + case EXCEPTION_INT_DIVIDE_BY_ZERO: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_INT_DIVIDE_BY_ZERO"); + break; + case EXCEPTION_INT_OVERFLOW: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_INT_OVERFLOW"); + break; + case EXCEPTION_INVALID_DISPOSITION: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_INVALID_DISPOSITION"); + break; + case EXCEPTION_NONCONTINUABLE_EXCEPTION: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_NONCONTINUABLE_EXCEPTION"); + break; + case EXCEPTION_PRIV_INSTRUCTION: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_PRIV_INSTRUCTION"); + break; + case EXCEPTION_SINGLE_STEP: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_SINGLE_STEP"); + break; + case EXCEPTION_STACK_OVERFLOW: + LogFile->write(EQEMuLog::Crash, "EXCEPTION_STACK_OVERFLOW"); + break; + default: + LogFile->write(EQEMuLog::Crash, "Unknown Exception"); + break; + } - if(EXCEPTION_STACK_OVERFLOW != ExceptionInfo->ExceptionRecord->ExceptionCode) - { - EQEmuStackWalker sw; sw.ShowCallstack(GetCurrentThread(), ExceptionInfo->ContextRecord); - } + if(EXCEPTION_STACK_OVERFLOW != ExceptionInfo->ExceptionRecord->ExceptionCode) + { + EQEmuStackWalker sw; sw.ShowCallstack(GetCurrentThread(), ExceptionInfo->ContextRecord); + } - return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_EXECUTE_HANDLER; } void set_exception_handler() { - SetUnhandledExceptionFilter(windows_exception_handler); + SetUnhandledExceptionFilter(windows_exception_handler); } #else // crash is off or an unhandled platform diff --git a/common/crc32.cpp b/common/crc32.cpp index b28d2cd83..0e9746a08 100644 --- a/common/crc32.cpp +++ b/common/crc32.cpp @@ -84,21 +84,21 @@ uint32 CRC32::GenerateNoFlip(const uint8* buf, uint32 bufsize) { void CRC32::SetEQChecksum(uchar* in_data, uint32 in_length, uint32 start_at) { unsigned long data; - unsigned long check = 0xffffffff; + unsigned long check = 0xffffffff; assert(in_length >= start_at && in_data); - for(uint32 i=start_at; i> 8; - data = CRC32Table[data]; - check = check ^ data; - } + for(uint32 i=start_at; i> 8; + data = CRC32Table[data]; + check = check ^ data; + } - memcpy(in_data, (char*)&check, 4); + memcpy(in_data, (char*)&check, 4); } uint32 CRC32::Update(const uint8* buf, uint32 bufsize, uint32 crc32var) { diff --git a/common/database.cpp b/common/database.cpp index 0fdf402b3..4572533c4 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/rulesys.h" @@ -56,7 +56,7 @@ server after the world server, or inbetween zones when that is finished /* Establish a connection to a mysql database with the supplied parameters - Added a very simple .ini file parser - Bounce + Added a very simple .ini file parser - Bounce Modify to use for win32 & linux - misanthropicfiend */ @@ -158,9 +158,9 @@ Zero will also be returned if there is a database error. */ uint32 Database::CheckLogin(const char* name, const char* password, int16* oStatus) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if(strlen(name) >= 50 || strlen(password) >= 50) return(0); @@ -202,50 +202,50 @@ uint32 Database::CheckLogin(const char* name, const char* password, int16* oStat } -//Lieka: Get Banned IP Address List - Only return false if the incoming connection's IP address is not present in the banned_ips table. +//Lieka: Get Banned IP Address List - Only return false if the incoming connection's IP address is not present in the banned_ips table. bool Database::CheckBannedIPs(const char* loginIP) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - //cout << "Checking against Banned IPs table."<< endl; //Lieka: Debugging - if (RunQuery(query, MakeAnyLenString(&query, "SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP), errbuf, &result)) { - safe_delete_array(query); - if (mysql_num_rows(result) != 0) - { - //cout << loginIP << " was present in the banned IPs table" << endl; //Lieka: Debugging - mysql_free_result(result); - return true; - } - else - { - //cout << loginIP << " was not present in the banned IPs table." << endl; //Lieka: Debugging - mysql_free_result(result); - return false; - } - mysql_free_result(result); - } - else - { - cerr << "Error in CheckBannedIPs query '" << query << "' " << errbuf << endl; - safe_delete_array(query); - return true; - } - return true; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; + //cout << "Checking against Banned IPs table."<< endl; //Lieka: Debugging + if (RunQuery(query, MakeAnyLenString(&query, "SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP), errbuf, &result)) { + safe_delete_array(query); + if (mysql_num_rows(result) != 0) + { + //cout << loginIP << " was present in the banned IPs table" << endl; //Lieka: Debugging + mysql_free_result(result); + return true; + } + else + { + //cout << loginIP << " was not present in the banned IPs table." << endl; //Lieka: Debugging + mysql_free_result(result); + return false; + } + mysql_free_result(result); + } + else + { + cerr << "Error in CheckBannedIPs query '" << query << "' " << errbuf << endl; + safe_delete_array(query); + return true; + } + return true; } bool Database::AddBannedIP(char* bannedIP, const char* notes) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; - if (!RunQuery(query, MakeAnyLenString(&query, "INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes), errbuf)) { - cerr << "Error in ReserveName query '" << query << "' " << errbuf << endl; - safe_delete_array(query); - return false; - } - safe_delete_array(query); - return true; + if (!RunQuery(query, MakeAnyLenString(&query, "INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes), errbuf)) { + cerr << "Error in ReserveName query '" << query << "' " << errbuf << endl; + safe_delete_array(query); + return false; + } + safe_delete_array(query); + return true; } //End Lieka Edit @@ -287,12 +287,12 @@ bool Database::AddGMIP(char* ip_address, char* name) { void Database::LoginIP(uint32 AccountID, const char* LoginIP) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO account_ip SET accid=%i, ip='%s' ON DUPLICATE KEY UPDATE count=count+1, lastused=now()", AccountID, LoginIP), errbuf)) { - cerr << "Error in Log IP query '" << query << "' " << errbuf << endl; - } - safe_delete_array(query); + cerr << "Error in Log IP query '" << query << "' " << errbuf << endl; + } + safe_delete_array(query); } int16 Database::CheckStatus(uint32 account_id) @@ -303,7 +303,7 @@ int16 Database::CheckStatus(uint32 account_id) MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT `status`, UNIX_TIMESTAMP(`suspendeduntil`) as `suspendeduntil`, UNIX_TIMESTAMP() as `current`" - " FROM `account` WHERE `id` = %i", account_id), errbuf, &result)) + " FROM `account` WHERE `id` = %i", account_id), errbuf, &result)) { safe_delete_array(query); @@ -343,7 +343,7 @@ int16 Database::CheckStatus(uint32 account_id) uint32 Database::CreateAccount(const char* name, const char* password, int16 status, uint32 lsaccount_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 querylen; uint32 last_insert_id; @@ -370,7 +370,7 @@ uint32 Database::CreateAccount(const char* name, const char* password, int16 sta bool Database::DeleteAccount(const char* name) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; cerr << "Account Attempting to be deleted:" << name << endl; @@ -391,7 +391,7 @@ bool Database::DeleteAccount(const char* name) { bool Database::SetLocalPassword(uint32 accid, const char* password) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET password=MD5('%s') where id=%i;", password, accid), errbuf)) { cerr << "Error in SetLocalPassword query '" << query << "' " << errbuf << endl; @@ -426,7 +426,7 @@ bool Database::SetAccountStatus(const char* name, int16 status) { bool Database::ReserveName(uint32 account_id, char* name) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "INSERT into character_ SET account_id=%i, name='%s', profile=NULL", account_id, name), errbuf)) { cerr << "Error in ReserveName query '" << query << "' " << errbuf << endl; @@ -651,34 +651,34 @@ bool Database::DeleteCharacter(char *name) } #if DEBUG >= 5 - printf(" keyring"); + printf(" keyring"); #endif - RunQuery(query, MakeAnyLenString(&query, "DELETE FROM keyring WHERE char_id='%d'", charid), errbuf, nullptr, &affected_rows); - if(query) - { - safe_delete_array(query); - query = nullptr; - } + RunQuery(query, MakeAnyLenString(&query, "DELETE FROM keyring WHERE char_id='%d'", charid), errbuf, nullptr, &affected_rows); + if(query) + { + safe_delete_array(query); + query = nullptr; + } #if DEBUG >= 5 - printf(" factions"); + printf(" factions"); #endif - RunQuery(query, MakeAnyLenString(&query, "DELETE FROM faction_values WHERE char_id='%d'", charid), errbuf, nullptr, &affected_rows); - if(query) - { - safe_delete_array(query); - query = nullptr; - } + RunQuery(query, MakeAnyLenString(&query, "DELETE FROM faction_values WHERE char_id='%d'", charid), errbuf, nullptr, &affected_rows); + if(query) + { + safe_delete_array(query); + query = nullptr; + } #if DEBUG >= 5 - printf(" instances"); + printf(" instances"); #endif - RunQuery(query, MakeAnyLenString(&query, "DELETE FROM instance_lockout_player WHERE charid='%d'", charid), errbuf, nullptr, &affected_rows); - if(query) - { - safe_delete_array(query); - query = nullptr; - } + RunQuery(query, MakeAnyLenString(&query, "DELETE FROM instance_lockout_player WHERE charid='%d'", charid), errbuf, nullptr, &affected_rows); + if(query) + { + safe_delete_array(query); + query = nullptr; + } #if DEBUG >= 5 printf(" _character"); @@ -696,14 +696,14 @@ bool Database::DeleteCharacter(char *name) } #if DEBUG >= 5 - printf(" alternate currency"); + printf(" alternate currency"); #endif - RunQuery(query, MakeAnyLenString(&query, "DELETE FROM character_alt_currency WHERE char_id='%d'", charid), errbuf, nullptr, &affected_rows); - if(query) - { - safe_delete_array(query); - query = nullptr; - } + RunQuery(query, MakeAnyLenString(&query, "DELETE FROM character_alt_currency WHERE char_id='%d'", charid), errbuf, nullptr, &affected_rows); + if(query) + { + safe_delete_array(query); + query = nullptr; + } #if DEBUG >= 5 printf("\n"); @@ -744,7 +744,7 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven errbuf, &result )) { - safe_delete_array(charidquery); + safe_delete_array(charidquery); LogFile->write(EQEMuLog::Error, "Error in char store id query: %s: %s", charidquery, errbuf); return(false); } @@ -816,15 +816,15 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven RunQuery(invquery, strlen(invquery), errbuf, 0, &affected_rows); if(!affected_rows) { - LogFile->write(EQEMuLog::Error, "StoreCharacter inventory failed. Query '%s' %s", invquery, errbuf); + LogFile->write(EQEMuLog::Error, "StoreCharacter inventory failed. Query '%s' %s", invquery, errbuf); } #if EQDEBUG >= 9 else { - LogFile->write(EQEMuLog::Debug, "StoreCharacter inventory succeeded. Query '%s' %s", invquery, errbuf); + LogFile->write(EQEMuLog::Debug, "StoreCharacter inventory succeeded. Query '%s' %s", invquery, errbuf); } #endif - safe_delete_array(invquery); + safe_delete_array(invquery); } if(i==30){ //end of standard inventory/cursor, jump to internals of bags/cursor @@ -859,9 +859,9 @@ Zero will also be returned if there is a database error. */ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT account_id, id FROM character_ WHERE name='%s'", charname), errbuf, &result)) { safe_delete_array(query); @@ -887,9 +887,9 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) { // Retrieve account_id for a given char_id uint32 Database::GetAccountIDByChar(uint32 char_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char* query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 ret = 0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT account_id FROM character_ WHERE id=%i", char_id), errbuf, &result)) { @@ -909,9 +909,9 @@ uint32 Database::GetAccountIDByChar(uint32 char_id) { uint32 Database::GetAccountIDByName(const char* accname, int16* status, uint32* lsid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; for (unsigned int i=0; i 0) { if (!varcache_array) { @@ -1099,7 +1099,7 @@ bool Database::GetVariable(const char* varname, char* varvalue, uint16 varvalue_ bool Database::SetVariable(const char* varname_in, const char* varvalue_in) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; char *varname,*varvalue; @@ -1140,8 +1140,8 @@ bool Database::SetVariable(const char* varname_in, const char* varvalue_in) { uint32 Database::GetMiniLoginAccount(char* ip){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; uint32 retid = 0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM account WHERE minilogin_ip='%s'", ip), errbuf, &result)) { @@ -1161,11 +1161,11 @@ uint32 Database::GetMiniLoginAccount(char* ip){ // Pyro: Get zone starting points from DB bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe_x, float* safe_y, float* safe_z, int16* minstatus, uint8* minlevel, char *flag_needed) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; // int buf_len = 256; - // int chars = -1; - MYSQL_RES *result; - MYSQL_ROW row; + // int chars = -1; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT safe_x, safe_y, safe_z, min_status, min_level, " @@ -1208,9 +1208,9 @@ bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe bool Database::GetZoneLongName(const char* short_name, char** long_name, char* file_name, float* safe_x, float* safe_y, float* safe_z, uint32* graveyard_id, uint32* maxclients) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT long_name, file_name, safe_x, safe_y, safe_z, graveyard_id, maxclients FROM zone WHERE short_name='%s' AND version=0", short_name), errbuf, &result)) { @@ -1252,10 +1252,10 @@ bool Database::GetZoneLongName(const char* short_name, char** long_name, char* f } uint32 Database::GetZoneGraveyardID(uint32 zone_id, uint32 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; - uint32 GraveyardID = 0; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + uint32 GraveyardID = 0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT graveyard_id FROM zone WHERE zoneidnumber='%u' AND (version=%i OR version=0) ORDER BY version DESC", zone_id, version), errbuf, &result)) { @@ -1277,9 +1277,9 @@ uint32 Database::GetZoneGraveyardID(uint32 zone_id, uint32 version) { bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid, float* graveyard_x, float* graveyard_y, float* graveyard_z, float* graveyard_heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT zone_id, x, y, z, heading FROM graveyard WHERE id=%i", graveyard_id), errbuf, &result)) { @@ -1313,9 +1313,9 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon bool Database::LoadZoneNames() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; strcpy(query, "SELECT MAX(zoneidnumber) FROM zone"); @@ -1381,15 +1381,15 @@ const char* Database::GetZoneName(uint32 zoneID, bool ErrorUnknown) { } if (zoneID <= max_zonename) { - if (zonename_array[zoneID]) - return zonename_array[zoneID]; - else { - if (ErrorUnknown) - return "UNKNOWN"; - else - return 0; - } - } + if (zonename_array[zoneID]) + return zonename_array[zoneID]; + else { + if (ErrorUnknown) + return "UNKNOWN"; + else + return 0; + } + } else { if (ErrorUnknown) return "UNKNOWN"; @@ -1401,8 +1401,8 @@ const char* Database::GetZoneName(uint32 zoneID, bool ErrorUnknown) { uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; int peqzone = 0; @@ -1512,7 +1512,7 @@ bool Database::CheckNameFilter(const char* name, bool surname) bool Database::AddToNameFilter(const char* name) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO name_filter (name) values ('%s')", name), errbuf, 0, &affected_rows)) { @@ -1532,9 +1532,9 @@ bool Database::AddToNameFilter(const char* name) { uint32 Database::GetAccountIDFromLSID(uint32 iLSID, char* oAccountName, int16* oStatus) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, name, status FROM account WHERE lsaccount_id=%i", iLSID), errbuf, &result)) { @@ -1567,9 +1567,9 @@ uint32 Database::GetAccountIDFromLSID(uint32 iLSID, char* oAccountName, int16* o void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT name, status FROM account WHERE id=%i", id), errbuf, &result)) { @@ -1589,7 +1589,7 @@ void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) { void Database::ClearMerchantTemp(){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "delete from merchantlist_temp"), errbuf)) { cerr << "Error in ClearMerchantTemp query '" << query << "' " << errbuf << endl; @@ -1599,7 +1599,7 @@ void Database::ClearMerchantTemp(){ bool Database::UpdateName(const char* oldname, const char* newname) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; cout << "Renaming " << oldname << " to " << newname << "..." << endl; @@ -1622,7 +1622,7 @@ bool Database::CheckUsedName(const char* name) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - MYSQL_RES *result; + MYSQL_RES *result; //if (strlen(name) > 15) // return false; if (!RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM character_ where name='%s'", name), errbuf, &result)) { @@ -1634,7 +1634,7 @@ bool Database::CheckUsedName(const char* name) safe_delete_array(query); uint32 tmp = mysql_num_rows(result); mysql_free_result(result); - if (tmp > 0) // There is a Name! No change (Return False) + if (tmp > 0) // There is a Name! No change (Return False) return false; else // Everything is okay, so we go and do this. return true; @@ -1749,15 +1749,15 @@ uint8 Database::CopyCharacter(const char* oldname, const char* newname, uint32 a char* end=query2; end += sprintf(end, "INSERT INTO character_ SET zonename=\'%s\', x = %f, y = %f, z = %f, profile=\'", GetZoneName(pp->zone_id), pp->x, pp->y, pp->z); - end += DoEscapeString(end, (char*) pp, sizeof(PlayerProfile_Struct)); + end += DoEscapeString(end, (char*) pp, sizeof(PlayerProfile_Struct)); end += sprintf(end,"\', extprofile=\'"); end += DoEscapeString(end, (char*) ext, sizeof(ExtendedProfile_Struct)); - end += sprintf(end, "\', account_id=%d, name='%s'", acctid, newname); + end += sprintf(end, "\', account_id=%d, name='%s'", acctid, newname); if (!RunQuery(query2, (uint32) (end - query2), errbuf, 0, &affected_rows)) { - cerr << "Error in CopyCharacter query '" << query << "' " << errbuf << endl; + cerr << "Error in CopyCharacter query '" << query << "' " << errbuf << endl; return 0; - } + } // @merth: Need to copy inventory as well (and shared bank?) if (affected_rows == 0) { @@ -1884,9 +1884,9 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 uint32 Database::GetCharacterInfo(const char* iName, uint32* oAccID, uint32* oZoneID, uint32* oInstanceID, float* oX, float* oY, float* oZ) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, account_id, zonename, instanceid, x, y, z FROM character_ WHERE name='%s'", iName), errbuf, &result)) { safe_delete_array(query); @@ -1919,7 +1919,7 @@ uint32 Database::GetCharacterInfo(const char* iName, uint32* oAccID, uint32* oZo bool Database::UpdateLiveChar(char* charname,uint32 lsaccount_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET charname='%s' WHERE id=%i;",charname, lsaccount_id), errbuf)) { cerr << "Error in UpdateLiveChar query '" << query << "' " << errbuf << endl; safe_delete_array(query); @@ -1932,9 +1932,9 @@ bool Database::UpdateLiveChar(char* charname,uint32 lsaccount_id) { bool Database::GetLiveChar(uint32 account_id, char* cname) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT charname FROM account WHERE id=%i", account_id), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) { @@ -2015,9 +2015,9 @@ void Database::AddReport(std::string who, std::string against, std::string lines safe_delete_array(escape_str); } -void Database::SetGroupID(const char* name,uint32 id, uint32 charid, uint32 ismerc){ +void Database::SetGroupID(const char* name,uint32 id, uint32 charid, uint32 ismerc){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if(id == 0){ //removing you from table if (!RunQuery(query, MakeAnyLenString(&query, "delete from group_id where charid=%i and name='%s' and ismerc=%i",charid, name, ismerc), errbuf)) LogFile->write(EQEMuLog::Error, "Error deleting character from group id: %s", errbuf); @@ -2032,8 +2032,8 @@ void Database::SetGroupID(const char* name,uint32 id, uint32 charid, uint32 ism void Database::ClearGroup(uint32 gid) { ClearGroupLeader(gid); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - if(gid == 0) { //clear all groups + char *query = 0; + if(gid == 0) { //clear all groups //if (!RunQuery(query, MakeAnyLenString(&query, "update group_id set groupid=0 where groupid!=0"), errbuf)) if (!RunQuery(query, MakeAnyLenString(&query, "delete from group_id"), errbuf)) printf("Unable to clear groups: %s\n",errbuf); @@ -2047,8 +2047,8 @@ void Database::ClearGroup(uint32 gid) { uint32 Database::GetGroupID(const char* name){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; uint32 groupid=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT groupid from group_id where name='%s'", name), errbuf, &result)) { @@ -2069,8 +2069,8 @@ uint32 Database::GetGroupID(const char* name){ char* Database::GetGroupLeaderForLogin(const char* name,char* leaderbuf){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; PlayerProfile_Struct pp; if (RunQuery(query, MakeAnyLenString(&query, "SELECT profile from character_ where name='%s'", name), errbuf, &result)) { @@ -2091,7 +2091,7 @@ char* Database::GetGroupLeaderForLogin(const char* name,char* leaderbuf){ void Database::SetGroupLeaderName(uint32 gid, const char* name) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "Replace into group_leaders set gid=%lu, leadername='%s'",(unsigned long)gid,name), errbuf)) printf("Unable to set group leader: %s\n",errbuf); @@ -2106,7 +2106,7 @@ char *Database::GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* mainta MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT leadername, maintank, assist, puller, marknpc, leadershipaa FROM group_leaders WHERE gid=%lu",(unsigned long)gid), - errbuf, &result)) { + errbuf, &result)) { safe_delete_array(query); @@ -2160,8 +2160,8 @@ char *Database::GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* mainta void Database::ClearGroupLeader(uint32 gid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - if(gid == 0) { //clear all group leaders + char *query = 0; + if(gid == 0) { //clear all group leaders if (!RunQuery(query, MakeAnyLenString(&query, "DELETE from group_leaders"), errbuf)) printf("Unable to clear group leaders: %s\n",errbuf); } else { //clear a specific group leader @@ -2176,7 +2176,7 @@ bool FetchRowMap(MYSQL_RES *result, map &rowmap) MYSQL_FIELD *fields; MYSQL_ROW row; unsigned long num_fields,i; -bool retval=false; +bool retval=false; rowmap.clear(); if (result && (num_fields=mysql_num_fields(result)) && (row = mysql_fetch_row(result))!=nullptr && (fields = mysql_fetch_fields(result))!=nullptr) { retval=true; @@ -2227,8 +2227,8 @@ void Database::SetAgreementFlag(uint32 acctid) void Database::ClearRaid(uint32 rid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - if(rid == 0) { //clear all raids + char *query = 0; + if(rid == 0) { //clear all raids if (!RunQuery(query, MakeAnyLenString(&query, "delete from raid_members"), errbuf)) printf("Unable to clear raids: %s\n",errbuf); } else { //clear a specific group @@ -2240,8 +2240,8 @@ void Database::ClearRaid(uint32 rid) { void Database::ClearRaidDetails(uint32 rid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - if(rid == 0) { //clear all raids + char *query = 0; + if(rid == 0) { //clear all raids if (!RunQuery(query, MakeAnyLenString(&query, "delete from raid_details"), errbuf)) printf("Unable to clear raid details: %s\n",errbuf); } else { //clear a specific group @@ -2253,8 +2253,8 @@ void Database::ClearRaidDetails(uint32 rid) { uint32 Database::GetRaidID(const char* name){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; uint32 raidid=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT raidid from raid_members where name='%s'", name), @@ -2279,8 +2279,8 @@ const char *Database::GetRaidLeaderName(uint32 rid) static char name[128]; char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT name FROM raid_members WHERE raidid=%u AND israidleader=1", @@ -3126,7 +3126,7 @@ void Database::UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win) } bool Database::GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, uint32 &mmc_w, uint32 &ruj_w, - uint32 &tak_w, uint32 &guk_l, uint32 &mir_l, uint32 &mmc_l, uint32 &ruj_l, uint32 &tak_l) + uint32 &tak_w, uint32 &guk_l, uint32 &mir_l, uint32 &mmc_l, uint32 &ruj_l, uint32 &tak_l) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; @@ -3175,7 +3175,7 @@ uint32 Database::GetGuildDBIDByCharID(uint32 char_id) { mysql_free_result(result); } else { - cerr << "Error in GetAccountIDByChar query '" << query << "' " << errbuf << endl; + cerr << "Error in GetAccountIDByChar query '" << query << "' " << errbuf << endl; } safe_delete_array(query); return retVal; diff --git a/common/database.h b/common/database.h index fd05a7033..753e90d7f 100644 --- a/common/database.h +++ b/common/database.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_DATABASE_H #define EQEMU_DATABASE_H @@ -79,7 +79,7 @@ EventLogDetails_Struct eld[255]; // Added By Hogie // INSERT into variables (varname,value) values('decaytime [minlevel] [maxlevel]','[number of seconds]'); // IE: decaytime 1 54 = Levels 1 through 54 -// decaytime 55 100 = Levels 55 through 100 +// decaytime 55 100 = Levels 55 through 100 // It will always put the LAST time for the level (I think) from the Database struct npcDecayTimes_Struct { uint16 minlvl; @@ -108,8 +108,8 @@ public: ~Database(); /* - * General Character Related Stuff - */ + * General Character Related Stuff + */ bool MoveCharacterToZone(const char* charname, const char* zonename); bool MoveCharacterToZone(const char* charname, const char* zonename,uint32 zoneid); bool MoveCharacterToZone(uint32 iCharID, const char* iZonename); @@ -124,8 +124,8 @@ public: uint8 CopyCharacter(const char* oldname, const char* newname, uint32 acctid); /* - * General Information Getting Queries - */ + * General Information Getting Queries + */ bool CheckNameFilter(const char* name, bool surname = false); bool CheckUsedName(const char* name); uint32 GetAccountIDByChar(const char* charname, uint32* oCharID = 0); @@ -136,15 +136,15 @@ public: void GetCharName(uint32 char_id, char* name); uint32 GetCharacterInfo(const char* iName, uint32* oAccID = 0, uint32* oZoneID = 0, uint32* oInstanceID = 0,float* oX = 0, float* oY = 0, float* oZ = 0); uint32 GetCharacterID(const char *name); - bool CheckBannedIPs(const char* loginIP); //Lieka Edit: Check incomming connection against banned IP table. - bool AddBannedIP(char* bannedIP, const char* notes); //Lieka Edit: Add IP address to the Banned_IPs table. + bool CheckBannedIPs(const char* loginIP); //Lieka Edit: Check incomming connection against banned IP table. + bool AddBannedIP(char* bannedIP, const char* notes); //Lieka Edit: Add IP address to the Banned_IPs table. bool CheckGMIPs(const char* loginIP, uint32 account_id); bool AddGMIP(char* ip_address, char* name); void LoginIP(uint32 AccountID, const char* LoginIP); /* - * Instancing Stuff - */ + * Instancing Stuff + */ bool VerifyZoneInstance(uint32 zone_id, uint16 instance_id); bool VerifyInstanceAlive(uint16 instance_id, uint32 char_id); bool CharacterInInstanceGroup(uint16 instance_id, uint32 char_id); @@ -172,22 +172,22 @@ public: bool GlobalInstance(uint16 instance_id); /* - * Adventure related. - */ + * Adventure related. + */ void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win); bool GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, uint32 &mmc_w, uint32 &ruj_w, uint32 &tak_w, uint32 &guk_l, uint32 &mir_l, uint32 &mmc_l, uint32 &ruj_l, uint32 &tak_l); /* - * Account Related - */ + * Account Related + */ uint32 GetMiniLoginAccount(char* ip); void GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus); uint32 CheckLogin(const char* name, const char* password, int16* oStatus = 0); int16 CheckStatus(uint32 account_id); uint32 CreateAccount(const char* name, const char* password, int16 status, uint32 lsaccount_id = 0); bool DeleteAccount(const char* name); - bool SetAccountStatus(const char* name, int16 status); + bool SetAccountStatus(const char* name, int16 status); bool SetLocalPassword(uint32 accid, const char* password); uint32 GetAccountIDFromLSID(uint32 iLSID, char* oAccountName = 0, int16* oStatus = 0); bool UpdateLiveChar(char* charname,uint32 lsaccount_id); @@ -196,8 +196,8 @@ public: void SetAgreementFlag(uint32 acctid); /* - * Groups - */ + * Groups + */ uint32 GetGroupID(const char* name); void SetGroupID(const char* name, uint32 id, uint32 charid, uint32 ismerc = false); void ClearGroup(uint32 gid = 0); @@ -205,20 +205,20 @@ public: void SetGroupLeaderName(uint32 gid, const char* name); char* GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, - GroupLeadershipAA_Struct* GLAA = nullptr); + GroupLeadershipAA_Struct* GLAA = nullptr); void ClearGroupLeader(uint32 gid = 0); /* - * Raids - */ + * Raids + */ void ClearRaid(uint32 rid = 0); void ClearRaidDetails(uint32 rid = 0); uint32 GetRaidID(const char* name); const char *GetRaidLeaderName(uint32 rid); /* - * Database Varaibles - */ + * Database Varaibles + */ bool GetVariable(const char* varname, char* varvalue, uint16 varvalue_len); bool SetVariable(const char* varname, const char* varvalue); bool LoadVariables(); @@ -226,14 +226,14 @@ public: bool LoadVariables_result(MYSQL_RES* result); /* - * General Queries - */ + * General Queries + */ bool LoadZoneNames(); bool GetZoneLongName(const char* short_name, char** long_name, char* file_name = 0, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, uint32* graveyard_id = 0, uint32* maxclients = 0); bool GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid = 0, float* graveyard_x = 0, float* graveyard_y = 0, float* graveyard_z = 0, float* graveyard_heading = 0); uint32 GetZoneGraveyardID(uint32 zone_id, uint32 version); uint32 GetZoneID(const char* zonename); - uint8 GetPEQZone(uint32 zoneID, uint32 version); + uint8 GetPEQZone(uint32 zoneID, uint32 version); const char* GetZoneName(uint32 zoneID, bool ErrorUnknown = false); uint8 GetServerType(); bool GetSafePoints(const char* short_name, uint32 version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr); diff --git a/common/dbcore.cpp b/common/dbcore.cpp index 57e754b31..7190f2224 100644 --- a/common/dbcore.cpp +++ b/common/dbcore.cpp @@ -38,7 +38,7 @@ DBcore::DBcore() { pDatabase = 0; pCompress = false; pSSL = false; - pStatus = Closed; + pStatus = Closed; } DBcore::~DBcore() { @@ -184,7 +184,7 @@ bool DBcore::Open(uint32* errnum, char* errbuf) { if (GetStatus() == Error) { mysql_close(&mysql); mysql_init(&mysql); // Initialize structure again - } + } if (!pHost) return false; /* diff --git a/common/dbmemshare.cpp b/common/dbmemshare.cpp index 4b7fc3cd4..8447f6d0d 100644 --- a/common/dbmemshare.cpp +++ b/common/dbmemshare.cpp @@ -1,12 +1,10 @@ - - // Doors #ifdef SHAREMEM int32 Database::GetDoorsCount(uint32* oMaxID) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; strcpy(query, "SELECT MAX(id), count(*) FROM doors"); if (RunQuery(query, strlen(query), errbuf, &result)) { @@ -65,9 +63,9 @@ bool Database::LoadDoors() { bool Database::DBLoadDoors(uint32 iDoorCount, uint32 iMaxDoorID) { cout << "Loading Doors from database..." << endl; char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; strcpy(query, "SELECT MAX(id), Count(*) FROM doors"); if (RunQuery(query, strlen(query), errbuf, &result)) diff --git a/common/debug.cpp b/common/debug.cpp index d621d2854..947571626 100644 --- a/common/debug.cpp +++ b/common/debug.cpp @@ -12,7 +12,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #include @@ -75,34 +75,34 @@ EQEMuLog::~EQEMuLog() { bool EQEMuLog::open(LogIDs id) { if (!logFileValid) { return false; - } + } if (id >= MaxLogID) { return false; - } + } LockMutex lock(&MOpen); if (pLogStatus[id] & 4) { return false; - } - if (fp[id]) { - //cerr<<"Warning: LogFile already open"<= MaxLogID) { return false; - } + } bool dofile = false; if (pLogStatus[id] & 1) { dofile = open(id); @@ -138,13 +138,13 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) { if (!logFileValid) return false; //check again for threading race reasons (to avoid two mutexes) - time_t aclock; - struct tm *newtime; + time_t aclock; + struct tm *newtime; - time( &aclock ); /* Get time in seconds */ - newtime = localtime( &aclock ); /* Convert time to struct */ + time( &aclock ); /* Get time in seconds */ + newtime = localtime( &aclock ); /* Convert time to struct */ - if (dofile) + if (dofile) #ifndef NO_PIDLOG fprintf(fp[id], "[%02d.%02d. - %02d:%02d:%02d] ", newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec); #else @@ -162,7 +162,7 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) { va_copy(tmpargptr, argptr); p(id, fmt, tmpargptr ); } - if (pLogStatus[id] & 2) { + if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) { fprintf(stderr, "[%s] ", LogNames[id]); vfprintf( stderr, fmt, argptr ); @@ -173,9 +173,9 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) { } } va_end(argptr); - if (dofile) + if (dofile) fprintf(fp[id], "\n"); - if (pLogStatus[id] & 2) { + if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) { fprintf(stderr, "\n"); fflush(stderr); @@ -184,19 +184,19 @@ bool EQEMuLog::write(LogIDs id, const char *fmt, ...) { fflush(stdout); } } - if(dofile) - fflush(fp[id]); - return true; + if(dofile) + fflush(fp[id]); + return true; } //write with Prefix and a VA_list bool EQEMuLog::writePVA(LogIDs id, const char *prefix, const char *fmt, va_list argptr) { if (!logFileValid) { return false; - } + } if (id >= MaxLogID) { return false; - } + } bool dofile = false; if (pLogStatus[id] & 1) { dofile = open(id); @@ -208,15 +208,15 @@ bool EQEMuLog::writePVA(LogIDs id, const char *prefix, const char *fmt, va_list if (!logFileValid) return false; //check again for threading race reasons (to avoid two mutexes) - time_t aclock; - struct tm *newtime; + time_t aclock; + struct tm *newtime; - time( &aclock ); /* Get time in seconds */ - newtime = localtime( &aclock ); /* Convert time to struct */ + time( &aclock ); /* Get time in seconds */ + newtime = localtime( &aclock ); /* Convert time to struct */ va_list tmpargptr; - if (dofile) { + if (dofile) { #ifndef NO_PIDLOG fprintf(fp[id], "[%02d.%02d. - %02d:%02d:%02d] %s", newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, prefix); #else @@ -224,13 +224,13 @@ bool EQEMuLog::writePVA(LogIDs id, const char *prefix, const char *fmt, va_list #endif va_copy(tmpargptr, argptr); vfprintf( fp[id], fmt, tmpargptr ); - } + } if(logCallbackPva[id]) { msgCallbackPva p = logCallbackPva[id]; va_copy(tmpargptr, argptr); p(id, prefix, fmt, tmpargptr ); } - if (pLogStatus[id] & 2) { + if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) { fprintf(stderr, "[%s] %s", LogNames[id], prefix); vfprintf( stderr, fmt, argptr ); @@ -241,26 +241,26 @@ bool EQEMuLog::writePVA(LogIDs id, const char *prefix, const char *fmt, va_list } } va_end(argptr); - if (dofile) + if (dofile) fprintf(fp[id], "\n"); - if (pLogStatus[id] & 2) { + if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) fprintf(stderr, "\n"); else fprintf(stdout, "\n"); } - if(dofile) - fflush(fp[id]); - return true; + if(dofile) + fflush(fp[id]); + return true; } bool EQEMuLog::writebuf(LogIDs id, const char *buf, uint8 size, uint32 count) { if (!logFileValid) { return false; - } + } if (id >= MaxLogID) { return false; - } + } bool dofile = false; if (pLogStatus[id] & 1) { dofile = open(id); @@ -271,13 +271,13 @@ bool EQEMuLog::writebuf(LogIDs id, const char *buf, uint8 size, uint32 count) { if (!logFileValid) return false; //check again for threading race reasons (to avoid two mutexes) - time_t aclock; - struct tm *newtime; + time_t aclock; + struct tm *newtime; - time( &aclock ); /* Get time in seconds */ - newtime = localtime( &aclock ); /* Convert time to struct */ + time( &aclock ); /* Get time in seconds */ + newtime = localtime( &aclock ); /* Convert time to struct */ - if (dofile) + if (dofile) #ifndef NO_PIDLOG fprintf(fp[id], "[%02d.%02d. - %02d:%02d:%02d] ", newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec); #else @@ -292,7 +292,7 @@ bool EQEMuLog::writebuf(LogIDs id, const char *buf, uint8 size, uint32 count) { msgCallbackBuf p = logCallbackBuf[id]; p(id, buf, size, count); } - if (pLogStatus[id] & 2) { + if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) { fprintf(stderr, "[%s] ", LogNames[id]); fwrite(buf, size, count, stderr); @@ -303,9 +303,9 @@ bool EQEMuLog::writebuf(LogIDs id, const char *buf, uint8 size, uint32 count) { fprintf(stdout, "\n"); } } - if(dofile) - fflush(fp[id]); - return true; + if(dofile) + fflush(fp[id]); + return true; } bool EQEMuLog::writeNTS(LogIDs id, bool dofile, const char *fmt, ...) { @@ -315,23 +315,23 @@ bool EQEMuLog::writeNTS(LogIDs id, bool dofile, const char *fmt, ...) { va_copy(tmpargptr, argptr); vfprintf( fp[id], fmt, tmpargptr ); } - if (pLogStatus[id] & 2) { + if (pLogStatus[id] & 2) { if (pLogStatus[id] & 8) vfprintf( stderr, fmt, argptr ); else vfprintf( stdout, fmt, argptr ); } va_end(argptr); - return true; + return true; }; bool EQEMuLog::Dump(LogIDs id, uint8* data, uint32 size, uint32 cols, uint32 skip) { if (!logFileValid) { #if EQDEBUG >= 10 - cerr << "Error: Dump() from null pointer"<= MaxLogID) { return; - } - logCallbackFmt[id] = proc; + } + logCallbackFmt[id] = proc; } void EQEMuLog::SetCallback(LogIDs id, msgCallbackBuf proc) { @@ -397,8 +397,8 @@ void EQEMuLog::SetCallback(LogIDs id, msgCallbackBuf proc) { return; if (id >= MaxLogID) { return; - } - logCallbackBuf[id] = proc; + } + logCallbackBuf[id] = proc; } void EQEMuLog::SetCallback(LogIDs id, msgCallbackPva proc) { @@ -406,8 +406,8 @@ void EQEMuLog::SetCallback(LogIDs id, msgCallbackPva proc) { return; if (id >= MaxLogID) { return; - } - logCallbackPva[id] = proc; + } + logCallbackPva[id] = proc; } void EQEMuLog::SetAllCallbacks(msgCallbackFmt proc) { @@ -437,5 +437,3 @@ void EQEMuLog::SetAllCallbacks(msgCallbackPva proc) { } } - - diff --git a/common/debug.h b/common/debug.h index 43a4a9833..3961598a6 100644 --- a/common/debug.h +++ b/common/debug.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Debug Levels @@ -23,11 +23,11 @@ ////// File/Console options // 0 <= Quiet mode Errors to file Status and Normal ignored // 1 >= Status and Normal to console, Errors to file -// 2 >= Status, Normal, and Error to console and logfile +// 2 >= Status, Normal, and Error to console and logfile // 3 >= Lite debug // 4 >= Medium debug // 5 >= Debug release (Anything higher is not recommended for regular use) -// 6 == (Reserved for special builds) Login opcode debug All packets dumped +// 6 == (Reserved for special builds) Login opcode debug All packets dumped // 7 == (Reserved for special builds) Chat Opcode debug All packets dumped // 8 == (Reserved for special builds) World opcode debug All packets dumped // 9 == (Reserved for special builds) Zone Opcode debug All packets dumped @@ -103,7 +103,7 @@ public: Debug, Quest, Commands, - Crash, + Crash, MaxLogID }; diff --git a/common/deity.h b/common/deity.h index bb9e1bf1d..f7a44f5a3 100644 --- a/common/deity.h +++ b/common/deity.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef DEITY_H #define DEITY_H diff --git a/common/emu_opcodes.cpp b/common/emu_opcodes.cpp index 90dea14f6..49da5e140 100644 --- a/common/emu_opcodes.cpp +++ b/common/emu_opcodes.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA */ #include "debug.h" @@ -25,7 +25,7 @@ const char *OpcodeNames[_maxEmuOpcode+1] = { //a preprocessor hack so we dont have to maintain two lists #define N(x) #x #include "emu_oplist.h" - #include "mail_oplist.h" + #include "mail_oplist.h" #undef N "" diff --git a/common/emu_opcodes.h b/common/emu_opcodes.h index 4899131d2..d7f1814da 100644 --- a/common/emu_opcodes.h +++ b/common/emu_opcodes.h @@ -1,5 +1,5 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator +Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -9,11 +9,11 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. +A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA */ #ifndef EMU_OPCODES_H #define EMU_OPCODES_H @@ -49,5 +49,3 @@ extern const char *OpcodeNames[_maxEmuOpcode+1]; #endif - - diff --git a/common/eq_constants.h b/common/eq_constants.h index 5faf66fdc..bc0c16857 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQ_CONSTANTS_H #define EQ_CONSTANTS_H @@ -53,49 +53,49 @@ enum ItemClass */ enum ItemTypes { - ItemType1HS = 0, - ItemType2HS = 1, - ItemTypePierce = 2, - ItemType1HB = 3, - ItemType2HB = 4, - ItemTypeBow = 5, + ItemType1HS = 0, + ItemType2HS = 1, + ItemTypePierce = 2, + ItemType1HB = 3, + ItemType2HB = 4, + ItemTypeBow = 5, //6 ItemTypeThrowing = 7, - ItemTypeShield = 8, + ItemTypeShield = 8, //9 - ItemTypeArmor = 10, - ItemTypeUnknon = 11, //A lot of random crap has this item use. + ItemTypeArmor = 10, + ItemTypeUnknon = 11, //A lot of random crap has this item use. ItemTypeLockPick = 12, ItemTypeFood = 14, - ItemTypeDrink = 15, - ItemTypeLightSource = 16, - ItemTypeStackable = 17, //Not all stackable items are this use... - ItemTypeBandage = 18, - ItemTypeThrowingv2 = 19, - ItemTypeSpell = 20, //spells and tomes - ItemTypePotion = 21, - ItemTypeWindInstr = 23, - ItemTypeStringInstr = 24, - ItemTypeBrassInstr = 25, - ItemTypeDrumInstr = 26, - ItemTypeArrow = 27, - ItemTypeJewlery = 29, - ItemTypeSkull = 30, + ItemTypeDrink = 15, + ItemTypeLightSource = 16, + ItemTypeStackable = 17, //Not all stackable items are this use... + ItemTypeBandage = 18, + ItemTypeThrowingv2 = 19, + ItemTypeSpell = 20, //spells and tomes + ItemTypePotion = 21, + ItemTypeWindInstr = 23, + ItemTypeStringInstr = 24, + ItemTypeBrassInstr = 25, + ItemTypeDrumInstr = 26, + ItemTypeArrow = 27, + ItemTypeJewlery = 29, + ItemTypeSkull = 30, ItemTypeTome = 31, ItemTypeNote = 32, - ItemTypeKey = 33, + ItemTypeKey = 33, ItemTypeCoin = 34, ItemType2HPierce = 35, - ItemTypeFishingPole = 36, - ItemTypeFishingBait = 37, - ItemTypeAlcohol = 38, - ItemTypeCompass = 40, - ItemTypePoison = 42, //might be wrong, but includes poisons - ItemTypeHand2Hand = 45, - ItemUseSinging = 50, + ItemTypeFishingPole = 36, + ItemTypeFishingBait = 37, + ItemTypeAlcohol = 38, + ItemTypeCompass = 40, + ItemTypePoison = 42, //might be wrong, but includes poisons + ItemTypeHand2Hand = 45, + ItemUseSinging = 50, ItemUseAllInstruments = 51, - ItemTypeCharm = 52, - ItemTypeAugment = 54, + ItemTypeCharm = 52, + ItemTypeAugment = 54, ItemTypeAugmentSolvent = 55, ItemTypeAugmentDistill = 56 }; @@ -284,84 +284,84 @@ typedef enum { //from showeq enum ChatColor { - CC_Default = 0, - CC_DarkGrey = 1, - CC_DarkGreen = 2, - CC_DarkBlue = 3, - CC_Purple = 5, - CC_LightGrey = 6, - CC_User_Say = 256, - CC_User_Tell = 257, - CC_User_Group = 258, - CC_User_Guild = 259, - CC_User_OOC = 260, - CC_User_Auction = 261, - CC_User_Shout = 262, - CC_User_Emote = 263, - CC_User_Spells = 264, - CC_User_YouHitOther = 265, - CC_User_OtherHitYou = 266, - CC_User_YouMissOther = 267, - CC_User_OtherMissYou = 268, - CC_User_Duels = 269, - CC_User_Skills = 270, - CC_User_Disciplines = 271, - CC_User_Default = 273, - CC_User_MerchantOffer = 275, - CC_User_MerchantExchange = 276, - CC_User_YourDeath = 277, - CC_User_OtherDeath = 278, - CC_User_OtherHitOther = 279, - CC_User_OtherMissOther = 280, - CC_User_Who = 281, - CC_User_Yell = 282, - CC_User_NonMelee = 283, - CC_User_SpellWornOff = 284, - CC_User_MoneySplit = 285, - CC_User_Loot = 286, - CC_User_Random = 287, - CC_User_OtherSpells = 288, - CC_User_SpellFailure = 289, - CC_User_ChatChannel = 290, - CC_User_Chat1 = 291, - CC_User_Chat2 = 292, - CC_User_Chat3 = 293, - CC_User_Chat4 = 294, - CC_User_Chat5 = 295, - CC_User_Chat6 = 296, - CC_User_Chat7 = 297, - CC_User_Chat8 = 298, - CC_User_Chat9 = 299, - CC_User_Chat10 = 300, - CC_User_MeleeCrit = 301, - CC_User_SpellCrit = 302, - CC_User_TooFarAway = 303, - CC_User_NPCRampage = 304, - CC_User_NPCFurry = 305, - CC_User_NPCEnrage = 306, - CC_User_EchoSay = 307, - CC_User_EchoTell = 308, - CC_User_EchoGroup = 309, - CC_User_EchoGuild = 310, - CC_User_EchoOOC = 311, - CC_User_EchoAuction = 312, - CC_User_EchoShout = 313, - CC_User_EchoEmote = 314, - CC_User_EchoChat1 = 315, - CC_User_EchoChat2 = 316, - CC_User_EchoChat3 = 317, - CC_User_EchoChat4 = 318, - CC_User_EchoChat5 = 319, - CC_User_EchoChat6 = 320, - CC_User_EchoChat7 = 321, - CC_User_EchoChat8 = 322, - CC_User_EchoChat9 = 323, - CC_User_EchoChat10 = 324, - CC_User_UnusedAtThisTime = 325, - CC_User_ItemTags = 326, - CC_User_RaidSay = 327, - CC_User_MyPet = 328, - CC_User_DamageShield = 329, + CC_Default = 0, + CC_DarkGrey = 1, + CC_DarkGreen = 2, + CC_DarkBlue = 3, + CC_Purple = 5, + CC_LightGrey = 6, + CC_User_Say = 256, + CC_User_Tell = 257, + CC_User_Group = 258, + CC_User_Guild = 259, + CC_User_OOC = 260, + CC_User_Auction = 261, + CC_User_Shout = 262, + CC_User_Emote = 263, + CC_User_Spells = 264, + CC_User_YouHitOther = 265, + CC_User_OtherHitYou = 266, + CC_User_YouMissOther = 267, + CC_User_OtherMissYou = 268, + CC_User_Duels = 269, + CC_User_Skills = 270, + CC_User_Disciplines = 271, + CC_User_Default = 273, + CC_User_MerchantOffer = 275, + CC_User_MerchantExchange = 276, + CC_User_YourDeath = 277, + CC_User_OtherDeath = 278, + CC_User_OtherHitOther = 279, + CC_User_OtherMissOther = 280, + CC_User_Who = 281, + CC_User_Yell = 282, + CC_User_NonMelee = 283, + CC_User_SpellWornOff = 284, + CC_User_MoneySplit = 285, + CC_User_Loot = 286, + CC_User_Random = 287, + CC_User_OtherSpells = 288, + CC_User_SpellFailure = 289, + CC_User_ChatChannel = 290, + CC_User_Chat1 = 291, + CC_User_Chat2 = 292, + CC_User_Chat3 = 293, + CC_User_Chat4 = 294, + CC_User_Chat5 = 295, + CC_User_Chat6 = 296, + CC_User_Chat7 = 297, + CC_User_Chat8 = 298, + CC_User_Chat9 = 299, + CC_User_Chat10 = 300, + CC_User_MeleeCrit = 301, + CC_User_SpellCrit = 302, + CC_User_TooFarAway = 303, + CC_User_NPCRampage = 304, + CC_User_NPCFurry = 305, + CC_User_NPCEnrage = 306, + CC_User_EchoSay = 307, + CC_User_EchoTell = 308, + CC_User_EchoGroup = 309, + CC_User_EchoGuild = 310, + CC_User_EchoOOC = 311, + CC_User_EchoAuction = 312, + CC_User_EchoShout = 313, + CC_User_EchoEmote = 314, + CC_User_EchoChat1 = 315, + CC_User_EchoChat2 = 316, + CC_User_EchoChat3 = 317, + CC_User_EchoChat4 = 318, + CC_User_EchoChat5 = 319, + CC_User_EchoChat6 = 320, + CC_User_EchoChat7 = 321, + CC_User_EchoChat8 = 322, + CC_User_EchoChat9 = 323, + CC_User_EchoChat10 = 324, + CC_User_UnusedAtThisTime = 325, + CC_User_ItemTags = 326, + CC_User_RaidSay = 327, + CC_User_MyPet = 328, + CC_User_DamageShield = 329, }; //ZoneChange_Struct->success values @@ -435,41 +435,41 @@ typedef enum { #define STAT_HASTE 19 #define STAT_DAMAGE_SHIELD 20 - /** - * Recast timer types. Used as an off set to charProfileStruct timers. - */ - enum RecastTypes - { - RecastTimer0 = 0, - RecastTimer1, - WeaponHealClickTimer, // 2 - MuramiteBaneNukeClickTimer, // 3 - RecastTimer4, - DispellClickTimer, // 5 (also click heal orbs?) - EpicTimer, // 6 - OoWBPClickTimer, // 7 - VishQuestClassItemTimer, // 8 - HealPotionTimer, // 9 - RecastTimer10, - RecastTimer11, - RecastTimer12, - RecastTimer13, - RecastTimer14, - RecastTimer15, - RecastTimer16, - RecastTimer17, - RecastTimer18, - ModRodTimer // 19 - }; - - enum GroupUpdateAction +/** +* Recast timer types. Used as an off set to charProfileStruct timers. +*/ +enum RecastTypes { - GUA_Joined = 0, - GUA_Left = 1, - GUA_LastLeft = 6, - GUA_FullGroupInfo = 7, - GUA_MakeLeader = 8, - GUA_Started = 9 + RecastTimer0 = 0, + RecastTimer1, + WeaponHealClickTimer, // 2 + MuramiteBaneNukeClickTimer, // 3 + RecastTimer4, + DispellClickTimer, // 5 (also click heal orbs?) + EpicTimer, // 6 + OoWBPClickTimer, // 7 + VishQuestClassItemTimer, // 8 + HealPotionTimer, // 9 + RecastTimer10, + RecastTimer11, + RecastTimer12, + RecastTimer13, + RecastTimer14, + RecastTimer15, + RecastTimer16, + RecastTimer17, + RecastTimer18, + ModRodTimer // 19 +}; + +enum GroupUpdateAction +{ + GUA_Joined = 0, + GUA_Left = 1, + GUA_LastLeft = 6, + GUA_FullGroupInfo = 7, + GUA_MakeLeader = 8, + GUA_Started = 9 }; //0x1c is something... @@ -479,81 +479,81 @@ static const uint8 DamageTypeUnknown = 0xFF; //indexed by 'SkillType' static const uint8 SkillDamageTypes[HIGHEST_SKILL+1] = { - /* _1H_BLUNT */ 0, - /* _1H_SLASHING */ 1, - /* _2H_BLUNT */ 0, - /* _2H_SLASHING */ 1, - /* ABJURE */ SpellDamageType, - /* ALTERATION */ SpellDamageType, - /* APPLY_POISON */ DamageTypeUnknown, - /* ARCHERY */ 7, - /* BACKSTAB */ 8, - /* BIND_WOUND */ DamageTypeUnknown, - /* BASH */ 10, - /* BLOCKSKILL */ DamageTypeUnknown, - /* BRASS_INSTRUMENTS */ SpellDamageType, - /* CHANNELING */ DamageTypeUnknown, - /* CONJURATION */ SpellDamageType, - /* DEFENSE */ DamageTypeUnknown, - /* DISARM */ DamageTypeUnknown, - /* DISARM_TRAPS */ DamageTypeUnknown, - /* DIVINATION */ SpellDamageType, - /* DODGE */ DamageTypeUnknown, - /* DOUBLE_ATTACK */ DamageTypeUnknown, - /* DRAGON_PUNCH */ 21, - /* DUAL_WIELD */ DamageTypeUnknown, - /* EAGLE_STRIKE */ 23, - /* EVOCATION */ SpellDamageType, - /* FEIGN_DEATH */ 4, - /* FLYING_KICK */ 30, - /* FORAGE */ DamageTypeUnknown, - /* HAND_TO_HAND */ 4, - /* HIDE */ DamageTypeUnknown, - /* KICK */ 30, - /* MEDITATE */ DamageTypeUnknown, - /* MEND */ DamageTypeUnknown, - /* OFFENSE */ DamageTypeUnknown, - /* PARRY */ DamageTypeUnknown, - /* PICK_LOCK */ DamageTypeUnknown, - /* PIERCING */ 36, - /* RIPOSTE */ DamageTypeUnknown, - /* ROUND_KICK */ 30, - /* SAFE_FALL */ DamageTypeUnknown, - /* SENSE_HEADING */ DamageTypeUnknown, - /* SINGING */ SpellDamageType, - /* SNEAK */ DamageTypeUnknown, - /* SPECIALIZE_ABJURE */ DamageTypeUnknown, - /* SPECIALIZE_ALTERATION */ DamageTypeUnknown, - /* SPECIALIZE_CONJURATION */ DamageTypeUnknown, - /* SPECIALIZE_DIVINATION */ DamageTypeUnknown, - /* SPECIALIZE_EVOCATION */ DamageTypeUnknown, - /* PICK_POCKETS */ DamageTypeUnknown, - /* STRINGED_INSTRUMENTS */ SpellDamageType, - /* SWIMMING */ DamageTypeUnknown, - /* THROWING */ 51, - /* TIGER_CLAW */ 23, - /* TRACKING */ DamageTypeUnknown, - /* WIND_INSTRUMENTS */ SpellDamageType, - /* FISHING */ DamageTypeUnknown, - /* MAKE_POISON */ DamageTypeUnknown, - /* TINKERING */ DamageTypeUnknown, - /* RESEARCH */ DamageTypeUnknown, - /* ALCHEMY */ DamageTypeUnknown, - /* BAKING */ DamageTypeUnknown, - /* TAILORING */ DamageTypeUnknown, - /* SENSE_TRAPS */ DamageTypeUnknown, - /* BLACKSMITHING */ DamageTypeUnknown, - /* FLETCHING */ DamageTypeUnknown, - /* BREWING */ DamageTypeUnknown, - /* ALCOHOL_TOLERANCE */ DamageTypeUnknown, - /* BEGGING */ DamageTypeUnknown, - /* JEWELRY_MAKING */ DamageTypeUnknown, - /* POTTERY */ DamageTypeUnknown, - /* PERCUSSION_INSTRUMENTS */ SpellDamageType, - /* INTIMIDATION */ DamageTypeUnknown, - /* BERSERKING */ DamageTypeUnknown, - /* TAUNT */ DamageTypeUnknown, - /* FRENZY */ 74 + /* _1H_BLUNT */ 0, + /* _1H_SLASHING */ 1, + /* _2H_BLUNT */ 0, + /* _2H_SLASHING */ 1, + /* ABJURE */ SpellDamageType, + /* ALTERATION */ SpellDamageType, + /* APPLY_POISON */ DamageTypeUnknown, + /* ARCHERY */ 7, + /* BACKSTAB */ 8, + /* BIND_WOUND */ DamageTypeUnknown, + /* BASH */ 10, + /* BLOCKSKILL */ DamageTypeUnknown, + /* BRASS_INSTRUMENTS */ SpellDamageType, + /* CHANNELING */ DamageTypeUnknown, + /* CONJURATION */ SpellDamageType, + /* DEFENSE */ DamageTypeUnknown, + /* DISARM */ DamageTypeUnknown, + /* DISARM_TRAPS */ DamageTypeUnknown, + /* DIVINATION */ SpellDamageType, + /* DODGE */ DamageTypeUnknown, + /* DOUBLE_ATTACK */ DamageTypeUnknown, + /* DRAGON_PUNCH */ 21, + /* DUAL_WIELD */ DamageTypeUnknown, + /* EAGLE_STRIKE */ 23, + /* EVOCATION */ SpellDamageType, + /* FEIGN_DEATH */ 4, + /* FLYING_KICK */ 30, + /* FORAGE */ DamageTypeUnknown, + /* HAND_TO_HAND */ 4, + /* HIDE */ DamageTypeUnknown, + /* KICK */ 30, + /* MEDITATE */ DamageTypeUnknown, + /* MEND */ DamageTypeUnknown, + /* OFFENSE */ DamageTypeUnknown, + /* PARRY */ DamageTypeUnknown, + /* PICK_LOCK */ DamageTypeUnknown, + /* PIERCING */ 36, + /* RIPOSTE */ DamageTypeUnknown, + /* ROUND_KICK */ 30, + /* SAFE_FALL */ DamageTypeUnknown, + /* SENSE_HEADING */ DamageTypeUnknown, + /* SINGING */ SpellDamageType, + /* SNEAK */ DamageTypeUnknown, + /* SPECIALIZE_ABJURE */ DamageTypeUnknown, + /* SPECIALIZE_ALTERATION */ DamageTypeUnknown, + /* SPECIALIZE_CONJURATION */ DamageTypeUnknown, + /* SPECIALIZE_DIVINATION */ DamageTypeUnknown, + /* SPECIALIZE_EVOCATION */ DamageTypeUnknown, + /* PICK_POCKETS */ DamageTypeUnknown, + /* STRINGED_INSTRUMENTS */ SpellDamageType, + /* SWIMMING */ DamageTypeUnknown, + /* THROWING */ 51, + /* TIGER_CLAW */ 23, + /* TRACKING */ DamageTypeUnknown, + /* WIND_INSTRUMENTS */ SpellDamageType, + /* FISHING */ DamageTypeUnknown, + /* MAKE_POISON */ DamageTypeUnknown, + /* TINKERING */ DamageTypeUnknown, + /* RESEARCH */ DamageTypeUnknown, + /* ALCHEMY */ DamageTypeUnknown, + /* BAKING */ DamageTypeUnknown, + /* TAILORING */ DamageTypeUnknown, + /* SENSE_TRAPS */ DamageTypeUnknown, + /* BLACKSMITHING */ DamageTypeUnknown, + /* FLETCHING */ DamageTypeUnknown, + /* BREWING */ DamageTypeUnknown, + /* ALCOHOL_TOLERANCE */ DamageTypeUnknown, + /* BEGGING */ DamageTypeUnknown, + /* JEWELRY_MAKING */ DamageTypeUnknown, + /* POTTERY */ DamageTypeUnknown, + /* PERCUSSION_INSTRUMENTS */ SpellDamageType, + /* INTIMIDATION */ DamageTypeUnknown, + /* BERSERKING */ DamageTypeUnknown, + /* TAUNT */ DamageTypeUnknown, + /* FRENZY */ 74 }; // Indexing positions into item material arrays diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index 9b4a15f80..f72b4c721 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQ_PACKET_STRUCTS_H #define EQ_PACKET_STRUCTS_H @@ -154,7 +154,7 @@ struct CharacterSelect_Struct { /*0040*/ Color_Struct cs_colors[10][9]; // Characters Equipment Colors /*0400*/ uint8 beardcolor[10]; // Characters beard Color /*0410*/ uint8 hairstyle[10]; // Characters hair style -/*0420*/ uint32 equip[10][9]; // 0=helm, 1=chest, 2=arm, 3=bracer, 4=hand, 5=leg, 6=boot, 7=melee1, 8=melee2 (Might not be) +/*0420*/ uint32 equip[10][9]; // 0=helm, 1=chest, 2=arm, 3=bracer, 4=hand, 5=leg, 6=boot, 7=melee1, 8=melee2 (Might not be) /*0780*/ uint32 secondary[10]; // Characters secondary IDFile number /*0820*/ uint32 drakkin_heritage[10]; // added for SoF /*0860*/ uint32 drakkin_tattoo[10]; // added for SoF @@ -195,10 +195,10 @@ struct CharacterSelect_Struct { ** Generic Spawn Struct ** Length: 383 Octets ** Used in: -** spawnZoneStruct -** dbSpawnStruct -** petStruct -** newSpawnStruct +** spawnZoneStruct +** dbSpawnStruct +** petStruct +** newSpawnStruct */ /* showeq -> eqemu @@ -206,119 +206,119 @@ sed -e 's/_t//g' -e 's/seto_0xFF/set_to_0xFF/g' */ struct Spawn_Struct { /*0000*/ uint8 unknown0000; -/*0001*/ uint8 gm; // 0=no, 1=gm -/*0002*/ uint8 unknown0003; -/*0003*/ uint8 aaitle; // 0=none, 1=general, 2=archtype, 3=class -/*0004*/ uint8 unknown0004; -/*0005*/ uint8 anon; // 0=normal, 1=anon, 2=roleplay -/*0006*/ uint8 face; // Face id for players -/*0007*/ char name[64]; // Player's Name -/*0071*/ uint16 deity; // Player's Deity +/*0001*/ uint8 gm; // 0=no, 1=gm +/*0002*/ uint8 unknown0003; +/*0003*/ uint8 aaitle; // 0=none, 1=general, 2=archtype, 3=class +/*0004*/ uint8 unknown0004; +/*0005*/ uint8 anon; // 0=normal, 1=anon, 2=roleplay +/*0006*/ uint8 face; // Face id for players +/*0007*/ char name[64]; // Player's Name +/*0071*/ uint16 deity; // Player's Deity /*0073*/ uint16 unknown0073; -/*0075*/ float size; // Model size -/*0079*/ uint32 unknown0079; -/*0083*/ uint8 NPC; // 0=player,1=npc,2=pc corpse,3=npc corpse,a -/*0084*/ uint8 invis; // Invis (0=not, 1=invis) -/*0085*/ uint8 haircolor; // Hair color -/*0086*/ uint8 curHp; // Current hp %%% wrong -/*0087*/ uint8 max_hp; // (name prolly wrong)takes on the value 100 for players, 100 or 110 for NPCs and 120 for PC corpses... -/*0088*/ uint8 findable; // 0=can't be found, 1=can be found -/*0089*/ uint8 unknown0089[5]; -/*0094*/ signed deltaHeading:10;// change in heading - signed x:19; // x coord - signed padding0054:3; // ***Placeholder -/*0098*/ signed y:19; // y coord - signed animation:10; // animation - signed padding0058:3; // ***Placeholder -/*0102*/ signed z:19; // z coord - signed deltaY:13; // change in y -/*0106*/ signed deltaX:13; // change in x - unsigned heading:12; // heading - signed padding0066:7; // ***Placeholder -/*0110*/ signed deltaZ:13; // change in z - signed padding0070:19; // ***Placeholder -/*0114*/ uint8 eyecolor1; // Player's left eye color -/*0115*/ uint8 unknown0115[11]; // Was [24] -/*0126*/ uint8 StandState; // stand state for SoF+ 0x64 for normal animation -/*0127*/ uint32 drakkin_heritage; // Added for SoF -/*0131*/ uint32 drakkin_tattoo; // Added for SoF -/*0135*/ uint32 drakkin_details; // Added for SoF -/*0139*/ uint8 showhelm; // 0=no, 1=yes -/*0140*/ uint8 unknown0140[4]; -/*0144*/ uint8 is_npc; // 0=no, 1=yes -/*0145*/ uint8 hairstyle; // Hair style -/*0146*/ uint8 beard; // Beard style (not totally, sure but maybe!) -/*0147*/ uint8 unknown0147[4]; -/*0151*/ uint8 level; // Spawn Level -/*0152*/ uint8 unknown0259[4]; // ***Placeholder -/*0156*/ uint8 beardcolor; // Beard color -/*0157*/ char suffix[32]; // Player's suffix (of Veeshan, etc.) -/*0189*/ uint32 petOwnerId; // If this is a pet, the spawn id of owner -/*0193*/ uint8 guildrank; // 0=normal, 1=officer, 2=leader -/*0194*/ uint8 unknown0194[3]; +/*0075*/ float size; // Model size +/*0079*/ uint32 unknown0079; +/*0083*/ uint8 NPC; // 0=player,1=npc,2=pc corpse,3=npc corpse,a +/*0084*/ uint8 invis; // Invis (0=not, 1=invis) +/*0085*/ uint8 haircolor; // Hair color +/*0086*/ uint8 curHp; // Current hp %%% wrong +/*0087*/ uint8 max_hp; // (name prolly wrong)takes on the value 100 for players, 100 or 110 for NPCs and 120 for PC corpses... +/*0088*/ uint8 findable; // 0=can't be found, 1=can be found +/*0089*/ uint8 unknown0089[5]; +/*0094*/ signed deltaHeading:10; // change in heading +/*????*/ signed x:19; // x coord +/*????*/ signed padding0054:3; // ***Placeholder +/*0098*/ signed y:19; // y coord +/*????*/ signed animation:10; // animation +/*????*/ signed padding0058:3; // ***Placeholder +/*0102*/ signed z:19; // z coord +/*????*/ signed deltaY:13; // change in y +/*0106*/ signed deltaX:13; // change in x +/*????*/ unsigned heading:12; // heading +/*????*/ signed padding0066:7; // ***Placeholder +/*0110*/ signed deltaZ:13; // change in z +/*????*/ signed padding0070:19; // ***Placeholder +/*0114*/ uint8 eyecolor1; // Player's left eye color +/*0115*/ uint8 unknown0115[11]; // Was [24] +/*0126*/ uint8 StandState; // stand state for SoF+ 0x64 for normal animation +/*0127*/ uint32 drakkin_heritage; // Added for SoF +/*0131*/ uint32 drakkin_tattoo; // Added for SoF +/*0135*/ uint32 drakkin_details; // Added for SoF +/*0139*/ uint8 showhelm; // 0=no, 1=yes +/*0140*/ uint8 unknown0140[4]; +/*0144*/ uint8 is_npc; // 0=no, 1=yes +/*0145*/ uint8 hairstyle; // Hair style +/*0146*/ uint8 beard; // Beard style (not totally, sure but maybe!) +/*0147*/ uint8 unknown0147[4]; +/*0151*/ uint8 level; // Spawn Level +/*0152*/ uint8 unknown0259[4]; // ***Placeholder +/*0156*/ uint8 beardcolor; // Beard color +/*0157*/ char suffix[32]; // Player's suffix (of Veeshan, etc.) +/*0189*/ uint32 petOwnerId; // If this is a pet, the spawn id of owner +/*0193*/ uint8 guildrank; // 0=normal, 1=officer, 2=leader +/*0194*/ uint8 unknown0194[3]; /*0197*/ union - { - struct - { - /*0197*/ uint32 equip_helmet; // Equipment: Helmet Visual - /*0201*/ uint32 equip_chest; // Equipment: Chest Visual - /*0205*/ uint32 equip_arms; // Equipment: Arms Visual - /*0209*/ uint32 equip_bracers; // Equipment: Bracers Visual - /*0213*/ uint32 equip_hands; // Equipment: Hands Visual - /*0217*/ uint32 equip_legs; // Equipment: Legs Visual - /*0221*/ uint32 equip_feet; // Equipment: Feet Visual - /*0225*/ uint32 equip_primary; // Equipment: Primary Visual - /*0229*/ uint32 equip_secondary; // Equipment: Secondary Visual - } equip; - /*0197*/ uint32 equipment[MAX_MATERIALS]; // Array elements correspond to struct equipment above - }; -/*0233*/ float runspeed; // Speed when running -/*0036*/ uint8 afk; // 0=no, 1=afk -/*0238*/ uint32 guildID; // Current guild -/*0242*/ char title[32]; // Title -/*0274*/ uint8 unknown0274; -/*0275*/ uint8 set_to_0xFF[8]; // ***Placeholder (all ff) -/*0283*/ uint8 helm; // Helm texture -/*0284*/ uint32 race; // Spawn race -/*0288*/ uint32 unknown0288; -/*0292*/ char lastName[32]; // Player's Lastname -/*0324*/ float walkspeed; // Speed when walking -/*0328*/ uint8 unknown0328; -/*0329*/ uint8 is_pet; // 0=no, 1=yes -/*0330*/ uint8 light; // Spawn's lightsource %%% wrong -/*0331*/ uint8 class_; // Player's class -/*0332*/ uint8 eyecolor2; // Left eye color -/*0333*/ uint8 flymode; -/*0334*/ uint8 gender; // Gender (0=male, 1=female) -/*0335*/ uint8 bodytype; // Bodytype + { + struct + { + /*0197*/ uint32 equip_helmet; // Equipment: Helmet Visual + /*0201*/ uint32 equip_chest; // Equipment: Chest Visual + /*0205*/ uint32 equip_arms; // Equipment: Arms Visual + /*0209*/ uint32 equip_bracers; // Equipment: Bracers Visual + /*0213*/ uint32 equip_hands; // Equipment: Hands Visual + /*0217*/ uint32 equip_legs; // Equipment: Legs Visual + /*0221*/ uint32 equip_feet; // Equipment: Feet Visual + /*0225*/ uint32 equip_primary; // Equipment: Primary Visual + /*0229*/ uint32 equip_secondary; // Equipment: Secondary Visual + } equip; + /*0197*/ uint32 equipment[MAX_MATERIALS]; // Array elements correspond to struct equipment above + }; +/*0233*/ float runspeed; // Speed when running +/*0036*/ uint8 afk; // 0=no, 1=afk +/*0238*/ uint32 guildID; // Current guild +/*0242*/ char title[32]; // Title +/*0274*/ uint8 unknown0274; +/*0275*/ uint8 set_to_0xFF[8]; // ***Placeholder (all ff) +/*0283*/ uint8 helm; // Helm texture +/*0284*/ uint32 race; // Spawn race +/*0288*/ uint32 unknown0288; +/*0292*/ char lastName[32]; // Player's Lastname +/*0324*/ float walkspeed; // Speed when walking +/*0328*/ uint8 unknown0328; +/*0329*/ uint8 is_pet; // 0=no, 1=yes +/*0330*/ uint8 light; // Spawn's lightsource %%% wrong +/*0331*/ uint8 class_; // Player's class +/*0332*/ uint8 eyecolor2; // Left eye color +/*0333*/ uint8 flymode; +/*0334*/ uint8 gender; // Gender (0=male, 1=female) +/*0335*/ uint8 bodytype; // Bodytype /*0336*/ uint8 unknown0336[3]; union { -/*0339*/ uint8 equip_chest2; // Second place in packet for chest texture (usually 0xFF in live packets) - // Not sure why there are 2 of them, but it effects chest texture! -/*0339*/ uint8 mount_color; // drogmor: 0=white, 1=black, 2=green, 3=red - // horse: 0=brown, 1=white, 2=black, 3=tan +/*0339*/ uint8 equip_chest2; // Second place in packet for chest texture (usually 0xFF in live packets) + // Not sure why there are 2 of them, but it effects chest texture! +/*0339*/ uint8 mount_color; // drogmor: 0=white, 1=black, 2=green, 3=red + // horse: 0=brown, 1=white, 2=black, 3=tan }; -/*0340*/ uint32 spawnId; // Spawn Id +/*0340*/ uint32 spawnId; // Spawn Id /*0344*/ uint8 unknown0344[3]; /*0347*/ uint8 IsMercenary; /*0348*/ union - { - struct - { - /*0348*/ Color_Struct color_helmet; // Color of helmet item - /*0352*/ Color_Struct color_chest; // Color of chest item - /*0356*/ Color_Struct color_arms; // Color of arms item - /*0360*/ Color_Struct color_bracers; // Color of bracers item - /*0364*/ Color_Struct color_hands; // Color of hands item - /*0368*/ Color_Struct color_legs; // Color of legs item - /*0372*/ Color_Struct color_feet; // Color of feet item - /*0376*/ Color_Struct color_primary; // Color of primary item - /*0380*/ Color_Struct color_secondary; // Color of secondary item - } equipment_colors; - /*0348*/ Color_Struct colors[MAX_MATERIALS]; // Array elements correspond to struct equipment_colors above - }; -/*0384*/ uint8 lfg; // 0=off, 1=lfg on + { + struct + { + /*0348*/ Color_Struct color_helmet; // Color of helmet item + /*0352*/ Color_Struct color_chest; // Color of chest item + /*0356*/ Color_Struct color_arms; // Color of arms item + /*0360*/ Color_Struct color_bracers; // Color of bracers item + /*0364*/ Color_Struct color_hands; // Color of hands item + /*0368*/ Color_Struct color_legs; // Color of legs item + /*0372*/ Color_Struct color_feet; // Color of feet item + /*0376*/ Color_Struct color_primary; // Color of primary item + /*0380*/ Color_Struct color_secondary; // Color of secondary item + } equipment_colors; + /*0348*/ Color_Struct colors[MAX_MATERIALS]; // Array elements correspond to struct equipment_colors above + }; +/*0384*/ uint8 lfg; // 0=off, 1=lfg on /*0385*/ bool DestructibleObject; // Only used to flag as a destrible object @@ -398,7 +398,7 @@ struct NewZone_Struct { /*0686*/ uint16 zone_instance; /*0688*/ uint32 unknown688; /*0692*/ uint8 unknown692[8]; -/*0700*/ float fog_density; +/*0700*/ float fog_density; /*0704*/ uint32 SuspendBuffs; /*0704*/ }; @@ -409,9 +409,9 @@ struct NewZone_Struct { ** */ struct MemorizeSpell_Struct { -uint32 slot; // Spot in the spell book/memorized slot -uint32 spell_id; // Spell id (200 or c8 is minor healing, etc) -uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming +uint32 slot; // Spot in the spell book/memorized slot +uint32 spell_id; // Spell id (200 or c8 is minor healing, etc) +uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming uint32 unknown12; }; @@ -423,7 +423,7 @@ uint32 unknown12; struct Charm_Struct { /*00*/ uint32 owner_id; /*04*/ uint32 pet_id; -/*08*/ uint32 command; // 1: make pet, 0: release pet +/*08*/ uint32 command; // 1: make pet, 0: release pet /*12*/ }; @@ -445,7 +445,7 @@ struct DeleteSpell_Struct struct ManaChange_Struct { - uint32 new_mana; // New Mana AMount + uint32 new_mana; // New Mana AMount uint32 stamina; uint32 spell_id; uint32 unknown12; @@ -471,9 +471,9 @@ struct CastSpell_Struct { uint32 slot; uint32 spell_id; - uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast + uint32 inventoryslot; // slot for clicky item, 0xFFFF = normal cast uint32 target_id; - uint8 cs_unknown[4]; + uint8 cs_unknown[4]; }; struct SpellEffect_Struct @@ -500,9 +500,9 @@ struct SpellEffect_Struct */ struct SpawnAppearance_Struct { -/*0000*/ uint16 spawn_id; // ID of the spawn -/*0002*/ uint16 type; // Values associated with the type -/*0004*/ uint32 parameter; // Type of data sent +/*0000*/ uint16 spawn_id; // ID of the spawn +/*0002*/ uint16 type; // Values associated with the type +/*0004*/ uint32 parameter; // Type of data sent /*0008*/ }; @@ -516,7 +516,7 @@ struct SpellBuff_Struct /*003*/ uint8 effect; //not real /*004*/ uint32 spellid; /*008*/ uint32 duration; -/*012*/ uint32 counters; +/*012*/ uint32 counters; /*016*/ uint32 player_id; //'global' ID of the caster, for wearoff messages /*020*/ }; @@ -606,8 +606,8 @@ struct GMTrainEnd_Struct struct GMSkillChange_Struct { /*000*/ uint16 npcid; -/*002*/ uint8 unknown1[2]; // something like PC_ID, but not really. stays the same thru the session though -/*002*/ uint16 skillbank; // 0 if normal skills, 1 if languages +/*002*/ uint8 unknown1[2]; // something like PC_ID, but not really. stays the same thru the session though +/*002*/ uint16 skillbank; // 0 if normal skills, 1 if languages /*002*/ uint8 unknown2[2]; /*008*/ uint16 skill_id; /*010*/ uint8 unknown3[2]; @@ -773,12 +773,12 @@ struct RaidLeadershipAA_Struct { * Size: 20 Octets */ struct BindStruct { - /*000*/ uint32 zoneId; - /*004*/ float x; - /*008*/ float y; - /*012*/ float z; - /*016*/ float heading; - /*020*/ + /*000*/ uint32 zoneId; + /*004*/ float x; + /*008*/ float y; + /*012*/ float z; + /*016*/ float heading; + /*020*/ }; struct SuspendedMinion_Struct @@ -810,49 +810,49 @@ static const uint32 MAX_RECAST_TYPES = 20; /* showeq -> eqemu sed -e 's/_t//g' -e 's/MAX_AA/MAX_PP_AA_ARRAY/g' \ - -e 's/MAX_SPELL_SLOTS/MAX_PP_MEMSPELL/g' \ - -e 's/MAX_KNOWN_SKILLS/MAX_PP_SKILL/g' \ - -e 's/MAXRIBUTES/MAX_PLAYER_TRIBUTES/g' \ - -e 's/MAX_BUFFS/BUFF_COUNT/g' \ - -e 's/MAX_KNOWN_LANGS/MAX_PP_LANGUAGE/g' \ - -e 's/MAX_RECASTYPES/MAX_RECAST_TYPES/g' \ - -e 's/spellBuff/SpellBuff_Struct/g' \ - -e 's/lastName/last_name/g' \ - -e 's/guildID/guildid/g' \ - -e 's/itemint/item_tint/g' \ - -e 's/MANA/mana/g' \ - -e 's/curHp/cur_hp/g' \ - -e 's/sSpellBook/spell_book/g' \ - -e 's/sMemSpells/mem_spells/g' \ - -e 's/uint32[ \t]*disciplines\[MAX_DISCIPLINES\]/Disciplines_Struct disciplines/g' \ - -e 's/aa_unspent/aapoints/g' \ - -e 's/aa_spent/aapoints_spent/g' \ - -e 's/InlineItem[ \t]*potionBelt\[MAX_POTIONS_IN_BELT\]/PotionBelt_Struct potionbelt/g' \ - -e 's/ldon_guk_points/ldon_points_guk/g' \ - -e 's/ldon_mir_points/ldon_points_mir/g' \ - -e 's/ldon_mmc_points/ldon_points_mmc/g' \ - -e 's/ldon_ruj_points/ldon_points_ruj/g' \ - -e 's/ldonak_points/ldon_points_tak/g' \ - -e 's/ldon_avail_points/ldon_points_available/g' \ - -e 's/tributeTime/tribute_time_remaining/g' \ - -e 's/careerTribute/career_tribute_points/g' \ - -e 's/currentTribute/tribute_points/g' \ - -e 's/tributeActive/tribute_active/g' \ - -e 's/TributeStruct/Tribute_Struct/g' \ - -e 's/expGroupLeadAA/group_leadership_exp/g' \ - -e 's/expRaidLeadAA/raid_leadership_exp/g' \ - -e 's/groupLeadAAUnspent/group_leadership_points/g' \ - -e 's/raidLeadAAUnspent/raid_leadership_points/g' \ - -e 's/uint32[ \t]*leadershipAAs\[MAX_LEAD_AA\]/LeadershipAA_Struct leader_abilities/g' \ - -e 's/BandolierStruct/Bandolier_Struct/g' \ - -e 's/MAX_BANDOLIERS/MAX_PLAYER_BANDOLIER/g' \ - -e 's/birthdayTime/birthday/g' \ - -e 's/lastSaveTime/lastlogin/g' \ - -e 's/zoneId/zone_id/g' \ - -e 's/hunger/hunger_level/g' \ - -e 's/thirst/thirst_level/g' \ - -e 's/guildstatus/guildrank/g' \ - -e 's/airRemaining/air_remaining/g' \ + -e 's/MAX_SPELL_SLOTS/MAX_PP_MEMSPELL/g' \ + -e 's/MAX_KNOWN_SKILLS/MAX_PP_SKILL/g' \ + -e 's/MAXRIBUTES/MAX_PLAYER_TRIBUTES/g' \ + -e 's/MAX_BUFFS/BUFF_COUNT/g' \ + -e 's/MAX_KNOWN_LANGS/MAX_PP_LANGUAGE/g' \ + -e 's/MAX_RECASTYPES/MAX_RECAST_TYPES/g' \ + -e 's/spellBuff/SpellBuff_Struct/g' \ + -e 's/lastName/last_name/g' \ + -e 's/guildID/guildid/g' \ + -e 's/itemint/item_tint/g' \ + -e 's/MANA/mana/g' \ + -e 's/curHp/cur_hp/g' \ + -e 's/sSpellBook/spell_book/g' \ + -e 's/sMemSpells/mem_spells/g' \ + -e 's/uint32[ \t]*disciplines\[MAX_DISCIPLINES\]/Disciplines_Struct disciplines/g' \ + -e 's/aa_unspent/aapoints/g' \ + -e 's/aa_spent/aapoints_spent/g' \ + -e 's/InlineItem[ \t]*potionBelt\[MAX_POTIONS_IN_BELT\]/PotionBelt_Struct potionbelt/g' \ + -e 's/ldon_guk_points/ldon_points_guk/g' \ + -e 's/ldon_mir_points/ldon_points_mir/g' \ + -e 's/ldon_mmc_points/ldon_points_mmc/g' \ + -e 's/ldon_ruj_points/ldon_points_ruj/g' \ + -e 's/ldonak_points/ldon_points_tak/g' \ + -e 's/ldon_avail_points/ldon_points_available/g' \ + -e 's/tributeTime/tribute_time_remaining/g' \ + -e 's/careerTribute/career_tribute_points/g' \ + -e 's/currentTribute/tribute_points/g' \ + -e 's/tributeActive/tribute_active/g' \ + -e 's/TributeStruct/Tribute_Struct/g' \ + -e 's/expGroupLeadAA/group_leadership_exp/g' \ + -e 's/expRaidLeadAA/raid_leadership_exp/g' \ + -e 's/groupLeadAAUnspent/group_leadership_points/g' \ + -e 's/raidLeadAAUnspent/raid_leadership_points/g' \ + -e 's/uint32[ \t]*leadershipAAs\[MAX_LEAD_AA\]/LeadershipAA_Struct leader_abilities/g' \ + -e 's/BandolierStruct/Bandolier_Struct/g' \ + -e 's/MAX_BANDOLIERS/MAX_PLAYER_BANDOLIER/g' \ + -e 's/birthdayTime/birthday/g' \ + -e 's/lastSaveTime/lastlogin/g' \ + -e 's/zoneId/zone_id/g' \ + -e 's/hunger/hunger_level/g' \ + -e 's/thirst/thirst_level/g' \ + -e 's/guildstatus/guildrank/g' \ + -e 's/airRemaining/air_remaining/g' \ */ struct PlayerProfile_Struct @@ -966,7 +966,7 @@ struct PlayerProfile_Struct /*5504*/ uint16 zone_id; // Current zone of the player /*5506*/ uint16 zoneInstance; // Instance ID /*5508*/ SpellBuff_Struct buffs[BUFF_COUNT]; // Buffs currently on the player -/*6008*/ char groupMembers[6][64];// +/*6008*/ char groupMembers[6][64];// /*6392*/ char unknown6428[656]; /*7048*/ uint32 entityid; /*7052*/ uint32 leadAAActive; @@ -1073,8 +1073,8 @@ struct PetCommand_Struct { */ struct DeleteSpawn_Struct { -/*00*/ uint32 spawn_id; // Spawn ID to delete -/*04*/ uint8 Decay; // 0 = vanish immediately, 1 = 'Decay' sparklies for corpses. +/*00*/ uint32 spawn_id; // Spawn ID to delete +/*04*/ uint8 Decay; // 0 = vanish immediately, 1 = 'Decay' sparklies for corpses. }; /* @@ -1119,8 +1119,7 @@ struct SpecialMesg_Struct }; /* -** When somebody changes what they're wearing -** or give a pet a weapon (model changes) +** When somebody changes what they're wearing or give a pet a weapon (model changes) ** Length: 19 Bytes */ struct WearChange_Struct{ @@ -1136,7 +1135,7 @@ struct WearChange_Struct{ }; /* -** Type: Bind Wound Structure +** Type: Bind Wound Structure ** Length: 8 Bytes */ //Fixed for 7-14-04 patch @@ -1150,13 +1149,13 @@ struct BindWound_Struct /* -** Type: Zone Change Request (before hand) +** Type: Zone Change Request (before hand) ** Length: 88 bytes ** OpCode: a320 */ struct ZoneChange_Struct { -/*000*/ char char_name[64]; // Character Name +/*000*/ char char_name[64]; // Character Name /*064*/ uint16 zoneID; /*066*/ uint16 instanceID; /*068*/ float y; @@ -1213,13 +1212,13 @@ struct Action_Struct }; // solar: this is what prints the You have been struck. and the regular -// melee messages like You try to pierce, etc. It's basically the melee +// melee messages like You try to pierce, etc. It's basically the melee // and spell damage message struct CombatDamage_Struct { /* 00 */ uint16 target; /* 02 */ uint16 source; -/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells +/* 04 */ uint8 type; //slashing, etc. 231 (0xE7) for spells /* 05 */ uint16 spellid; /* 07 */ uint32 damage; /* 11 */ uint32 unknown11; @@ -1232,13 +1231,13 @@ struct CombatDamage_Struct ** Consider Struct */ struct Consider_Struct{ -/*000*/ uint32 playerid; // PlayerID -/*004*/ uint32 targetid; // TargetID -/*008*/ uint32 faction; // Faction -/*0012*/ uint32 level; // Level -/*016*/ int32 cur_hp; // Current Hitpoints -/*020*/ int32 max_hp; // Maximum Hitpoints -/*024*/ uint8 pvpcon; // Pvp con flag 0/1 +/*000*/ uint32 playerid; // PlayerID +/*004*/ uint32 targetid; // TargetID +/*008*/ uint32 faction; // Faction +/*0012*/ uint32 level; // Level +/*016*/ int32 cur_hp; // Current Hitpoints +/*020*/ int32 max_hp; // Maximum Hitpoints +/*024*/ uint8 pvpcon; // Pvp con flag 0/1 /*025*/ uint8 unknown3[3]; }; @@ -1254,7 +1253,7 @@ struct Death_Struct /*008*/ uint32 corpseid; // was corpseid /*012*/ uint32 bindzoneid; /*016*/ uint32 spell_id; -/*020*/ uint32 attack_skill; +/*020*/ uint32 attack_skill; /*024*/ uint32 damage; /*028*/ uint32 unknown028; }; @@ -1275,19 +1274,19 @@ struct BecomeCorpse_Struct { struct PlayerPositionUpdateServer_Struct { /*0000*/ uint16 spawn_id; -/*0002*/ int32 delta_heading:10, // change in heading - x_pos:19, // x coord - padding0002:3; // ***Placeholder -/*0006*/ int32 y_pos:19, // y coord - animation:10, // animation - padding0006:3; // ***Placeholder -/*0010*/ int32 z_pos:19, // z coord - delta_y:13; // change in y -/*0014*/ int32 delta_x:13, // change in x - heading:12, // heading - padding0014:7; // ***Placeholder -/*0018*/ int32 delta_z:13, // change in z - padding0018:19; // ***Placeholder +/*0002*/ int32 delta_heading:10, // change in heading + x_pos:19, // x coord + padding0002:3; // ***Placeholder +/*0006*/ int32 y_pos:19, // y coord + animation:10, // animation + padding0006:3; // ***Placeholder +/*0010*/ int32 z_pos:19, // z coord + delta_y:13; // change in y +/*0014*/ int32 delta_x:13, // change in x + heading:12, // heading + padding0014:7; // ***Placeholder +/*0018*/ int32 delta_z:13, // change in z + padding0018:19; // ***Placeholder /*0022*/ }; @@ -1301,28 +1300,27 @@ struct PlayerPositionUpdateClient_Struct { /*0000*/ uint16 spawn_id; /*0022*/ uint16 sequence; //increments one each packet -/*0004*/ float y_pos; // y coord -/*0008*/ float delta_z; // Change in z -/*0016*/ float delta_x; // Change in x -/*0012*/ float delta_y; // Change in y -/*0020*/ int32 animation:10, // animation - delta_heading:10, // change in heading - padding0020:12; // ***Placeholder (mostly 1) -/*0024*/ float x_pos; // x coord -/*0028*/ float z_pos; // z coord -/*0034*/ uint16 heading:12, // Directional heading - padding0004:4; // ***Placeholder -/*0032*/ uint8 unknown0006[2]; // ***Placeholder +/*0004*/ float y_pos; // y coord +/*0008*/ float delta_z; // Change in z +/*0016*/ float delta_x; // Change in x +/*0012*/ float delta_y; // Change in y +/*0020*/ int32 animation:10, // animation + delta_heading:10, // change in heading + padding0020:12; // ***Placeholder (mostly 1) +/*0024*/ float x_pos; // x coord +/*0028*/ float z_pos; // z coord +/*0034*/ uint16 heading:12, // Directional heading + padding0004:4; // ***Placeholder +/*0032*/ uint8 unknown0006[2]; // ***Placeholder /*0036*/ }; struct SpawnPositionUpdate_Struct { -/*0000*/ uint16 spawn_id; -/*0002*/ uint64 y_pos:19, z_pos:19, x_pos:19, padding002:7; -/*0010*/ unsigned heading:12; - signed padding010:4; -/*0012*/ +/*0000*/ uint16 spawn_id; +/*0002*/ uint64 y_pos:19, z_pos:19, x_pos:19, padding002:7; +/*0010*/ unsigned heading:12; +/*0012*/ signed padding010:4; }; /* @@ -1388,8 +1386,8 @@ struct MobHealth ** OpCode: 5721 */ struct Stamina_Struct { -/*00*/ uint32 food; // (low more hungry 127-0) -/*02*/ uint32 water; // (low more thirsty 127-0) +/*00*/ uint32 food; // (low more hungry 127-0) +/*02*/ uint32 water; // (low more thirsty 127-0) }; /* @@ -1398,9 +1396,9 @@ struct Stamina_Struct { */ struct LevelUpdate_Struct { -/*00*/ uint32 level; // New level -/*04*/ uint32 level_old; // Old level -/*08*/ uint32 exp; // Current Experience +/*00*/ uint32 level; // New level +/*04*/ uint32 level_old; // Old level +/*08*/ uint32 exp; // Current Experience }; /* @@ -1410,8 +1408,8 @@ struct LevelUpdate_Struct */ struct ExpUpdate_Struct { -/*0000*/ uint32 exp; // Current experience ratio from 0 to 330 -/*0004*/ uint32 aaxp; // @BP ?? +/*0000*/ uint32 exp; // Current experience ratio from 0 to 330 +/*0004*/ uint32 aaxp; // @BP ?? }; /* @@ -1449,9 +1447,9 @@ struct Consume_Struct { /*0000*/ uint32 slot; /*0004*/ uint32 auto_consumed; // 0xffffffff when auto eating e7030000 when right click -/*0008*/ uint8 c_unknown1[4]; -/*0012*/ uint8 type; // 0x01=Food 0x02=Water -/*0013*/ uint8 unknown13[3]; +/*0008*/ uint8 c_unknown1[4]; +/*0012*/ uint8 type; // 0x01=Food 0x02=Water +/*0013*/ uint8 unknown13[3]; }; struct DeleteItem_Struct { @@ -1470,11 +1468,11 @@ struct MoveItem_Struct // // from_slot/to_slot // -1 - destroy -// 0 - cursor -// 1 - inventory -// 2 - bank -// 3 - trade -// 4 - shared bank +// 0 - cursor +// 1 - inventory +// 2 - bank +// 3 - trade +// 4 - shared bank // // cointype // 0 - copeer @@ -1489,11 +1487,11 @@ static const uint32 COINTYPE_CP = 0; struct MoveCoin_Struct { - int32 from_slot; - int32 to_slot; - uint32 cointype1; - uint32 cointype2; - int32 amount; + int32 from_slot; + int32 to_slot; + uint32 cointype1; + uint32 cointype2; + int32 amount; }; struct TradeCoin_Struct{ uint32 trader; @@ -1601,11 +1599,11 @@ struct GuildCommand_Struct { struct OnLevelMessage_Struct { - char Title[128]; - char Text[4096]; - uint32 Buttons; - uint32 Duration; - uint32 PopupID; + char Title[128]; + char Text[4096]; + uint32 Buttons; + uint32 Duration; + uint32 PopupID; uint32 NegativeID; char ButtonName0[25]; char ButtonName1[25]; @@ -1651,27 +1649,27 @@ struct GMZoneRequest_Struct { }; struct GMSummon_Struct { -/* 0*/ char charname[64]; -/* 30*/ char gmname[64]; -/* 60*/ uint32 success; +/* 0*/ char charname[64]; +/* 30*/ char gmname[64]; +/* 60*/ uint32 success; /* 61*/ uint32 zoneID; -/*92*/ float y; -/*96*/ float x; -/*100*/ float z; -/*104*/ uint32 unknown2; // E0 E0 56 00 +/*92*/ float y; +/*96*/ float x; +/*100*/ float z; +/*104*/ uint32 unknown2; // E0 E0 56 00 }; struct GMGoto_Struct { // x,y is swapped as compared to summon and makes sense as own packet -/* 0*/ char charname[64]; +/* 0*/ char charname[64]; -/* 64*/ char gmname[64]; -/* 128*/ uint32 success; -/* 132*/ uint32 zoneID; +/* 64*/ char gmname[64]; +/* 128*/uint32 success; +/* 132*/ uint32 zoneID; -/*136*/ int32 y; -/*140*/ int32 x; -/*144*/ int32 z; -/*148*/ uint32 unknown2; // E0 E0 56 00 +/*136*/ int32 y; +/*140*/ int32 x; +/*144*/ int32 z; +/*148*/ uint32 unknown2; // E0 E0 56 00 }; struct GMLastName_Struct { @@ -1679,7 +1677,7 @@ struct GMLastName_Struct { char gmname[64]; char lastname[64]; uint16 unknown[4]; // 0x00, 0x00 - // 0x01, 0x00 = Update the clients + // 0x01, 0x00 = Update the clients }; //Combat Abilities @@ -1750,7 +1748,7 @@ Wrong size on OP_LFG. Got: 80, Expected: 68 */ /*000*/ uint32 unknown000; /*004*/ uint8 value; // 0x00 = off 0x01 = on -/*005*/ uint8 MatchFilter; +/*005*/ uint8 MatchFilter; /*006*/ uint16 Unknown006; /*008*/ uint32 FromLevel; /*012*/ uint32 ToLevel; @@ -1875,7 +1873,7 @@ struct Adventure_Purchase_Struct { }; struct Adventure_Sell_Struct { -/*000*/ uint32 unknown000; //0x01 +/*000*/ uint32 unknown000; //0x01 /*004*/ uint32 npcid; /*008*/ uint32 slot; /*012*/ uint32 charges; @@ -1993,7 +1991,7 @@ struct AdventureLeaderboard_Struct uint8 iss_unknown001[6]; };*/ -struct Illusion_Struct { //size: 256 - SoF +struct Illusion_Struct { //size: 256 - SoF /*000*/ uint32 spawnid; /*004*/ char charname[64]; // /*068*/ uint16 race; // @@ -2093,7 +2091,7 @@ struct ZoneUnavail_Struct { int16 unknown[4]; }; -enum { //Group action fields +enum { //Group action fields groupActJoin = 0, groupActLeave = 1, groupActDisband = 6, @@ -2226,10 +2224,10 @@ struct TradeBusy_Struct { }; struct PetitionUpdate_Struct { - uint32 petnumber; // Petition Number + uint32 petnumber; // Petition Number uint32 color; // 0x00 = green, 0x01 = yellow, 0x02 = red uint32 status; - time_t senttime; // 4 has to be 0x1F + time_t senttime; // 4 has to be 0x1F char accountid[32]; char gmsenttoo[64]; int32 quetotal; @@ -2393,7 +2391,7 @@ struct GMEmoteZone_Struct { // Variable length. struct BookText_Struct { uint8 window; // where to display the text (0xFF means new window) - uint8 type; //type: 0=scroll, 1=book, 2=item info.. prolly others. + uint8 type; //type: 0=scroll, 1=book, 2=item info.. prolly others. uint32 invslot; // Only used in SoF and later clients. char booktext[1]; // Variable Length }; @@ -2402,7 +2400,7 @@ struct BookText_Struct { // or in our case, the 'name' column in our books table. struct BookRequest_Struct { uint8 window; // where to display the text (0xFF means new window) - uint8 type; //type: 0=scroll, 1=book, 2=item info.. prolly others. + uint8 type; //type: 0=scroll, 1=book, 2=item info.. prolly others. uint32 invslot; // Only used in Sof and later clients; char txtfile[20]; }; @@ -2457,7 +2455,7 @@ struct Shielding_Struct { /* ** Click Object Action Struct ** Response to client clicking on a World Container (ie, forge) -* also sent by the client when they close the container. +** also sent by the client when they close the container. ** */ struct ClickObjectAction_Struct { @@ -2487,33 +2485,33 @@ struct CloseContainer_Struct { ** Generic Door Struct ** Length: 52 Octets ** Used in: -** cDoorSpawnsStruct(f721) +** cDoorSpawnsStruct(f721) ** */ struct Door_Struct { -/*0000*/ char name[32]; // Filename of Door // Was 10char long before... added the 6 in the next unknown to it: Daeken M. BlackBlade //changed both to 32: Trevius -/*0032*/ float yPos; // y loc -/*0036*/ float xPos; // x loc -/*0040*/ float zPos; // z loc -/*0044*/ float heading; -/*0048*/ uint32 incline; // rotates the whole door -/*0052*/ uint16 size; // 100 is normal, smaller number = smaller model -/*0054*/ uint8 unknown0038[6]; -/*0060*/ uint8 doorId; // door's id # -/*0061*/ uint8 opentype; +/*0000*/ char name[32]; // Filename of Door // Was 10char long before... added the 6 in the next unknown to it: Daeken M. BlackBlade //changed both to 32: Trevius +/*0032*/ float yPos; // y loc +/*0036*/ float xPos; // x loc +/*0040*/ float zPos; // z loc +/*0044*/ float heading; +/*0048*/ uint32 incline; // rotates the whole door +/*0052*/ uint16 size; // 100 is normal, smaller number = smaller model +/*0054*/ uint8 unknown0038[6]; +/*0060*/ uint8 doorId; // door's id # +/*0061*/ uint8 opentype; /* - * Open types: + * Open types: * 66 = PORT1414 (Qeynos) * 55 = BBBOARD (Qeynos) * 100 = QEYLAMP (Qeynos) * 56 = CHEST1 (Qeynos) * 5 = DOOR1 (Qeynos) */ -/*0062*/ uint8 state_at_spawn; -/*0063*/ uint8 invert_state; // if this is 1, the door is normally open -/*0064*/ uint32 door_param; -/*0068*/ uint8 unknown0052[12]; // mostly 0s, the last 3 bytes are something tho +/*0062*/ uint8 state_at_spawn; +/*0063*/ uint8 invert_state; // if this is 1, the door is normally open +/*0064*/ uint32 door_param; +/*0068*/ uint8 unknown0052[12]; // mostly 0s, the last 3 bytes are something tho /*0080*/ }; @@ -2524,7 +2522,7 @@ struct DoorSpawns_Struct { }; /* - OP Code: Op_ClickDoor + OP Code: Op_ClickDoor Size: 16 */ struct ClickDoor_Struct { @@ -2565,7 +2563,7 @@ struct Resurrect_Struct { /*008*/ float y; /*012*/ float x; /*016*/ float z; -/*020*/ uint32 unknown020; +/*020*/ uint32 unknown020; /*024*/ char your_name[64]; /*088*/ uint32 unknown088; /*092*/ char rezzer_name[64]; @@ -2578,12 +2576,12 @@ struct Resurrect_Struct { struct Translocate_Struct { /*000*/ uint32 ZoneID; /*004*/ uint32 SpellID; -/*008*/ uint32 unknown008; //Heading ? +/*008*/ uint32 unknown008; //Heading ? /*012*/ char Caster[64]; /*076*/ float y; -/*080*/ float x; +/*080*/ float x; /*084*/ float z; -/*088*/ uint32 Complete; +/*088*/ uint32 Complete; }; struct Sacrifice_Struct { @@ -2637,17 +2635,17 @@ enum { }; struct BazaarWindowStart_Struct { - uint8 Action; - uint8 Unknown001; - uint16 Unknown002; + uint8 Action; + uint8 Unknown001; + uint16 Unknown002; }; struct BazaarWelcome_Struct { BazaarWindowStart_Struct Beginning; - uint32 Traders; - uint32 Items; - uint8 Unknown012[8]; + uint32 Traders; + uint32 Items; + uint8 Unknown012[8]; }; struct BazaarSearch_Struct { @@ -2791,10 +2789,10 @@ struct BuyerRemoveItem_Struct { }; struct ServerSideFilters_Struct { -uint8 clientattackfilters; // 0) No, 1) All (players) but self, 2) All (players) but group -uint8 npcattackfilters; // 0) No, 1) Ignore NPC misses (all), 2) Ignore NPC Misses + Attacks (all but self), 3) Ignores NPC Misses + Attacks (all but group) -uint8 clientcastfilters; // 0) No, 1) Ignore PC Casts (all), 2) Ignore PC Casts (not directed towards self) -uint8 npccastfilters; // 0) No, 1) Ignore NPC Casts (all), 2) Ignore NPC Casts (not directed towards self) +uint8 clientattackfilters; // 0) No, 1) All (players) but self, 2) All (players) but group +uint8 npcattackfilters; // 0) No, 1) Ignore NPC misses (all), 2) Ignore NPC Misses + Attacks (all but self), 3) Ignores NPC Misses + Attacks (all but group) +uint8 clientcastfilters; // 0) No, 1) Ignore PC Casts (all), 2) Ignore PC Casts (not directed towards self) +uint8 npccastfilters; // 0) No, 1) Ignore NPC Casts (all), 2) Ignore NPC Casts (not directed towards self) }; /* @@ -2821,23 +2819,23 @@ struct LDONItemViewRequest_Struct { }; /* - * Client to server packet + * Client to server packet */ struct PickPocket_Struct { // Size 18 - uint32 to; - uint32 from; - uint16 myskill; - uint8 type; // -1 you are being picked, 0 failed , 1 = plat, 2 = gold, 3 = silver, 4 = copper, 5 = item - uint8 unknown1; // 0 for response, unknown for input - uint32 coin; - uint8 lastsix[2]; + uint32 to; + uint32 from; + uint16 myskill; + uint8 type; // -1 you are being picked, 0 failed , 1 = plat, 2 = gold, 3 = silver, 4 = copper, 5 = item + uint8 unknown1; // 0 for response, unknown for input + uint32 coin; + uint8 lastsix[2]; }; /* * Server to client packet */ -enum { +enum { PickPocketFailed = 0, PickPocketPlatinum = 1, PickPocketGold = 2, @@ -2888,7 +2886,7 @@ struct LogServer_Struct { struct ApproveWorld_Struct { // Size 544 // Op_Code OP_ApproveWorld - uint8 unknown544[544]; + uint8 unknown544[544]; }; struct ClientError_Struct @@ -3017,7 +3015,7 @@ struct BecomeTrader_Struct { /*000*/ uint32 ID; /*004*/ uint32 Code; -/*008*/ char Name[64]; +/*008*/ char Name[64]; /*072*/ uint32 Unknown072; // Observed 0x33,0x91 etc on zone-in, 0x00 when sent for a new trader after zone-in /*076*/ }; @@ -3041,15 +3039,15 @@ struct TraderBuy_Struct{ /*012*/ uint32 AlreadySold; /*016*/ uint32 Price; /*020*/ uint32 Quantity; -/*024*/ char ItemName[64]; +/*024*/ char ItemName[64]; }; struct TraderItemUpdate_Struct{ - uint32 Unknown000; - uint32 TraderID; - uint8 FromSlot; - int ToSlot; //7? - uint16 Charges; + uint32 Unknown000; + uint32 TraderID; + uint8 FromSlot; + int ToSlot; //7? + uint16 Charges; }; struct TraderPriceUpdate_Struct { @@ -3131,9 +3129,9 @@ struct Internal_GuildMembers_Struct { //just for display purposes, this is not a uint32 note_length; //total length of all the public notes, excluding terminators Internal_GuildMemberEntry_Struct member[0]; /* - * followed by a set of `count` null terminated name strings - * and then a set of `count` null terminated public note strings - */ + * followed by a set of `count` null terminated name strings + * and then a set of `count` null terminated public note strings + */ }; struct GuildMOTD_Struct{ @@ -3282,15 +3280,15 @@ struct ZoneInSendName_Struct2 { static const uint32 MAX_TRIBUTE_TIERS = 10; struct StartTribute_Struct { - uint32 client_id; - uint32 tribute_master_id; - uint32 response; + uint32 client_id; + uint32 tribute_master_id; + uint32 response; }; struct TributeLevel_Struct { - uint32 level; //backwards byte order! - uint32 tribute_item_id; //backwards byte order! - uint32 cost; //backwards byte order! + uint32 level; //backwards byte order! + uint32 tribute_item_id; //backwards byte order! + uint32 cost; //backwards byte order! }; struct TributeAbility_Struct { @@ -3306,15 +3304,15 @@ struct GuildTributeAbility_Struct { }; struct SelectTributeReq_Struct { - uint32 client_id; //? maybe action ID? - uint32 tribute_id; - uint32 unknown8; //seen E3 00 00 00 + uint32 client_id; //? maybe action ID? + uint32 tribute_id; + uint32 unknown8; //seen E3 00 00 00 }; struct SelectTributeReply_Struct { - uint32 client_id; //echoed from request. - uint32 tribute_id; - char desc[0]; + uint32 client_id; //echoed from request. + uint32 tribute_id; + char desc[0]; }; struct TributeInfo_Struct { @@ -3325,23 +3323,23 @@ struct TributeInfo_Struct { }; struct TributeItem_Struct { - uint32 slot; - uint32 quantity; - uint32 tribute_master_id; - int32 tribute_points; + uint32 slot; + uint32 quantity; + uint32 tribute_master_id; + int32 tribute_points; }; struct TributePoint_Struct { - int32 tribute_points; - uint32 unknown04; - int32 career_tribute_points; - uint32 unknown12; + int32 tribute_points; + uint32 unknown04; + int32 career_tribute_points; + uint32 unknown12; }; struct TributeMoney_Struct { - uint32 platinum; - uint32 tribute_master_id; - int32 tribute_points; + uint32 platinum; + uint32 tribute_master_id; + int32 tribute_points; }; @@ -3391,7 +3389,7 @@ struct RecipesSearch_Struct { //one sent for each item, from server in reply to favorites or search struct RecipeReply_Struct { uint32 object_type; - uint32 some_id; //same as in favorites + uint32 some_id; //same as in favorites uint32 component_count; uint32 recipe_id; uint32 trivial; @@ -3433,9 +3431,9 @@ struct MerchantList{ uint32 id; uint32 slot; uint32 item; - int16 faction_required; - int8 level_required; - uint16 alt_currency_cost; + int16 faction_required; + int8 level_required; + uint16 alt_currency_cost; }; struct TempMerchantList{ uint32 npcid; @@ -3446,8 +3444,8 @@ struct TempMerchantList{ }; struct AltCurrencyDefinition_Struct { - uint32 id; - uint32 item_id; + uint32 id; + uint32 item_id; }; struct NPC_Emote_Struct { @@ -3524,13 +3522,13 @@ struct SetTitleReply_Struct { }; struct TaskMemberList_Struct { -/*00*/ uint32 gopher_id; -/*04*/ uint32 unknown04; -/*08*/ uint32 member_count; //1 less than the number of members -/*12*/ char list_pointer[0]; +/*00*/ uint32 gopher_id; +/*04*/ uint32 unknown04; +/*08*/ uint32 member_count; //1 less than the number of members +/*12*/ char list_pointer[0]; /* list is of the form: char member_name[1] //null terminated string - uint8 task_leader //boolean flag + uint8 task_leader //boolean flag */ }; @@ -3547,12 +3545,12 @@ struct TaskDescription_Struct { /*018*/ uint32 unknown18; /*022*/ uint32 unknown22; /*026*/ char desc[1]; //variable length, 0 terminated -/*027*/ uint32 reward_count; //not sure +/*027*/ uint32 reward_count; //not sure /*031*/ uint32 unknown31; /*035*/ uint32 unknown35; /*039*/ uint16 unknown39; /*041*/ char reward_link[1]; //variable length, 0 terminated -/*042*/ uint32 unknown43; //maybe crystal count? +/*042*/ uint32 unknown43; //maybe crystal count? }; // Old structs not used by Task System implentation but left for reference @@ -3570,9 +3568,9 @@ struct TaskActivity_Struct { /*034*/ uint32 goal_count; /*038*/ uint32 unknown38; //0xFFFFFFFF /*042*/ uint32 unknown42; //0xFFFFFFFF -/*046*/ uint32 unknown46; //saw 0x151,0x156 -/*050*/ uint32 unknown50; //saw 0x404,0 -/*054*/ char activity_name[1]; //variable length, 0 terminated... commonly empty +/*046*/ uint32 unknown46; //saw 0x151,0x156 +/*050*/ uint32 unknown50; //saw 0x404,0 +/*054*/ char activity_name[1]; //variable length, 0 terminated... commonly empty /*055*/ uint32 done_count; /*059*/ uint32 unknown59; //=1 except on unknown and terminal activities? /*063*/ @@ -3592,7 +3590,7 @@ struct TaskSelectorData_Struct { /*000*/ uint32 Unknown7; // Seen 0 /*000*/ char TaskName[1]; // Null Terminated /*000*/ char TaskDescription[1]; // Null Terminated -/*000*/ uint8 Unknown10; // Possibly another Null Terminated String? Seen 0 +/*000*/ uint8 Unknown10; // Possibly another Null Terminated String? Seen 0 /*000*/ uint32 ActivityCount; // Seen 5 /*000*/ TaskSelectorActivities_Struct Activities[1]; }; @@ -3626,7 +3624,7 @@ struct TaskHistory_Struct { #endif struct AcceptNewTask_Struct { - uint32 unknown00; + uint32 unknown00; uint32 task_id; //set to 0 for 'decline' uint32 task_master_id; //entity ID }; @@ -3708,7 +3706,7 @@ struct TaskDescriptionData2_Struct { }; struct TaskDescriptionTrailer_Struct { - //uint16 unknown1; // 0x0012 + //uint16 unknown1; // 0x0012 uint32 Points; }; @@ -3728,7 +3726,7 @@ struct TaskActivityData1_Struct { uint32 unknown1; // 0xffffffff uint32 unknown2; // 0xffffffff uint32 ZoneID; // seen 0x36 - uint32 unknown3; + uint32 unknown3; }; struct TaskActivityTrailer_Struct { @@ -3744,7 +3742,7 @@ struct TaskActivityShort_Struct { uint32 ActivityID; uint32 unknown3; uint32 ActivityType; // 0xffffffff for the short packet - uint32 unknown4; + uint32 unknown4; }; struct TaskActivityComplete_Struct { @@ -3778,7 +3776,7 @@ struct TaskHistoryReplyData1_Struct { }; struct TaskHistoryReplyData2_Struct { - uint32 GoalCount; + uint32 GoalCount; uint32 unknown04; // 0xffffffff uint32 unknown08; // 0xffffffff uint32 ZoneID; @@ -3816,14 +3814,14 @@ struct BankerChange_Struct { }; struct LeadershipExpUpdate_Struct { - /*0000*/ uint32 unknown0000; // All zeroes? - /*0004*/ uint32 group_leadership_exp; // Group leadership exp value - /*0008*/ uint32 group_leadership_points; // Unspent group points - /*0012*/ uint32 unknown0012; // Type? - /*0016*/ uint32 unknown0016; // All zeroes? - /*0020*/ uint32 raid_leadership_exp; // Raid leadership exp value - /*0024*/ uint32 raid_leadership_points; // Unspent raid points - /*0028*/ uint32 unknown0028; +/*0000*/ uint32 unknown0000; // All zeroes? +/*0004*/ uint32 group_leadership_exp; // Group leadership exp value +/*0008*/ uint32 group_leadership_points; // Unspent group points +/*0012*/ uint32 unknown0012; // Type? +/*0016*/ uint32 unknown0016; // All zeroes? +/*0020*/ uint32 raid_leadership_exp; // Raid leadership exp value +/*0024*/ uint32 raid_leadership_points; // Unspent raid points +/*0028*/ uint32 unknown0028; }; struct UpdateLeadershipAA_Struct { @@ -3932,19 +3930,19 @@ struct RaidMembers_Struct { }; struct DynamicWall_Struct { -/*00*/ char name[32]; -/*32*/ float y; -/*36*/ float x; -/*40*/ float z; -/*44*/ uint32 something; -/*48*/ uint32 unknown48; //0 -/*52*/ uint32 one_hundred; //0x64 -/*56*/ uint32 unknown56; //0 -/*60*/ uint32 something2; -/*64*/ int32 unknown64; //-1 -/*68*/ uint32 unknown68; //0 -/*72*/ uint32 unknown72; //0 -/*76*/ uint32 unknown76; //0x100 +/*00*/ char name[32]; +/*32*/ float y; +/*36*/ float x; +/*40*/ float z; +/*44*/ uint32 something; +/*48*/ uint32 unknown48; //0 +/*52*/ uint32 one_hundred; //0x64 +/*56*/ uint32 unknown56; //0 +/*60*/ uint32 something2; +/*64*/ int32 unknown64; //-1 +/*68*/ uint32 unknown68; //0 +/*72*/ uint32 unknown72; //0 +/*76*/ uint32 unknown76; //0x100 /*80*/ }; @@ -4099,8 +4097,8 @@ struct AA_Action { struct AA_Skills { //this should be removed and changed to AA_Array /*00*/ uint32 aa_skill; // Total AAs Spent -/*04*/ uint32 aa_value; -/*08*/ uint32 unknown08; +/*04*/ uint32 aa_value; +/*08*/ uint32 unknown08; /*12*/ }; @@ -4113,11 +4111,11 @@ struct AAExpUpdate_Struct { struct AltAdvStats_Struct { -/*000*/ uint32 experience; -/*004*/ uint16 unspent; -/*006*/ uint16 unknown006; -/*008*/ uint8 percentage; -/*009*/ uint8 unknown009[3]; +/*000*/ uint32 experience; +/*004*/ uint16 unspent; +/*006*/ uint16 unknown006; +/*008*/ uint8 percentage; +/*009*/ uint8 unknown009[3]; }; struct PlayerAA_Struct { // Is this still used? @@ -4125,8 +4123,8 @@ struct PlayerAA_Struct { // Is this still used? }; struct AATable_Struct { -/*00*/ int32 aa_spent; // Total AAs Spent -/*04*/ AA_Skills aa_list[MAX_PP_AA_ARRAY]; +/*00*/ int32 aa_spent; // Total AAs Spent +/*04*/ AA_Skills aa_list[MAX_PP_AA_ARRAY]; }; struct Weather_Struct { @@ -4152,8 +4150,8 @@ struct AnnoyingZoneUnknown_Struct { }; struct LoadSpellSet_Struct { - uint32 spell[MAX_PP_MEMSPELL]; // 0xFFFFFFFF if no action, slot number if to unmem starting at 0 - uint32 unknown; //there seems to be an extra field in this packet... + uint32 spell[MAX_PP_MEMSPELL]; // 0xFFFFFFFF if no action, slot number if to unmem starting at 0 + uint32 unknown; //there seems to be an extra field in this packet... }; // This is the structure for OP_ZonePlayerToBind opcode. Discovered on Feb 9 2007 by FNW from packet logs for titanium client @@ -4201,8 +4199,8 @@ struct RespawnWindow_Struct { */ struct spawnShroudOther { -/*0000*/ uint32 spawnId; // Spawn Id of the shrouded player -/*0004*/ Spawn_Struct spawn; // Updated spawn struct for the player +/*0000*/ uint32 spawnId; // Spawn Id of the shrouded player +/*0004*/ Spawn_Struct spawn; // Updated spawn struct for the player /*0586*/ }; @@ -4236,11 +4234,11 @@ struct ItemVerifyReply_Struct { #if 0 struct spawnShroudSelf { -/*00000*/ uint32 spawnId; // Spawn Id of you -/*00004*/ Spawn_Struct spawn; // Updated spawnStruct for you +/*00000*/ uint32 spawnId; // Spawn Id of you +/*00004*/ Spawn_Struct spawn; // Updated spawnStruct for you //this is a sub-struct of PlayerProfile, which we havent broken out yet. -/*00586*/ playerProfileStruct profile; // Character profile for shrouded char -/*13522*/ uint8 items; // Items on the player +/*00586*/ playerProfileStruct profile; // Character profile for shrouded char +/*13522*/ uint8 items; // Items on the player /*xxxxx*/ }; #endif @@ -4255,9 +4253,9 @@ typedef struct { } GroupLFPMemberEntry; struct ControlBoat_Struct { -/*000*/ uint32 boatId; // entitylist id of the boat +/*000*/ uint32 boatId; // entitylist id of the boat /*004*/ bool TakeControl; // 01 if taking control, 00 if releasing it -/*007*/ // no idea what these last three bytes represent +/*007*/ // no idea what these last three bytes represent }; struct AugmentInfo_Struct @@ -4347,9 +4345,9 @@ struct PVPLeaderBoardDetailsReply_Struct struct DisciplineTimer_Struct { -/*00*/ uint32 TimerID; -/*04*/ uint32 Duration; -/*08*/ uint32 Unknown08; +/*00*/ uint32 TimerID; +/*04*/ uint32 Duration; +/*08*/ uint32 Unknown08; }; struct InternalVeteranRewardItem @@ -4462,7 +4460,7 @@ struct GuildBankWithdrawItem_Struct struct GuildBankItemUpdate_Struct { void Init(uint32 inAction, uint32 inUnknown004, uint16 inSlotID, uint16 inArea, uint16 inUnknown012, uint32 inItemID, uint32 inIcon, uint32 inQuantity, - uint32 inPermissions, uint32 inAllowMerge, bool inUseable) + uint32 inPermissions, uint32 inAllowMerge, bool inUseable) { Action = inAction; Unknown004 = inUnknown004; @@ -4711,16 +4709,16 @@ struct AltCurrencySelectItem_Struct { //eg: "I will give you no doubloons for a cloth cap." //Probably also sends amounts somewhere struct AltCurrencySelectItemReply_Struct { -/*000*/ uint32 unknown000; -/*004*/ uint8 unknown004; //0xff -/*005*/ uint8 unknown005; //0xff -/*006*/ uint8 unknown006; //0xff -/*007*/ uint8 unknown007; //0xff -/*008*/ char item_name[64]; -/*072*/ uint32 unknown074; -/*076*/ uint32 cost; -/*080*/ uint32 unknown080; -/*084*/ uint32 unknown084; +/*000*/ uint32 unknown000; +/*004*/ uint8 unknown004; //0xff +/*005*/ uint8 unknown005; //0xff +/*006*/ uint8 unknown006; //0xff +/*007*/ uint8 unknown007; //0xff +/*008*/ char item_name[64]; +/*072*/ uint32 unknown074; +/*076*/ uint32 cost; +/*080*/ uint32 unknown080; +/*084*/ uint32 unknown084; }; //Client -> Server @@ -4801,7 +4799,7 @@ struct LFGuild_GuildToggle_Struct /*012*/ char Comment[256]; /*268*/ uint8 Unknown268[256]; /*524*/ uint32 FromLevel; -/*528*/ uint32 ToLevel; +/*528*/ uint32 ToLevel; /*532*/ uint32 Classes; /*536*/ uint32 AACount; /*540*/ uint32 TimeZone; @@ -4923,7 +4921,7 @@ struct MercenaryListEntry_Struct { // Sent by the server when browsing the Mercenary Merchant struct MercenaryMerchantList_Struct { /*0000*/ uint32 MercTypeCount; // Number of Merc Types to follow -/*0004*/ uint32 MercGrades[MAX_MERC_GRADES]; // Count varies, but hard set to 3 max for now - From dbstr_us.txt - Apprentice (330000100), Journeyman (330000200), Master (330000300) +/*0004*/ uint32 MercGrades[MAX_MERC_GRADES]; // Count varies, but hard set to 3 max for now - From dbstr_us.txt - Apprentice (330000100), Journeyman (330000200), Master (330000300) /*0016*/ uint32 MercCount; // Number of MercenaryInfo_Struct to follow /*0020*/ MercenaryListEntry_Struct Mercs[MAX_MERC]; // Data for individual mercenaries in the Merchant List }; @@ -5080,3 +5078,4 @@ typedef std::list ItemList; #pragma pack() #endif + diff --git a/common/eqemu_exception.cpp b/common/eqemu_exception.cpp index c247e1a0a..88e1ea225 100644 --- a/common/eqemu_exception.cpp +++ b/common/eqemu_exception.cpp @@ -1,65 +1,65 @@ -/* EQEmu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEmu Development Team (http://www.eqemulator.net) +/* EQEmu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEmu Development Team (http://www.eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "eqemu_exception.h" namespace EQEmu { - Exception::Exception(const char* name, const std::string& description, const char* file, long line) - : line_(line), - file_(file), - desc_(description), - name_(name) - { - } + Exception::Exception(const char* name, const std::string& description, const char* file, long line) + : line_(line), + file_(file), + desc_(description), + name_(name) + { + } - Exception::Exception(const Exception& e) - : line_(e.line_), - file_(e.file_), - desc_(e.desc_), - name_(e.name_) - { - } + Exception::Exception(const Exception& e) + : line_(e.line_), + file_(e.file_), + desc_(e.desc_), + name_(e.name_) + { + } #ifdef EQEMU_RVALUE_MOVE - Exception::Exception(const Exception&& e) - : line_(e.line_), - file_(e.file_), - desc_(e.desc_), - name_(e.name_) - { - } + Exception::Exception(const Exception&& e) + : line_(e.line_), + file_(e.file_), + desc_(e.desc_), + name_(e.name_) + { + } #endif - void Exception::operator=(const Exception& e) { - line_ = e.line_; - file_ = e.file_; - desc_ = e.desc_; - name_ = e.name_; - } + void Exception::operator=(const Exception& e) { + line_ = e.line_; + file_ = e.file_; + desc_ = e.desc_; + name_ = e.name_; + } - const std::string& Exception::full_description() const { - if(full_desc_.empty()) { - std::stringstream ss; - ss << "EQEmu Exception (" << name_ << ") in " << file_; - ss << " at line (" << line_ << "): " << desc_; - full_desc_ = ss.str(); - } - return full_desc_; - } + const std::string& Exception::full_description() const { + if(full_desc_.empty()) { + std::stringstream ss; + ss << "EQEmu Exception (" << name_ << ") in " << file_; + ss << " at line (" << line_ << "): " << desc_; + full_desc_ = ss.str(); + } + return full_desc_; + } } // EQEmu diff --git a/common/eqemu_exception.h b/common/eqemu_exception.h index 2ccd75be0..85086d1ad 100644 --- a/common/eqemu_exception.h +++ b/common/eqemu_exception.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_EQEMUEXCEPTION_H @@ -24,83 +24,83 @@ namespace EQEmu { - //! EQEmu Exception Class - /*! - A custom exception class for things EQEmu throws. - */ - class Exception : public std::exception { - public: + //! EQEmu Exception Class + /*! + A custom exception class for things EQEmu throws. + */ + class Exception : public std::exception { + public: - //! Detailed Constructor - /*! - \param name The name given for this exception. - \param description The description for this exception. - \param file The file name for this exception. - \param line The line number for this exception. - */ - Exception(const char* name, const std::string& description, const char* file, long line); + //! Detailed Constructor + /*! + \param name The name given for this exception. + \param description The description for this exception. + \param file The file name for this exception. + \param line The line number for this exception. + */ + Exception(const char* name, const std::string& description, const char* file, long line); - //! Copy Constructor - Exception(const Exception& e); + //! Copy Constructor + Exception(const Exception& e); - //! Move Constructor + //! Move Constructor #ifdef EQEMU_RVALUE_MOVE - Exception(const Exception&& e); + Exception(const Exception&& e); #endif - //! Destructor - ~Exception() throw() { } + //! Destructor + ~Exception() throw() { } - //! Assignment Operator - void operator=(const Exception& e); + //! Assignment Operator + void operator=(const Exception& e); - //! Get Name - /*! - Gets the name of the exception as it was when it was created. - These are typically descriptive categories that the exception would fall under. - */ - virtual const std::string& name() const { return name_; } + //! Get Name + /*! + Gets the name of the exception as it was when it was created. + These are typically descriptive categories that the exception would fall under. + */ + virtual const std::string& name() const { return name_; } - //! Get Basic Description - /*! - Gets the description of the exception as it was when it was created. - This tends to explain the circumstances of why the exception was thrown. - */ - virtual const std::string& description() const { return desc_; } + //! Get Basic Description + /*! + Gets the description of the exception as it was when it was created. + This tends to explain the circumstances of why the exception was thrown. + */ + virtual const std::string& description() const { return desc_; } - //! Get Full Description - /*! - Gets a full description for this exception. - This is a string containing the name, description, file and line number in a custom format. - This string is created the first time the full_description is accessed. - */ - virtual const std::string& full_description() const; + //! Get Full Description + /*! + Gets a full description for this exception. + This is a string containing the name, description, file and line number in a custom format. + This string is created the first time the full_description is accessed. + */ + virtual const std::string& full_description() const; - //! Get File Name - /*! - Gets the name of the file this exception was thrown from. - */ - virtual const std::string& file() const { return file_; } + //! Get File Name + /*! + Gets the name of the file this exception was thrown from. + */ + virtual const std::string& file() const { return file_; } - //! Get File Line - /*! - Gets the file line this exception was thrown from. - */ - virtual const long& line() const { return line_; } + //! Get File Line + /*! + Gets the file line this exception was thrown from. + */ + virtual const long& line() const { return line_; } - //! std::exception overload - /*! - Overload from std::exception - Allows it to be caught as a std::exception without casting which is nice, returns the full description. - */ - const char* what() const throw() { return full_description().c_str(); } - protected: - std::string name_; //!< Exception name - std::string desc_; //!< Exception Description - mutable std::string full_desc_; //!< Full Exception Description - std::string file_; //!< File Name - long line_; // @@ -69,58 +69,58 @@ EQTime::~EQTime() int EQTime::getEQTimeOfDay( time_t timeConvert, struct TimeOfDay_Struct *eqTimeOfDay ) { - /* check to see if we have a reference time to go by. */ - if( eqTime.start_realtime == 0 ) - return 0; + /* check to see if we have a reference time to go by. */ + if( eqTime.start_realtime == 0 ) + return 0; - unsigned long diff = timeConvert - eqTime.start_realtime; + unsigned long diff = timeConvert - eqTime.start_realtime; - /* There are 3 seconds per 1 EQ Minute */ - diff /= 3; + /* There are 3 seconds per 1 EQ Minute */ + diff /= 3; - /* Start off timezone offset */ + /* Start off timezone offset */ - int32 ntz = timezone; + int32 ntz = timezone; - /* The minutes range from 0 - 59 */ - diff += eqTime.start_eqtime.minute + (ntz%60); - eqTimeOfDay->minute = diff % 60; - diff /= 60; - ntz /= 60; + /* The minutes range from 0 - 59 */ + diff += eqTime.start_eqtime.minute + (ntz%60); + eqTimeOfDay->minute = diff % 60; + diff /= 60; + ntz /= 60; - // The hours range from 1-24 - // 1 = 1am - // 2 = 2am - // ... - // 23 = 11 pm - // 24 = 12 am - // - // Modify it so that it works from - // 0-23 for our calculations - diff += ( eqTime.start_eqtime.hour - 1) + (ntz%24); - eqTimeOfDay->hour = (diff%24) + 1; - diff /= 24; - ntz /= 24; + // The hours range from 1-24 + // 1 = 1am + // 2 = 2am + // ... + // 23 = 11 pm + // 24 = 12 am + // + // Modify it so that it works from + // 0-23 for our calculations + diff += ( eqTime.start_eqtime.hour - 1) + (ntz%24); + eqTimeOfDay->hour = (diff%24) + 1; + diff /= 24; + ntz /= 24; - // The days range from 1-28 - // Modify it so that it works from - // 0-27 for our calculations - diff += ( eqTime.start_eqtime.day - 1 ) + (ntz%28); - eqTimeOfDay->day = (diff%28) + 1; - diff /= 28; - ntz /= 28; + // The days range from 1-28 + // Modify it so that it works from + // 0-27 for our calculations + diff += ( eqTime.start_eqtime.day - 1 ) + (ntz%28); + eqTimeOfDay->day = (diff%28) + 1; + diff /= 28; + ntz /= 28; - // The months range from 1-12 - // Modify it so that it works from - // 0-11 for our calculations - diff += ( eqTime.start_eqtime.month - 1 ) + (ntz%12); - eqTimeOfDay->month = (diff%12) + 1; - diff /= 12; - ntz /= 12; + // The months range from 1-12 + // Modify it so that it works from + // 0-11 for our calculations + diff += ( eqTime.start_eqtime.month - 1 ) + (ntz%12); + eqTimeOfDay->month = (diff%12) + 1; + diff /= 12; + ntz /= 12; - eqTimeOfDay->year = eqTime.start_eqtime.year + diff + ntz; + eqTimeOfDay->year = eqTime.start_eqtime.year + diff + ntz; - return 1; + return 1; } //setEQTimeOfDay @@ -172,7 +172,7 @@ bool EQTime::loadFile(const char *filename) in.ignore(80, '\n'); if(version != EQT_VERSION) { - LogFile->write(EQEMuLog::Error, "'%s' is NOT a valid EQTime file. File version is %i, EQTime version is %i", filename, version, EQT_VERSION); + LogFile->write(EQEMuLog::Error, "'%s' is NOT a valid EQTime file. File version is %i, EQTime version is %i", filename, version, EQT_VERSION); return false; } //in >> eqTime.start_eqtime.day; @@ -273,8 +273,3 @@ void EQTime::ToString(TimeOfDay_Struct *t, string &str) { str = buf; } - - - - - diff --git a/common/errmsg.h b/common/errmsg.h index 03863ec61..f884d7ab2 100644 --- a/common/errmsg.h +++ b/common/errmsg.h @@ -1,22 +1,22 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ -/* Error messages for mysql clients */ -/* error messages for the demon is in share/language/errmsg.sys */ +/* Error messages for mysql clients */ +/* error messages for the demon is in share/language/errmsg.sys */ #ifdef __cplusplus extern "C" { diff --git a/common/extprofile.cpp b/common/extprofile.cpp index b66ada553..0ea3fb7a1 100644 --- a/common/extprofile.cpp +++ b/common/extprofile.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" @@ -50,8 +50,3 @@ bool SetExtendedProfile(ExtendedProfile_Struct *to, char *old, unsigned int len) return(false); } - - - - - diff --git a/common/extprofile.h b/common/extprofile.h index 183f98206..74e9a89c3 100644 --- a/common/extprofile.h +++ b/common/extprofile.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EXTENDED_PROFILE_H #define EXTENDED_PROFILE_H diff --git a/common/faction.cpp b/common/faction.cpp index 9a8e27db2..7016f6547 100644 --- a/common/faction.cpp +++ b/common/faction.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "faction.h" @@ -29,20 +29,20 @@ const char *FactionValueToString(FACTION_VALUE fv) { return("Kindly"); case FACTION_AMIABLE: return("Amiable"); - case FACTION_INDIFFERENT: - return("Indifferent"); - case FACTION_APPREHENSIVE: - return("Apprehensive"); - case FACTION_DUBIOUS: - return("Dubious"); - case FACTION_THREATENLY: - return("Threatenly"); - case FACTION_SCOWLS: - return("Scowls, ready to attack."); - default: - break; - } - return("Unknown Faction Con"); + case FACTION_INDIFFERENT: + return("Indifferent"); + case FACTION_APPREHENSIVE: + return("Apprehensive"); + case FACTION_DUBIOUS: + return("Dubious"); + case FACTION_THREATENLY: + return("Threatenly"); + case FACTION_SCOWLS: + return("Scowls, ready to attack."); + default: + break; + } + return("Unknown Faction Con"); } @@ -50,21 +50,21 @@ const char *FactionValueToString(FACTION_VALUE fv) { //| Name: CalculateFaction; rembrant, Dec. 16, 2001 //o-------------------------------------------------------------- //| Notes: Returns the faction message value. -//| Modify these values to taste. +//| Modify these values to taste. //o-------------------------------------------------------------- FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value) { int32 character_value = tmpCharacter_value; if (fm) character_value += fm->base + fm->class_mod + fm->race_mod + fm->deity_mod; - if(character_value >= 1101) return FACTION_ALLY; - if(character_value >= 701 && character_value <= 1100) return FACTION_WARMLY; - if(character_value >= 401 && character_value <= 700) return FACTION_KINDLY; - if(character_value >= 101 && character_value <= 400) return FACTION_AMIABLE; - if(character_value >= 0 && character_value <= 100) return FACTION_INDIFFERENT; - if(character_value >= -100 && character_value <= -1) return FACTION_APPREHENSIVE; - if(character_value >= -700 && character_value <= -101) return FACTION_DUBIOUS; - if(character_value >= -999 && character_value <= -701) return FACTION_THREATENLY; + if(character_value >= 1101) return FACTION_ALLY; + if(character_value >= 701 && character_value <= 1100) return FACTION_WARMLY; + if(character_value >= 401 && character_value <= 700) return FACTION_KINDLY; + if(character_value >= 101 && character_value <= 400) return FACTION_AMIABLE; + if(character_value >= 0 && character_value <= 100) return FACTION_INDIFFERENT; + if(character_value >= -100 && character_value <= -1) return FACTION_APPREHENSIVE; + if(character_value >= -700 && character_value <= -101) return FACTION_DUBIOUS; + if(character_value >= -999 && character_value <= -701) return FACTION_THREATENLY; if(character_value <= -1000) return FACTION_SCOWLS; return FACTION_INDIFFERENT; } @@ -72,70 +72,70 @@ FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value) // neotokyo: this function should check if some races have more than one race define bool IsOfEqualRace(int r1, int r2) { - if (r1 == r2) - return true; - // TODO: add more values - switch(r1) - { - case DARK_ELF: - if (r2 == 77) - return true; - break; - case BARBARIAN: - if (r2 == 90) - return true; - } - return false; + if (r1 == r2) + return true; + // TODO: add more values + switch(r1) + { + case DARK_ELF: + if (r2 == 77) + return true; + break; + case BARBARIAN: + if (r2 == 90) + return true; + } + return false; } // neotokyo: trolls endure ogres, dark elves, ... bool IsOfIndiffRace(int r1, int r2) { - if (r1 == r2) - return true; - // TODO: add more values - switch(r1) - { - case DARK_ELF: - case OGRE: - case TROLL: - if (r2 == OGRE || r2 == TROLL || r2 == DARK_ELF) - return true; - break; - case HUMAN: - case BARBARIAN: - case HALF_ELF: - case GNOME: - case HALFLING: - case WOOD_ELF: - if (r2 == HUMAN || - r2 == BARBARIAN || - r2 == ERUDITE || - r2 == HALF_ELF || - r2 == GNOME || - r2 == HALFLING || - r2 == DWARF || - r2 == HIGH_ELF || - r2 == WOOD_ELF) - return true; - break; - case ERUDITE: - if (r2 == HUMAN || r2 == HALF_ELF) - return true; - break; - case DWARF: - if (r2 == HALFLING || r2 == GNOME) - return true; - break; - case HIGH_ELF: - if (r2 == WOOD_ELF) - return true; - break; - case VAHSHIR: - return true; - case IKSAR: - return false; - } - return false; + if (r1 == r2) + return true; + // TODO: add more values + switch(r1) + { + case DARK_ELF: + case OGRE: + case TROLL: + if (r2 == OGRE || r2 == TROLL || r2 == DARK_ELF) + return true; + break; + case HUMAN: + case BARBARIAN: + case HALF_ELF: + case GNOME: + case HALFLING: + case WOOD_ELF: + if (r2 == HUMAN || + r2 == BARBARIAN || + r2 == ERUDITE || + r2 == HALF_ELF || + r2 == GNOME || + r2 == HALFLING || + r2 == DWARF || + r2 == HIGH_ELF || + r2 == WOOD_ELF) + return true; + break; + case ERUDITE: + if (r2 == HUMAN || r2 == HALF_ELF) + return true; + break; + case DWARF: + if (r2 == HALFLING || r2 == GNOME) + return true; + break; + case HIGH_ELF: + if (r2 == WOOD_ELF) + return true; + break; + case VAHSHIR: + return true; + case IKSAR: + return false; + } + return false; } diff --git a/common/faction.h b/common/faction.h index ae41a9286..c98fc0916 100644 --- a/common/faction.h +++ b/common/faction.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_FACTION_H #define _EQEMU_FACTION_H @@ -29,12 +29,12 @@ enum FACTION_VALUE { FACTION_KINDLY = 3, FACTION_AMIABLE = 4, - FACTION_INDIFFERENT = 5, + FACTION_INDIFFERENT = 5, - FACTION_APPREHENSIVE = 6, - FACTION_DUBIOUS = 7, - FACTION_THREATENLY = 8, - FACTION_SCOWLS = 9 + FACTION_APPREHENSIVE = 6, + FACTION_DUBIOUS = 7, + FACTION_THREATENLY = 8, + FACTION_SCOWLS = 9 }; struct NPCFactionList { @@ -57,7 +57,7 @@ struct FactionMods struct Faction { int32 id; - std::map mods; + std::map mods; int16 base; char name[50]; }; @@ -65,10 +65,10 @@ struct Faction { typedef std::map faction_map; struct NPCFaction { - uint32 factionID; - int32 value_mod; - int8 npc_value; - uint8 temp; + uint32 factionID; + int32 value_mod; + int8 npc_value; + uint8 temp; }; const char *FactionValueToString(FACTION_VALUE fv); diff --git a/common/features.h b/common/features.h index 938cb9cf7..1359e1989 100644 --- a/common/features.h +++ b/common/features.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef FEATURES_H #define FEATURES_H @@ -228,7 +228,7 @@ enum { //some random constants #define MAX_NPC_FACTIONS 20 //value caps -#define MAX_FACTION 1500 +#define MAX_FACTION 1500 #define MIN_FACTION -1500 //The Level Cap: diff --git a/common/fixed_memory_hash_set.h b/common/fixed_memory_hash_set.h index f2235e953..2b119bd3f 100644 --- a/common/fixed_memory_hash_set.h +++ b/common/fixed_memory_hash_set.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_FIXED_MEMORY_HASHSET_H @@ -25,227 +25,228 @@ namespace EQEmu { - /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an - allocator for (shared memory), we assume all keys are unsigned int - */ - template - class FixedMemoryHashSet { - typedef uint32 key_type; - typedef T value_type; - typedef uint8 byte; - typedef value_type& reference; - typedef const value_type& const_reference; - typedef size_t size_type; - public: - /*! - Constructor which initializes the hash set - \param data Raw data - \param size Raw data size - \param element_count Max number of possible unique elements that can be inserted. - \param max_element_id Number of offsets to store: eg highest "key" that will be used. - */ - FixedMemoryHashSet(byte *data, size_type size, key_type element_count, key_type max_element_id) { - data_ = data; - size_ = size; + /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an + allocator for (shared memory), we assume all keys are unsigned int + */ + template + class FixedMemoryHashSet { + typedef uint32 key_type; + typedef T value_type; + typedef uint8 byte; + typedef value_type& reference; + typedef const value_type& const_reference; + typedef size_t size_type; + public: + /*! + Constructor which initializes the hash set + \param data Raw data + \param size Raw data size + \param element_count Max number of possible unique elements that can be inserted. + \param max_element_id Number of offsets to store: eg highest "key" that will be used. + */ + FixedMemoryHashSet(byte *data, size_type size, key_type element_count, key_type max_element_id) { + data_ = data; + size_ = size; - byte *ptr = data; - *reinterpret_cast(ptr) = max_element_id + 1; - offset_count_ = max_element_id + 1; - ptr += sizeof(key_type); + byte *ptr = data; + *reinterpret_cast(ptr) = max_element_id + 1; + offset_count_ = max_element_id + 1; + ptr += sizeof(key_type); - *reinterpret_cast(ptr) = element_count; - max_elements_ = element_count; - ptr += sizeof(key_type); + *reinterpret_cast(ptr) = element_count; + max_elements_ = element_count; + ptr += sizeof(key_type); - *reinterpret_cast(ptr) = 0; - current_elements_ = 0; - ptr += sizeof(key_type); + *reinterpret_cast(ptr) = 0; + current_elements_ = 0; + ptr += sizeof(key_type); - offsets_ = reinterpret_cast(ptr); - memset(ptr, 0xFFFFFFFFU, sizeof(key_type) * (max_element_id + 1)); - ptr += sizeof(key_type) * (max_element_id + 1); + offsets_ = reinterpret_cast(ptr); + memset(ptr, 0xFFFFFFFFU, sizeof(key_type) * (max_element_id + 1)); + ptr += sizeof(key_type) * (max_element_id + 1); - elements_ = reinterpret_cast(ptr); - } + elements_ = reinterpret_cast(ptr); + } - /*! - Constructor which does not initialize the hash set. Builds the hash set from what data is - stored in the data pointer passed. - \param data Raw data - \param size Raw data size - */ - FixedMemoryHashSet(byte *data, size_type size) { - data_ = data; - size_ = size; + /*! + Constructor which does not initialize the hash set. Builds the hash set from what data is + stored in the data pointer passed. + \param data Raw data + \param size Raw data size + */ + FixedMemoryHashSet(byte *data, size_type size) { + data_ = data; + size_ = size; - byte *ptr = data; + byte *ptr = data; - offset_count_ = *reinterpret_cast(ptr); - ptr += sizeof(key_type); + offset_count_ = *reinterpret_cast(ptr); + ptr += sizeof(key_type); - max_elements_ = *reinterpret_cast(ptr); - ptr += sizeof(key_type); + max_elements_ = *reinterpret_cast(ptr); + ptr += sizeof(key_type); - current_elements_ = *reinterpret_cast(ptr); - ptr += sizeof(key_type); + current_elements_ = *reinterpret_cast(ptr); + ptr += sizeof(key_type); - offsets_ = reinterpret_cast(ptr); - ptr += sizeof(key_type) * offset_count_; + offsets_ = reinterpret_cast(ptr); + ptr += sizeof(key_type) * offset_count_; - elements_ = reinterpret_cast(ptr); - } + elements_ = reinterpret_cast(ptr); + } - //! Copy Constructor - FixedMemoryHashSet(const FixedMemoryHashSet& other) : - data_(other.data_), - size_(other.size_), - offset_count_(other.offset_count_), - max_elements_(other.max_elements_), - current_elements_(other.current_elements_), - offsets_(other.offsets_), - elements_(other.elements_) - { - } + //! Copy Constructor + FixedMemoryHashSet(const FixedMemoryHashSet& other) : + data_(other.data_), + size_(other.size_), + offset_count_(other.offset_count_), + max_elements_(other.max_elements_), + current_elements_(other.current_elements_), + offsets_(other.offsets_), + elements_(other.elements_) + { + } - //! RValue-Move Constructor + //! RValue-Move Constructor #ifdef EQEMU_RVALUE_MOVE - FixedMemoryHashSet(FixedMemoryHashSet&& other) : - data_(other.data_), - size_(other.size_), - offset_count_(other.offset_count_), - max_elements_(other.max_elements_), - current_elements_(other.current_elements_), - offsets_(other.offsets_), - elements_(other.elements_) - { - } + FixedMemoryHashSet(FixedMemoryHashSet&& other) : + data_(other.data_), + size_(other.size_), + offset_count_(other.offset_count_), + max_elements_(other.max_elements_), + current_elements_(other.current_elements_), + offsets_(other.offsets_), + elements_(other.elements_) + { + } #endif - //! Destructor - ~FixedMemoryHashSet() { - } + //! Destructor + ~FixedMemoryHashSet() { + } - //! Assignment operator - const FixedMemoryHashSet& operator=(const FixedMemoryHashSet& other) { - data_ = other.data_; - size_ = other.size_; - offset_count_ = other.offset_count_; - max_elements_ = other.max_elements_; - current_elements_ = other.current_elements_; - offsets_ = other.offsets_; - elements_ = other.elements_; - return *this; - } + //! Assignment operator + const FixedMemoryHashSet& operator=(const FixedMemoryHashSet& other) { + data_ = other.data_; + size_ = other.size_; + offset_count_ = other.offset_count_; + max_elements_ = other.max_elements_; + current_elements_ = other.current_elements_; + offsets_ = other.offsets_; + elements_ = other.elements_; + return *this; + } - //! Returns whether the set is empty (has 0 elements) or not - bool empty() const { - return current_elements_ == 0; - } + //! Returns whether the set is empty (has 0 elements) or not + bool empty() const { + return current_elements_ == 0; + } - //! Returns the number of unique elements in the set currently - size_type size() const { - return current_elements_; - } + //! Returns the number of unique elements in the set currently + size_type size() const { + return current_elements_; + } - //! Returns the maximum number of elements one can insert into the set. - size_type max_size() const { - return max_elements_; - } + //! Returns the maximum number of elements one can insert into the set. + size_type max_size() const { + return max_elements_; + } - //! Returns the maximum key one can use with the set. - key_type max_key() const { - return offset_count_ > 0 ? (offset_count_ - 1) : 0; - } + //! Returns the maximum key one can use with the set. + key_type max_key() const { + return offset_count_ > 0 ? (offset_count_ - 1) : 0; + } - /*! - Retrieve value operator - \param i Index to retrieve the value from - */ - reference operator[](const key_type& i) { - if(i >= offset_count_) { - EQ_EXCEPT("Fixed Memory Hash Set", "Index out of range"); - } + /*! + Retrieve value operator + \param i Index to retrieve the value from + */ + reference operator[](const key_type& i) { + if(i >= offset_count_) { + EQ_EXCEPT("Fixed Memory Hash Set", "Index out of range"); + } - if(offsets_[i] == 0xFFFFFFFFU) { - EQ_EXCEPT("Fixed Memory Hash Set", "Element not found."); - } + if(offsets_[i] == 0xFFFFFFFFU) { + EQ_EXCEPT("Fixed Memory Hash Set", "Element not found."); + } - return elements_[offsets_[i]]; - } + return elements_[offsets_[i]]; + } - /*! - Retrieve value function - \param i Index to retrieve the value from - */ - reference at(const key_type& i) { - if(i >= offset_count_) { - EQ_EXCEPT("Fixed Memory Hash Set", "Index out of range."); - } + /*! + Retrieve value function + \param i Index to retrieve the value from + */ + reference at(const key_type& i) { + if(i >= offset_count_) { + EQ_EXCEPT("Fixed Memory Hash Set", "Index out of range."); + } - if(offsets_[i] == 0xFFFFFFFFU) { - EQ_EXCEPT("Fixed Memory Hash Set", "Element not found."); - } + if(offsets_[i] == 0xFFFFFFFFU) { + EQ_EXCEPT("Fixed Memory Hash Set", "Element not found."); + } - return elements_[offsets_[i]]; - } + return elements_[offsets_[i]]; + } - /*! - Checks if there is a value at a certain index - \param i Index to check for a value - */ - bool exists(const key_type& i) const { - if(i >= offset_count_) { - return false; - } + /*! + Checks if there is a value at a certain index + \param i Index to check for a value + */ + bool exists(const key_type& i) const { + if(i >= offset_count_) { + return false; + } - if(offsets_[i] == 0xFFFFFFFFU) { - return false; - } + if(offsets_[i] == 0xFFFFFFFFU) { + return false; + } - return true; - } + return true; + } - /*! - Inserts a value into the set at a specific index - \param i Index to insert the value at - \param v Value to insert - */ - void insert(const key_type& i, const_reference v) { - if(i >= offset_count_) { - EQ_EXCEPT("Fixed Memory Hash Set", "Index out of range."); - } + /*! + Inserts a value into the set at a specific index + \param i Index to insert the value at + \param v Value to insert + */ + void insert(const key_type& i, const_reference v) { + if(i >= offset_count_) { + EQ_EXCEPT("Fixed Memory Hash Set", "Index out of range."); + } - if(offsets_[i] != 0xFFFFFFFFU) { - elements_[offsets_[i]] = v; - } else { - if(current_elements_ >= max_elements_) { - EQ_EXCEPT("Fixed Memory Hash Set", "Insert pointer out of range."); - } + if(offsets_[i] != 0xFFFFFFFFU) { + elements_[offsets_[i]] = v; + } else { + if(current_elements_ >= max_elements_) { + EQ_EXCEPT("Fixed Memory Hash Set", "Insert pointer out of range."); + } - offsets_[i] = current_elements_; - memcpy(&elements_[current_elements_], &v, sizeof(value_type)); - ++current_elements_; - *reinterpret_cast(data_ + (sizeof(key_type) * 2)) = current_elements_; - } - } + offsets_[i] = current_elements_; + memcpy(&elements_[current_elements_], &v, sizeof(value_type)); + ++current_elements_; + *reinterpret_cast(data_ + (sizeof(key_type) * 2)) = current_elements_; + } + } - //! Calculates how much memory we should allocate based on element size and count - static size_type estimated_size(key_type element_count, key_type max_elements) { - size_type total_size = 3 * sizeof(key_type); - total_size += sizeof(key_type) * (max_elements + 1); - total_size += sizeof(T) * element_count; - return total_size; - } + //! Calculates how much memory we should allocate based on element size and count + static size_type estimated_size(key_type element_count, key_type max_elements) { + size_type total_size = 3 * sizeof(key_type); + total_size += sizeof(key_type) * (max_elements + 1); + total_size += sizeof(T) * element_count; + return total_size; + } - private: - unsigned char *data_; - size_type size_; - key_type offset_count_; - key_type max_elements_; - key_type current_elements_; - key_type *offsets_; - value_type *elements_; - }; + private: + unsigned char *data_; + size_type size_; + key_type offset_count_; + key_type max_elements_; + key_type current_elements_; + key_type *offsets_; + value_type *elements_; + }; } // EQEmu #endif + diff --git a/common/fixed_memory_variable_hash_set.h b/common/fixed_memory_variable_hash_set.h index 67cbb441e..b25fe5b2f 100644 --- a/common/fixed_memory_variable_hash_set.h +++ b/common/fixed_memory_variable_hash_set.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_FIXED_MEMORY_VARIABLE_HASHSET_H @@ -25,217 +25,217 @@ namespace EQEmu { - /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an - allocator for (shared memory), we assume all keys are unsigned int, values are a pointer and size - */ - template - class FixedMemoryVariableHashSet { - typedef uint32 key_type; - typedef T value_type; - typedef uint8 byte; - typedef value_type& reference; - typedef const value_type& const_reference; - typedef uint32 size_type; - public: - /*! - Constructor which initializes the hash set - \param data Raw data - \param size Raw data size - \param max_element_id Number of offsets to store: eg highest "key" that will be used. - */ - FixedMemoryVariableHashSet(byte *data, size_type size, key_type max_element_id) { - data_ = data; - size_ = size; - remaining_size_ = size_ - (sizeof(key_type) * 3) - (sizeof(key_type) * (max_element_id + 1)); + /*! Simple HashSet designed to be used in fixed memory that may be difficult to use an + allocator for (shared memory), we assume all keys are unsigned int, values are a pointer and size + */ + template + class FixedMemoryVariableHashSet { + typedef uint32 key_type; + typedef T value_type; + typedef uint8 byte; + typedef value_type& reference; + typedef const value_type& const_reference; + typedef uint32 size_type; + public: + /*! + Constructor which initializes the hash set + \param data Raw data + \param size Raw data size + \param max_element_id Number of offsets to store: eg highest "key" that will be used. + */ + FixedMemoryVariableHashSet(byte *data, size_type size, key_type max_element_id) { + data_ = data; + size_ = size; + remaining_size_ = size_ - (sizeof(key_type) * 3) - (sizeof(key_type) * (max_element_id + 1)); - byte *ptr = data; - *reinterpret_cast(ptr) = max_element_id + 1; - offset_count_ = max_element_id + 1; - ptr += sizeof(key_type); + byte *ptr = data; + *reinterpret_cast(ptr) = max_element_id + 1; + offset_count_ = max_element_id + 1; + ptr += sizeof(key_type); - *reinterpret_cast(ptr) = remaining_size_; - ptr += sizeof(key_type); + *reinterpret_cast(ptr) = remaining_size_; + ptr += sizeof(key_type); - *reinterpret_cast(ptr) = 0; - current_offset_ = 0; - ptr += sizeof(key_type); + *reinterpret_cast(ptr) = 0; + current_offset_ = 0; + ptr += sizeof(key_type); - offsets_ = reinterpret_cast(ptr); - memset(ptr, 0xFFFFFFFFU, sizeof(key_type) * (max_element_id + 1)); - ptr += sizeof(key_type) * (max_element_id + 1); + offsets_ = reinterpret_cast(ptr); + memset(ptr, 0xFFFFFFFFU, sizeof(key_type) * (max_element_id + 1)); + ptr += sizeof(key_type) * (max_element_id + 1); - elements_ = reinterpret_cast(ptr); - } + elements_ = reinterpret_cast(ptr); + } - /*! - Constructor which does not initialize the hash set. Builds the hash set from what data is - stored in the data pointer passed. - \param data Raw data - \param size Raw data size - */ - FixedMemoryVariableHashSet(byte *data, size_type size) { - data_ = data; - size_ = size; + /*! + Constructor which does not initialize the hash set. Builds the hash set from what data is + stored in the data pointer passed. + \param data Raw data + \param size Raw data size + */ + FixedMemoryVariableHashSet(byte *data, size_type size) { + data_ = data; + size_ = size; - byte *ptr = data; - offset_count_ = *reinterpret_cast(ptr); - ptr += sizeof(key_type); + byte *ptr = data; + offset_count_ = *reinterpret_cast(ptr); + ptr += sizeof(key_type); - remaining_size_ = *reinterpret_cast(ptr); - ptr += sizeof(key_type); + remaining_size_ = *reinterpret_cast(ptr); + ptr += sizeof(key_type); - current_offset_ = *reinterpret_cast(ptr); - ptr += sizeof(key_type); + current_offset_ = *reinterpret_cast(ptr); + ptr += sizeof(key_type); - offsets_ = reinterpret_cast(ptr); - ptr += sizeof(key_type) * offset_count_; + offsets_ = reinterpret_cast(ptr); + ptr += sizeof(key_type) * offset_count_; - elements_ = reinterpret_cast(ptr); - } + elements_ = reinterpret_cast(ptr); + } - //! Copy Constructor - FixedMemoryVariableHashSet(const FixedMemoryVariableHashSet& other) : - data_(other.data_), - size_(other.size_), - offset_count_(other.offset_count_), - remaining_size_(other.remaining_size_), - current_offset_(other.current_offset_), - offsets_(other.offsets_), - elements_(other.elements_) - { - } + //! Copy Constructor + FixedMemoryVariableHashSet(const FixedMemoryVariableHashSet& other) : + data_(other.data_), + size_(other.size_), + offset_count_(other.offset_count_), + remaining_size_(other.remaining_size_), + current_offset_(other.current_offset_), + offsets_(other.offsets_), + elements_(other.elements_) + { + } - //! RValue-Move Constructor + //! RValue-Move Constructor #ifdef EQEMU_RVALUE_MOVE - FixedMemoryVariableHashSet(FixedMemoryVariableHashSet&& other) : - data_(other.data_), - size_(other.size_), - offset_count_(other.offset_count_), - remaining_size_(other.remaining_size_), - current_offset_(other.current_offset_), - offsets_(other.offsets_), - elements_(other.elements_) - { - } + FixedMemoryVariableHashSet(FixedMemoryVariableHashSet&& other) : + data_(other.data_), + size_(other.size_), + offset_count_(other.offset_count_), + remaining_size_(other.remaining_size_), + current_offset_(other.current_offset_), + offsets_(other.offsets_), + elements_(other.elements_) + { + } #endif - //! Destructor - ~FixedMemoryVariableHashSet() { - } + //! Destructor + ~FixedMemoryVariableHashSet() { + } - //! Assignment operator - const FixedMemoryVariableHashSet& operator=(const FixedMemoryVariableHashSet& other) { - data_ = other.data_; - size_ = other.size_; - offset_count_ = other.offset_count_; - remaining_size_ = other.remaining_size_; - current_offset_ = other.current_offset_; - offsets_ = other.offsets_; - elements_ = other.elements_; - return *this; - } + //! Assignment operator + const FixedMemoryVariableHashSet& operator=(const FixedMemoryVariableHashSet& other) { + data_ = other.data_; + size_ = other.size_; + offset_count_ = other.offset_count_; + remaining_size_ = other.remaining_size_; + current_offset_ = other.current_offset_; + offsets_ = other.offsets_; + elements_ = other.elements_; + return *this; + } - //! Returns the number of bytes in the set currently - size_type size() const { - return size_ - remaining_size_; - } + //! Returns the number of bytes in the set currently + size_type size() const { + return size_ - remaining_size_; + } - //! Returns the maximum number of bytes one can insert into the set. - size_type max_size() const { - return size_ - (sizeof(key_type) * 2); - } + //! Returns the maximum number of bytes one can insert into the set. + size_type max_size() const { + return size_ - (sizeof(key_type) * 2); + } - //! Returns the maximum key one can use with the set. - key_type max_key() const { - return offset_count_ > 0 ? (offset_count_ - 1) : 0; - } + //! Returns the maximum key one can use with the set. + key_type max_key() const { + return offset_count_ > 0 ? (offset_count_ - 1) : 0; + } - /*! - Retrieve value operator - \param i Index to retrieve the value from - */ - reference operator[](const key_type& i) { - if(i >= offset_count_) { - EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range"); - } + /*! + Retrieve value operator + \param i Index to retrieve the value from + */ + reference operator[](const key_type& i) { + if(i >= offset_count_) { + EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range"); + } - if(offsets_[i] == 0xFFFFFFFFU) { - EQ_EXCEPT("Fixed Memory Variable Hash Set", "Element not found."); - } + if(offsets_[i] == 0xFFFFFFFFU) { + EQ_EXCEPT("Fixed Memory Variable Hash Set", "Element not found."); + } - return *reinterpret_cast(&elements_[offsets_[i]]); - } + return *reinterpret_cast(&elements_[offsets_[i]]); + } - /*! - Retrieve value function - \param i Index to retrieve the value from - */ - reference at(const key_type& i) { - if(i >= offset_count_) { - EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range"); - } + /*! + Retrieve value function + \param i Index to retrieve the value from + */ + reference at(const key_type& i) { + if(i >= offset_count_) { + EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range"); + } - if(offsets_[i] == 0xFFFFFFFFU) { - EQ_EXCEPT("Fixed Memory Variable Hash Set", "Element not found."); - } + if(offsets_[i] == 0xFFFFFFFFU) { + EQ_EXCEPT("Fixed Memory Variable Hash Set", "Element not found."); + } - return *reinterpret_cast(&elements_[offsets_[i]]); - } + return *reinterpret_cast(&elements_[offsets_[i]]); + } - /*! - Checks if there is a value at a certain index - \param i Index to check for a value - */ - bool exists(const key_type& i) const { - if(i >= offset_count_) { - return false; - } + /*! + Checks if there is a value at a certain index + \param i Index to check for a value + */ + bool exists(const key_type& i) const { + if(i >= offset_count_) { + return false; + } - if(offsets_[i] == 0xFFFFFFFFU) { - return false; - } + if(offsets_[i] == 0xFFFFFFFFU) { + return false; + } - return true; - } + return true; + } - /*! - Inserts a value into the set at a specific index - \param i Index to insert the value at - \param v Value to insert - */ - void insert(const key_type& i, byte *data, size_type size) { - if(i >= offset_count_) { - EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range."); - } + /*! + Inserts a value into the set at a specific index + \param i Index to insert the value at + \param v Value to insert + */ + void insert(const key_type& i, byte *data, size_type size) { + if(i >= offset_count_) { + EQ_EXCEPT("Fixed Memory Variable Hash Set", "Index out of range."); + } - if(size > remaining_size_) { - EQ_EXCEPT("Fixed Memory Hash Set", "Not enough room in hash set to insert this value."); - } + if(size > remaining_size_) { + EQ_EXCEPT("Fixed Memory Hash Set", "Not enough room in hash set to insert this value."); + } - if(offsets_[i] != 0xFFFFFFFFU) { - EQ_EXCEPT("Fixed Memory Hash Set", "Could not insert a repeat value at this index."); - } else { - offsets_[i] = current_offset_; - memcpy(&elements_[current_offset_], data, size); + if(offsets_[i] != 0xFFFFFFFFU) { + EQ_EXCEPT("Fixed Memory Hash Set", "Could not insert a repeat value at this index."); + } else { + offsets_[i] = current_offset_; + memcpy(&elements_[current_offset_], data, size); - remaining_size_ -= size; - *reinterpret_cast(data_ + sizeof(key_type)) = remaining_size_; + remaining_size_ -= size; + *reinterpret_cast(data_ + sizeof(key_type)) = remaining_size_; - current_offset_ += size; - *reinterpret_cast(data_ + (sizeof(key_type) * 2)) = current_offset_; - } - } + current_offset_ += size; + *reinterpret_cast(data_ + (sizeof(key_type) * 2)) = current_offset_; + } + } - private: - unsigned char *data_; - size_type size_; - size_type remaining_size_; - key_type current_offset_; - key_type offset_count_; - key_type *offsets_; - byte *elements_; - }; + private: + unsigned char *data_; + size_type size_; + size_type remaining_size_; + key_type current_offset_; + key_type offset_count_; + key_type *offsets_; + byte *elements_; + }; } // EQEmu #endif diff --git a/common/guild_base.cpp b/common/guild_base.cpp index a5b29ce3e..83e3a3666 100644 --- a/common/guild_base.cpp +++ b/common/guild_base.cpp @@ -1,5 +1,5 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -9,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" @@ -316,8 +316,8 @@ uint32 BaseGuildManager::_GetFreeGuildID() { } char errbuf[MYSQL_ERRMSG_SIZE]; - char query[100]; - MYSQL_RES *result; + char query[100]; + MYSQL_RES *result; //this has got to be one of the more retarded things I have seen. //none the less, im too lazy to rewrite it right now. @@ -953,22 +953,22 @@ bool BaseGuildManager::_RunQuery(char *&query, int len, const char *errmsg) { #endif static void ProcessGuildMember(MYSQL_ROW &row, CharGuildInfo &into) { //fields from `characer_` - into.char_id = atoi(row[0]); - into.char_name = row[1]; - into.class_ = atoi(row[2]); - into.level = atoi(row[3]); - into.time_last_on = atoul(row[4]); - into.zone_id = atoi(row[5]); + into.char_id = atoi(row[0]); + into.char_name = row[1]; + into.class_ = atoi(row[2]); + into.level = atoi(row[3]); + into.time_last_on = atoul(row[4]); + into.zone_id = atoi(row[5]); //fields from `guild_members`, leave at defaults if missing - into.guild_id = row[6] ? atoi(row[6]) : GUILD_NONE; - into.rank = row[7] ? atoi(row[7]) : (GUILD_MAX_RANK+1); + into.guild_id = row[6] ? atoi(row[6]) : GUILD_NONE; + into.rank = row[7] ? atoi(row[7]) : (GUILD_MAX_RANK+1); into.tribute_enable = row[8] ? (row[8][0] == '0'?false:true) : false; into.total_tribute = row[9] ? atoi(row[9]) : 0; into.last_tribute = row[10]? atoul(row[10]) : 0; //timestamp - into.banker = row[11]? (row[11][0] == '0'?false:true) : false; + into.banker = row[11]? (row[11][0] == '0'?false:true) : false; into.public_note = row[12]? row[12] : ""; - into.alt = row[13]? (row[13][0] == '0'?false:true) : false; + into.alt = row[13]? (row[13][0] == '0'?false:true) : false; //a little sanity checking/cleanup if(into.guild_id == 0) @@ -1320,9 +1320,9 @@ uint32 BaseGuildManager::DoesAccountContainAGuildLeader(uint32 AccountID) MYSQL_RES *result; if (!m_db->RunQuery(query, - MakeAnyLenString(&query, - "select guild_id from guild_members where char_id in (select id from character_ where account_id = %i) and rank = 2", - AccountID), errbuf, &result)) + MakeAnyLenString(&query, + "select guild_id from guild_members where char_id in (select id from character_ where account_id = %i) and rank = 2", + AccountID), errbuf, &result)) { _log(GUILDS__ERROR, "Error executing query '%s': %s", query, errbuf); safe_delete_array(query); @@ -1341,10 +1341,10 @@ uint32 BaseGuildManager::DoesAccountContainAGuildLeader(uint32 AccountID) bool Database::LoadGuilds(GuildRanks_Struct* guilds) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; // int i; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; for (int a = 0; a < 512; a++) { guilds[a].leader = 0; @@ -1445,7 +1445,7 @@ bool Database::LoadGuilds(GuildRanks_Struct* guilds) { void Database::SetPublicNote(uint32 guild_id,char* charname, char* note){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; char* notebuf = new char[(strlen(note)*2)+3]; DoEscapeString(notebuf, note, strlen(note)) ; if (!RunQuery(query, MakeAnyLenString(&query, "update character_ set publicnote='%s' where name='%s' and guild=%i", notebuf,charname,guild_id), errbuf)) { @@ -1459,9 +1459,9 @@ void Database::SetPublicNote(uint32 guild_id,char* charname, char* note){ bool Database::GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, eqid, name, leader, minstatus, rank0title, rank1, rank1title, rank2, rank2title, rank3, rank3title, rank4, rank4title, rank5, rank5title from guilds where eqid=%i;", guildeqid), errbuf, &result)) { diff --git a/common/guilds.cpp b/common/guilds.cpp index 3e15c3307..22b2ca240 100644 --- a/common/guilds.cpp +++ b/common/guilds.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "MiscFunctions.h" @@ -29,7 +29,7 @@ /* void Database::GetGuildMembers(uint32 guild_id, GuildMember_Struct* gms){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; MYSQL_RES *result; MYSQL_ROW row; uint32 count=0; @@ -59,8 +59,8 @@ void Database::GetGuildMembers(uint32 guild_id, GuildMember_Struct* gms){ } uint32 Database::NumberInGuild(uint32 guild_id) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; MYSQL_RES *result; MYSQL_ROW row; @@ -83,7 +83,7 @@ uint32 Database::NumberInGuild(uint32 guild_id) { } bool Database::SetGuild(char* name, uint32 guild_id, uint8 guildrank) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET guild=%i, guildrank=%i WHERE name='%s'", guild_id, guildrank, name), errbuf, 0, &affected_rows)) { @@ -103,7 +103,7 @@ bool Database::SetGuild(char* name, uint32 guild_id, uint8 guildrank) { bool Database::SetGuild(uint32 charid, uint32 guild_id, uint8 guildrank) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET guild=%i, guildrank=%i WHERE id=%i", guild_id, guildrank, charid), errbuf, 0, &affected_rows)) { @@ -126,7 +126,7 @@ bool Database::SetGuild(uint32 charid, uint32 guild_id, uint8 guildrank) { bool Database::DeleteGuild(uint32 guild_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; char *query2 = 0; uint32 affected_rows = 0; @@ -152,7 +152,7 @@ bool Database::DeleteGuild(uint32 guild_id) bool Database::RenameGuild(uint32 guild_id, const char* name) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; char buf[65]; DoEscapeString(buf, name, strlen(name)) ; @@ -178,8 +178,8 @@ bool Database::RenameGuild(uint32 guild_id, const char* name) { bool Database::EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* grl) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - int chars = 0; + char *query = 0; + int chars = 0; uint32 affected_rows = 0; char buf[203]; char buf2[8]; @@ -217,9 +217,9 @@ bool Database::EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* bool Database::GetGuildNameByID(uint32 guild_id, char * name) { if (!name || !guild_id) return false; char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "select name from guilds where id='%i'", guild_id), errbuf, &result)) { safe_delete_array(query); @@ -241,9 +241,9 @@ bool Database::GetGuildNameByID(uint32 guild_id, char * name) { uint32 Database::GetGuildIDbyLeader(uint32 leader) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM guilds WHERE leader=%i", leader), errbuf, &result)) { safe_delete_array(query); @@ -267,7 +267,7 @@ uint32 Database::GetGuildIDbyLeader(uint32 leader) bool Database::SetGuildLeader(uint32 guild_id, uint32 leader) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (RunQuery(query, MakeAnyLenString(&query, "UPDATE guilds SET leader=%i WHERE id=%i", leader, guild_id), errbuf, 0, &affected_rows)) { @@ -288,7 +288,7 @@ bool Database::SetGuildLeader(uint32 guild_id, uint32 leader) bool Database::SetGuildMOTD(uint32 guild_id, const char* motd) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; char* motdbuf = 0; uint32 affected_rows = 0; @@ -318,9 +318,9 @@ bool Database::SetGuildMOTD(uint32 guild_id, const char* motd) { string Database::GetGuildMOTD(uint32 guild_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; string motd_str; if (RunQuery(query, MakeAnyLenString(&query, "SELECT motd FROM guilds WHERE id=%i", guild_id), errbuf, &result)) { safe_delete_array(query); diff --git a/common/guilds.h b/common/guilds.h index 663698a70..ad91892ce 100644 --- a/common/guilds.h +++ b/common/guilds.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef GUILD_H @@ -23,7 +23,7 @@ #define GUILD_NONE 0xFFFFFFFF // user has no guild -#define GUILD_MAX_RANK 8 // 0-2 - some places in the code assume a single digit, dont go above 9 +#define GUILD_MAX_RANK 8 // 0-2 - some places in the code assume a single digit, dont go above 9 //defines for standard ranks #define GUILD_MEMBER 0 diff --git a/common/ipc_mutex.cpp b/common/ipc_mutex.cpp index 8b83d54ca..1ac88538c 100644 --- a/common/ipc_mutex.cpp +++ b/common/ipc_mutex.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "ipc_mutex.h" @@ -30,91 +30,91 @@ namespace EQEmu { - struct IPCMutex::Implementation { + struct IPCMutex::Implementation { #ifdef _WINDOWS - HANDLE mut_; + HANDLE mut_; #else - int fd_; + int fd_; #endif - }; + }; - IPCMutex::IPCMutex(std::string name) : locked_(false) { - imp_ = new Implementation; + IPCMutex::IPCMutex(std::string name) : locked_(false) { + imp_ = new Implementation; #ifdef _WINDOWS - std::string final_name = "EQEmuMutex_"; - final_name += name; + std::string final_name = "EQEmuMutex_"; + final_name += name; - imp_->mut_ = CreateMutex(nullptr, - FALSE, - final_name.c_str()); + imp_->mut_ = CreateMutex(nullptr, + FALSE, + final_name.c_str()); - if(!imp_->mut_) { - EQ_EXCEPT("IPC Mutex", "Could not create mutex."); - } + if(!imp_->mut_) { + EQ_EXCEPT("IPC Mutex", "Could not create mutex."); + } #else - std::string final_name = name; - final_name += ".lock"; + std::string final_name = name; + final_name += ".lock"; - imp_->fd_ = open(final_name.c_str(), - O_RDWR | O_CREAT | O_CLOEXEC, - S_IRUSR | S_IWUSR); + imp_->fd_ = open(final_name.c_str(), + O_RDWR | O_CREAT | O_CLOEXEC, + S_IRUSR | S_IWUSR); - if(imp_->fd_ == -1) { - EQ_EXCEPT("IPC Mutex", "Could not create mutex."); - } + if(imp_->fd_ == -1) { + EQ_EXCEPT("IPC Mutex", "Could not create mutex."); + } #endif - } + } - IPCMutex::~IPCMutex() { + IPCMutex::~IPCMutex() { #ifdef _WINDOWS - if(locked_) { - ReleaseMutex(imp_->mut_); - } - CloseHandle(imp_->mut_); + if(locked_) { + ReleaseMutex(imp_->mut_); + } + CloseHandle(imp_->mut_); #else - if(locked_) { - lockf(imp_->fd_, F_ULOCK, 0); - } - close(imp_->fd_); + if(locked_) { + lockf(imp_->fd_, F_ULOCK, 0); + } + close(imp_->fd_); #endif - delete imp_; - } + delete imp_; + } - bool IPCMutex::Lock() { - if(locked_) { - return false; - } + bool IPCMutex::Lock() { + if(locked_) { + return false; + } #ifdef _WINDOWS - DWORD wait_result = WaitForSingleObject(imp_->mut_, INFINITE); - if(wait_result != WAIT_OBJECT_0) { - return false; - } + DWORD wait_result = WaitForSingleObject(imp_->mut_, INFINITE); + if(wait_result != WAIT_OBJECT_0) { + return false; + } #else - if(lockf(imp_->fd_, F_LOCK, 0) != 0) { - return false; - } + if(lockf(imp_->fd_, F_LOCK, 0) != 0) { + return false; + } #endif - locked_ = true; - return true; - } + locked_ = true; + return true; + } - bool IPCMutex::Unlock() { - if(!locked_) { - return false; - } + bool IPCMutex::Unlock() { + if(!locked_) { + return false; + } #ifdef _WINDOWS - if(!ReleaseMutex(imp_->mut_)) { - return false; - } + if(!ReleaseMutex(imp_->mut_)) { + return false; + } #else - if(lockf(imp_->fd_, F_ULOCK, 0) != 0) { - return false; - } + if(lockf(imp_->fd_, F_ULOCK, 0) != 0) { + return false; + } #endif - locked_ = false; - return true; - } + locked_ = false; + return true; + } } diff --git a/common/ipc_mutex.h b/common/ipc_mutex.h index 41e1f1731..ab0af4817 100644 --- a/common/ipc_mutex.h +++ b/common/ipc_mutex.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _MUTEX_H_ @@ -23,43 +23,43 @@ namespace EQEmu { - //! Interprocess Named Binary Semaphore (Mutex) - /*! - Important to note: while this can be used to synchronize processes, it is not in itself re-entrant or thread-safe - and thus should be used from one thread and non-recursively. It was intended to be a simple synchronization method - for our MemoryMappedFile loading. - */ - class IPCMutex { - struct Implementation; - public: - //! Constructor - /*! - Creates a named binary semaphore, basically a semaphore that is init S <- 1 - \param name The name of this mutex. - */ - IPCMutex(std::string name); + //! Interprocess Named Binary Semaphore (Mutex) + /*! + Important to note: while this can be used to synchronize processes, it is not in itself re-entrant or thread-safe + and thus should be used from one thread and non-recursively. It was intended to be a simple synchronization method + for our MemoryMappedFile loading. + */ + class IPCMutex { + struct Implementation; + public: + //! Constructor + /*! + Creates a named binary semaphore, basically a semaphore that is init S <- 1 + \param name The name of this mutex. + */ + IPCMutex(std::string name); - //! Destructor - ~IPCMutex(); + //! Destructor + ~IPCMutex(); - //! Lock the mutex - /*! - Same basic function as P(): for(;;) { if(S > 0) { S -= 1; break; } } - */ - bool Lock(); + //! Lock the mutex + /*! + Same basic function as P(): for(;;) { if(S > 0) { S -= 1; break; } } + */ + bool Lock(); - //! Unlocks the mutex - /*! - Same basic function as V(): S += 1; - */ - bool Unlock(); - private: - IPCMutex(const IPCMutex&); - const IPCMutex& operator=(const IPCMutex&); + //! Unlocks the mutex + /*! + Same basic function as V(): S += 1; + */ + bool Unlock(); + private: + IPCMutex(const IPCMutex&); + const IPCMutex& operator=(const IPCMutex&); - bool locked_; //!< Whether this mutex is locked or not - Implementation *imp_; - }; + bool locked_; //!< Whether this mutex is locked or not + Implementation *imp_; + }; } #endif diff --git a/common/item_struct.h b/common/item_struct.h index d1dd5b1b0..2c5d95d76 100644 --- a/common/item_struct.h +++ b/common/item_struct.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY except by those people which sell it, which -are required to give you total support for your newly bought product; -without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA */ #ifndef ITEM_STRUCT_H @@ -21,25 +21,25 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA /* * Note: (Doodman) - * This structure has field names that match the DB name exactly. - * Please take care as to not mess this up as it should make - * everyones life (i.e. mine) much easier. And the DB names - * match the field name from the 13th floor (SEQ) item collectors, - * so please maintain that as well. + * This structure has field names that match the DB name exactly. + * Please take care as to not mess this up as it should make + * everyones life (i.e. mine) much easier. And the DB names + * match the field name from the 13th floor (SEQ) item collectors, + * so please maintain that as well. * * Note #2: (Doodman) - * UnkXXX fields are left in here for completeness but commented - * out since they are really unknown and since the items are now - * preserialized they should not be needed. Conversly if they - * -are- needed, then they shouldn't be unkown. + * UnkXXX fields are left in here for completeness but commented + * out since they are really unknown and since the items are now + * preserialized they should not be needed. Conversly if they + * -are- needed, then they shouldn't be unkown. * * Note #3: (Doodman) - * Please take care when adding new found data fields to add them - * to the appropriate structure. Item_Struct has elements that are - * global to all types of items only. + * Please take care when adding new found data fields to add them + * to the appropriate structure. Item_Struct has elements that are + * global to all types of items only. * * Note #4: (Doodman) - * Made ya look! Ha! + * Made ya look! Ha! */ #include "eq_constants.h" @@ -93,7 +93,7 @@ struct Item_Struct { bool PendingLoreFlag; bool ArtifactFlag; bool SummonedFlag; - uint8 FVNoDrop; // Firiona Vie nodrop flag + uint8 FVNoDrop; // Firiona Vie nodrop flag uint32 Favor; // Individual favor uint32 GuildFavor; // Guild favor uint32 PointType; @@ -155,8 +155,8 @@ struct Item_Struct { float SellRate; // Sell rate //uint32 Unk059; union { - uint32 Fulfilment; // Food fulfilment (How long it lasts) - int16 CastTime; // Cast Time for clicky effects, in milliseconds + uint32 Fulfilment; // Food fulfilment (How long it lasts) + int16 CastTime; // Cast Time for clicky effects, in milliseconds }; uint32 EliteMaterial; int32 ProcRate; @@ -205,7 +205,7 @@ struct Item_Struct { bool Stackable; bool NoTransfer; bool QuestItemFlag; - int16 StackSize; + int16 StackSize; uint8 PotionBeltSlots; ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard; diff --git a/common/languages.h b/common/languages.h index a5b4e5f5b..a14e78460 100644 --- a/common/languages.h +++ b/common/languages.h @@ -1,52 +1,52 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LANGUAGES_H #define LANGUAGES_H #include "../common/types.h" -#define LANG_COMMON_TONGUE 0 -#define LANG_BARBARIAN 1 -#define LANG_ERUDIAN 2 -#define LANG_ELVISH 3 -#define LANG_DARK_ELVISH 4 -#define LANG_DWARVISH 5 -#define LANG_TROLL 6 -#define LANG_OGRE 7 -#define LANG_GNOMISH 8 -#define LANG_HALFLING 9 -#define LANG_THIEVES_CANT 10 -#define LANG_OLD_ERUDIAN 11 -#define LANG_ELDER_ELVISH 12 -#define LANG_FROGLOK 13 -#define LANG_GOBLIN 14 -#define LANG_GNOLL 15 -#define LANG_COMBINE_TONGUE 16 -#define LANG_ELDER_TEIRDAL 17 -#define LANG_LIZARDMAN 18 -#define LANG_ORCISH 19 -#define LANG_FAERIE 20 -#define LANG_DRAGON 21 -#define LANG_ELDER_DRAGON 22 -#define LANG_DARK_SPEECH 23 -#define LANG_VAH_SHIR 24 -#define LANG_ALARAN 25 -#define LANG_HADAL 26 -#define LANG_UNKNOWN 27 +#define LANG_COMMON_TONGUE 0 +#define LANG_BARBARIAN 1 +#define LANG_ERUDIAN 2 +#define LANG_ELVISH 3 +#define LANG_DARK_ELVISH 4 +#define LANG_DWARVISH 5 +#define LANG_TROLL 6 +#define LANG_OGRE 7 +#define LANG_GNOMISH 8 +#define LANG_HALFLING 9 +#define LANG_THIEVES_CANT 10 +#define LANG_OLD_ERUDIAN 11 +#define LANG_ELDER_ELVISH 12 +#define LANG_FROGLOK 13 +#define LANG_GOBLIN 14 +#define LANG_GNOLL 15 +#define LANG_COMBINE_TONGUE 16 +#define LANG_ELDER_TEIRDAL 17 +#define LANG_LIZARDMAN 18 +#define LANG_ORCISH 19 +#define LANG_FAERIE 20 +#define LANG_DRAGON 21 +#define LANG_ELDER_DRAGON 22 +#define LANG_DARK_SPEECH 23 +#define LANG_VAH_SHIR 24 +#define LANG_ALARAN 25 +#define LANG_HADAL 26 +#define LANG_UNKNOWN 27 #endif diff --git a/common/linked_list.h b/common/linked_list.h index 7f004407d..fe8755d40 100644 --- a/common/linked_list.h +++ b/common/linked_list.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LINKEDLIST_H #define LINKEDLIST_H @@ -29,84 +29,84 @@ class ListElement { private: - TYPE data; - ListElement* next; - ListElement* prev; + TYPE data; + ListElement* next; + ListElement* prev; public: - ListElement (); - ListElement (const TYPE&); - ListElement (const ListElement&); + ListElement (); + ListElement (const TYPE&); + ListElement (const ListElement&); - ~ListElement (); + ~ListElement (); - ListElement& operator= (const ListElement&); + ListElement& operator= (const ListElement&); - ListElement* GetLast () - { - ListElement* tmp = this; - while (tmp->GetNext()) { - tmp = tmp->GetNext(); + ListElement* GetLast () + { + ListElement* tmp = this; + while (tmp->GetNext()) { + tmp = tmp->GetNext(); + } + return tmp; } - return tmp; - } - ListElement* GetNext () const { return next ; } - ListElement* GetPrev () const { return prev ; } + ListElement* GetNext () const { return next ; } + ListElement* GetPrev () const { return prev ; } - inline TYPE& GetData () { return data ; } - inline const TYPE& GetData () const { return data ; } + inline TYPE& GetData () { return data ; } + inline const TYPE& GetData () const { return data ; } - void SetData ( const TYPE& d ) { data = d ; } // Quagmire - this may look like a mem leak, but dont change it, this behavior is expected where it's called - void SetLastNext ( ListElement* p ) - { - GetLast()->SetNext(p); - } - void SetNext (ListElement* n) { next = n ; } - void SetPrev (ListElement* p) { prev = p ; } + void SetData ( const TYPE& d ) { data = d ; } // Quagmire - this may look like a mem leak, but dont change it, this behavior is expected where it's called + void SetLastNext ( ListElement* p ) + { + GetLast()->SetNext(p); + } + void SetNext (ListElement* n) { next = n ; } + void SetPrev (ListElement* p) { prev = p ; } - void ReplaceData(const TYPE&); + void ReplaceData(const TYPE&); }; template class LinkedList { private: - uint32 count; + uint32 count; ListElement* first; bool list_destructor_invoked; public: - LinkedList(); - ~LinkedList(); - bool dont_delete; - LinkedList& operator= (const LinkedList&); + LinkedList(); + ~LinkedList(); + bool dont_delete; + LinkedList& operator= (const LinkedList&); - void Append (const TYPE&); - void Insert (const TYPE&); - TYPE Pop(); - TYPE PeekTop(); - void Clear(); - void LCount() { count--; } - void ResetCount() { count=0; } - uint32 Count() { return count; } - ListElement* GetFirst() { return first; } + void Append (const TYPE&); + void Insert (const TYPE&); + TYPE Pop(); + TYPE PeekTop(); + void Clear(); + void LCount() { count--; } + void ResetCount() { count=0; } + uint32 Count() { return count; } + ListElement* GetFirst() { return first; } - friend class LinkedListIterator; + friend class LinkedListIterator; }; template class LinkedListIterator { private: - LinkedList& list; - ListElement* current_element; - direction dir; + LinkedList& list; + ListElement* current_element; + direction dir; public: - LinkedListIterator(LinkedList& l,direction d = FORWARD) : list(l), dir(d) {}; + LinkedListIterator(LinkedList& l,direction d = FORWARD) : list(l), dir(d) {}; - void Advance(); - const TYPE& GetData(); + void Advance(); + const TYPE& GetData(); bool IsFirst() { if (current_element->GetPrev() == 0) @@ -121,13 +121,13 @@ public: else return false; } - bool MoreElements(); - void MoveFirst(); - void MoveLast(); - void RemoveCurrent(bool DeleteData = true); - void Replace(const TYPE& new_data); - void Reset(); - void SetDir(direction); + bool MoreElements(); + void MoveFirst(); + void MoveLast(); + void RemoveCurrent(bool DeleteData = true); + void Replace(const TYPE& new_data); + void Reset(); + void SetDir(direction); }; template @@ -169,110 +169,110 @@ void LinkedListIterator::Advance() template bool LinkedListIterator::MoreElements() { - if (current_element == 0) - return false; - return true; + if (current_element == 0) + return false; + return true; } template const TYPE& LinkedListIterator::GetData() { - return current_element->GetData(); + return current_element->GetData(); } template void LinkedListIterator::MoveFirst() { - ListElement* prev = current_element->GetPrev(); - ListElement* next = current_element->GetNext(); + ListElement* prev = current_element->GetPrev(); + ListElement* next = current_element->GetNext(); - if (prev == 0) + if (prev == 0) { return; } -// if (prev != 0) -// { - prev->SetNext(next); -// } - if (next != 0) - { - next->SetPrev(prev); - } - current_element->SetPrev(0); - current_element->SetNext(list.first); - list.first->SetPrev(current_element); - list.first = current_element; + //if (prev != 0) + //{ + prev->SetNext(next); + //} + if (next != 0) + { + next->SetPrev(prev); + } + current_element->SetPrev(0); + current_element->SetNext(list.first); + list.first->SetPrev(current_element); + list.first = current_element; } template void LinkedListIterator::MoveLast() { - ListElement* prev = current_element->GetPrev(); - ListElement* next = current_element->GetNext(); + ListElement* prev = current_element->GetPrev(); + ListElement* next = current_element->GetNext(); - if (next == 0) + if (next == 0) { return; } - if (prev != 0) - { - prev->SetNext(next); - } + if (prev != 0) + { + prev->SetNext(next); + } else { - list.first = next; + list.first = next; } -// if (next != 0) -// { - next->SetPrev(prev); -// } - current_element->SetNext(0); - current_element->SetPrev(next->GetLast()); - next->GetLast()->SetNext(current_element); + //if (next != 0) + //{ + next->SetPrev(prev); + //} + current_element->SetNext(0); + current_element->SetPrev(next->GetLast()); + next->GetLast()->SetNext(current_element); } template void LinkedListIterator::RemoveCurrent(bool DeleteData) { - ListElement* save; + ListElement* save; - if (list.first == current_element) - { - list.first = current_element->GetNext(); - } + if (list.first == current_element) + { + list.first = current_element->GetNext(); + } - if (current_element->GetPrev() != 0) - { - current_element->GetPrev()->SetNext(current_element->GetNext()); - } - if (current_element->GetNext() != 0) - { - current_element->GetNext()->SetPrev(current_element->GetPrev()); - } - if (dir == FORWARD) - { - save = current_element->GetNext(); - } - else - { - save = current_element->GetPrev(); - } - current_element->SetNext(0); - current_element->SetPrev(0); - if (!DeleteData) - current_element->SetData(0); - safe_delete(current_element); - current_element = save; - list.LCount(); + if (current_element->GetPrev() != 0) + { + current_element->GetPrev()->SetNext(current_element->GetNext()); + } + if (current_element->GetNext() != 0) + { + current_element->GetNext()->SetPrev(current_element->GetPrev()); + } + if (dir == FORWARD) + { + save = current_element->GetNext(); + } + else + { + save = current_element->GetPrev(); + } + current_element->SetNext(0); + current_element->SetPrev(0); + if (!DeleteData) + current_element->SetData(0); + safe_delete(current_element); + current_element = save; + list.LCount(); } template void LinkedListIterator::Replace(const TYPE& new_data) { - current_element->ReplaceData(new_data); + current_element->ReplaceData(new_data); } template @@ -280,8 +280,8 @@ void LinkedListIterator::Reset() { if (!(&list)) { - current_element=0; - return; + current_element=0; + return; } if (dir == FORWARD) @@ -323,15 +323,15 @@ void LinkedListIterator::Reset() template void LinkedListIterator::SetDir(direction d) { - dir = d; + dir = d; } template ListElement::ListElement(const TYPE& d) { - data = d; - next = 0; - prev = 0; + data = d; + next = 0; + prev = 0; } template @@ -353,7 +353,7 @@ template void ListElement::ReplaceData(const TYPE& new_data) { if (data != 0) - safe_delete(data); + safe_delete(data); data = new_data; } @@ -388,32 +388,32 @@ void LinkedList::Clear() { template void LinkedList::Append(const TYPE& data) { - ListElement* new_element = new ListElement(data); + ListElement* new_element = new ListElement(data); - if (first == 0) - { - first = new_element; - } - else - { - new_element->SetPrev(first->GetLast()); - first->SetLastNext(new_element); - } - count++; + if (first == 0) + { + first = new_element; + } + else + { + new_element->SetPrev(first->GetLast()); + first->SetLastNext(new_element); + } + count++; } template void LinkedList::Insert(const TYPE& data) { - ListElement* new_element = new ListElement(data); + ListElement* new_element = new ListElement(data); - new_element->SetNext(first); - if (first != 0) - { - first->SetPrev(new_element); - } - first = new_element; - count++; + new_element->SetNext(first); + if (first != 0) + { + first->SetPrev(new_element); + } + first = new_element; + count++; } template diff --git a/common/logsys.cpp b/common/logsys.cpp index 16e365558..7f04d01b8 100644 --- a/common/logsys.cpp +++ b/common/logsys.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "logsys.h" @@ -109,7 +109,7 @@ bool load_log_settings(const char *filename) { bool enabled; if(!strcasecmp(value, "on") || !strcasecmp(value, "true") || !strcasecmp(value, "yes") || !strcasecmp(value, "enabled") || !strcmp(value, "1")) enabled = true; - else if(!strcasecmp(value, "off") || !strcasecmp(value, "false") || !strcasecmp(value, "no") || !strcasecmp(value, "disabled") || !strcmp(value, "0")) + else if(!strcasecmp(value, "off") || !strcasecmp(value, "false") || !strcasecmp(value, "no") || !strcasecmp(value, "disabled") || !strcmp(value, "0")) enabled = false; else { printf("Unable to parse value '%s' from %s. Skipping line.", value, filename); @@ -155,6 +155,3 @@ bool load_log_settings(const char *filename) { return(true); } - - - diff --git a/common/logsys.h b/common/logsys.h index beb6856d7..3f9da4111 100644 --- a/common/logsys.h +++ b/common/logsys.h @@ -1,46 +1,40 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LOGSYS_H_ #define LOGSYS_H_ /* - * - * Usage: - * - * These are the main functions provided by logsys: - * - _log(TYPE, fmt, ...) - Log a message in any context - * - mlog(TYPE, fmt, ...) - Zone only. Log a message from a Mob:: context, prefixing it with the mob's name. - * - clog(TYPE, fmt, ...) - World only. Log a message from a Client:: context, prefixing it with the client's account name. - * - zlog(TYPE, fmt, ...) - World only. Log a message from a ZoneServer:: context, prefixing it with the zones id/name or ip/port. - * - _hex(TYPE, data, length) - Log hex dump in any context. - * - mhex(TYPE, data, length) - Zone only. Log a hex dump from a Mob:: context, prefixing it with the mob's name - * - _pkt(TYPE, BasePacket *) - Log a packet hex dump with header in any context. - * - mhex(TYPE, data, length) - Zone only. Log a packet hex dump from a Mob:: context, prefixing it with the mob's name - * Types are defined in logtypes.h - * - * - * - * - * this is very C-ish, not C++ish, but thats how I felt like writting it - * - * - * - */ +* +* Usage: +* +* These are the main functions provided by logsys: +* - _log(TYPE, fmt, ...) - Log a message in any context +* - mlog(TYPE, fmt, ...) - Zone only. Log a message from a Mob:: context, prefixing it with the mob's name. +* - clog(TYPE, fmt, ...) - World only. Log a message from a Client:: context, prefixing it with the client's account name. +* - zlog(TYPE, fmt, ...) - World only. Log a message from a ZoneServer:: context, prefixing it with the zones id/name or ip/port. +* - _hex(TYPE, data, length) - Log hex dump in any context. +* - mhex(TYPE, data, length) - Zone only. Log a hex dump from a Mob:: context, prefixing it with the mob's name +* - _pkt(TYPE, BasePacket *) - Log a packet hex dump with header in any context. +* - mhex(TYPE, data, length) - Zone only. Log a packet hex dump from a Mob:: context, prefixing it with the mob's name +* Types are defined in logtypes.h +* +* this is very C-ish, not C++ish, but thats how I felt like writting it +*/ #include #include "types.h" @@ -175,13 +169,5 @@ extern void log_toggle(LogType t); extern bool load_log_settings(const char *filename); - - - #endif /*LOGSYS_H_*/ - - - - - diff --git a/common/logsys_eqemu.cpp b/common/logsys_eqemu.cpp index 31f8621da..79ea82ec0 100644 --- a/common/logsys_eqemu.cpp +++ b/common/logsys_eqemu.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" @@ -37,7 +37,3 @@ void log_messageVA(LogType type, const char *fmt, va_list args) { LogFile->writePVA(EQEMuLog::Debug, prefix_buffer, fmt, args); } - - - - diff --git a/common/logtypes.h b/common/logtypes.h index 2dfa7c61e..cadfbf71a 100644 --- a/common/logtypes.h +++ b/common/logtypes.h @@ -1,23 +1,21 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - - #ifndef LOG_CATEGORY #define LOG_CATEGORY(name) #endif @@ -32,8 +30,6 @@ #endif - - LOG_CATEGORY( CHAT ) LOG_TYPE( CHAT, SAY, DISABLED ) LOG_TYPE( CHAT, EMOTE, DISABLED ) @@ -189,10 +185,10 @@ LOG_TYPE( CLIENT, NET_IN_TRACE, DISABLED ) LOG_TYPE( CLIENT, EXP, DISABLED ) LOG_CATEGORY( SKILLS ) -LOG_TYPE( SKILLS, GAIN, DISABLED ) +LOG_TYPE( SKILLS, GAIN, DISABLED ) LOG_CATEGORY( RULES ) -LOG_TYPE( RULES, ERROR, DISABLED ) +LOG_TYPE( RULES, ERROR, DISABLED ) LOG_TYPE( RULES, CHANGE, DISABLED ) LOG_CATEGORY( NET ) @@ -260,6 +256,3 @@ LOG_TYPE( WORLD, LAUNCH_TRACE, ENABLED ) #undef LOG_TYPE #undef LOG_CATEGORY - - - diff --git a/common/loottable.h b/common/loottable.h index 051c6c792..8ad2f1e72 100644 --- a/common/loottable.h +++ b/common/loottable.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_LOOTTABLE_H @@ -26,7 +26,7 @@ struct LootTableEntries_Struct { uint8 droplimit; uint8 mindrop; uint8 multiplier; - float probability; + float probability; }; struct LootTable_Struct { diff --git a/common/md5.cpp b/common/md5.cpp index b91d42389..2933a2388 100644 --- a/common/md5.cpp +++ b/common/md5.cpp @@ -1,7 +1,7 @@ /* md5.c -- An implementation of Ron Rivest's MD5 message-digest algorithm. * Written by Colin Plumb in 1993, no copyright is claimed. This code is in the * public domain; do with it what you wish. Equivalent code is available from -* RSA Data Security, Inc. This code does not oblige you to include legal +* RSA Data Security, Inc. This code does not oblige you to include legal * boilerplate in the documentation. To compute the message digest of a string * of bytes, declare an MD5Context structure, pass it to MD5Init, call * MD5Update as needed on buffers full of bytes, and then call MD5Final, which @@ -99,12 +99,12 @@ MD5* MD5::operator= (const MD5* iMD5) { /* Byte-swap an array of words to little-endian. (Byte-sex independent) */ void MD5::byteSwap(uint32 *buf, uint32 words) { - uint8 *p = (uint8 *)buf; - do { - *buf++ = (uint32)((uint32)p[3]<<8 | p[2]) << 16 | - ((uint32)p[1]<<8 | p[0]); - p += 4; - } while (--words); + uint8 *p = (uint8 *)buf; + do { + *buf++ = (uint32)((uint32)p[3]<<8 | p[2]) << 16 | + ((uint32)p[1]<<8 | p[0]); + p += 4; + } while (--words); } void MD5::Generate(const uint8* buf, uint32 len, uint8 digest[16]) { @@ -116,70 +116,70 @@ void MD5::Generate(const uint8* buf, uint32 len, uint8 digest[16]) { /* Start MD5 accumulation. */ void MD5::Init(struct MD5Context *ctx) { - ctx->hash[0] = 0x67452301; - ctx->hash[1] = 0xefcdab89; - ctx->hash[2] = 0x98badcfe; - ctx->hash[3] = 0x10325476; - ctx->bytes[1] = ctx->bytes[0] = 0; + ctx->hash[0] = 0x67452301; + ctx->hash[1] = 0xefcdab89; + ctx->hash[2] = 0x98badcfe; + ctx->hash[3] = 0x10325476; + ctx->bytes[1] = ctx->bytes[0] = 0; } /* Update ctx to reflect the addition of another buffer full of bytes. */ void MD5::Update(struct MD5Context *ctx, uint8 const *buf, uint32 len) { - uint32 t = ctx->bytes[0]; - if ((ctx->bytes[0] = t + len) < t) /* Update 64-bit byte count */ - ctx->bytes[1]++; /* Carry from low to high */ + uint32 t = ctx->bytes[0]; + if ((ctx->bytes[0] = t + len) < t) /* Update 64-bit byte count */ + ctx->bytes[1]++; /* Carry from low to high */ - t = 64 - (t & 0x3f); /* Bytes available in ctx->input (>= 1) */ - if (t > len) { - memcpy((uint8*)ctx->input+64-t, buf, len); - return; - } - /* First chunk is an odd size */ - memcpy((uint8*)ctx->input+64-t, buf, t); - byteSwap(ctx->input, 16); - Transform(ctx->hash, ctx->input); - buf += t; - len -= t; - /* Process data in 64-byte chunks */ - while (len >= 64) { - memcpy(ctx->input, buf, 64); - byteSwap(ctx->input, 16); - Transform(ctx->hash, ctx->input); - buf += 64; - len -= 64; - } - /* Buffer any remaining bytes of data */ - memcpy(ctx->input, buf, len); + t = 64 - (t & 0x3f); /* Bytes available in ctx->input (>= 1) */ + if (t > len) { + memcpy((uint8*)ctx->input+64-t, buf, len); + return; + } + /* First chunk is an odd size */ + memcpy((uint8*)ctx->input+64-t, buf, t); + byteSwap(ctx->input, 16); + Transform(ctx->hash, ctx->input); + buf += t; + len -= t; + /* Process data in 64-byte chunks */ + while (len >= 64) { + memcpy(ctx->input, buf, 64); + byteSwap(ctx->input, 16); + Transform(ctx->hash, ctx->input); + buf += 64; + len -= 64; + } + /* Buffer any remaining bytes of data */ + memcpy(ctx->input, buf, len); } /* Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, LSB-first) */ void MD5::Final(uint8 digest[16], MD5Context *ctx) { - int count = ctx->bytes[0] & 0x3F; /* Bytes mod 64 */ - uint8 *p = (uint8*)ctx->input + count; - /* Set the first byte of padding to 0x80. There is always room. */ - *p++ = 0x80; - /* Bytes of zero padding needed to make 56 bytes (-8..55) */ - count = 56 - 1 - count; - if (count < 0) { /* Padding forces an extra block */ - memset(p, 0, count+8); - byteSwap(ctx->input, 16); - Transform(ctx->hash, ctx->input); - p = (uint8*)ctx->input; - count = 56; - } - memset(p, 0, count); - byteSwap(ctx->input, 14); - /* Append 8 bytes of length in *bits* and transform */ - ctx->input[14] = ctx->bytes[0] << 3; + int count = ctx->bytes[0] & 0x3F; /* Bytes mod 64 */ + uint8 *p = (uint8*)ctx->input + count; + /* Set the first byte of padding to 0x80. There is always room. */ + *p++ = 0x80; + /* Bytes of zero padding needed to make 56 bytes (-8..55) */ + count = 56 - 1 - count; + if (count < 0) { /* Padding forces an extra block */ + memset(p, 0, count+8); + byteSwap(ctx->input, 16); + Transform(ctx->hash, ctx->input); + p = (uint8*)ctx->input; + count = 56; + } + memset(p, 0, count); + byteSwap(ctx->input, 14); + /* Append 8 bytes of length in *bits* and transform */ + ctx->input[14] = ctx->bytes[0] << 3; - ctx->input[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29; - Transform(ctx->hash, ctx->input); - byteSwap(ctx->hash, 4); - memcpy(digest, ctx->hash, 16); - memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + ctx->input[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29; + Transform(ctx->hash, ctx->input); + byteSwap(ctx->hash, 4); + memcpy(digest, ctx->hash, 16); + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions */ @@ -194,78 +194,82 @@ void MD5::Final(uint8 digest[16], MD5Context *ctx) { /* The heart of the MD5 algorithm. */ void MD5::Transform(uint32 hash[4], const uint32 input[16]) { - register uint32 a = hash[0], b = hash[1], c = hash[2], d = hash[3]; + register uint32 a = hash[0], b = hash[1], c = hash[2], d = hash[3]; - MD5STEP(F1, a, b, c, d, input[ 0]+0xd76aa478, 7); - MD5STEP(F1, d, a, b, c, input[ 1]+0xe8c7b756, 12); - MD5STEP(F1, c, d, a, b, input[ 2]+0x242070db, 17); - MD5STEP(F1, b, c, d, a, input[ 3]+0xc1bdceee, 22); - MD5STEP(F1, a, b, c, d, input[ 4]+0xf57c0faf, 7); - MD5STEP(F1, d, a, b, c, input[ 5]+0x4787c62a, 12); - MD5STEP(F1, c, d, a, b, input[ 6]+0xa8304613, 17); - MD5STEP(F1, b, c, d, a, input[ 7]+0xfd469501, 22); - MD5STEP(F1, a, b, c, d, input[ 8]+0x698098d8, 7); - MD5STEP(F1, d, a, b, c, input[ 9]+0x8b44f7af, 12); - MD5STEP(F1, c, d, a, b, input[10]+0xffff5bb1, 17); - MD5STEP(F1, b, c, d, a, input[11]+0x895cd7be, 22); - MD5STEP(F1, a, b, c, d, input[12]+0x6b901122, 7); - MD5STEP(F1, d, a, b, c, input[13]+0xfd987193, 12); - MD5STEP(F1, c, d, a, b, input[14]+0xa679438e, 17); - MD5STEP(F1, b, c, d, a, input[15]+0x49b40821, 22); + MD5STEP(F1, a, b, c, d, input[ 0]+0xd76aa478, 7); + MD5STEP(F1, d, a, b, c, input[ 1]+0xe8c7b756, 12); + MD5STEP(F1, c, d, a, b, input[ 2]+0x242070db, 17); + MD5STEP(F1, b, c, d, a, input[ 3]+0xc1bdceee, 22); + MD5STEP(F1, a, b, c, d, input[ 4]+0xf57c0faf, 7); + MD5STEP(F1, d, a, b, c, input[ 5]+0x4787c62a, 12); + MD5STEP(F1, c, d, a, b, input[ 6]+0xa8304613, 17); + MD5STEP(F1, b, c, d, a, input[ 7]+0xfd469501, 22); + MD5STEP(F1, a, b, c, d, input[ 8]+0x698098d8, 7); + MD5STEP(F1, d, a, b, c, input[ 9]+0x8b44f7af, 12); + MD5STEP(F1, c, d, a, b, input[10]+0xffff5bb1, 17); + MD5STEP(F1, b, c, d, a, input[11]+0x895cd7be, 22); + MD5STEP(F1, a, b, c, d, input[12]+0x6b901122, 7); + MD5STEP(F1, d, a, b, c, input[13]+0xfd987193, 12); + MD5STEP(F1, c, d, a, b, input[14]+0xa679438e, 17); + MD5STEP(F1, b, c, d, a, input[15]+0x49b40821, 22); - MD5STEP(F2, a, b, c, d, input[ 1]+0xf61e2562, 5); - MD5STEP(F2, d, a, b, c, input[ 6]+0xc040b340, 9); - MD5STEP(F2, c, d, a, b, input[11]+0x265e5a51, 14); - MD5STEP(F2, b, c, d, a, input[ 0]+0xe9b6c7aa, 20); - MD5STEP(F2, a, b, c, d, input[ 5]+0xd62f105d, 5); - MD5STEP(F2, d, a, b, c, input[10]+0x02441453, 9); - MD5STEP(F2, c, d, a, b, input[15]+0xd8a1e681, 14); - MD5STEP(F2, b, c, d, a, input[ 4]+0xe7d3fbc8, 20); - MD5STEP(F2, a, b, c, d, input[ 9]+0x21e1cde6, 5); - MD5STEP(F2, d, a, b, c, input[14]+0xc33707d6, 9); - MD5STEP(F2, c, d, a, b, input[ 3]+0xf4d50d87, 14); - MD5STEP(F2, b, c, d, a, input[ 8]+0x455a14ed, 20); - MD5STEP(F2, a, b, c, d, input[13]+0xa9e3e905, 5); - MD5STEP(F2, d, a, b, c, input[ 2]+0xfcefa3f8, 9); - MD5STEP(F2, c, d, a, b, input[ 7]+0x676f02d9, 14); - MD5STEP(F2, b, c, d, a, input[12]+0x8d2a4c8a, 20); + MD5STEP(F2, a, b, c, d, input[ 1]+0xf61e2562, 5); + MD5STEP(F2, d, a, b, c, input[ 6]+0xc040b340, 9); + MD5STEP(F2, c, d, a, b, input[11]+0x265e5a51, 14); + MD5STEP(F2, b, c, d, a, input[ 0]+0xe9b6c7aa, 20); + MD5STEP(F2, a, b, c, d, input[ 5]+0xd62f105d, 5); + MD5STEP(F2, d, a, b, c, input[10]+0x02441453, 9); + MD5STEP(F2, c, d, a, b, input[15]+0xd8a1e681, 14); + MD5STEP(F2, b, c, d, a, input[ 4]+0xe7d3fbc8, 20); + MD5STEP(F2, a, b, c, d, input[ 9]+0x21e1cde6, 5); + MD5STEP(F2, d, a, b, c, input[14]+0xc33707d6, 9); + MD5STEP(F2, c, d, a, b, input[ 3]+0xf4d50d87, 14); + MD5STEP(F2, b, c, d, a, input[ 8]+0x455a14ed, 20); + MD5STEP(F2, a, b, c, d, input[13]+0xa9e3e905, 5); + MD5STEP(F2, d, a, b, c, input[ 2]+0xfcefa3f8, 9); + MD5STEP(F2, c, d, a, b, input[ 7]+0x676f02d9, 14); + MD5STEP(F2, b, c, d, a, input[12]+0x8d2a4c8a, 20); - MD5STEP(F3, a, b, c, d, input[ 5]+0xfffa3942, 4); - MD5STEP(F3, d, a, b, c, input[ 8]+0x8771f681, 11); - MD5STEP(F3, c, d, a, b, input[11]+0x6d9d6122, 16); - MD5STEP(F3, b, c, d, a, input[14]+0xfde5380c, 23); - MD5STEP(F3, a, b, c, d, input[ 1]+0xa4beea44, 4); - MD5STEP(F3, d, a, b, c, input[ 4]+0x4bdecfa9, 11); - MD5STEP(F3, c, d, a, b, input[ 7]+0xf6bb4b60, 16); - MD5STEP(F3, b, c, d, a, input[10]+0xbebfbc70, 23); - MD5STEP(F3, a, b, c, d, input[13]+0x289b7ec6, 4); - MD5STEP(F3, d, a, b, c, input[ 0]+0xeaa127fa, 11); - MD5STEP(F3, c, d, a, b, input[ 3]+0xd4ef3085, 16); - MD5STEP(F3, b, c, d, a, input[ 6]+0x04881d05, 23); - MD5STEP(F3, a, b, c, d, input[ 9]+0xd9d4d039, 4); - MD5STEP(F3, d, a, b, c, input[12]+0xe6db99e5, 11); - MD5STEP(F3, c, d, a, b, input[15]+0x1fa27cf8, 16); - MD5STEP(F3, b, c, d, a, input[ 2]+0xc4ac5665, 23); + MD5STEP(F3, a, b, c, d, input[ 5]+0xfffa3942, 4); + MD5STEP(F3, d, a, b, c, input[ 8]+0x8771f681, 11); + MD5STEP(F3, c, d, a, b, input[11]+0x6d9d6122, 16); + MD5STEP(F3, b, c, d, a, input[14]+0xfde5380c, 23); + MD5STEP(F3, a, b, c, d, input[ 1]+0xa4beea44, 4); + MD5STEP(F3, d, a, b, c, input[ 4]+0x4bdecfa9, 11); + MD5STEP(F3, c, d, a, b, input[ 7]+0xf6bb4b60, 16); + MD5STEP(F3, b, c, d, a, input[10]+0xbebfbc70, 23); + MD5STEP(F3, a, b, c, d, input[13]+0x289b7ec6, 4); + MD5STEP(F3, d, a, b, c, input[ 0]+0xeaa127fa, 11); + MD5STEP(F3, c, d, a, b, input[ 3]+0xd4ef3085, 16); + MD5STEP(F3, b, c, d, a, input[ 6]+0x04881d05, 23); + MD5STEP(F3, a, b, c, d, input[ 9]+0xd9d4d039, 4); + MD5STEP(F3, d, a, b, c, input[12]+0xe6db99e5, 11); + MD5STEP(F3, c, d, a, b, input[15]+0x1fa27cf8, 16); + MD5STEP(F3, b, c, d, a, input[ 2]+0xc4ac5665, 23); - MD5STEP(F4, a, b, c, d, input[ 0]+0xf4292244, 6); - MD5STEP(F4, d, a, b, c, input[ 7]+0x432aff97, 10); - MD5STEP(F4, c, d, a, b, input[14]+0xab9423a7, 15); - MD5STEP(F4, b, c, d, a, input[ 5]+0xfc93a039, 21); - MD5STEP(F4, a, b, c, d, input[12]+0x655b59c3, 6); - MD5STEP(F4, d, a, b, c, input[ 3]+0x8f0ccc92, 10); - MD5STEP(F4, c, d, a, b, input[10]+0xffeff47d, 15); - MD5STEP(F4, b, c, d, a, input[ 1]+0x85845dd1, 21); - MD5STEP(F4, a, b, c, d, input[ 8]+0x6fa87e4f, 6); - MD5STEP(F4, d, a, b, c, input[15]+0xfe2ce6e0, 10); - MD5STEP(F4, c, d, a, b, input[ 6]+0xa3014314, 15); - MD5STEP(F4, b, c, d, a, input[13]+0x4e0811a1, 21); - MD5STEP(F4, a, b, c, d, input[ 4]+0xf7537e82, 6); - MD5STEP(F4, d, a, b, c, input[11]+0xbd3af235, 10); - MD5STEP(F4, c, d, a, b, input[ 2]+0x2ad7d2bb, 15); - MD5STEP(F4, b, c, d, a, input[ 9]+0xeb86d391, 21); + MD5STEP(F4, a, b, c, d, input[ 0]+0xf4292244, 6); + MD5STEP(F4, d, a, b, c, input[ 7]+0x432aff97, 10); + MD5STEP(F4, c, d, a, b, input[14]+0xab9423a7, 15); + MD5STEP(F4, b, c, d, a, input[ 5]+0xfc93a039, 21); + MD5STEP(F4, a, b, c, d, input[12]+0x655b59c3, 6); + MD5STEP(F4, d, a, b, c, input[ 3]+0x8f0ccc92, 10); + MD5STEP(F4, c, d, a, b, input[10]+0xffeff47d, 15); + MD5STEP(F4, b, c, d, a, input[ 1]+0x85845dd1, 21); + MD5STEP(F4, a, b, c, d, input[ 8]+0x6fa87e4f, 6); + MD5STEP(F4, d, a, b, c, input[15]+0xfe2ce6e0, 10); + MD5STEP(F4, c, d, a, b, input[ 6]+0xa3014314, 15); + MD5STEP(F4, b, c, d, a, input[13]+0x4e0811a1, 21); + MD5STEP(F4, a, b, c, d, input[ 4]+0xf7537e82, 6); + MD5STEP(F4, d, a, b, c, input[11]+0xbd3af235, 10); + MD5STEP(F4, c, d, a, b, input[ 2]+0x2ad7d2bb, 15); + MD5STEP(F4, b, c, d, a, input[ 9]+0xeb86d391, 21); - hash[0] += a; hash[1] += b; hash[2] += c; hash[3] += d; + hash[0] += a; + hash[1] += b; + hash[2] += c; + hash[3] += d; } + diff --git a/common/memory_mapped_file.cpp b/common/memory_mapped_file.cpp index c12eafeaf..1754f34ba 100644 --- a/common/memory_mapped_file.cpp +++ b/common/memory_mapped_file.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "memory_mapped_file.h" @@ -32,160 +32,160 @@ namespace EQEmu { - struct MemoryMappedFile::Implementation { + struct MemoryMappedFile::Implementation { #ifdef _WINDOWS - HANDLE mapped_object_; + HANDLE mapped_object_; #else - int fd_; + int fd_; #endif - }; + }; - MemoryMappedFile::MemoryMappedFile(std::string filename, uint32 size) - : filename_(filename), size_(size) { - imp_ = new Implementation; + MemoryMappedFile::MemoryMappedFile(std::string filename, uint32 size) + : filename_(filename), size_(size) { + imp_ = new Implementation; #ifdef _WINDOWS - DWORD total_size = size + sizeof(shared_memory_struct); - HANDLE file = CreateFile(filename.c_str(), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - nullptr, - OPEN_ALWAYS, - 0, - nullptr); + DWORD total_size = size + sizeof(shared_memory_struct); + HANDLE file = CreateFile(filename.c_str(), + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + nullptr, + OPEN_ALWAYS, + 0, + nullptr); - if(file == INVALID_HANDLE_VALUE) { - EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); - } + if(file == INVALID_HANDLE_VALUE) { + EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); + } - imp_->mapped_object_ = CreateFileMapping(file, - nullptr, - PAGE_READWRITE, - 0, - total_size, - filename.c_str()); + imp_->mapped_object_ = CreateFileMapping(file, + nullptr, + PAGE_READWRITE, + 0, + total_size, + filename.c_str()); - if(!imp_->mapped_object_) { - EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); - } + if(!imp_->mapped_object_) { + EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); + } - memory_ = reinterpret_cast(MapViewOfFile(imp_->mapped_object_, - FILE_MAP_ALL_ACCESS, - 0, - 0, - total_size)); + memory_ = reinterpret_cast(MapViewOfFile(imp_->mapped_object_, + FILE_MAP_ALL_ACCESS, + 0, + 0, + total_size)); - if(!memory_) { - EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); - } + if(!memory_) { + EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); + } #else - size_t total_size = size + sizeof(shared_memory_struct); - imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); - if(imp_->fd_ == -1) { - EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); - } + size_t total_size = size + sizeof(shared_memory_struct); + imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); + if(imp_->fd_ == -1) { + EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); + } - if(ftruncate(imp_->fd_, total_size) == -1) { - EQ_EXCEPT("Shared Memory", "Could not set file size for this shared memory segment."); - } + if(ftruncate(imp_->fd_, total_size) == -1) { + EQ_EXCEPT("Shared Memory", "Could not set file size for this shared memory segment."); + } - memory_ = reinterpret_cast( - mmap(nullptr, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0)); + memory_ = reinterpret_cast( + mmap(nullptr, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0)); - if(memory_ == MAP_FAILED) { - EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); - } + if(memory_ == MAP_FAILED) { + EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); + } #endif - } + } - MemoryMappedFile::MemoryMappedFile(std::string filename) - : filename_(filename) { - imp_ = new Implementation; + MemoryMappedFile::MemoryMappedFile(std::string filename) + : filename_(filename) { + imp_ = new Implementation; - //get existing size - FILE *f = fopen(filename.c_str(), "rb"); - if(!f) { - EQ_EXCEPT("Shared Memory", "Could not open the file to find the existing file size."); - } - fseek(f, 0U, SEEK_END); - uint32 size = static_cast(ftell(f)) - sizeof(shared_memory_struct); - size_ = size; - fclose(f); + //get existing size + FILE *f = fopen(filename.c_str(), "rb"); + if(!f) { + EQ_EXCEPT("Shared Memory", "Could not open the file to find the existing file size."); + } + fseek(f, 0U, SEEK_END); + uint32 size = static_cast(ftell(f)) - sizeof(shared_memory_struct); + size_ = size; + fclose(f); #ifdef _WINDOWS - DWORD total_size = size + sizeof(shared_memory_struct); - HANDLE file = CreateFile(filename.c_str(), - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - nullptr, - OPEN_ALWAYS, - 0, - nullptr); + DWORD total_size = size + sizeof(shared_memory_struct); + HANDLE file = CreateFile(filename.c_str(), + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + nullptr, + OPEN_ALWAYS, + 0, + nullptr); - if(file == INVALID_HANDLE_VALUE) { - EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); - } + if(file == INVALID_HANDLE_VALUE) { + EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); + } - imp_->mapped_object_ = CreateFileMapping(file, - nullptr, - PAGE_READWRITE, - 0, - total_size, - filename.c_str()); + imp_->mapped_object_ = CreateFileMapping(file, + nullptr, + PAGE_READWRITE, + 0, + total_size, + filename.c_str()); - if(!imp_->mapped_object_) { - EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); - } + if(!imp_->mapped_object_) { + EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); + } - memory_ = reinterpret_cast(MapViewOfFile(imp_->mapped_object_, - FILE_MAP_ALL_ACCESS, - 0, - 0, - total_size)); + memory_ = reinterpret_cast(MapViewOfFile(imp_->mapped_object_, + FILE_MAP_ALL_ACCESS, + 0, + 0, + total_size)); - if(!memory_) { - EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); - } + if(!memory_) { + EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); + } #else - size_t total_size = size + sizeof(shared_memory_struct); - imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); - if(imp_->fd_ == -1) { - EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); - } + size_t total_size = size + sizeof(shared_memory_struct); + imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); + if(imp_->fd_ == -1) { + EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); + } - if(ftruncate(imp_->fd_, total_size) == -1) { - EQ_EXCEPT("Shared Memory", "Could not set file size for this shared memory segment."); - } + if(ftruncate(imp_->fd_, total_size) == -1) { + EQ_EXCEPT("Shared Memory", "Could not set file size for this shared memory segment."); + } - memory_ = reinterpret_cast( - mmap(nullptr, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0)); + memory_ = reinterpret_cast( + mmap(nullptr, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0)); - if(memory_ == MAP_FAILED) { - EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); - } + if(memory_ == MAP_FAILED) { + EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); + } #endif - } + } - MemoryMappedFile::~MemoryMappedFile() { + MemoryMappedFile::~MemoryMappedFile() { #ifdef _WINDOWS - if(imp_->mapped_object_) { - CloseHandle(imp_->mapped_object_); - } + if(imp_->mapped_object_) { + CloseHandle(imp_->mapped_object_); + } #else - if(memory_) { - size_t total_size = size_ + sizeof(shared_memory_struct); - munmap(reinterpret_cast(memory_), total_size); - close(imp_->fd_); - } + if(memory_) { + size_t total_size = size_ + sizeof(shared_memory_struct); + munmap(reinterpret_cast(memory_), total_size); + close(imp_->fd_); + } #endif - delete imp_; - } + delete imp_; + } - void MemoryMappedFile::ZeroFile() { - memset(reinterpret_cast(memory_), 0, sizeof(shared_memory_struct)); - memset(memory_->data, 0, size_); - memory_->size = size_; - } + void MemoryMappedFile::ZeroFile() { + memset(reinterpret_cast(memory_), 0, sizeof(shared_memory_struct)); + memset(memory_->data, 0, size_); + memory_->size = size_; + } } // EQEmu diff --git a/common/memory_mapped_file.h b/common/memory_mapped_file.h index 8ab588f34..cc4ed700d 100644 --- a/common/memory_mapped_file.h +++ b/common/memory_mapped_file.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_MEMORYMAPPEDFILE_H_ @@ -24,63 +24,63 @@ namespace EQEmu { - //! Memory Backed Shared Memory - /*! - Allows us to create shared memory that is backed by a file on both windows and unix platforms that - works in a consistent manner. Non-copyable. - */ - class MemoryMappedFile { - struct Implementation; - struct shared_memory_struct; + //! Memory Backed Shared Memory + /*! + Allows us to create shared memory that is backed by a file on both windows and unix platforms that + works in a consistent manner. Non-copyable. + */ + class MemoryMappedFile { + struct Implementation; + struct shared_memory_struct; - //! Underlying data structure. - struct shared_memory_struct { - uint32 size; - unsigned char data[1]; - }; - public: - //! Constructor - /*! - Creates a mmf for the given filename and of size. - \param filename Actual filename of the mmf. - \param size Size in bytes of the mmf. - */ - MemoryMappedFile(std::string filename, uint32 size); + //! Underlying data structure. + struct shared_memory_struct { + uint32 size; + unsigned char data[1]; + }; + public: + //! Constructor + /*! + Creates a mmf for the given filename and of size. + \param filename Actual filename of the mmf. + \param size Size in bytes of the mmf. + */ + MemoryMappedFile(std::string filename, uint32 size); - //! Constructor - /*! - Creates a mmf for the given filename and gets the size based on the existing size. - \param filename Actual filename of the mmf. - */ - MemoryMappedFile(std::string filename); + //! Constructor + /*! + Creates a mmf for the given filename and gets the size based on the existing size. + \param filename Actual filename of the mmf. + */ + MemoryMappedFile(std::string filename); - //! Destructor - ~MemoryMappedFile(); + //! Destructor + ~MemoryMappedFile(); - //! Get Data Operator - inline void *operator->() const { return memory_->data; } + //! Get Data Operator + inline void *operator->() const { return memory_->data; } - //! Get Data Function - inline void *Get() const { return memory_->data; } + //! Get Data Function + inline void *Get() const { return memory_->data; } - //! Get Size Function - inline uint32 Size() const { return memory_->size; } + //! Get Size Function + inline uint32 Size() const { return memory_->size; } - //! Zeros all the memory in the file, and set it to be unloaded - void ZeroFile(); - private: - //! Copy Constructor - MemoryMappedFile(const MemoryMappedFile&); + //! Zeros all the memory in the file, and set it to be unloaded + void ZeroFile(); + private: + //! Copy Constructor + MemoryMappedFile(const MemoryMappedFile&); - //! Assignment Operator - const MemoryMappedFile& operator=(const MemoryMappedFile&); + //! Assignment Operator + const MemoryMappedFile& operator=(const MemoryMappedFile&); - std::string filename_; //!< Filename of this shared memory object - uint32 size_; //!< Size in bytes of this shared memory object - shared_memory_struct *memory_; //!< Underlying data of the shared memory object. + std::string filename_; //!< Filename of this shared memory object + uint32 size_; //!< Size in bytes of this shared memory object + shared_memory_struct *memory_; //!< Underlying data of the shared memory object. - Implementation *imp_; //!< Underlying implementation. - }; + Implementation *imp_; //!< Underlying implementation. + }; } // EQEmu #endif diff --git a/common/misc.cpp b/common/misc.cpp index 1bcfd90c9..0928113e0 100644 --- a/common/misc.cpp +++ b/common/misc.cpp @@ -36,20 +36,20 @@ int print_stacktrace() #include int print_stacktrace() { - void *ba[20]; - int n = backtrace (ba, 20); - if (n != 0) - { - char **names = backtrace_symbols (ba, n); - if (names != nullptr) - { - int i; - cerr << "called from " << (char*)names[0] << endl; - for (i = 1; i < n; ++i) - cerr << " " << (char*)names[i] << endl; - free (names); - } - } + void *ba[20]; + int n = backtrace (ba, 20); + if (n != 0) + { + char **names = backtrace_symbols (ba, n); + if (names != nullptr) + { + int i; + cerr << "called from " << (char*)names[0] << endl; + for (i = 1; i < n; ++i) + cerr << " " << (char*)names[i] << endl; + free (names); + } + } return(0); } #endif //!FREEBSD @@ -387,9 +387,9 @@ void encode_chunk(char *in, int len, char *out) void decode_chunk(char *in, char *out) { - *out = DEC(*in) << 2 | DEC(in[1]) >> 4; - *(out+1) = DEC(in[1]) << 4 | DEC(in[2]) >> 2; - *(out+2) = DEC(in[2]) << 6 | DEC(in[3]); + *out = DEC(*in) << 2 | DEC(in[1]) >> 4; + *(out+1) = DEC(in[1]) << 4 | DEC(in[2]) >> 2; + *(out+2) = DEC(in[2]) << 6 | DEC(in[3]); } void dump_message_column(unsigned char *buffer, unsigned long length, string leader, FILE *to) diff --git a/common/misc.h b/common/misc.h index dffd2814e..41cfaec4c 100644 --- a/common/misc.h +++ b/common/misc.h @@ -21,7 +21,7 @@ void LoadItemDBFieldNames(); void encode_length(unsigned long length, char *out); unsigned long decode_length(char *in); -unsigned long encode(char *in, unsigned long length, char *out); +unsigned long encode(char *in, unsigned long length, char *out); void decode(char *in, char *out); void encode_chunk(char *in, int len, char *out); void decode_chunk(char *in, char *out); @@ -41,3 +41,4 @@ void build_hex_line(const char *buffer, unsigned long length, unsigned long offs void print_hex(const char *buffer, unsigned long length); #endif + diff --git a/common/moremath.cpp b/common/moremath.cpp index a3140a2a8..84f0b8900 100644 --- a/common/moremath.cpp +++ b/common/moremath.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" diff --git a/common/moremath.h b/common/moremath.h index 1f64d0462..d000a54b8 100644 --- a/common/moremath.h +++ b/common/moremath.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef MOREMATH_H #define MOREMATH_H diff --git a/common/opcodemgr.cpp b/common/opcodemgr.cpp index 71bf97b7c..a7286e686 100644 --- a/common/opcodemgr.cpp +++ b/common/opcodemgr.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include @@ -180,7 +180,6 @@ bool RegularOpcodeManager::ReloadOpcodes(const char *filename, bool report_error return(ret); } - uint16 RegularOpcodeManager::EmuToEQ(const EmuOpcode emu_op) { //opcode is checked for validity in GetEQOpcode uint16 res; @@ -221,7 +220,6 @@ void RegularOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) { s.Set(emu_op, eq_op); } - void RegularOpcodeManager::NormalMemStrategy::Set(EmuOpcode emu_op, uint16 eq_op) { if(uint32(emu_op) >= it->EmuOpcodeCount || eq_op >= it->EQOpcodeCount) return; @@ -233,7 +231,6 @@ NullOpcodeManager::NullOpcodeManager() : MutableOpcodeManager() { } - bool NullOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { return(true); } @@ -254,7 +251,6 @@ EmptyOpcodeManager::EmptyOpcodeManager() : MutableOpcodeManager() { } - bool EmptyOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) { return(true); } @@ -280,9 +276,3 @@ void EmptyOpcodeManager::SetOpcode(EmuOpcode emu_op, uint16 eq_op) { eq_to_emu[eq_op] = emu_op; } - - - - - - diff --git a/common/opcodemgr.h b/common/opcodemgr.h index 14e6fde7a..64e025c57 100644 --- a/common/opcodemgr.h +++ b/common/opcodemgr.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef OPCODE_MANAGER_H @@ -58,8 +58,8 @@ public: }; protected: - bool loaded; //true if all opcodes loaded - Mutex MOpcodes; //this only protects the local machine + bool loaded; //true if all opcodes loaded + Mutex MOpcodes; //this only protects the local machine //in a shared manager, this dosent protect others static bool LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, bool report_errors); @@ -162,15 +162,3 @@ protected: #endif - - - - - - - - - - - - diff --git a/common/packet_dump.cpp b/common/packet_dump.cpp index 1b6a9710d..bc652f6c6 100644 --- a/common/packet_dump.cpp +++ b/common/packet_dump.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -59,8 +59,8 @@ void DumpPacketHex(const uchar* buf, uint32 size, uint32 cols, uint32 skip) { char* ascii = new char[cols+1]; memset(ascii, 0, cols+1); uint32 i; - for(i=skip; i #include @@ -33,7 +33,7 @@ #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #endif @@ -73,8 +73,8 @@ void oldFileDumpPacketHex(const char* filename, const uchar* buf, uint32 size, u ofstream logfile(filename, ios::app); // Output as HEX char output[4]; - for(uint32 i=skip; i @@ -43,13 +43,13 @@ void EncryptProfilePacket(uchar* pBuffer, uint32 size) { data[0] = data[len/2]; data[len/2] = swap; - for(uint32 i=0; i>0x19)|(data[i]<<0x27))+0x422437A9; - data[i] = (data[i]<<0x07)|(data[i]>>0x39); + data[i] = (data[i]<<0x07)|(data[i]>>0x39); data[i] = data[i] - crypt; crypt = next_crypt; - } + } } void EncryptZoneSpawnPacket(EQApplicationPacket* app) { @@ -66,13 +66,13 @@ void EncryptZoneSpawnPacket(uchar* pBuffer, uint32 size) { data[0] = data[len/2]; data[len/2] = swap; - for(uint32 i=0; i>0x23))+0x659365E7; - data[i] = (data[i]<<0x0e)|(data[i]>>0x32); + data[i] = (data[i]<<0x0e)|(data[i]>>0x32); data[i] = data[i] - crypt; crypt = next_crypt; - } + } } #define MEMORY_DEBUG @@ -100,28 +100,28 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou #ifdef REUSE_ZLIB static bool inited = false; static z_stream zstream; - int zerror; + int zerror; - if(in_data == nullptr && out_data == nullptr && in_length == 0 && max_out_length == 0) { - //special delete state - deflateEnd(&zstream); - return(0); - } - if(!inited) { + if(in_data == nullptr && out_data == nullptr && in_length == 0 && max_out_length == 0) { + //special delete state + deflateEnd(&zstream); + return(0); + } + if(!inited) { memset(&zstream, 0, sizeof(zstream)); - zstream.zalloc = eqemu_alloc_func; - zstream.zfree = eqemu_free_func; - zstream.opaque = Z_NULL; + zstream.zalloc = eqemu_alloc_func; + zstream.zfree = eqemu_free_func; + zstream.opaque = Z_NULL; deflateInit(&zstream, Z_FINISH); - } + } - zstream.next_in = const_cast(in_data); - zstream.avail_in = in_length; -/* zstream.zalloc = Z_NULL; - zstream.zfree = Z_NULL; - zstream.opaque = Z_NULL; + zstream.next_in = const_cast(in_data); + zstream.avail_in = in_length; +/* zstream.zalloc = Z_NULL; + zstream.zfree = Z_NULL; + zstream.opaque = Z_NULL; deflateInit(&zstream, Z_FINISH);*/ - zstream.next_out = out_data; + zstream.next_out = out_data; zstream.avail_out = max_out_length; zerror = deflate(&zstream, Z_FINISH); @@ -144,15 +144,15 @@ int DeflatePacket(const unsigned char* in_data, int in_length, unsigned char* ou z_stream zstream; memset(&zstream, 0, sizeof(zstream)); - int zerror; + int zerror; - zstream.next_in = const_cast(in_data); - zstream.avail_in = in_length; - zstream.zalloc = eqemu_alloc_func; - zstream.zfree = eqemu_free_func; - zstream.opaque = Z_NULL; + zstream.next_in = const_cast(in_data); + zstream.avail_in = in_length; + zstream.zalloc = eqemu_alloc_func; + zstream.zfree = eqemu_free_func; + zstream.opaque = Z_NULL; deflateInit(&zstream, Z_FINISH); - zstream.next_out = out_data; + zstream.next_out = out_data; zstream.avail_out = max_out_length; zerror = deflate(&zstream, Z_FINISH); @@ -173,26 +173,26 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint #ifdef REUSE_ZLIB static bool inited = false; static z_stream zstream; - int zerror; + int zerror; - if(indata == nullptr && outdata == nullptr && indatalen == 0 && outdatalen == 0) { - //special delete state - inflateEnd(&zstream); - return(0); - } - if(!inited) { - zstream.zalloc = eqemu_alloc_func; - zstream.zfree = eqemu_free_func; - zstream.opaque = Z_NULL; + if(indata == nullptr && outdata == nullptr && indatalen == 0 && outdatalen == 0) { + //special delete state + inflateEnd(&zstream); + return(0); + } + if(!inited) { + zstream.zalloc = eqemu_alloc_func; + zstream.zfree = eqemu_free_func; + zstream.opaque = Z_NULL; inflateInit2(&zstream, 15); - } + } zstream.next_in = const_cast(indata); zstream.avail_in = indatalen; zstream.next_out = outdata; zstream.avail_out = outdatalen; - zstream.zalloc = eqemu_alloc_func; - zstream.zfree = eqemu_free_func; + zstream.zalloc = eqemu_alloc_func; + zstream.zfree = eqemu_free_func; zstream.opaque = Z_NULL; i = inflateInit2( &zstream, 15 ); @@ -237,8 +237,8 @@ uint32 InflatePacket(const uchar* indata, uint32 indatalen, uchar* outdata, uint zstream.avail_in = indatalen; zstream.next_out = outdata; zstream.avail_out = outdatalen; - zstream.zalloc = eqemu_alloc_func; - zstream.zfree = eqemu_free_func; + zstream.zalloc = eqemu_alloc_func; + zstream.zfree = eqemu_free_func; zstream.opaque = Z_NULL; i = inflateInit2( &zstream, 15 ); diff --git a/common/packet_functions.h b/common/packet_functions.h index 4ac7fa0ac..3746c7c79 100644 --- a/common/packet_functions.h +++ b/common/packet_functions.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PACKET_FUNCTIONS_H #define PACKET_FUNCTIONS_H diff --git a/common/perl_EQDB.cpp b/common/perl_EQDB.cpp index 086a27c73..960809871 100644 --- a/common/perl_EQDB.cpp +++ b/common/perl_EQDB.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef const char Const_char; @@ -32,7 +32,7 @@ typedef const char Const_char; #include "../common/useperl.h" #include "EQDB.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif diff --git a/common/perl_EQDBRes.cpp b/common/perl_EQDBRes.cpp index 835bea2c8..23837321f 100644 --- a/common/perl_EQDBRes.cpp +++ b/common/perl_EQDBRes.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef const char Const_char; diff --git a/common/platform.cpp b/common/platform.cpp index 6ec98b364..1a7b2ed7f 100644 --- a/common/platform.cpp +++ b/common/platform.cpp @@ -3,9 +3,10 @@ EQEmuExePlatform exe_platform = ExePlatformNone; void RegisterExecutablePlatform(EQEmuExePlatform p) { - exe_platform = p; + exe_platform = p; } const EQEmuExePlatform& GetExecutablePlatform() { - return exe_platform; + return exe_platform; } + diff --git a/common/platform.h b/common/platform.h index 978b2801f..f91ccb6f3 100644 --- a/common/platform.h +++ b/common/platform.h @@ -3,14 +3,14 @@ enum EQEmuExePlatform { - ExePlatformNone = 0, - ExePlatformZone, - ExePlatformWorld, - ExePlatformLogin, - ExePlatformQueryServ, - ExePlatformUCS, - ExePlatformLaunch, - ExePlatformSharedMemory + ExePlatformNone = 0, + ExePlatformZone, + ExePlatformWorld, + ExePlatformLogin, + ExePlatformQueryServ, + ExePlatformUCS, + ExePlatformLaunch, + ExePlatformSharedMemory }; void RegisterExecutablePlatform(EQEmuExePlatform p); diff --git a/common/profiler.h b/common/profiler.h index 10ae404d2..a66e3ac88 100644 --- a/common/profiler.h +++ b/common/profiler.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PROFILER_H #define PROFILER_H diff --git a/common/ptimer.cpp b/common/ptimer.cpp index 85acf6e6b..d9bfa9428 100644 --- a/common/ptimer.cpp +++ b/common/ptimer.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" @@ -128,9 +128,9 @@ PersistentTimer::PersistentTimer(uint32 char_id, pTimerType type, uint32 in_star bool PersistentTimer::Load(Database *db) { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + char *query = 0; uint32 qlen = 0; uint32 qcount = 0; @@ -169,7 +169,7 @@ bool PersistentTimer::Store(Database *db) { return(true); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 qlen = 0; qlen = MakeAnyLenString(&query, "REPLACE INTO timers " @@ -196,7 +196,7 @@ bool PersistentTimer::Store(Database *db) { bool PersistentTimer::Clear(Database *db) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 qlen = 0; qlen = MakeAnyLenString(&query, "DELETE FROM timers " @@ -222,30 +222,30 @@ bool PersistentTimer::Clear(Database *db) { /* This function checks if the timer triggered */ bool PersistentTimer::Expired(Database *db, bool iReset) { - if (this == nullptr) { + if (this == nullptr) { LogFile->write(EQEMuLog::Error, "Null timer during ->Check()!?\n"); return(true); } uint32 current_time = get_current_time(); - if (current_time-start_time >= timer_time) { + if (current_time-start_time >= timer_time) { if (enabled && iReset) { start_time = current_time; // Reset timer } else if(enabled) { Clear(db); //remove it from DB too } return(true); - } + } - return(false); + return(false); } /* This function set the timer and restart it */ void PersistentTimer::Start(uint32 set_timer_time) { - start_time = get_current_time(); + start_time = get_current_time(); enabled = true; - if (set_timer_time != 0) { + if (set_timer_time != 0) { timer_time = set_timer_time; - } + } #ifdef DEBUG_PTIMERS printf("Starting timer: char %lu of type %u at %lu for %lu seconds.\n", (unsigned long)_char_id, _type, (unsigned long)start_time, (unsigned long)timer_time); #endif @@ -253,25 +253,25 @@ void PersistentTimer::Start(uint32 set_timer_time) { // This timer updates the timer without restarting it void PersistentTimer::SetTimer(uint32 set_timer_time) { - // If we were disabled before => restart the timer - timer_time = set_timer_time; - if (!enabled) { + // If we were disabled before => restart the timer + timer_time = set_timer_time; + if (!enabled) { start_time = get_current_time(); enabled = true; - } + } #ifdef DEBUG_PTIMERS printf("Setting timer: char %lu of type %u at %lu for %lu seconds.\n", (unsigned long)_char_id, _type, (unsigned long)start_time, (unsigned long)timer_time); #endif } uint32 PersistentTimer::GetRemainingTime() { - if (enabled) { + if (enabled) { uint32 current_time = get_current_time(); - if (current_time-start_time > timer_time) + if (current_time-start_time > timer_time) return 0; else return (start_time + timer_time) - current_time; - } + } else { return 0xFFFFFFFF; } @@ -310,9 +310,9 @@ bool PTimerList::Load(Database *db) { _list.clear(); char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + char *query = 0; uint32 qlen = 0; uint32 qcount = 0; @@ -382,7 +382,7 @@ bool PTimerList::Clear(Database *db) { _list.clear(); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 qlen = 0; qlen = MakeAnyLenString(&query, "DELETE FROM timers " @@ -480,7 +480,7 @@ void PTimerList::ToVector(vector< pair > &out) { bool PTimerList::ClearOffline(Database *db, uint32 char_id, pTimerType type) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 qlen = 0; qlen = MakeAnyLenString(&query, "DELETE FROM timers WHERE char_id=%lu AND type=%u ",(unsigned long)char_id, type); diff --git a/common/ptimer.h b/common/ptimer.h index 1220daa92..56e2aa6a9 100644 --- a/common/ptimer.h +++ b/common/ptimer.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PTIMER_H #define PTIMER_H @@ -47,7 +47,7 @@ enum { //values for pTimerType pTimerItemStart = 100, pTimerItemEnd = 200, //I don't think any items would use one this high but hey, incase. - pTimerPeqzoneReuse = 900, + pTimerPeqzoneReuse = 900, pTimerMercReuse = 901, pTimerMercSuspend = 902, pTimerAAStart = 1000, //AA re-use timers diff --git a/common/queue.h b/common/queue.h index c79e81e19..00dd48cac 100644 --- a/common/queue.h +++ b/common/queue.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef QUEUE_H #define QUEUE_H @@ -25,102 +25,102 @@ template class MyQueueNode { public: - MyQueueNode(T* data) - { - next = 0; - this->data = data; - } + MyQueueNode(T* data) + { + next = 0; + this->data = data; + } - friend class MyQueue; + friend class MyQueue; private: - T* data; - MyQueueNode* next; + T* data; + MyQueueNode* next; }; template class MyQueue { public: - MyQueue() - { - head = tail = 0; - } + MyQueue() + { + head = tail = 0; + } ~MyQueue() { clear(); } - void push(T* data) - { - if (head == 0) - { - tail = head = new MyQueueNode(data); - } - else - { - tail->next = new MyQueueNode(data); - tail = tail->next; - } - } + void push(T* data) + { + if (head == 0) + { + tail = head = new MyQueueNode(data); + } + else + { + tail->next = new MyQueueNode(data); + tail = tail->next; + } + } - T* pop() - { - if (head == 0) - { - return 0; - } + T* pop() + { + if (head == 0) + { + return 0; + } - T* data = head->data; - MyQueueNode* next_node = head->next; - delete head; - head = next_node; + T* data = head->data; + MyQueueNode* next_node = head->next; + delete head; + head = next_node; - return data; - } + return data; + } - T* top() - { - if (head == 0) - { - return 0; - } + T* top() + { + if (head == 0) + { + return 0; + } - return head->data; - } + return head->data; + } - bool empty() - { - if (head == 0) - { - return true; - } + bool empty() + { + if (head == 0) + { + return true; + } - return false; - } + return false; + } - void clear() - { + void clear() + { T* d = 0; - while((d = pop())) { + while((d = pop())) { delete d; } - return; - } + return; + } - int count() - { - int count = 0; + int count() + { + int count = 0; MyQueueNode* d = head; - while(d != 0) { - count++; - d = d->next; + while(d != 0) { + count++; + d = d->next; } - return(count); - } + return(count); + } private: - MyQueueNode* head; - MyQueueNode* tail; + MyQueueNode* head; + MyQueueNode* tail; }; #endif diff --git a/common/queues.h b/common/queues.h index c6779385a..474d7d898 100644 --- a/common/queues.h +++ b/common/queues.h @@ -1,25 +1,25 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ /* - Code for generell handling of priority Queues. - Implemention of queues from "Algoritms in C" by Robert Sedgewick. - Copyright Monty Program KB. - By monty. + Code for generell handling of priority Queues. + Implemention of queues from "Algoritms in C" by Robert Sedgewick. + Copyright Monty Program KB. + By monty. */ #ifndef _queues_h @@ -29,13 +29,13 @@ extern "C" { #endif typedef struct st_queue { - byte **root; - void *first_cmp_arg; - uint elements; - uint max_elements; - uint offset_to_key; /* compare is done on element+offset */ - int max_at_top; /* Set if queue_top gives max */ - int (*compare)(void *, byte *,byte *); + byte **root; + void *first_cmp_arg; + uint elements; + uint max_elements; + uint offset_to_key; /* compare is done on element+offset */ + int max_at_top; /* Set if queue_top gives max */ + int (*compare)(void *, byte *,byte *); } QUEUE; #define queue_top(queue) ((queue)->root[1]) @@ -44,11 +44,11 @@ typedef struct st_queue { #define queue_replaced(queue) _downheap(queue,1) int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key, - pbool max_at_top, int (*compare)(void *,byte *, byte *), - void *first_cmp_arg); + pbool max_at_top, int (*compare)(void *,byte *, byte *), + void *first_cmp_arg); int reinit_queue(QUEUE *queue,uint max_elements,uint offset_to_key, - pbool max_at_top, int (*compare)(void *,byte *, byte *), - void *first_cmp_arg); + pbool max_at_top, int (*compare)(void *,byte *, byte *), + void *first_cmp_arg); void delete_queue(QUEUE *queue); void queue_insert(QUEUE *queue,byte *element); byte *queue_remove(QUEUE *queue,uint idx); diff --git a/common/races.cpp b/common/races.cpp index a041845a3..d088ce185 100644 --- a/common/races.cpp +++ b/common/races.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/eq_packet_structs.h" diff --git a/common/races.h b/common/races.h index 452da9461..2c360e908 100644 --- a/common/races.h +++ b/common/races.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef RACES_H #define RACES_H @@ -104,413 +104,411 @@ inline uint32 GetRaceBitmask(uint16 race) { return uint32(pow(2.0f, float(GetArr //pulled from the client by ksmith: $races_table = array( - 1 => "Human", - 2 => "Barbarian", - 3 => "Erudite", - 4 => "Wood Elf", - 5 => "High Elf", - 6 => "Dark Elf", - 7 => "Half Elf", - 8 => "Dwarf", - 9 => "Troll", - 10 => "Ogre", - 11 => "Halfling", - 12 => "Gnome", - 13 => "Aviak", - 14 => "Were Wolf", - 15 => "Brownie", - 16 => "Centaur", - 17 => "Golem", - 18 => "Giant / Cyclops", - 19 => "Trakenon", - 20 => "Doppleganger", - 21 => "Evil Eye", - 22 => "Beetle", - 23 => "Kerra", - 24 => "Fish", - 25 => "Fairy", - 26 => "Old Froglok", - 27 => "Old Froglok Ghoul", - 28 => "Fungusman", - 29 => "Gargoyle", - 30 => "Gasbag", - 31 => "Gelatinous Cube", - 32 => "Ghost", - 33 => "Ghoul", - 34 => "Giant Bat", - 35 => "Giant Eel", - 36 => "Giant Rat", - 37 => "Giant Snake", - 38 => "Giant Spider", - 39 => "Gnoll", - 40 => "Goblin", - 41 => "Gorilla", - 42 => "Wolf", - 43 => "Bear", - 44 => "Freeport Guards", - 45 => "Demi Lich", - 46 => "Imp", - 47 => "Griffin", - 48 => "Kobold", - 49 => "Lava Dragon", - 50 => "Lion", - 51 => "Lizard Man", - 52 => "Mimic", - 53 => "Minotaur", - 54 => "Orc", - 55 => "Human Beggar", - 56 => "Pixie", - 57 => "Dracnid", - 58 => "Solusek Ro", - 59 => "Bloodgills", - 60 => "Skeleton", - 61 => "Shark", - 62 => "Tunare", - 63 => "Tiger", - 64 => "Treant", - 65 => "Vampire", - 66 => "Rallos Zek", - 67 => "Highpass Citizen", - 68 => "Tentacle", - 69 => "Will 'O Wisp", - 70 => "Zombie", - 71 => "Qeynos Citizen", - 72 => "Ship", - 73 => "Launch", - 74 => "Piranha", - 75 => "Elemental", - 76 => "Puma", - 77 => "Neriak Citizen", - 78 => "Erudite Citizen", - 79 => "Bixie", - 80 => "Reanimated Hand", - 81 => "Rivervale Citizen", - 82 => "Scarecrow", - 83 => "Skunk", - 84 => "Snake Elemental", - 85 => "Spectre", - 86 => "Sphinx", - 87 => "Armadillo", - 88 => "Clockwork Gnome", - 89 => "Drake", - 90 => "Halas Citizen", - 91 => "Alligator", - 92 => "Grobb Citizen", - 93 => "Oggok Citizen", - 94 => "Kaladim Citizen", - 95 => "Cazic Thule", - 96 => "Cockatrice", - 97 => "Daisy Man", - 98 => "Elf Vampire", - 99 => "Denizen", - 100 => "Dervish", - 101 => "Efreeti", - 102 => "Old Froglok Tadpole", - 103 => "Kedge", - 104 => "Leech", - 105 => "Swordfish", - 106 => "Felguard", - 107 => "Mammoth", - 108 => "Eye of Zomm", - 109 => "Wasp", - 110 => "Mermaid", - 111 => "Harpie", - 112 => "Fayguard", - 113 => "Drixie", - 114 => "Ghost Ship", - 115 => "Clam", - 116 => "Sea Horse", - 117 => "Ghost Dwarf", - 118 => "Erudite Ghost", - 119 => "Sabertooth Cat", - 120 => "Wolf Elemental", - 121 => "Gorgon", - 122 => "Dragon Skeleton", - 123 => "Innoruuk", - 124 => "Unicorn", - 125 => "Pegasus", - 126 => "Djinn", - 127 => "Invisible Man", - 128 => "Iksar", - 129 => "Scorpion", - 130 => "Vah Shir", - 131 => "Sarnak", - 132 => "Draglock", - 133 => "Lycanthrope", - 134 => "Mosquito", - 135 => "Rhino", - 136 => "Xalgoz", - 137 => "Kunark Goblin", - 138 => "Yeti", - 139 => "Iksar Citizen", - 140 => "Forest Giant", - 141 => "Boat", - 142 => "UNKNOWN RACE", - 143 => "UNKNOWN RACE", - 144 => "Burynai", - 145 => "Goo", - 146 => "Spectral Sarnak", - 147 => "Spectral Iksar", - 148 => "Kunark Fish", - 149 => "Iksar Scorpion", - 150 => "Erollisi", - 151 => "Tribunal", - 152 => "Bertoxxulous", - 153 => "Bristlebane", - 154 => "Fay Drake", - 155 => "Sarnak Skeleton", - 156 => "Ratman", - 157 => "Wyvern", - 158 => "Wurm", - 159 => "Devourer", - 160 => "Iksar Golem", - 161 => "Iksar Skeleton", - 162 => "Man Eating Plant", - 163 => "Raptor", - 164 => "Sarnak Golem", - 165 => "Water Dragon", - 166 => "Iksar Hand", - 167 => "Succulent", - 168 => "Flying Monkey", - 169 => "Brontotherium", - 170 => "Snow Dervish", - 171 => "Dire Wolf", - 172 => "Manticore", - 173 => "Totem", - 174 => "Cold Spectre", - 175 => "Enchanted Armor", - 176 => "Snow Bunny", - 177 => "Walrus", - 178 => "Rock-gem Men", - 179 => "UNKNOWN RACE", - 180 => "UNKNOWN RACE", - 181 => "Yak Man", - 182 => "Faun", - 183 => "Coldain", - 184 => "Velious Dragons", - 185 => "Hag", - 186 => "Hippogriff", - 187 => "Siren", - 188 => "Frost Giant", - 189 => "Storm Giant", - 190 => "Ottermen", - 191 => "Walrus Man", - 192 => "Clockwork Dragon", - 193 => "Abhorent", - 194 => "Sea Turtle", - 195 => "Black and White Dragons", - 196 => "Ghost Dragon", - 197 => "Ronnie Test", - 198 => "Prismatic Dragon", - 199 => "ShikNar", - 200 => "Rockhopper", - 201 => "Underbulk", - 202 => "Grimling", - 203 => "Vacuum Worm", - 204 => "Evan Test", - 205 => "Kahli Shah", - 206 => "Owlbear", - 207 => "Rhino Beetle", - 208 => "Vampyre", - 209 => "Earth Elemental", - 210 => "Air Elemental", - 211 => "Water Elemental", - 212 => "Fire Elemental", - 213 => "Wetfang Minnow", - 214 => "Thought Horror", - 215 => "Tegi", - 216 => "Horse", - 217 => "Shissar", - 218 => "Fungal Fiend", - 219 => "Vampire Volatalis", - 220 => "StoneGrabber", - 221 => "Scarlet Cheetah", - 222 => "Zelniak", - 223 => "Lightcrawler", - 224 => "Shade", - 225 => "Sunflower", - 226 => "Sun Revenant", - 227 => "Shrieker", - 228 => "Galorian", - 229 => "Netherbian", - 230 => "Akheva", - 231 => "Spire Spirit", - 232 => "Sonic Wolf", - 233 => "Ground Shaker", - 234 => "Vah Shir Skeleton", - 235 => "Mutant Humanoid", - 236 => "Seru", - 237 => "Recuso", - 238 => "Vah Shir King", - 239 => "Vah Shir Guard", - 240 => "Teleport Man", - 241 => "Lujein", - 242 => "Naiad", - 243 => "Nymph", - 244 => "Ent", - 245 => "Fly Man", - 246 => "Tarew Marr", - 247 => "Sol Ro", - 248 => "Clockwork Golem", - 249 => "Clockwork Brain", - 250 => "Spectral Banshee", - 251 => "Guard of Justice", - 252 => "UNKNOWN RACE", - 253 => "Disease Boss", - 254 => "Sol Ro Guard", - 255 => "New Bertox", - 256 => "New Tribunal", - 257 => "Terris Thule", - 258 => "Vegerog", - 259 => "Crocodile", - 260 => "Bat", - 261 => "Slarghilug", - 262 => "Tranquilion", - 263 => "Tin Soldier", - 264 => "Nightmare Wraith", - 265 => "Malarian", - 266 => "Knight of Pestilence", - 267 => "Lepertoloth", - 268 => "Bubonian Boss", - 269 => "Bubonian Underling", - 270 => "Pusling", - 271 => "Water Mephit", - 272 => "Stormrider", - 273 => "Junk Beast", - 274 => "Broken Clockwork", - 275 => "Giant Clockwork", - 276 => "Clockwork Beetle", - 277 => "Nightmare Goblin", - 278 => "Karana", - 279 => "Blood Raven", - 280 => "Nightmare Gargoyle", - 281 => "Mouths of Insanity", - 282 => "Skeletal Horse", - 283 => "Saryn", - 284 => "Fennin Ro", - 285 => "Tormentor", - 286 => "Necro Priest", - 287 => "Nightmare", - 288 => "New Rallos Zek", - 289 => "Vallon Zek", - 290 => "Tallon Zek", - 291 => "Air Mephit", - 292 => "Earth Mephit", - 293 => "Fire Mephit", - 294 => "Nightmare Mephit", - 295 => "Zebuxoruk", - 296 => "Mithaniel Marr", - 297 => "Undead Knight", - 298 => "The Rathe", - 299 => "Xegony", - 300 => "Fiend", - 301 => "Test Object", - 302 => "Crab", - 303 => "Phoenix", - 304 => "PoP Dragon", - 305 => "PoP Bear", - 306 => "Storm Taarid", - 307 => "Storm Satuur", - 308 => "Storm Kuraaln", - 309 => "Storm Volaas", - 310 => "Storm Mana", - 311 => "Storm Fire", - 312 => "Storm Celestial", - 313 => "War Wraith", - 314 => "Wrulon", - 315 => "Kraken", - 316 => "Poison Frog", - 317 => "Queztocoatal", - 318 => "Valorian", - 319 => "War Boar", - 320 => "PoP Efreeti", - 321 => "War Boar Unarmored", - 322 => "Black Knight", - 323 => "Animated Armor", - 324 => "Undead Footman", - 325 => "Rallos Zek Minion", - 326 => "Arachnid", - 327 => "Crystal Spider", - 328 => "Zeb Cage", - 329 => "BoT Portal", - 330 => "Froglok", - 331 => "Troll Buccaneer", - 332 => "Troll Freebooter", - 333 => "Troll Sea Rover", - 334 => "Spectre Pirate Boss", - 335 => "Pirate Boss", - 336 => "Pirate Dark Shaman", - 337 => "Pirate Officer", - 338 => "Gnome Pirate", - 339 => "Dark Elf Pirate", - 340 => "Ogre Pirate", - 341 => "Human Pirate", - 342 => "Erudite Pirate", - 343 => "Poison Dart Frog", - 344 => "Troll Zombie", - 345 => "Luggald Land", - 346 => "Luggald Armored", - 347 => "Luggald Robed", - 348 => "Froglok Mount", - 349 => "Froglok Skeleton", - 350 => "Undead Froglok", - 351 => "Chosen Warrior", - 352 => "Chosen Wizard", - 353 => "Veksar", - 354 => "Greater Veksar", - 355 => "Veksar Boss", - 356 => "Chokadai", - 357 => "Undead Chokadai", - 358 => "Undead Veksar", - 359 => "Vampire Lesser", - 360 => "Vampire Elite", - 361 => "Rujakian Orc", - 362 => "Bone Golem", - 363 => "Synarcana", - 364 => "Sand Elf", - 365 => "Vampire Master", - 366 => "Rujakian Orc Elite", - 367 => "Skeleton New", - 368 => "Mummy New", - 369 => "Goblin New", - 370 => "Insect", - 371 => "Froglok Ghost", - 372 => "Dervish New", - 373 => "Shadow Creatue", - 374 => "Golem New", - 375 => "Evil Eye New", - 376 => "Box", - 377 => "Barrel", - 378 => "Chest", - 379 => "Vase", - 380 => "Table", - 381 => "Weapons Rack", - 382 => "Coffin", - 383 => "Bones", - 384 => "Jokester", - 385 => "Talosian Nihil", - 386 => "Talosian Exile", - 387 => "Talosian Golem", - 388 => "Talosian Wolf", - 389 => "Talosian Amphibian", - 390 => "Talosian Mountain Beast", - 391 => "Talosian Trilobyte", - 392 => "Invader War Hound", - 393 => "Invader Elite Centaur", - 394 => "Invader Lamia", - 395 => "Invader Cyclops", - 396 => "Kyv", - 397 => "Invader Soldier", - 398 => "Invader Brute", - 399 => "Invader Force Commander", - 400 => "Invader Lieutenant Boss", - 401 => "Invader War Beast", - 402 => "Invader Soldier Elite", - 403 => "UNKNOWN RACE", - 404 => "Discord Ship", - - + 1 => "Human", + 2 => "Barbarian", + 3 => "Erudite", + 4 => "Wood Elf", + 5 => "High Elf", + 6 => "Dark Elf", + 7 => "Half Elf", + 8 => "Dwarf", + 9 => "Troll", + 10 => "Ogre", + 11 => "Halfling", + 12 => "Gnome", + 13 => "Aviak", + 14 => "Were Wolf", + 15 => "Brownie", + 16 => "Centaur", + 17 => "Golem", + 18 => "Giant / Cyclops", + 19 => "Trakenon", + 20 => "Doppleganger", + 21 => "Evil Eye", + 22 => "Beetle", + 23 => "Kerra", + 24 => "Fish", + 25 => "Fairy", + 26 => "Old Froglok", + 27 => "Old Froglok Ghoul", + 28 => "Fungusman", + 29 => "Gargoyle", + 30 => "Gasbag", + 31 => "Gelatinous Cube", + 32 => "Ghost", + 33 => "Ghoul", + 34 => "Giant Bat", + 35 => "Giant Eel", + 36 => "Giant Rat", + 37 => "Giant Snake", + 38 => "Giant Spider", + 39 => "Gnoll", + 40 => "Goblin", + 41 => "Gorilla", + 42 => "Wolf", + 43 => "Bear", + 44 => "Freeport Guards", + 45 => "Demi Lich", + 46 => "Imp", + 47 => "Griffin", + 48 => "Kobold", + 49 => "Lava Dragon", + 50 => "Lion", + 51 => "Lizard Man", + 52 => "Mimic", + 53 => "Minotaur", + 54 => "Orc", + 55 => "Human Beggar", + 56 => "Pixie", + 57 => "Dracnid", + 58 => "Solusek Ro", + 59 => "Bloodgills", + 60 => "Skeleton", + 61 => "Shark", + 62 => "Tunare", + 63 => "Tiger", + 64 => "Treant", + 65 => "Vampire", + 66 => "Rallos Zek", + 67 => "Highpass Citizen", + 68 => "Tentacle", + 69 => "Will 'O Wisp", + 70 => "Zombie", + 71 => "Qeynos Citizen", + 72 => "Ship", + 73 => "Launch", + 74 => "Piranha", + 75 => "Elemental", + 76 => "Puma", + 77 => "Neriak Citizen", + 78 => "Erudite Citizen", + 79 => "Bixie", + 80 => "Reanimated Hand", + 81 => "Rivervale Citizen", + 82 => "Scarecrow", + 83 => "Skunk", + 84 => "Snake Elemental", + 85 => "Spectre", + 86 => "Sphinx", + 87 => "Armadillo", + 88 => "Clockwork Gnome", + 89 => "Drake", + 90 => "Halas Citizen", + 91 => "Alligator", + 92 => "Grobb Citizen", + 93 => "Oggok Citizen", + 94 => "Kaladim Citizen", + 95 => "Cazic Thule", + 96 => "Cockatrice", + 97 => "Daisy Man", + 98 => "Elf Vampire", + 99 => "Denizen", + 100 => "Dervish", + 101 => "Efreeti", + 102 => "Old Froglok Tadpole", + 103 => "Kedge", + 104 => "Leech", + 105 => "Swordfish", + 106 => "Felguard", + 107 => "Mammoth", + 108 => "Eye of Zomm", + 109 => "Wasp", + 110 => "Mermaid", + 111 => "Harpie", + 112 => "Fayguard", + 113 => "Drixie", + 114 => "Ghost Ship", + 115 => "Clam", + 116 => "Sea Horse", + 117 => "Ghost Dwarf", + 118 => "Erudite Ghost", + 119 => "Sabertooth Cat", + 120 => "Wolf Elemental", + 121 => "Gorgon", + 122 => "Dragon Skeleton", + 123 => "Innoruuk", + 124 => "Unicorn", + 125 => "Pegasus", + 126 => "Djinn", + 127 => "Invisible Man", + 128 => "Iksar", + 129 => "Scorpion", + 130 => "Vah Shir", + 131 => "Sarnak", + 132 => "Draglock", + 133 => "Lycanthrope", + 134 => "Mosquito", + 135 => "Rhino", + 136 => "Xalgoz", + 137 => "Kunark Goblin", + 138 => "Yeti", + 139 => "Iksar Citizen", + 140 => "Forest Giant", + 141 => "Boat", + 142 => "UNKNOWN RACE", + 143 => "UNKNOWN RACE", + 144 => "Burynai", + 145 => "Goo", + 146 => "Spectral Sarnak", + 147 => "Spectral Iksar", + 148 => "Kunark Fish", + 149 => "Iksar Scorpion", + 150 => "Erollisi", + 151 => "Tribunal", + 152 => "Bertoxxulous", + 153 => "Bristlebane", + 154 => "Fay Drake", + 155 => "Sarnak Skeleton", + 156 => "Ratman", + 157 => "Wyvern", + 158 => "Wurm", + 159 => "Devourer", + 160 => "Iksar Golem", + 161 => "Iksar Skeleton", + 162 => "Man Eating Plant", + 163 => "Raptor", + 164 => "Sarnak Golem", + 165 => "Water Dragon", + 166 => "Iksar Hand", + 167 => "Succulent", + 168 => "Flying Monkey", + 169 => "Brontotherium", + 170 => "Snow Dervish", + 171 => "Dire Wolf", + 172 => "Manticore", + 173 => "Totem", + 174 => "Cold Spectre", + 175 => "Enchanted Armor", + 176 => "Snow Bunny", + 177 => "Walrus", + 178 => "Rock-gem Men", + 179 => "UNKNOWN RACE", + 180 => "UNKNOWN RACE", + 181 => "Yak Man", + 182 => "Faun", + 183 => "Coldain", + 184 => "Velious Dragons", + 185 => "Hag", + 186 => "Hippogriff", + 187 => "Siren", + 188 => "Frost Giant", + 189 => "Storm Giant", + 190 => "Ottermen", + 191 => "Walrus Man", + 192 => "Clockwork Dragon", + 193 => "Abhorent", + 194 => "Sea Turtle", + 195 => "Black and White Dragons", + 196 => "Ghost Dragon", + 197 => "Ronnie Test", + 198 => "Prismatic Dragon", + 199 => "ShikNar", + 200 => "Rockhopper", + 201 => "Underbulk", + 202 => "Grimling", + 203 => "Vacuum Worm", + 204 => "Evan Test", + 205 => "Kahli Shah", + 206 => "Owlbear", + 207 => "Rhino Beetle", + 208 => "Vampyre", + 209 => "Earth Elemental", + 210 => "Air Elemental", + 211 => "Water Elemental", + 212 => "Fire Elemental", + 213 => "Wetfang Minnow", + 214 => "Thought Horror", + 215 => "Tegi", + 216 => "Horse", + 217 => "Shissar", + 218 => "Fungal Fiend", + 219 => "Vampire Volatalis", + 220 => "StoneGrabber", + 221 => "Scarlet Cheetah", + 222 => "Zelniak", + 223 => "Lightcrawler", + 224 => "Shade", + 225 => "Sunflower", + 226 => "Sun Revenant", + 227 => "Shrieker", + 228 => "Galorian", + 229 => "Netherbian", + 230 => "Akheva", + 231 => "Spire Spirit", + 232 => "Sonic Wolf", + 233 => "Ground Shaker", + 234 => "Vah Shir Skeleton", + 235 => "Mutant Humanoid", + 236 => "Seru", + 237 => "Recuso", + 238 => "Vah Shir King", + 239 => "Vah Shir Guard", + 240 => "Teleport Man", + 241 => "Lujein", + 242 => "Naiad", + 243 => "Nymph", + 244 => "Ent", + 245 => "Fly Man", + 246 => "Tarew Marr", + 247 => "Sol Ro", + 248 => "Clockwork Golem", + 249 => "Clockwork Brain", + 250 => "Spectral Banshee", + 251 => "Guard of Justice", + 252 => "UNKNOWN RACE", + 253 => "Disease Boss", + 254 => "Sol Ro Guard", + 255 => "New Bertox", + 256 => "New Tribunal", + 257 => "Terris Thule", + 258 => "Vegerog", + 259 => "Crocodile", + 260 => "Bat", + 261 => "Slarghilug", + 262 => "Tranquilion", + 263 => "Tin Soldier", + 264 => "Nightmare Wraith", + 265 => "Malarian", + 266 => "Knight of Pestilence", + 267 => "Lepertoloth", + 268 => "Bubonian Boss", + 269 => "Bubonian Underling", + 270 => "Pusling", + 271 => "Water Mephit", + 272 => "Stormrider", + 273 => "Junk Beast", + 274 => "Broken Clockwork", + 275 => "Giant Clockwork", + 276 => "Clockwork Beetle", + 277 => "Nightmare Goblin", + 278 => "Karana", + 279 => "Blood Raven", + 280 => "Nightmare Gargoyle", + 281 => "Mouths of Insanity", + 282 => "Skeletal Horse", + 283 => "Saryn", + 284 => "Fennin Ro", + 285 => "Tormentor", + 286 => "Necro Priest", + 287 => "Nightmare", + 288 => "New Rallos Zek", + 289 => "Vallon Zek", + 290 => "Tallon Zek", + 291 => "Air Mephit", + 292 => "Earth Mephit", + 293 => "Fire Mephit", + 294 => "Nightmare Mephit", + 295 => "Zebuxoruk", + 296 => "Mithaniel Marr", + 297 => "Undead Knight", + 298 => "The Rathe", + 299 => "Xegony", + 300 => "Fiend", + 301 => "Test Object", + 302 => "Crab", + 303 => "Phoenix", + 304 => "PoP Dragon", + 305 => "PoP Bear", + 306 => "Storm Taarid", + 307 => "Storm Satuur", + 308 => "Storm Kuraaln", + 309 => "Storm Volaas", + 310 => "Storm Mana", + 311 => "Storm Fire", + 312 => "Storm Celestial", + 313 => "War Wraith", + 314 => "Wrulon", + 315 => "Kraken", + 316 => "Poison Frog", + 317 => "Queztocoatal", + 318 => "Valorian", + 319 => "War Boar", + 320 => "PoP Efreeti", + 321 => "War Boar Unarmored", + 322 => "Black Knight", + 323 => "Animated Armor", + 324 => "Undead Footman", + 325 => "Rallos Zek Minion", + 326 => "Arachnid", + 327 => "Crystal Spider", + 328 => "Zeb Cage", + 329 => "BoT Portal", + 330 => "Froglok", + 331 => "Troll Buccaneer", + 332 => "Troll Freebooter", + 333 => "Troll Sea Rover", + 334 => "Spectre Pirate Boss", + 335 => "Pirate Boss", + 336 => "Pirate Dark Shaman", + 337 => "Pirate Officer", + 338 => "Gnome Pirate", + 339 => "Dark Elf Pirate", + 340 => "Ogre Pirate", + 341 => "Human Pirate", + 342 => "Erudite Pirate", + 343 => "Poison Dart Frog", + 344 => "Troll Zombie", + 345 => "Luggald Land", + 346 => "Luggald Armored", + 347 => "Luggald Robed", + 348 => "Froglok Mount", + 349 => "Froglok Skeleton", + 350 => "Undead Froglok", + 351 => "Chosen Warrior", + 352 => "Chosen Wizard", + 353 => "Veksar", + 354 => "Greater Veksar", + 355 => "Veksar Boss", + 356 => "Chokadai", + 357 => "Undead Chokadai", + 358 => "Undead Veksar", + 359 => "Vampire Lesser", + 360 => "Vampire Elite", + 361 => "Rujakian Orc", + 362 => "Bone Golem", + 363 => "Synarcana", + 364 => "Sand Elf", + 365 => "Vampire Master", + 366 => "Rujakian Orc Elite", + 367 => "Skeleton New", + 368 => "Mummy New", + 369 => "Goblin New", + 370 => "Insect", + 371 => "Froglok Ghost", + 372 => "Dervish New", + 373 => "Shadow Creatue", + 374 => "Golem New", + 375 => "Evil Eye New", + 376 => "Box", + 377 => "Barrel", + 378 => "Chest", + 379 => "Vase", + 380 => "Table", + 381 => "Weapons Rack", + 382 => "Coffin", + 383 => "Bones", + 384 => "Jokester", + 385 => "Talosian Nihil", + 386 => "Talosian Exile", + 387 => "Talosian Golem", + 388 => "Talosian Wolf", + 389 => "Talosian Amphibian", + 390 => "Talosian Mountain Beast", + 391 => "Talosian Trilobyte", + 392 => "Invader War Hound", + 393 => "Invader Elite Centaur", + 394 => "Invader Lamia", + 395 => "Invader Cyclops", + 396 => "Kyv", + 397 => "Invader Soldier", + 398 => "Invader Brute", + 399 => "Invader Force Commander", + 400 => "Invader Lieutenant Boss", + 401 => "Invader War Beast", + 402 => "Invader Soldier Elite", + 403 => "UNKNOWN RACE", + 404 => "Discord Ship", */ - #endif + diff --git a/common/rdtsc.cpp b/common/rdtsc.cpp index 15826d49a..15786397e 100644 --- a/common/rdtsc.cpp +++ b/common/rdtsc.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "rdtsc.h" @@ -166,7 +166,3 @@ void RDTSC_Collector::reset() { _count = 0; } - - - - diff --git a/common/rdtsc.h b/common/rdtsc.h index d73fbaec8..2a36cac0f 100644 --- a/common/rdtsc.h +++ b/common/rdtsc.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef RDTSC_H #define RDTSC_H @@ -83,5 +83,4 @@ protected: int64 _count; }; - #endif diff --git a/common/rulesys.cpp b/common/rulesys.cpp index a6ec1a708..b7c9bd7e8 100644 --- a/common/rulesys.cpp +++ b/common/rulesys.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "rulesys.h" @@ -26,7 +26,7 @@ /* FatherNitwit: Added new rules subsystem to allow game rules to be changed - at runtime. more about this will come as time goes on. + at runtime. more about this will come as time goes on. FatherNitwit: Added #rules command to manage rules data from in game. FatherNitwit: Renamed old #rules to #serverrules FatherNitwit: Moved max level into the rules system (Character:MaxLevel) @@ -54,18 +54,15 @@ CREATE TABLE rule_values ( Commands: #rules: - - current -> lists current set name - - switch (set name) -> change set in the DB, but dont reload - - load (set name) -> load set into this zone without changing the world - - wload (set name) -> tell world and all zones to load this rule set - - store [set name] -> store the current rules in this zone to the set (or - active if not specified) - - reset -> reset all rule values to their defaults. - - list [catname] - - set (cat) (rule) (value) - - values [catname] -> show the values of all rules in the specified category/ - - + current -> lists current set name + switch (set name) -> change set in the DB, but dont reload + load (set name) -> load set into this zone without changing the world + wload (set name) -> tell world and all zones to load this rule set + store [set name] -> store the current rules in this zone to the set (or active if not specified) + reset -> reset all rule values to their defaults. + list [catname] + set (cat) (rule) (value) + values [catname] -> show the values of all rules in the specified category/ */ const char *RuleManager::s_categoryNames[_CatCount+1] = { @@ -76,9 +73,9 @@ const char *RuleManager::s_categoryNames[_CatCount+1] = { }; const RuleManager::RuleInfo RuleManager::s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount+1] = { - /* this is done in three steps so we can reliably get to them by index*/ + /* this is done in three steps so we can reliably get to them by index*/ #define RULE_INT(cat, rule, default_value) \ - { #cat ":" #rule, Category__##cat, IntRule, Int__##rule }, + { #cat ":" #rule, Category__##cat, IntRule, Int__##rule }, #include "ruletypes.h" #define RULE_REAL(cat, rule, default_value) \ { #cat ":" #rule, Category__##cat, RealRule, Real__##rule }, @@ -90,8 +87,8 @@ const RuleManager::RuleInfo RuleManager::s_RuleInfo[_IntRuleCount+_RealRuleCount }; RuleManager::RuleManager() -: m_activeRuleset(0), - m_activeName("default") +: m_activeRuleset(0), + m_activeName("default") { ResetRules(); } @@ -195,7 +192,7 @@ bool RuleManager::SetRule(const char *rule_name, const char *rule_value, Databas void RuleManager::ResetRules() { _log(RULES__CHANGE, "Resetting running rules to default values"); #define RULE_INT(cat, rule, default_value) \ - m_RuleIntValues[ Int__##rule ] = default_value; + m_RuleIntValues[ Int__##rule ] = default_value; #define RULE_REAL(cat, rule, default_value) \ m_RuleRealValues[ Real__##rule ] = default_value; #define RULE_BOOL(cat, rule, default_value) \ @@ -321,7 +318,7 @@ void RuleManager::_SaveRule(Database *db, RuleType type, uint16 index) { } char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; if (!db->RunQuery(query, MakeAnyLenString(&query, "REPLACE INTO rule_values (ruleset_id, rule_name, rule_value) " " VALUES(%d, '%s', '%s')", @@ -376,7 +373,7 @@ int RuleManager::_FindOrCreateRuleset(Database *db, const char *ruleset) { uint32 new_id; char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; if (!db->RunQuery(query, MakeAnyLenString(&query, "INSERT INTO rule_sets (ruleset_id, name) " " VALUES(0, '%s')", @@ -445,48 +442,16 @@ bool RuleManager::ListRulesets(Database *db, std::map &into) { int32 RuleManager::GetIntRule(RuleManager::IntType t) const { - return(m_RuleIntValues[t]); + return(m_RuleIntValues[t]); } float RuleManager::GetRealRule(RuleManager::RealType t) const { - return(m_RuleRealValues[t]); + return(m_RuleRealValues[t]); } bool RuleManager::GetBoolRule(RuleManager::BoolType t) const { - return (m_RuleBoolValues[t] == 1); + return (m_RuleBoolValues[t] == 1); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/rulesys.h b/common/rulesys.h index 266b75570..25c3a4019 100644 --- a/common/rulesys.h +++ b/common/rulesys.h @@ -1,28 +1,28 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef RULESYS_H_ #define RULESYS_H_ /* * Access to the rules system in normal code is done with three calls: -* - RuleI(category, rule) -> fetch an integer rule's value -* - RuleR(category, rule) -> fetch a real (float) rule's value -* - RuleB(category, rule) -> fetch a boolean/flag rule's value +* - RuleI(category, rule) -> fetch an integer rule's value +* - RuleR(category, rule) -> fetch a real (float) rule's value +* - RuleB(category, rule) -> fetch a boolean/flag rule's value * */ @@ -30,7 +30,7 @@ //which makes it a global for now, but with instancing we will do exactly //what we do with the zone global and just make it a member of core classes #define RuleI(cat, rule) \ - RuleManager::Instance()->GetIntRule( RuleManager::Int__##rule ) + RuleManager::Instance()->GetIntRule( RuleManager::Int__##rule ) #define RuleR(cat, rule) \ RuleManager::Instance()->GetRealRule( RuleManager::Real__##rule ) #define RuleB(cat, rule) \ @@ -76,12 +76,12 @@ public: _CatCount } CategoryType; - static RuleManager* Instance() { - static RuleManager rules; - return &rules; - } + static RuleManager* Instance() { + static RuleManager rules; + return &rules; + } - static const IntType InvalidInt = _IntRuleCount; + static const IntType InvalidInt = _IntRuleCount; static const RealType InvalidReal = _RealRuleCount; static const BoolType InvalidBool = _BoolRuleCount; static const CategoryType InvalidCategory = _CatCount; @@ -89,12 +89,12 @@ public: static const uint32 _RulesCount = _IntRuleCount+_RealRuleCount+_BoolRuleCount; //fetch routines, you should generally use the Rule* macros instead of this - int32 GetIntRule (IntType t) const; + int32 GetIntRule (IntType t) const; float GetRealRule(RealType t) const; bool GetBoolRule(BoolType t) const; //management routines - static const char *GetRuleName(IntType t) { return(s_RuleInfo[t].name); } + static const char *GetRuleName(IntType t) { return(s_RuleInfo[t].name); } static const char *GetRuleName(RealType t) { return(s_RuleInfo[t+_IntRuleCount].name); } static const char *GetRuleName(BoolType t) { return(s_RuleInfo[t+_IntRuleCount+_RealRuleCount].name); } static uint32 CountRules() { return(_RulesCount); } @@ -115,14 +115,14 @@ public: void SaveRules(Database *db, const char *ruleset = nullptr); private: - RuleManager(); - RuleManager(const RuleManager&); - const RuleManager& operator=(const RuleManager&); + RuleManager(); + RuleManager(const RuleManager&); + const RuleManager& operator=(const RuleManager&); int m_activeRuleset; std::string m_activeName; #ifdef WIN64 - uint32 m_RuleIntValues [_IntRuleCount ]; + uint32 m_RuleIntValues [_IntRuleCount ]; #else int m_RuleIntValues [_IntRuleCount ]; #endif @@ -152,3 +152,4 @@ private: }; #endif /*RULESYS_H_*/ + diff --git a/common/ruletypes.h b/common/ruletypes.h index 204763b2b..f615f42a0 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -86,10 +86,10 @@ RULE_BOOL ( Character, SoDClientUseSoDHPManaEnd, false) // Setting this to true RULE_BOOL ( Character, UseRaceClassExpBonuses, true) // Setting this to true will enable Class and Racial experience rate bonuses RULE_BOOL ( Character, RespawnFromHover, false) // Use Respawn window, or not. RULE_INT ( Character, RespawnFromHoverTimer, 300) // Respawn Window countdown timer, in SECONDS -RULE_BOOL ( Character, UseNewStatsWindow, true) // New stats window shows everything +RULE_BOOL ( Character, UseNewStatsWindow, true) // New stats window shows everything RULE_BOOL ( Character, ItemCastsUseFocus, false) // If true, this allows item clickies to use focuses that have limited max levels on them RULE_INT ( Character, MinStatusForNoDropExemptions, 80) // This allows status x and higher to trade no drop items. -RULE_INT ( Character, SkillCapMaxLevel, 75 ) // Sets the Max Level used for Skill Caps (from skill_caps table). -1 makes it use MaxLevel rule value. It is set to 75 because PEQ only has skillcaps up to that level, and grabbing the players' skill past 75 will return 0, breaking all skills past that level. This helps servers with obsurd level caps (75+ level cap) function without any modifications. +RULE_INT ( Character, SkillCapMaxLevel, 75 ) // Sets the Max Level used for Skill Caps (from skill_caps table). -1 makes it use MaxLevel rule value. It is set to 75 because PEQ only has skillcaps up to that level, and grabbing the players' skill past 75 will return 0, breaking all skills past that level. This helps servers with obsurd level caps (75+ level cap) function without any modifications. RULE_INT ( Character, StatCap, 0 ) RULE_BOOL ( Character, CheckCursorEmptyWhenLooting, true ) // If true, a player cannot loot a corpse (player or NPC) with an item on their cursor RULE_BOOL ( Character, MaintainIntoxicationAcrossZones, true ) // If true, alcohol effects are maintained across zoning and logging out/in. @@ -100,7 +100,7 @@ RULE_CATEGORY_END() RULE_CATEGORY( Mercs ) RULE_INT (Mercs, SuspendIntervalMS, 10000) -RULE_INT (Mercs, UpkeepIntervalMS, 180000) +RULE_INT (Mercs, UpkeepIntervalMS, 180000) RULE_INT (Mercs, SuspendIntervalS, 10) RULE_INT (Mercs, UpkeepIntervalS, 180) RULE_BOOL (Mercs, AllowMercs, false) @@ -144,19 +144,19 @@ RULE_INT ( World, ClientKeepaliveTimeoutMS, 65000 ) RULE_BOOL ( World, UseBannedIPsTable, false ) // Toggle whether or not to check incoming client connections against the Banned_IPs table. Set this value to false to disable this feature. RULE_BOOL ( World, EnableTutorialButton, true) RULE_BOOL ( World, EnableReturnHomeButton, true) -RULE_INT ( World, MaxLevelForTutorial, 10) -RULE_INT ( World, TutorialZoneID, 189) -RULE_INT ( World, GuildBankZoneID, 345) -RULE_INT ( World, MinOfflineTimeToReturnHome, 21600) // 21600 seconds is 6 Hours -RULE_INT ( World, MaxClientsPerIP, -1 ) // Maximum number of clients allowed to connect per IP address if account status is < AddMaxClientsStatus. Default value: -1 (feature disabled) -RULE_INT ( World, ExemptMaxClientsStatus, -1 ) // Exempt accounts from the MaxClientsPerIP and AddMaxClientsStatus rules, if their status is >= this value. Default value: -1 (feature disabled) -RULE_INT ( World, AddMaxClientsPerIP, -1 ) // Maximum number of clients allowed to connect per IP address if account status is < ExemptMaxClientsStatus. Default value: -1 (feature disabled) -RULE_INT ( World, AddMaxClientsStatus, -1 ) // Accounts with status >= this rule will be allowed to use the amount of accounts defined in the AddMaxClientsPerIP. Default value: -1 (feature disabled) +RULE_INT ( World, MaxLevelForTutorial, 10) +RULE_INT ( World, TutorialZoneID, 189) +RULE_INT ( World, GuildBankZoneID, 345) +RULE_INT ( World, MinOfflineTimeToReturnHome, 21600) // 21600 seconds is 6 Hours +RULE_INT ( World, MaxClientsPerIP, -1 ) // Maximum number of clients allowed to connect per IP address if account status is < AddMaxClientsStatus. Default value: -1 (feature disabled) +RULE_INT ( World, ExemptMaxClientsStatus, -1 ) // Exempt accounts from the MaxClientsPerIP and AddMaxClientsStatus rules, if their status is >= this value. Default value: -1 (feature disabled) +RULE_INT ( World, AddMaxClientsPerIP, -1 ) // Maximum number of clients allowed to connect per IP address if account status is < ExemptMaxClientsStatus. Default value: -1 (feature disabled) +RULE_INT ( World, AddMaxClientsStatus, -1 ) // Accounts with status >= this rule will be allowed to use the amount of accounts defined in the AddMaxClientsPerIP. Default value: -1 (feature disabled) RULE_BOOL ( World, MaxClientsSetByStatus, false) // If True, IP Limiting will be set to the status on the account as long as the status is > MaxClientsPerIP RULE_BOOL ( World, ClearTempMerchantlist, true) // Clears temp merchant items when world boots. RULE_BOOL ( World, DeleteStaleCorpeBackups, true) // Deletes stale corpse backups older than 2 weeks. -RULE_INT ( World, AccountSessionLimit, -1 ) //Max number of characters allowed on at once from a single account (-1 is disabled) -RULE_INT ( World, ExemptAccountLimitStatus, -1 ) //Min status required to be exempt from multi-session per account limiting (-1 is disabled) +RULE_INT ( World, AccountSessionLimit, -1 ) //Max number of characters allowed on at once from a single account (-1 is disabled) +RULE_INT ( World, ExemptAccountLimitStatus, -1 ) //Min status required to be exempt from multi-session per account limiting (-1 is disabled) RULE_BOOL ( World, GMAccountIPList, false) // Check ip list against GM Accounts, AntiHack GM Accounts. RULE_INT ( World, MinGMAntiHackStatus, 1 ) //Minimum GM status to check against AntiHack list RULE_INT ( World, SoFStartZoneID, -1 ) //Sets the Starting Zone for SoF Clients separate from Titanium Clients (-1 is disabled) @@ -168,25 +168,25 @@ RULE_BOOL (World, IPLimitDisconnectAll, false) RULE_CATEGORY_END() RULE_CATEGORY( Zone ) -RULE_INT ( Zone, NPCPositonUpdateTicCount, 32 ) //ms between intervals of sending a position update to the entire zone. -RULE_INT ( Zone, ClientLinkdeadMS, 180000) //the time a client remains link dead on the server after a sudden disconnection -RULE_INT ( Zone, GraveyardTimeMS, 1200000) //ms time until a player corpse is moved to a zone's graveyard, if one is specified for the zone +RULE_INT ( Zone, NPCPositonUpdateTicCount, 32 ) //ms between intervals of sending a position update to the entire zone. +RULE_INT ( Zone, ClientLinkdeadMS, 180000) //the time a client remains link dead on the server after a sudden disconnection +RULE_INT ( Zone, GraveyardTimeMS, 1200000) //ms time until a player corpse is moved to a zone's graveyard, if one is specified for the zone RULE_BOOL ( Zone, EnableShadowrest, 1 ) // enables or disables the shadowrest zone feature for player corpses. Default is turned on. RULE_BOOL ( Zone, UsePlayerCorpseBackups, true) // Keeps backups of player corpses. -RULE_INT ( Zone, MQWarpExemptStatus, -1 ) // Required status level to exempt the MQWarpDetector. Set to -1 to disable this feature. -RULE_INT ( Zone, MQZoneExemptStatus, -1 ) // Required status level to exempt the MQZoneDetector. Set to -1 to disable this feature. -RULE_INT ( Zone, MQGateExemptStatus, -1 ) // Required status level to exempt the MQGateDetector. Set to -1 to disable this feature. -RULE_INT ( Zone, MQGhostExemptStatus, -1 ) // Required status level to exempt the MGhostDetector. Set to -1 to disable this feature. -RULE_BOOL ( Zone, EnableMQWarpDetector, true ) // Enable the MQWarp Detector. Set to False to disable this feature. -RULE_BOOL ( Zone, EnableMQZoneDetector, true ) // Enable the MQZone Detector. Set to False to disable this feature. -RULE_BOOL ( Zone, EnableMQGateDetector, true ) // Enable the MQGate Detector. Set to False to disable this feature. -RULE_BOOL ( Zone, EnableMQGhostDetector, true ) // Enable the MQGhost Detector. Set to False to disable this feature. +RULE_INT ( Zone, MQWarpExemptStatus, -1 ) // Required status level to exempt the MQWarpDetector. Set to -1 to disable this feature. +RULE_INT ( Zone, MQZoneExemptStatus, -1 ) // Required status level to exempt the MQZoneDetector. Set to -1 to disable this feature. +RULE_INT ( Zone, MQGateExemptStatus, -1 ) // Required status level to exempt the MQGateDetector. Set to -1 to disable this feature. +RULE_INT ( Zone, MQGhostExemptStatus, -1 ) // Required status level to exempt the MGhostDetector. Set to -1 to disable this feature. +RULE_BOOL ( Zone, EnableMQWarpDetector, true ) // Enable the MQWarp Detector. Set to False to disable this feature. +RULE_BOOL ( Zone, EnableMQZoneDetector, true ) // Enable the MQZone Detector. Set to False to disable this feature. +RULE_BOOL ( Zone, EnableMQGateDetector, true ) // Enable the MQGate Detector. Set to False to disable this feature. +RULE_BOOL ( Zone, EnableMQGhostDetector, true ) // Enable the MQGhost Detector. Set to False to disable this feature. RULE_REAL ( Zone, MQWarpDetectionDistanceFactor, 9.0) //clients move at 4.4 about if in a straight line but with movement and to acct for lag we raise it a bit RULE_BOOL ( Zone, MarkMQWarpLT, false ) RULE_INT ( Zone, AutoShutdownDelay, 5000 ) //How long a dynamic zone stays loaded while empty RULE_INT ( Zone, PEQZoneReuseTime, 900 ) //How long, in seconds, until you can reuse the #peqzone command. -RULE_INT ( Zone, PEQZoneDebuff1, 4454 ) //First debuff casted by #peqzone Default is Cursed Keeper's Blight. -RULE_INT ( Zone, PEQZoneDebuff2, 2209 ) //Second debuff casted by #peqzone Default is Tendrils of Apathy. +RULE_INT ( Zone, PEQZoneDebuff1, 4454 ) //First debuff casted by #peqzone Default is Cursed Keeper's Blight. +RULE_INT ( Zone, PEQZoneDebuff2, 2209 ) //Second debuff casted by #peqzone Default is Tendrils of Apathy. RULE_BOOL ( Zone, UsePEQZoneDebuffs, true ) //Will determine if #peqzone will debuff players or not when used. RULE_REAL ( Zone, HotZoneBonus, 0.75 ) RULE_INT ( Zone, ReservedInstances, 30 ) //Will reserve this many instance ids for globals... probably not a good idea to change this while a server is running. @@ -209,7 +209,7 @@ RULE_BOOL ( Map, UseClosestZ, false) // Move mobs to the nearest Z above or be // Only set UseClosestZ true if all your .map files generated from EQGs were created // with azone2. // -RULE_INT ( Map, FindBestZHeightAdjust, 1) // Adds this to the current Z before seeking the best Z position +RULE_INT ( Map, FindBestZHeightAdjust, 1) // Adds this to the current Z before seeking the best Z position RULE_CATEGORY_END() RULE_CATEGORY( Pathing ) @@ -221,24 +221,24 @@ RULE_BOOL ( Pathing, Guard, true ) // Enable pathing for mobs moving to their g RULE_BOOL ( Pathing, Find, true ) // Enable pathing for FindPerson requests from the client. RULE_BOOL ( Pathing, Fear, true ) // Enable pathing for fear RULE_REAL ( Pathing, ZDiffThreshold, 10) // If a mob las LOS to it's target, it will run to it if the Z difference is < this. -RULE_INT ( Pathing, LOSCheckFrequency, 1000) // A mob will check for LOS to it's target this often (milliseconds). -RULE_INT ( Pathing, RouteUpdateFrequencyShort, 1000) // How often a new route will be calculated if the target has moved. -RULE_INT ( Pathing, RouteUpdateFrequencyLong, 5000) // How often a new route will be calculated if the target has moved. +RULE_INT ( Pathing, LOSCheckFrequency, 1000) // A mob will check for LOS to it's target this often (milliseconds). +RULE_INT ( Pathing, RouteUpdateFrequencyShort, 1000) // How often a new route will be calculated if the target has moved. +RULE_INT ( Pathing, RouteUpdateFrequencyLong, 5000) // How often a new route will be calculated if the target has moved. // When a path has a path node route and it's target changes position, if it has RouteUpdateFrequencyNodeCount or less nodes to go on it's // current path, it will recalculate it's path based on the RouteUpdateFrequencyShort timer, otherwise it will use the // RouteUpdateFrequencyLong timer. -RULE_INT ( Pathing, RouteUpdateFrequencyNodeCount, 5) +RULE_INT ( Pathing, RouteUpdateFrequencyNodeCount, 5) RULE_REAL ( Pathing, MinDistanceForLOSCheckShort, 40000) // (NoRoot). While following a path, only check for LOS to target within this distance. RULE_REAL ( Pathing, MinDistanceForLOSCheckLong, 1000000) // (NoRoot). Min distance when initially attempting to acquire the target. -RULE_INT ( Pathing, MinNodesLeftForLOSCheck, 4) // Only check for LOS when we are down to this many path nodes left to run. +RULE_INT ( Pathing, MinNodesLeftForLOSCheck, 4) // Only check for LOS when we are down to this many path nodes left to run. // This next rule was put in for situations where the mob and it's target may be on different sides of a 'hazard', e.g. a pit // If the mob has LOS to it's target, even though there is a hazard in it's way, it may break off from the node path and run at // the target, only to later detect the hazard and re-acquire a node path. Depending upon the placement of the path nodes, this // can lead to the mob looping. The rule is intended to allow the mob to at least get closer to it's target each time before // checking LOS and trying to head straight for it. -RULE_INT ( Pathing, MinNodesTraversedForLOSCheck, 3) // Only check for LOS after we have traversed this many path nodes. -RULE_INT ( Pathing, CullNodesFromStart, 1) // Checks LOS from Start point to second node for this many nodes and removes first node if there is LOS -RULE_INT ( Pathing, CullNodesFromEnd, 1) // Checks LOS from End point to second to last node for this many nodes and removes last node if there is LOS +RULE_INT ( Pathing, MinNodesTraversedForLOSCheck, 3) // Only check for LOS after we have traversed this many path nodes. +RULE_INT ( Pathing, CullNodesFromStart, 1) // Checks LOS from Start point to second node for this many nodes and removes first node if there is LOS +RULE_INT ( Pathing, CullNodesFromEnd, 1) // Checks LOS from End point to second to last node for this many nodes and removes last node if there is LOS RULE_REAL ( Pathing, CandidateNodeRangeXY, 400) // When searching for path start/end nodes, only nodes within this range will be considered. RULE_REAL ( Pathing, CandidateNodeRangeZ, 10) // When searching for path start/end nodes, only nodes within this range will be considered. @@ -247,7 +247,7 @@ RULE_CATEGORY_END() RULE_CATEGORY( Watermap ) // enable these to use the water detection code. Requires Water Maps generated by awater utility RULE_BOOL ( Watermap, CheckWaypointsInWaterWhenLoading, false ) // Does not apply BestZ as waypoints are loaded if they are in water -RULE_BOOL ( Watermap, CheckForWaterAtWaypoints, false) // Check if a mob has moved into/out of water when at waypoints and sets flymode +RULE_BOOL ( Watermap, CheckForWaterAtWaypoints, false) // Check if a mob has moved into/out of water when at waypoints and sets flymode RULE_BOOL ( Watermap, CheckForWaterWhenMoving, false) // Checks if a mob has moved into/out of water each time it's loc is recalculated RULE_BOOL ( Watermap, CheckForWaterOnSendTo, false) // Checks if a mob has moved into/out of water on SendTo RULE_BOOL ( Watermap, CheckForWaterWhenFishing, false) // Only lets a player fish near water (if a water map exists for the zone) @@ -326,7 +326,7 @@ RULE_INT ( Combat, MinRangedAttackDist, 25) //Minimum Distance to use Ranged Att RULE_BOOL ( Combat, ArcheryBonusRequiresStationary, true) //does the 2x archery bonus chance require a stationary npc RULE_REAL ( Combat, ArcheryBaseDamageBonus, 1) // % Modifier to Base Archery Damage (.5 = 50% base damage, 1 = 100%, 2 = 200%) RULE_REAL ( Combat, ArcheryNPCMultiplier, 1.0) // this is multiplied by the regular dmg to get the archery dmg -RULE_BOOL ( Combat, AssistNoTargetSelf, true) //when assisting a target that does not have a target: true = target self, false = leave target as was before assist (false = live like) +RULE_BOOL ( Combat, AssistNoTargetSelf, true) //when assisting a target that does not have a target: true = target self, false = leave target as was before assist (false = live like) RULE_INT ( Combat, MaxRampageTargets, 3) //max number of people hit with rampage RULE_INT ( Combat, MaxFlurryHits, 2) //max number of extra hits from flurry RULE_INT ( Combat, MonkDamageTableBonus, 5) //% bonus monks get to their damage table calcs @@ -413,7 +413,7 @@ RULE_CATEGORY_END() #ifdef BOTS RULE_CATEGORY ( Bots ) RULE_REAL ( Bots, BotManaRegen, 2.0 ) // Adjust mana regen for bots, 1 is fast and higher numbers slow it down 3 is about the same as players. -RULE_BOOL ( Bots, BotFinishBuffing, false ) // Allow for buffs to complete even if the bot caster is out of mana. Only affects buffing out of combat. +RULE_BOOL ( Bots, BotFinishBuffing, false ) // Allow for buffs to complete even if the bot caster is out of mana. Only affects buffing out of combat. RULE_INT ( Bots, CreateBotCount, 150 ) // Number of bots that each account can create RULE_INT ( Bots, SpawnBotCount, 71 ) // Number of bots a character can have spawned at one time, You + 71 bots is a 12 group raid RULE_BOOL ( Bots, BotQuest, false ) // Optional quest method to manage bot spawn limits using the quest_globals name bot_spawn_limit, see: /bazaar/Aediles_Thrall.pl diff --git a/common/seperator-2.h b/common/seperator-2.h index b681c0a8a..a57b5617a 100644 --- a/common/seperator-2.h +++ b/common/seperator-2.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // This class will split up a string smartly at the div character (default is space) // Seperator.arg[i] is a copy of the string chopped at the divs diff --git a/common/seperator.h b/common/seperator.h index 3031813b6..f6438fe5d 100644 --- a/common/seperator.h +++ b/common/seperator.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // This class will split up a string smartly at the div character (default is space and tab) // Seperator.arg[i] is a copy of the string chopped at the divs diff --git a/common/serverinfo.cpp b/common/serverinfo.cpp index 6a4840f45..aaa13e7ab 100644 --- a/common/serverinfo.cpp +++ b/common/serverinfo.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Serverinfo.cpp - Server information gathering functions, used in #serverinfo - Windows specific // I'm not sure quite how to get this exact information in *nix, hopefully someone can fill that in diff --git a/common/serverinfo.h b/common/serverinfo.h index dcba2a525..14425e6af 100644 --- a/common/serverinfo.h +++ b/common/serverinfo.h @@ -1,29 +1,29 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef SERVERINFO_H #define SERVERINFO_H #ifdef _WINDOWS - extern char Ver_name[36]; - extern DWORD Ver_build, Ver_min, Ver_maj, Ver_pid; - int GetOS(); + extern char Ver_name[36]; + extern DWORD Ver_build, Ver_min, Ver_maj, Ver_pid; + int GetOS(); #else - char* GetOS(char* os_string); + char* GetOS(char* os_string); #endif #endif diff --git a/common/servertalk.h b/common/servertalk.h index b78dfada9..b5d9d6246 100644 --- a/common/servertalk.h +++ b/common/servertalk.h @@ -22,8 +22,8 @@ #define ServerOP_EmoteMessage 0x0009 // Worldfarts #define ServerOP_ClientList 0x000A // Update worldserver's client list, for #whos #define ServerOP_Who 0x000B // #who -#define ServerOP_ZonePlayer 0x000C // #zone, or #summon -#define ServerOP_KickPlayer 0x000D // #kick +#define ServerOP_ZonePlayer 0x000C // #zone, or #summon +#define ServerOP_KickPlayer 0x000D // #kick #define ServerOP_RefreshGuild 0x000E // Notice to all zoneservers to refresh their guild cache for ID# in packet (ServerGuildRefresh_Struct) #define ServerOP_VoiceMacro 0x000F @@ -39,8 +39,8 @@ #define ServerOP_FlagUpdate 0x0018 // GM Flag updated for character, refresh the memory cache #define ServerOP_GMGoto 0x0019 #define ServerOP_MultiLineMsg 0x001A -#define ServerOP_Lock 0x001B // For #lock/#unlock inside server -#define ServerOP_Motd 0x001C // For changing MoTD inside server. +#define ServerOP_Lock 0x001B // For #lock/#unlock inside server +#define ServerOP_Motd 0x001C // For changing MoTD inside server. #define ServerOP_Uptime 0x001D #define ServerOP_Petition 0x001E #define ServerOP_KillPlayer 0x001F @@ -59,7 +59,7 @@ #define ServerOP_ItemStatus 0x002C #define ServerOP_OOCMute 0x002D #define ServerOP_Revoke 0x002E -//#define 0x002F +//#define 0x002F #define ServerOP_GroupIDReq 0x0030 #define ServerOP_GroupIDReply 0x0031 #define ServerOP_GroupLeave 0x0032 // for disbanding out of zone folks @@ -104,26 +104,26 @@ #define ServerOP_GroupFollowAck 0x0111 #define ServerOP_GroupCancelInvite 0x0112 -#define ServerOP_InstanceUpdateTime 0x014F -#define ServerOP_AdventureRequest 0x0150 -#define ServerOP_AdventureRequestAccept 0x0151 -#define ServerOP_AdventureRequestDeny 0x0152 -#define ServerOP_AdventureRequestCreate 0x0153 -#define ServerOP_AdventureData 0x0154 -#define ServerOP_AdventureDataClear 0x0155 -#define ServerOP_AdventureCreateDeny 0x0156 -#define ServerOP_AdventureDataRequest 0x0157 -#define ServerOP_AdventureClickDoor 0x0158 -#define ServerOP_AdventureClickDoorReply 0x0159 -#define ServerOP_AdventureClickDoorError 0x015a -#define ServerOP_AdventureLeave 0x015b -#define ServerOP_AdventureLeaveReply 0x015c -#define ServerOP_AdventureLeaveDeny 0x015d -#define ServerOP_AdventureCountUpdate 0x015e -#define ServerOP_AdventureZoneData 0x015f -#define ServerOP_AdventureAssaCountUpdate 0x0160 -#define ServerOP_AdventureFinish 0x0161 -#define ServerOP_AdventureLeaderboard 0x0162 +#define ServerOP_InstanceUpdateTime 0x014F +#define ServerOP_AdventureRequest 0x0150 +#define ServerOP_AdventureRequestAccept 0x0151 +#define ServerOP_AdventureRequestDeny 0x0152 +#define ServerOP_AdventureRequestCreate 0x0153 +#define ServerOP_AdventureData 0x0154 +#define ServerOP_AdventureDataClear 0x0155 +#define ServerOP_AdventureCreateDeny 0x0156 +#define ServerOP_AdventureDataRequest 0x0157 +#define ServerOP_AdventureClickDoor 0x0158 +#define ServerOP_AdventureClickDoorReply 0x0159 +#define ServerOP_AdventureClickDoorError 0x015a +#define ServerOP_AdventureLeave 0x015b +#define ServerOP_AdventureLeaveReply 0x015c +#define ServerOP_AdventureLeaveDeny 0x015d +#define ServerOP_AdventureCountUpdate 0x015e +#define ServerOP_AdventureZoneData 0x015f +#define ServerOP_AdventureAssaCountUpdate 0x0160 +#define ServerOP_AdventureFinish 0x0161 +#define ServerOP_AdventureLeaderboard 0x0162 #define ServerOP_WhoAll 0x0210 #define ServerOP_FriendsWho 0x0211 @@ -179,12 +179,12 @@ #define ServerOP_CZMessagePlayer 0x4008 #define ServerOP_ReloadWorld 0x4009 -#define ServerOP_QSPlayerLogTrades 0x4010 -#define ServerOP_QSPlayerLogHandins 0x4011 -#define ServerOP_QSPlayerLogNPCKills 0x4012 -#define ServerOP_QSPlayerLogDeletes 0x4013 -#define ServerOP_QSPlayerLogMoves 0x4014 -#define ServerOP_QSMerchantLogTransactions 0x4015 +#define ServerOP_QSPlayerLogTrades 0x4010 +#define ServerOP_QSPlayerLogHandins 0x4011 +#define ServerOP_QSPlayerLogNPCKills 0x4012 +#define ServerOP_QSPlayerLogDeletes 0x4013 +#define ServerOP_QSPlayerLogMoves 0x4014 +#define ServerOP_QSMerchantLogTransactions 0x4015 enum { QSG_LFGuild = 0 }; enum { QSG_LFGuild_PlayerMatches = 0, QSG_LFGuild_UpdatePlayerInfo, QSG_LFGuild_RequestPlayerInfo, QSG_LFGuild_UpdateGuildInfo, QSG_LFGuild_GuildMatches, @@ -197,7 +197,7 @@ class ServerPacket { public: ~ServerPacket() { safe_delete_array(pBuffer); } - ServerPacket(uint16 in_opcode = 0, uint32 in_size = 0) { + ServerPacket(uint16 in_opcode = 0, uint32 in_size = 0) { this->compressed = false; size = in_size; opcode = in_opcode; @@ -336,15 +336,15 @@ struct ServerGroupFollowAck_Struct { struct ServerChannelMessage_Struct { - char deliverto[64]; - char to[64]; - char from[64]; + char deliverto[64]; + char to[64]; + char from[64]; uint8 fromadmin; - bool noreply; + bool noreply; uint16 chan_num; uint32 guilddbid; - uint16 language; - char message[0]; + uint16 language; + char message[0]; }; struct ServerEmoteMessage_Struct { @@ -407,9 +407,9 @@ struct ServerZonePlayer_Struct { char name[64]; char zone[25]; uint32 instance_id; - float x_pos; - float y_pos; - float z_pos; + float x_pos; + float y_pos; + float z_pos; }; struct RezzPlayer_Struct { @@ -500,18 +500,18 @@ struct ServerLSZoneSleep_Struct { struct ServerLSPlayerJoinWorld_Struct { uint32 lsaccount_id; - char key[30]; + char key[30]; }; struct ServerLSPlayerLeftWorld_Struct { uint32 lsaccount_id; - char key[30]; + char key[30]; }; struct ServerLSPlayerZoneChange_Struct { uint32 lsaccount_id; uint32 from; // 0 = world - uint32 to; // 0 = world + uint32 to; // 0 = world }; struct ServerLSClientAuth { uint32 lsaccount_id; // ID# in login server's db @@ -567,8 +567,8 @@ struct ServerUptime_Struct { }; struct ServerPetitionUpdate_Struct { - uint32 petid; // Petition Number - uint8 status; // 0x00 = ReRead DB -- 0x01 = Checkout -- More? Dunno... lol + uint32 petid; // Petition Number + uint8 status; // 0x00 = ReRead DB -- 0x01 = Checkout -- More? Dunno... lol }; struct ServerWhoAll_Struct { @@ -585,8 +585,8 @@ struct ServerWhoAll_Struct { struct ServerFriendsWho_Struct { uint32 FromID; - char FromName[64]; - char FriendsString[1]; + char FromName[64]; + char FriendsString[1]; }; struct ServerKillPlayer_Struct { @@ -640,8 +640,8 @@ struct ServerSyncWorldList_Struct { uint32 adminid; uint8 greenname; uint8 showdown; - int32 num_players; - int32 num_zones; + int32 num_players; + int32 num_zones; bool placeholder; }; @@ -708,8 +708,8 @@ struct ServerGroupChannelMessage_Struct { uint32 zoneid; uint16 instanceid; uint32 groupid; - char from[64]; - char message[0]; + char from[64]; + char message[0]; }; struct ServerDisbandGroup_Struct { @@ -1070,10 +1070,10 @@ struct ServerCameraShake_Struct }; struct ServerMailMessageHeader_Struct { - char from[64]; - char to[64]; - char subject[128]; - char message[0]; + char from[64]; + char to[64]; + char subject[128]; + char message[0]; }; struct Server_Speech_Struct { @@ -1111,7 +1111,7 @@ struct QSTradeItems_Struct { struct QSPlayerLogTrade_Struct { uint32 char1_id; - MoneyUpdate_Struct char1_money; + MoneyUpdate_Struct char1_money; uint16 char1_count; uint32 char2_id; MoneyUpdate_Struct char2_money; @@ -1132,20 +1132,20 @@ struct QSHandinItems_Struct { }; struct QSPlayerLogHandin_Struct { - uint32 quest_id; - uint32 char_id; - MoneyUpdate_Struct char_money; - uint16 char_count; - uint32 npc_id; - MoneyUpdate_Struct npc_money; - uint16 npc_count; + uint32 quest_id; + uint32 char_id; + MoneyUpdate_Struct char_money; + uint16 char_count; + uint32 npc_id; + MoneyUpdate_Struct npc_money; + uint16 npc_count; QSHandinItems_Struct items[0]; }; struct QSPlayerLogNPCKillSub_Struct{ uint32 NPCID; uint32 ZoneID; - uint32 Type; + uint32 Type; }; struct QSPlayerLogNPCKillsPlayers_Struct{ @@ -1169,10 +1169,10 @@ struct QSDeleteItems_Struct { }; struct QSPlayerLogDelete_Struct { - uint32 char_id; - uint16 stack_size; // '0' indicates full stack or non-stackable item move - uint16 char_count; - QSDeleteItems_Struct items[0]; + uint32 char_id; + uint16 stack_size; // '0' indicates full stack or non-stackable item move + uint16 char_count; + QSDeleteItems_Struct items[0]; }; struct QSMoveItems_Struct { @@ -1188,12 +1188,12 @@ struct QSMoveItems_Struct { }; struct QSPlayerLogMove_Struct { - uint32 char_id; - uint16 from_slot; - uint16 to_slot; - uint16 stack_size; // '0' indicates full stack or non-stackable item move - uint16 char_count; - bool postaction; + uint32 char_id; + uint16 from_slot; + uint16 to_slot; + uint16 stack_size; // '0' indicates full stack or non-stackable item move + uint16 char_count; + bool postaction; QSMoveItems_Struct items[0]; }; @@ -1209,18 +1209,18 @@ struct QSTransactionItems_Struct { }; struct QSMerchantLogTransaction_Struct { - uint32 zone_id; - uint32 merchant_id; - MoneyUpdate_Struct merchant_money; - uint16 merchant_count; - uint32 char_id; - MoneyUpdate_Struct char_money; - uint16 char_count; + uint32 zone_id; + uint32 merchant_id; + MoneyUpdate_Struct merchant_money; + uint16 merchant_count; + uint32 char_id; + MoneyUpdate_Struct char_money; + uint16 char_count; QSTransactionItems_Struct items[0]; }; struct CZMessagePlayer_Struct { - uint32 Type; + uint32 Type; char CharName[64]; char Message[512]; }; diff --git a/common/shareddb.cpp b/common/shareddb.cpp index a5107215f..87420550c 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -1,4 +1,3 @@ - #include "shareddb.h" #include #include @@ -22,33 +21,33 @@ using namespace std; SharedDatabase::SharedDatabase() : Database(), skill_caps_mmf(nullptr), items_mmf(nullptr), items_hash(nullptr), faction_mmf(nullptr), faction_hash(nullptr), - loot_table_mmf(nullptr), loot_drop_mmf(nullptr), loot_table_hash(nullptr), loot_drop_hash(nullptr) + loot_table_mmf(nullptr), loot_drop_mmf(nullptr), loot_table_hash(nullptr), loot_drop_hash(nullptr) { } SharedDatabase::SharedDatabase(const char* host, const char* user, const char* passwd, const char* database, uint32 port) : Database(host, user, passwd, database, port), skill_caps_mmf(nullptr), items_mmf(nullptr), items_hash(nullptr), - faction_mmf(nullptr), faction_hash(nullptr), loot_table_mmf(nullptr), loot_drop_mmf(nullptr), loot_table_hash(nullptr), - loot_drop_hash(nullptr) + faction_mmf(nullptr), faction_hash(nullptr), loot_table_mmf(nullptr), loot_drop_mmf(nullptr), loot_table_hash(nullptr), + loot_drop_hash(nullptr) { } SharedDatabase::~SharedDatabase() { - safe_delete(skill_caps_mmf); - safe_delete(items_mmf); - safe_delete(items_hash); - safe_delete(faction_mmf); - safe_delete(faction_hash); - safe_delete(loot_table_mmf); - safe_delete(loot_drop_mmf); - safe_delete(loot_table_hash); - safe_delete(loot_drop_hash); + safe_delete(skill_caps_mmf); + safe_delete(items_mmf); + safe_delete(items_hash); + safe_delete(faction_mmf); + safe_delete(faction_hash); + safe_delete(loot_table_mmf); + safe_delete(loot_drop_mmf); + safe_delete(loot_table_hash); + safe_delete(loot_drop_hash); } bool SharedDatabase::SetHideMe(uint32 account_id, uint8 hideme) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET hideme = %i where id = %i", hideme, account_id), errbuf)) { cerr << "Error in SetGMSpeed query '" << query << "' " << errbuf << endl; @@ -99,7 +98,7 @@ uint8 SharedDatabase::GetGMSpeed(uint32 account_id) bool SharedDatabase::SetGMSpeed(uint32 account_id, uint8 gmspeed) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET gmspeed = %i where id = %i", gmspeed, account_id), errbuf)) { cerr << "Error in SetGMSpeed query '" << query << "' " << errbuf << endl; @@ -117,8 +116,8 @@ uint32 SharedDatabase::GetTotalTimeEntitledOnAccount(uint32 AccountID) { uint32 EntitledTime = 0; const char *EntitledQuery = "select sum(ascii(substring(profile, 237, 1)) + (ascii(substring(profile, 238, 1)) * 256) +" - "(ascii(substring(profile, 239, 1)) * 65536) + (ascii(substring(profile, 240, 1)) * 16777216))" - "from character_ where account_id = %i"; + "(ascii(substring(profile, 239, 1)) * 65536) + (ascii(substring(profile, 240, 1)) * 16777216))" + "from character_ where account_id = %i"; char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; @@ -147,7 +146,7 @@ iter_queue it; int i; bool ret=true; char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; // Delete cursor items if ((ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND ( (slotid >=8000 and slotid<=8999) or slotid=30 or (slotid>=331 and slotid<=340))", char_id), errbuf))) { for(it=start,i=8000;it!=end;it++,i++) { @@ -166,7 +165,7 @@ bool ret=true; bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const ItemInst* inst) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; MYSQL_ROW row; // Delete cursor items @@ -203,7 +202,7 @@ bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const Ite bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 slot_id) { _CP(Database_SaveInventory); char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; bool ret = false; uint32 augslot[5] = { 0, 0, 0, 0, 0 }; @@ -246,14 +245,14 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s else charges = 0x7FFF; - uint32 len_query = MakeAnyLenString(&query, + uint32 len_query = MakeAnyLenString(&query, "REPLACE INTO sharedbank " " (acctid,slotid,itemid,charges,custom_data," " augslot1,augslot2,augslot3,augslot4,augslot5)" " VALUES(%lu,%lu,%lu,%lu,'%s'," " %lu,%lu,%lu,%lu,%lu)", (unsigned long)account_id, (unsigned long)slot_id, (unsigned long)inst->GetItem()->ID, (unsigned long)charges, - inst->GetCustomDataString().c_str(), + inst->GetCustomDataString().c_str(), (unsigned long)augslot[0],(unsigned long)augslot[1],(unsigned long)augslot[2],(unsigned long)augslot[3],(unsigned long)augslot[4]); @@ -290,7 +289,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s " VALUES(%lu,%lu,%lu,%lu,%lu,'%s',%lu," " %lu,%lu,%lu,%lu,%lu)", (unsigned long)char_id, (unsigned long)slot_id, (unsigned long)inst->GetItem()->ID, (unsigned long)charges, - (unsigned long)(inst->IsInstNoDrop() ? 1:0),inst->GetCustomDataString().c_str(),(unsigned long)inst->GetColor(), + (unsigned long)(inst->IsInstNoDrop() ? 1:0),inst->GetCustomDataString().c_str(),(unsigned long)inst->GetColor(), (unsigned long)augslot[0],(unsigned long)augslot[1],(unsigned long)augslot[2],(unsigned long)augslot[3],(unsigned long)augslot[4] ); ret = RunQuery(query, len_query, errbuf); @@ -350,7 +349,7 @@ int32 SharedDatabase::GetSharedPlatinum(uint32 account_id) bool SharedDatabase::SetSharedPlatinum(uint32 account_id, int32 amount_to_add) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE account SET sharedplat = sharedplat + %i WHERE id = %i", amount_to_add, account_id), errbuf)) { cerr << "Error in SetSharedPlatinum query '" << query << "' " << errbuf << endl; @@ -410,10 +409,10 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv, // Retrieve shared bank inventory based on either account or character bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - uint32 len_query = 0; + char* query = 0; + uint32 len_query = 0; MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; bool ret = false; if (is_charid) { @@ -451,33 +450,33 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { } } } - if(row[8]) { - std::string data_str(row[8]); - std::string id; - std::string value; - bool use_id = true; + if(row[8]) { + std::string data_str(row[8]); + std::string id; + std::string value; + bool use_id = true; - for(int i = 0; i < data_str.length(); ++i) { - if(data_str[i] == '^') { - if(!use_id) { - inst->SetCustomData(id, value); - id.clear(); - value.clear(); - } - use_id = !use_id; - } - else { - char v = data_str[i]; - if(use_id) { - id.push_back(v); - } else { - value.push_back(v); - } - } - } - } + for(int i = 0; i < data_str.length(); ++i) { + if(data_str[i] == '^') { + if(!use_id) { + inst->SetCustomData(id, value); + id.clear(); + value.clear(); + } + use_id = !use_id; + } + else { + char v = data_str[i]; + if(use_id) { + id.push_back(v); + } else { + value.push_back(v); + } + } + } + } - put_slot_id = inv->PutItem(slot_id, *inst); + put_slot_id = inv->PutItem(slot_id, *inst); safe_delete(inst); // Save ptr to item in inventory @@ -513,14 +512,14 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { _CP(Database_GetInventory); char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES* result; - MYSQL_ROW row; + char* query = 0; + MYSQL_RES* result; + MYSQL_ROW row; bool ret = false; // Retrieve character inventory if (RunQuery(query, MakeAnyLenString(&query, "SELECT slotid,itemid,charges,color,augslot1,augslot2,augslot3,augslot4,augslot5," - "instnodrop,custom_data FROM inventory WHERE charid=%i ORDER BY slotid", char_id), errbuf, &result)) { + "instnodrop,custom_data FROM inventory WHERE charid=%i ORDER BY slotid", char_id), errbuf, &result)) { while ((row = mysql_fetch_row(result))) { int16 slot_id = atoi(row[0]); @@ -542,31 +541,31 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { ItemInst* inst = CreateBaseItem(item, charges); - if(row[10]) { - std::string data_str(row[10]); - std::string id; - std::string value; - bool use_id = true; + if(row[10]) { + std::string data_str(row[10]); + std::string id; + std::string value; + bool use_id = true; - for(int i = 0; i < data_str.length(); ++i) { - if(data_str[i] == '^') { - if(!use_id) { - inst->SetCustomData(id, value); - id.clear(); - value.clear(); - } - use_id = !use_id; - } - else { - char v = data_str[i]; - if(use_id) { - id.push_back(v); - } else { - value.push_back(v); - } - } - } - } + for(int i = 0; i < data_str.length(); ++i) { + if(data_str[i] == '^') { + if(!use_id) { + inst->SetCustomData(id, value); + id.clear(); + value.clear(); + } + use_id = !use_id; + } + else { + char v = data_str[i]; + if(use_id) { + id.push_back(v); + } else { + value.push_back(v); + } + } + } + } if (instnodrop || (slot_id >= 0 && slot_id <= 21 && inst->GetItem()->Attuneable)) inst->SetInstNoDrop(true); @@ -622,15 +621,15 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) { _CP(Database_GetInventory_name); char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES* result; - MYSQL_ROW row; + char* query = 0; + MYSQL_RES* result; + MYSQL_ROW row; bool ret = false; // Retrieve character inventory if (RunQuery(query, MakeAnyLenString(&query, "SELECT slotid,itemid,charges,color,augslot1,augslot2,augslot3,augslot4,augslot5," - "instnodrop,custom_data FROM inventory INNER JOIN character_ ch ON ch.id=charid WHERE ch.name='%s' AND ch.account_id=%i ORDER BY slotid", - name, account_id), errbuf, &result)) + "instnodrop,custom_data FROM inventory INNER JOIN character_ ch ON ch.id=charid WHERE ch.name='%s' AND ch.account_id=%i ORDER BY slotid", + name, account_id), errbuf, &result)) { while ((row = mysql_fetch_row(result))) { int16 slot_id = atoi(row[0]); @@ -652,31 +651,31 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) ItemInst* inst = CreateBaseItem(item, charges); inst->SetInstNoDrop(instnodrop); - if(row[10]) { - std::string data_str(row[10]); - std::string id; - std::string value; - bool use_id = true; + if(row[10]) { + std::string data_str(row[10]); + std::string id; + std::string value; + bool use_id = true; - for(int i = 0; i < data_str.length(); ++i) { - if(data_str[i] == '^') { - if(!use_id) { - inst->SetCustomData(id, value); - id.clear(); - value.clear(); - } - use_id = !use_id; - } - else { - char v = data_str[i]; - if(use_id) { - id.push_back(v); - } else { - value.push_back(v); - } - } - } - } + for(int i = 0; i < data_str.length(); ++i) { + if(data_str[i] == '^') { + if(!use_id) { + inst->SetCustomData(id, value); + id.clear(); + value.clear(); + } + use_id = !use_id; + } + else { + char v = data_str[i]; + if(use_id) { + id.push_back(v); + } else { + value.push_back(v); + } + } + } + } if (color > 0) inst->SetColor(color); @@ -719,10 +718,10 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) void SharedDatabase::GetItemsCount(int32 &item_count, uint32 &max_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; item_count = -1; - max_id = 0; + max_id = 0; char query[] = "SELECT MAX(id), count(*) FROM items"; if (RunQuery(query, static_cast(strlen(query)), errbuf, &result)) { @@ -740,275 +739,275 @@ void SharedDatabase::GetItemsCount(int32 &item_count, uint32 &max_id) { } bool SharedDatabase::LoadItems() { - if(items_mmf) { - return true; - } + if(items_mmf) { + return true; + } - try { - EQEmu::IPCMutex mutex("items"); - mutex.Lock(); - items_mmf = new EQEmu::MemoryMappedFile("shared/items"); + try { + EQEmu::IPCMutex mutex("items"); + mutex.Lock(); + items_mmf = new EQEmu::MemoryMappedFile("shared/items"); - int32 items = -1; - uint32 max_item = 0; - GetItemsCount(items, max_item); - if(items == -1) { - EQ_EXCEPT("SharedDatabase", "Database returned no result"); - } - uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(items, max_item)); - if(items_mmf->Size() != size) { - EQ_EXCEPT("SharedDatabase", "Couldn't load items because items_mmf->Size() != size"); - } + int32 items = -1; + uint32 max_item = 0; + GetItemsCount(items, max_item); + if(items == -1) { + EQ_EXCEPT("SharedDatabase", "Database returned no result"); + } + uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(items, max_item)); + if(items_mmf->Size() != size) { + EQ_EXCEPT("SharedDatabase", "Couldn't load items because items_mmf->Size() != size"); + } - items_hash = new EQEmu::FixedMemoryHashSet(reinterpret_cast(items_mmf->Get()), size); - mutex.Unlock(); - } catch(std::exception& ex) { - LogFile->write(EQEMuLog::Error, "Error Loading Items: %s", ex.what()); - return false; - } + items_hash = new EQEmu::FixedMemoryHashSet(reinterpret_cast(items_mmf->Get()), size); + mutex.Unlock(); + } catch(std::exception& ex) { + LogFile->write(EQEMuLog::Error, "Error Loading Items: %s", ex.what()); + return false; + } return true; } void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_item_id) { - EQEmu::FixedMemoryHashSet hash(reinterpret_cast(data), size, items, max_item_id); - char errbuf[MYSQL_ERRMSG_SIZE]; + EQEmu::FixedMemoryHashSet hash(reinterpret_cast(data), size, items, max_item_id); + char errbuf[MYSQL_ERRMSG_SIZE]; MYSQL_RES *result; MYSQL_ROW row; - char ndbuffer[4]; - bool disableNoRent = false; - if(GetVariable("disablenorent", ndbuffer, 4)) { - if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { - disableNoRent = true; - } - } - bool disableNoDrop = false; - if(GetVariable("disablenodrop", ndbuffer, 4)) { - if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { - disableNoDrop = true; - } - } - bool disableLoreGroup = false; - if(GetVariable("disablelore", ndbuffer, 4)) { - if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { - disableLoreGroup = true; - } - } - bool disableNoTransfer = false; - if(GetVariable("disablenotransfer", ndbuffer, 4)) { - if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { - disableNoTransfer = true; - } - } + char ndbuffer[4]; + bool disableNoRent = false; + if(GetVariable("disablenorent", ndbuffer, 4)) { + if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { + disableNoRent = true; + } + } + bool disableNoDrop = false; + if(GetVariable("disablenodrop", ndbuffer, 4)) { + if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { + disableNoDrop = true; + } + } + bool disableLoreGroup = false; + if(GetVariable("disablelore", ndbuffer, 4)) { + if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { + disableLoreGroup = true; + } + } + bool disableNoTransfer = false; + if(GetVariable("disablenotransfer", ndbuffer, 4)) { + if(ndbuffer[0] == '1' && ndbuffer[1] == '\0') { + disableNoTransfer = true; + } + } - char query[] = "select source," + char query[] = "select source," #define F(x) "`"#x"`," #include "item_fieldlist.h" #undef F "updated" " from items order by id"; - Item_Struct item; + Item_Struct item; if(RunQuery(query, sizeof(query), errbuf, &result)) { - while((row = mysql_fetch_row(result))) { - memset(&item, 0, sizeof(Item_Struct)); + while((row = mysql_fetch_row(result))) { + memset(&item, 0, sizeof(Item_Struct)); - item.ItemClass = (uint8)atoi(row[ItemField::itemclass]); - strcpy(item.Name,row[ItemField::name]); - strcpy(item.Lore,row[ItemField::lore]); - strcpy(item.IDFile,row[ItemField::idfile]); - item.ID = (uint32)atoul(row[ItemField::id]); - item.Weight = (uint8)atoi(row[ItemField::weight]); - item.NoRent = disableNoRent ? (uint8)atoi("255") : (uint8)atoi(row[ItemField::norent]); - item.NoDrop = disableNoDrop ? (uint8)atoi("255") : (uint8)atoi(row[ItemField::nodrop]); - item.Size = (uint8)atoi(row[ItemField::size]); - item.Slots = (uint32)atoul(row[ItemField::slots]); - item.Price = (uint32)atoul(row[ItemField::price]); - item.Icon = (uint32)atoul(row[ItemField::icon]); - item.BenefitFlag = (atoul(row[ItemField::benefitflag]) != 0); - item.Tradeskills = (atoi(row[ItemField::tradeskills])==0) ? false : true; - item.CR = (int8)atoi(row[ItemField::cr]); - item.DR = (int8)atoi(row[ItemField::dr]); - item.PR = (int8)atoi(row[ItemField::pr]); - item.MR = (int8)atoi(row[ItemField::mr]); - item.FR = (int8)atoi(row[ItemField::fr]); - item.AStr = (int8)atoi(row[ItemField::astr]); - item.ASta = (int8)atoi(row[ItemField::asta]); - item.AAgi = (int8)atoi(row[ItemField::aagi]); - item.ADex = (int8)atoi(row[ItemField::adex]); - item.ACha = (int8)atoi(row[ItemField::acha]); - item.AInt = (int8)atoi(row[ItemField::aint]); - item.AWis = (int8)atoi(row[ItemField::awis]); - item.HP = (int32)atoul(row[ItemField::hp]); - item.Mana = (int32)atoul(row[ItemField::mana]); - item.AC = (int32)atoul(row[ItemField::ac]); - item.Deity = (uint32)atoul(row[ItemField::deity]); - item.SkillModValue = (int32)atoul(row[ItemField::skillmodvalue]); - //item.Unk033 = (int32)atoul(row[ItemField::UNK033]); - item.SkillModType = (uint32)atoul(row[ItemField::skillmodtype]); - item.BaneDmgRace = (uint32)atoul(row[ItemField::banedmgrace]); - item.BaneDmgAmt = (int8)atoi(row[ItemField::banedmgamt]); - item.BaneDmgBody = (uint32)atoul(row[ItemField::banedmgbody]); - item.Magic = (atoi(row[ItemField::magic])==0) ? false : true; - item.CastTime_ = (int32)atoul(row[ItemField::casttime_]); - item.ReqLevel = (uint8)atoi(row[ItemField::reqlevel]); - item.BardType = (uint32)atoul(row[ItemField::bardtype]); - item.BardValue = (int32)atoul(row[ItemField::bardvalue]); - item.Light = (int8)atoi(row[ItemField::light]); - item.Delay = (uint8)atoi(row[ItemField::delay]); - item.RecLevel = (uint8)atoi(row[ItemField::reclevel]); - item.RecSkill = (uint8)atoi(row[ItemField::recskill]); - item.ElemDmgType = (uint8)atoi(row[ItemField::elemdmgtype]); - item.ElemDmgAmt = (uint8)atoi(row[ItemField::elemdmgamt]); - item.Range = (uint8)atoi(row[ItemField::range]); - item.Damage = (uint32)atoi(row[ItemField::damage]); - item.Color = (uint32)atoul(row[ItemField::color]); - item.Classes = (uint32)atoul(row[ItemField::classes]); - item.Races = (uint32)atoul(row[ItemField::races]); - //item.Unk054 = (uint32)atoul(row[ItemField::UNK054]); - item.MaxCharges = (int16)atoi(row[ItemField::maxcharges]); - item.ItemType = (uint8)atoi(row[ItemField::itemtype]); - item.Material = (uint8)atoi(row[ItemField::material]); - item.SellRate = (float)atof(row[ItemField::sellrate]); - //item.Unk059 = (uint32)atoul(row[ItemField::UNK059]); - item.CastTime = (uint32)atoul(row[ItemField::casttime]); - item.EliteMaterial = (uint32)atoul(row[ItemField::elitematerial]); - item.ProcRate = (int32)atoi(row[ItemField::procrate]); - item.CombatEffects = (int8)atoi(row[ItemField::combateffects]); - item.Shielding = (int8)atoi(row[ItemField::shielding]); - item.StunResist = (int8)atoi(row[ItemField::stunresist]); - item.StrikeThrough = (int8)atoi(row[ItemField::strikethrough]); - item.ExtraDmgSkill = (uint32)atoul(row[ItemField::extradmgskill]); - item.ExtraDmgAmt = (uint32)atoul(row[ItemField::extradmgamt]); - item.SpellShield = (int8)atoi(row[ItemField::spellshield]); - item.Avoidance = (int8)atoi(row[ItemField::avoidance]); - item.Accuracy = (int8)atoi(row[ItemField::accuracy]); - item.CharmFileID = (uint32)atoul(row[ItemField::charmfileid]); - item.FactionMod1 = (int32)atoul(row[ItemField::factionmod1]); - item.FactionMod2 = (int32)atoul(row[ItemField::factionmod2]); - item.FactionMod3 = (int32)atoul(row[ItemField::factionmod3]); - item.FactionMod4 = (int32)atoul(row[ItemField::factionmod4]); - item.FactionAmt1 = (int32)atoul(row[ItemField::factionamt1]); - item.FactionAmt2 = (int32)atoul(row[ItemField::factionamt2]); - item.FactionAmt3 = (int32)atoul(row[ItemField::factionamt3]); - item.FactionAmt4 = (int32)atoul(row[ItemField::factionamt4]); - strcpy(item.CharmFile,row[ItemField::charmfile]); - item.AugType = (uint32)atoul(row[ItemField::augtype]); - item.AugSlotType[0] = (uint8)atoi(row[ItemField::augslot1type]); - item.AugSlotVisible[0] = (uint8)atoi(row[ItemField::augslot1visible]); - item.AugSlotUnk2[0] = 0; - item.AugSlotType[1] = (uint8)atoi(row[ItemField::augslot2type]); - item.AugSlotVisible[1] = (uint8)atoi(row[ItemField::augslot2visible]); - item.AugSlotUnk2[1] = 0; - item.AugSlotType[2] = (uint8)atoi(row[ItemField::augslot3type]); - item.AugSlotVisible[2] = (uint8)atoi(row[ItemField::augslot3visible]); - item.AugSlotUnk2[2] = 0; - item.AugSlotType[3] = (uint8)atoi(row[ItemField::augslot4type]); - item.AugSlotVisible[3] = (uint8)atoi(row[ItemField::augslot4visible]); - item.AugSlotUnk2[3] = 0; - item.AugSlotType[4] = (uint8)atoi(row[ItemField::augslot5type]); - item.AugSlotVisible[4] = (uint8)atoi(row[ItemField::augslot5visible]); - item.AugSlotUnk2[4] = 0; - item.LDoNTheme = (uint32)atoul(row[ItemField::ldontheme]); - item.LDoNPrice = (uint32)atoul(row[ItemField::ldonprice]); - item.LDoNSold = (uint32)atoul(row[ItemField::ldonsold]); - item.BagType = (uint8)atoi(row[ItemField::bagtype]); - item.BagSlots = (uint8)atoi(row[ItemField::bagslots]); - item.BagSize = (uint8)atoi(row[ItemField::bagsize]); - item.BagWR = (uint8)atoi(row[ItemField::bagwr]); - item.Book = (uint8)atoi(row[ItemField::book]); - item.BookType = (uint32)atoul(row[ItemField::booktype]); - strcpy(item.Filename,row[ItemField::filename]); - item.BaneDmgRaceAmt = (uint32)atoul(row[ItemField::banedmgraceamt]); - item.AugRestrict = (uint32)atoul(row[ItemField::augrestrict]); - item.LoreGroup = disableLoreGroup ? (uint8)atoi("0") : atoi(row[ItemField::loregroup]); - item.LoreFlag = item.LoreGroup!=0; - item.PendingLoreFlag = (atoi(row[ItemField::pendingloreflag])==0) ? false : true; - item.ArtifactFlag = (atoi(row[ItemField::artifactflag])==0) ? false : true; - item.SummonedFlag = (atoi(row[ItemField::summonedflag])==0) ? false : true; - item.Favor = (uint32)atoul(row[ItemField::favor]); - item.FVNoDrop = (atoi(row[ItemField::fvnodrop])==0) ? false : true; - item.Endur = (uint32)atoul(row[ItemField::endur]); - item.DotShielding = (uint32)atoul(row[ItemField::dotshielding]); - item.Attack = (uint32)atoul(row[ItemField::attack]); - item.Regen = (uint32)atoul(row[ItemField::regen]); - item.ManaRegen = (uint32)atoul(row[ItemField::manaregen]); - item.EnduranceRegen = (uint32)atoul(row[ItemField::enduranceregen]); - item.Haste = (uint32)atoul(row[ItemField::haste]); - item.DamageShield = (uint32)atoul(row[ItemField::damageshield]); - item.RecastDelay = (uint32)atoul(row[ItemField::recastdelay]); - item.RecastType = (uint32)atoul(row[ItemField::recasttype]); - item.GuildFavor = (uint32)atoul(row[ItemField::guildfavor]); - item.AugDistiller = (uint32)atoul(row[ItemField::augdistiller]); - item.Attuneable = (atoi(row[ItemField::attuneable])==0) ? false : true; - item.NoPet = (atoi(row[ItemField::nopet])==0) ? false : true; - item.PointType = (uint32)atoul(row[ItemField::pointtype]); - item.PotionBelt = (atoi(row[ItemField::potionbelt])==0) ? false : true; - item.PotionBeltSlots = (atoi(row[ItemField::potionbeltslots])==0) ? false : true; - item.StackSize = (uint16)atoi(row[ItemField::stacksize]); - item.NoTransfer = disableNoTransfer ? false : (atoi(row[ItemField::notransfer])==0) ? false : true; - item.Stackable = (atoi(row[ItemField::stackable])==0) ? false : true; - item.Click.Effect = (uint32)atoul(row[ItemField::clickeffect]); - item.Click.Type = (uint8)atoul(row[ItemField::clicktype]); - item.Click.Level = (uint8)atoul(row[ItemField::clicklevel]); - item.Click.Level2 = (uint8)atoul(row[ItemField::clicklevel2]); - strcpy(item.CharmFile,row[ItemField::charmfile]); - item.Proc.Effect = (uint16)atoul(row[ItemField::proceffect]); - item.Proc.Type = (uint8)atoul(row[ItemField::proctype]); - item.Proc.Level = (uint8)atoul(row[ItemField::proclevel]); - item.Proc.Level2 = (uint8)atoul(row[ItemField::proclevel2]); - item.Worn.Effect = (uint16)atoul(row[ItemField::worneffect]); - item.Worn.Type = (uint8)atoul(row[ItemField::worntype]); - item.Worn.Level = (uint8)atoul(row[ItemField::wornlevel]); - item.Worn.Level2 = (uint8)atoul(row[ItemField::wornlevel2]); - item.Focus.Effect = (uint16)atoul(row[ItemField::focuseffect]); - item.Focus.Type = (uint8)atoul(row[ItemField::focustype]); - item.Focus.Level = (uint8)atoul(row[ItemField::focuslevel]); - item.Focus.Level2 = (uint8)atoul(row[ItemField::focuslevel2]); - item.Scroll.Effect = (uint16)atoul(row[ItemField::scrolleffect]); - item.Scroll.Type = (uint8)atoul(row[ItemField::scrolltype]); - item.Scroll.Level = (uint8)atoul(row[ItemField::scrolllevel]); - item.Scroll.Level2 = (uint8)atoul(row[ItemField::scrolllevel2]); - item.Bard.Effect = (uint16)atoul(row[ItemField::bardeffect]); - item.Bard.Type = (uint8)atoul(row[ItemField::bardtype]); - item.Bard.Level = (uint8)atoul(row[ItemField::bardlevel]); - item.Bard.Level2 = (uint8)atoul(row[ItemField::bardlevel2]); - item.QuestItemFlag = (atoi(row[ItemField::questitemflag])==0) ? false : true; - item.SVCorruption = (int32)atoi(row[ItemField::svcorruption]); - item.Purity = (uint32)atoul(row[ItemField::purity]); - item.BackstabDmg = (uint32)atoul(row[ItemField::backstabdmg]); - item.DSMitigation = (uint32)atoul(row[ItemField::dsmitigation]); - item.HeroicStr = (int32)atoi(row[ItemField::heroic_str]); - item.HeroicInt = (int32)atoi(row[ItemField::heroic_int]); - item.HeroicWis = (int32)atoi(row[ItemField::heroic_wis]); - item.HeroicAgi = (int32)atoi(row[ItemField::heroic_agi]); - item.HeroicDex = (int32)atoi(row[ItemField::heroic_dex]); - item.HeroicSta = (int32)atoi(row[ItemField::heroic_sta]); - item.HeroicCha = (int32)atoi(row[ItemField::heroic_cha]); - item.HeroicMR = (int32)atoi(row[ItemField::heroic_mr]); - item.HeroicFR = (int32)atoi(row[ItemField::heroic_fr]); - item.HeroicCR = (int32)atoi(row[ItemField::heroic_cr]); - item.HeroicDR = (int32)atoi(row[ItemField::heroic_dr]); - item.HeroicPR = (int32)atoi(row[ItemField::heroic_pr]); - item.HeroicSVCorrup = (int32)atoi(row[ItemField::heroic_svcorrup]); - item.HealAmt = (int32)atoi(row[ItemField::healamt]); - item.SpellDmg = (int32)atoi(row[ItemField::spelldmg]); - item.LDoNSellBackRate = (uint32)atoul(row[ItemField::ldonsellbackrate]); - item.ScriptFileID = (uint32)atoul(row[ItemField::scriptfileid]); - item.ExpendableArrow = (uint16)atoul(row[ItemField::expendablearrow]); - item.Clairvoyance = (uint32)atoul(row[ItemField::clairvoyance]); - strcpy(item.ClickName,row[ItemField::clickname]); - strcpy(item.ProcName,row[ItemField::procname]); - strcpy(item.WornName,row[ItemField::wornname]); - strcpy(item.FocusName,row[ItemField::focusname]); - strcpy(item.ScrollName,row[ItemField::scrollname]); + item.ItemClass = (uint8)atoi(row[ItemField::itemclass]); + strcpy(item.Name,row[ItemField::name]); + strcpy(item.Lore,row[ItemField::lore]); + strcpy(item.IDFile,row[ItemField::idfile]); + item.ID = (uint32)atoul(row[ItemField::id]); + item.Weight = (uint8)atoi(row[ItemField::weight]); + item.NoRent = disableNoRent ? (uint8)atoi("255") : (uint8)atoi(row[ItemField::norent]); + item.NoDrop = disableNoDrop ? (uint8)atoi("255") : (uint8)atoi(row[ItemField::nodrop]); + item.Size = (uint8)atoi(row[ItemField::size]); + item.Slots = (uint32)atoul(row[ItemField::slots]); + item.Price = (uint32)atoul(row[ItemField::price]); + item.Icon = (uint32)atoul(row[ItemField::icon]); + item.BenefitFlag = (atoul(row[ItemField::benefitflag]) != 0); + item.Tradeskills = (atoi(row[ItemField::tradeskills])==0) ? false : true; + item.CR = (int8)atoi(row[ItemField::cr]); + item.DR = (int8)atoi(row[ItemField::dr]); + item.PR = (int8)atoi(row[ItemField::pr]); + item.MR = (int8)atoi(row[ItemField::mr]); + item.FR = (int8)atoi(row[ItemField::fr]); + item.AStr = (int8)atoi(row[ItemField::astr]); + item.ASta = (int8)atoi(row[ItemField::asta]); + item.AAgi = (int8)atoi(row[ItemField::aagi]); + item.ADex = (int8)atoi(row[ItemField::adex]); + item.ACha = (int8)atoi(row[ItemField::acha]); + item.AInt = (int8)atoi(row[ItemField::aint]); + item.AWis = (int8)atoi(row[ItemField::awis]); + item.HP = (int32)atoul(row[ItemField::hp]); + item.Mana = (int32)atoul(row[ItemField::mana]); + item.AC = (int32)atoul(row[ItemField::ac]); + item.Deity = (uint32)atoul(row[ItemField::deity]); + item.SkillModValue = (int32)atoul(row[ItemField::skillmodvalue]); + //item.Unk033 = (int32)atoul(row[ItemField::UNK033]); + item.SkillModType = (uint32)atoul(row[ItemField::skillmodtype]); + item.BaneDmgRace = (uint32)atoul(row[ItemField::banedmgrace]); + item.BaneDmgAmt = (int8)atoi(row[ItemField::banedmgamt]); + item.BaneDmgBody = (uint32)atoul(row[ItemField::banedmgbody]); + item.Magic = (atoi(row[ItemField::magic])==0) ? false : true; + item.CastTime_ = (int32)atoul(row[ItemField::casttime_]); + item.ReqLevel = (uint8)atoi(row[ItemField::reqlevel]); + item.BardType = (uint32)atoul(row[ItemField::bardtype]); + item.BardValue = (int32)atoul(row[ItemField::bardvalue]); + item.Light = (int8)atoi(row[ItemField::light]); + item.Delay = (uint8)atoi(row[ItemField::delay]); + item.RecLevel = (uint8)atoi(row[ItemField::reclevel]); + item.RecSkill = (uint8)atoi(row[ItemField::recskill]); + item.ElemDmgType = (uint8)atoi(row[ItemField::elemdmgtype]); + item.ElemDmgAmt = (uint8)atoi(row[ItemField::elemdmgamt]); + item.Range = (uint8)atoi(row[ItemField::range]); + item.Damage = (uint32)atoi(row[ItemField::damage]); + item.Color = (uint32)atoul(row[ItemField::color]); + item.Classes = (uint32)atoul(row[ItemField::classes]); + item.Races = (uint32)atoul(row[ItemField::races]); + //item.Unk054 = (uint32)atoul(row[ItemField::UNK054]); + item.MaxCharges = (int16)atoi(row[ItemField::maxcharges]); + item.ItemType = (uint8)atoi(row[ItemField::itemtype]); + item.Material = (uint8)atoi(row[ItemField::material]); + item.SellRate = (float)atof(row[ItemField::sellrate]); + //item.Unk059 = (uint32)atoul(row[ItemField::UNK059]); + item.CastTime = (uint32)atoul(row[ItemField::casttime]); + item.EliteMaterial = (uint32)atoul(row[ItemField::elitematerial]); + item.ProcRate = (int32)atoi(row[ItemField::procrate]); + item.CombatEffects = (int8)atoi(row[ItemField::combateffects]); + item.Shielding = (int8)atoi(row[ItemField::shielding]); + item.StunResist = (int8)atoi(row[ItemField::stunresist]); + item.StrikeThrough = (int8)atoi(row[ItemField::strikethrough]); + item.ExtraDmgSkill = (uint32)atoul(row[ItemField::extradmgskill]); + item.ExtraDmgAmt = (uint32)atoul(row[ItemField::extradmgamt]); + item.SpellShield = (int8)atoi(row[ItemField::spellshield]); + item.Avoidance = (int8)atoi(row[ItemField::avoidance]); + item.Accuracy = (int8)atoi(row[ItemField::accuracy]); + item.CharmFileID = (uint32)atoul(row[ItemField::charmfileid]); + item.FactionMod1 = (int32)atoul(row[ItemField::factionmod1]); + item.FactionMod2 = (int32)atoul(row[ItemField::factionmod2]); + item.FactionMod3 = (int32)atoul(row[ItemField::factionmod3]); + item.FactionMod4 = (int32)atoul(row[ItemField::factionmod4]); + item.FactionAmt1 = (int32)atoul(row[ItemField::factionamt1]); + item.FactionAmt2 = (int32)atoul(row[ItemField::factionamt2]); + item.FactionAmt3 = (int32)atoul(row[ItemField::factionamt3]); + item.FactionAmt4 = (int32)atoul(row[ItemField::factionamt4]); + strcpy(item.CharmFile,row[ItemField::charmfile]); + item.AugType = (uint32)atoul(row[ItemField::augtype]); + item.AugSlotType[0] = (uint8)atoi(row[ItemField::augslot1type]); + item.AugSlotVisible[0] = (uint8)atoi(row[ItemField::augslot1visible]); + item.AugSlotUnk2[0] = 0; + item.AugSlotType[1] = (uint8)atoi(row[ItemField::augslot2type]); + item.AugSlotVisible[1] = (uint8)atoi(row[ItemField::augslot2visible]); + item.AugSlotUnk2[1] = 0; + item.AugSlotType[2] = (uint8)atoi(row[ItemField::augslot3type]); + item.AugSlotVisible[2] = (uint8)atoi(row[ItemField::augslot3visible]); + item.AugSlotUnk2[2] = 0; + item.AugSlotType[3] = (uint8)atoi(row[ItemField::augslot4type]); + item.AugSlotVisible[3] = (uint8)atoi(row[ItemField::augslot4visible]); + item.AugSlotUnk2[3] = 0; + item.AugSlotType[4] = (uint8)atoi(row[ItemField::augslot5type]); + item.AugSlotVisible[4] = (uint8)atoi(row[ItemField::augslot5visible]); + item.AugSlotUnk2[4] = 0; + item.LDoNTheme = (uint32)atoul(row[ItemField::ldontheme]); + item.LDoNPrice = (uint32)atoul(row[ItemField::ldonprice]); + item.LDoNSold = (uint32)atoul(row[ItemField::ldonsold]); + item.BagType = (uint8)atoi(row[ItemField::bagtype]); + item.BagSlots = (uint8)atoi(row[ItemField::bagslots]); + item.BagSize = (uint8)atoi(row[ItemField::bagsize]); + item.BagWR = (uint8)atoi(row[ItemField::bagwr]); + item.Book = (uint8)atoi(row[ItemField::book]); + item.BookType = (uint32)atoul(row[ItemField::booktype]); + strcpy(item.Filename,row[ItemField::filename]); + item.BaneDmgRaceAmt = (uint32)atoul(row[ItemField::banedmgraceamt]); + item.AugRestrict = (uint32)atoul(row[ItemField::augrestrict]); + item.LoreGroup = disableLoreGroup ? (uint8)atoi("0") : atoi(row[ItemField::loregroup]); + item.LoreFlag = item.LoreGroup!=0; + item.PendingLoreFlag = (atoi(row[ItemField::pendingloreflag])==0) ? false : true; + item.ArtifactFlag = (atoi(row[ItemField::artifactflag])==0) ? false : true; + item.SummonedFlag = (atoi(row[ItemField::summonedflag])==0) ? false : true; + item.Favor = (uint32)atoul(row[ItemField::favor]); + item.FVNoDrop = (atoi(row[ItemField::fvnodrop])==0) ? false : true; + item.Endur = (uint32)atoul(row[ItemField::endur]); + item.DotShielding = (uint32)atoul(row[ItemField::dotshielding]); + item.Attack = (uint32)atoul(row[ItemField::attack]); + item.Regen = (uint32)atoul(row[ItemField::regen]); + item.ManaRegen = (uint32)atoul(row[ItemField::manaregen]); + item.EnduranceRegen = (uint32)atoul(row[ItemField::enduranceregen]); + item.Haste = (uint32)atoul(row[ItemField::haste]); + item.DamageShield = (uint32)atoul(row[ItemField::damageshield]); + item.RecastDelay = (uint32)atoul(row[ItemField::recastdelay]); + item.RecastType = (uint32)atoul(row[ItemField::recasttype]); + item.GuildFavor = (uint32)atoul(row[ItemField::guildfavor]); + item.AugDistiller = (uint32)atoul(row[ItemField::augdistiller]); + item.Attuneable = (atoi(row[ItemField::attuneable])==0) ? false : true; + item.NoPet = (atoi(row[ItemField::nopet])==0) ? false : true; + item.PointType = (uint32)atoul(row[ItemField::pointtype]); + item.PotionBelt = (atoi(row[ItemField::potionbelt])==0) ? false : true; + item.PotionBeltSlots = (atoi(row[ItemField::potionbeltslots])==0) ? false : true; + item.StackSize = (uint16)atoi(row[ItemField::stacksize]); + item.NoTransfer = disableNoTransfer ? false : (atoi(row[ItemField::notransfer])==0) ? false : true; + item.Stackable = (atoi(row[ItemField::stackable])==0) ? false : true; + item.Click.Effect = (uint32)atoul(row[ItemField::clickeffect]); + item.Click.Type = (uint8)atoul(row[ItemField::clicktype]); + item.Click.Level = (uint8)atoul(row[ItemField::clicklevel]); + item.Click.Level2 = (uint8)atoul(row[ItemField::clicklevel2]); + strcpy(item.CharmFile,row[ItemField::charmfile]); + item.Proc.Effect = (uint16)atoul(row[ItemField::proceffect]); + item.Proc.Type = (uint8)atoul(row[ItemField::proctype]); + item.Proc.Level = (uint8)atoul(row[ItemField::proclevel]); + item.Proc.Level2 = (uint8)atoul(row[ItemField::proclevel2]); + item.Worn.Effect = (uint16)atoul(row[ItemField::worneffect]); + item.Worn.Type = (uint8)atoul(row[ItemField::worntype]); + item.Worn.Level = (uint8)atoul(row[ItemField::wornlevel]); + item.Worn.Level2 = (uint8)atoul(row[ItemField::wornlevel2]); + item.Focus.Effect = (uint16)atoul(row[ItemField::focuseffect]); + item.Focus.Type = (uint8)atoul(row[ItemField::focustype]); + item.Focus.Level = (uint8)atoul(row[ItemField::focuslevel]); + item.Focus.Level2 = (uint8)atoul(row[ItemField::focuslevel2]); + item.Scroll.Effect = (uint16)atoul(row[ItemField::scrolleffect]); + item.Scroll.Type = (uint8)atoul(row[ItemField::scrolltype]); + item.Scroll.Level = (uint8)atoul(row[ItemField::scrolllevel]); + item.Scroll.Level2 = (uint8)atoul(row[ItemField::scrolllevel2]); + item.Bard.Effect = (uint16)atoul(row[ItemField::bardeffect]); + item.Bard.Type = (uint8)atoul(row[ItemField::bardtype]); + item.Bard.Level = (uint8)atoul(row[ItemField::bardlevel]); + item.Bard.Level2 = (uint8)atoul(row[ItemField::bardlevel2]); + item.QuestItemFlag = (atoi(row[ItemField::questitemflag])==0) ? false : true; + item.SVCorruption = (int32)atoi(row[ItemField::svcorruption]); + item.Purity = (uint32)atoul(row[ItemField::purity]); + item.BackstabDmg = (uint32)atoul(row[ItemField::backstabdmg]); + item.DSMitigation = (uint32)atoul(row[ItemField::dsmitigation]); + item.HeroicStr = (int32)atoi(row[ItemField::heroic_str]); + item.HeroicInt = (int32)atoi(row[ItemField::heroic_int]); + item.HeroicWis = (int32)atoi(row[ItemField::heroic_wis]); + item.HeroicAgi = (int32)atoi(row[ItemField::heroic_agi]); + item.HeroicDex = (int32)atoi(row[ItemField::heroic_dex]); + item.HeroicSta = (int32)atoi(row[ItemField::heroic_sta]); + item.HeroicCha = (int32)atoi(row[ItemField::heroic_cha]); + item.HeroicMR = (int32)atoi(row[ItemField::heroic_mr]); + item.HeroicFR = (int32)atoi(row[ItemField::heroic_fr]); + item.HeroicCR = (int32)atoi(row[ItemField::heroic_cr]); + item.HeroicDR = (int32)atoi(row[ItemField::heroic_dr]); + item.HeroicPR = (int32)atoi(row[ItemField::heroic_pr]); + item.HeroicSVCorrup = (int32)atoi(row[ItemField::heroic_svcorrup]); + item.HealAmt = (int32)atoi(row[ItemField::healamt]); + item.SpellDmg = (int32)atoi(row[ItemField::spelldmg]); + item.LDoNSellBackRate = (uint32)atoul(row[ItemField::ldonsellbackrate]); + item.ScriptFileID = (uint32)atoul(row[ItemField::scriptfileid]); + item.ExpendableArrow = (uint16)atoul(row[ItemField::expendablearrow]); + item.Clairvoyance = (uint32)atoul(row[ItemField::clairvoyance]); + strcpy(item.ClickName,row[ItemField::clickname]); + strcpy(item.ProcName,row[ItemField::procname]); + strcpy(item.WornName,row[ItemField::wornname]); + strcpy(item.FocusName,row[ItemField::focusname]); + strcpy(item.ScrollName,row[ItemField::scrollname]); - try { - hash.insert(item.ID, item); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "Database::LoadItems: %s", ex.what()); - break; - } + try { + hash.insert(item.ID, item); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "Database::LoadItems: %s", ex.what()); + break; + } } mysql_free_result(result); @@ -1019,46 +1018,46 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_ } const Item_Struct* SharedDatabase::GetItem(uint32 id) { - if(!items_hash || id > items_hash->max_key()) { - return nullptr; - } + if(!items_hash || id > items_hash->max_key()) { + return nullptr; + } - if(items_hash->exists(id)) { - return &(items_hash->at(id)); - } + if(items_hash->exists(id)) { + return &(items_hash->at(id)); + } - return nullptr; + return nullptr; } const Item_Struct* SharedDatabase::IterateItems(uint32* id) { - if(!items_hash || !id) { - return nullptr; - } + if(!items_hash || !id) { + return nullptr; + } - for(;;) { - if(*id > items_hash->max_key()) { - break; - } + for(;;) { + if(*id > items_hash->max_key()) { + break; + } - if(items_hash->exists(*id)) { - return &(items_hash->at((*id)++)); - } else { - ++(*id); - } - } + if(items_hash->exists(*id)) { + return &(items_hash->at((*id)++)); + } else { + ++(*id); + } + } - return nullptr; + return nullptr; } string SharedDatabase::GetBook(const char *txtfile) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; char txtfile2[20]; string txtout; - strcpy(txtfile2,txtfile); + strcpy(txtfile2,txtfile); if (!RunQuery(query, MakeAnyLenString(&query, "SELECT txtfile FROM books where name='%s'", txtfile2), errbuf, &result)) { cerr << "Error in GetBook query '" << query << "' " << errbuf << endl; if (query != 0) @@ -1084,133 +1083,133 @@ string SharedDatabase::GetBook(const char *txtfile) } void SharedDatabase::GetFactionListInfo(uint32 &list_count, uint32 &max_lists) { - list_count = 0; - max_lists = 0; - const char *query = "SELECT COUNT(*), MAX(id) FROM npc_faction"; - char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + list_count = 0; + max_lists = 0; + const char *query = "SELECT COUNT(*), MAX(id) FROM npc_faction"; + char errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *result; + MYSQL_ROW row; - if(RunQuery(query, strlen(query), errbuf, &result)) { - if(row = mysql_fetch_row(result)) { - list_count = static_cast(atoul(row[0])); - max_lists = static_cast(atoul(row[1])); - } - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error getting npc faction info from database: %s, %s", query, errbuf); - } + if(RunQuery(query, strlen(query), errbuf, &result)) { + if(row = mysql_fetch_row(result)) { + list_count = static_cast(atoul(row[0])); + max_lists = static_cast(atoul(row[1])); + } + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error getting npc faction info from database: %s, %s", query, errbuf); + } } const NPCFactionList* SharedDatabase::GetNPCFactionEntry(uint32 id) { if(!faction_hash) { - return nullptr; - } + return nullptr; + } - if(faction_hash->exists(id)) { - return &(faction_hash->at(id)); - } + if(faction_hash->exists(id)) { + return &(faction_hash->at(id)); + } - return nullptr; + return nullptr; } void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_count, uint32 max_lists) { - EQEmu::FixedMemoryHashSet hash(reinterpret_cast(data), size, list_count, max_lists); - const char *query = "SELECT npc_faction.id, npc_faction.primaryfaction, npc_faction.ignore_primary_assist, " - "npc_faction_entries.faction_id, npc_faction_entries.value, npc_faction_entries.npc_value, npc_faction_entries.temp " - "FROM npc_faction LEFT JOIN npc_faction_entries ON npc_faction.id = npc_faction_entries.npc_faction_id ORDER BY " - "npc_faction.id;"; + EQEmu::FixedMemoryHashSet hash(reinterpret_cast(data), size, list_count, max_lists); + const char *query = "SELECT npc_faction.id, npc_faction.primaryfaction, npc_faction.ignore_primary_assist, " + "npc_faction_entries.faction_id, npc_faction_entries.value, npc_faction_entries.npc_value, npc_faction_entries.temp " + "FROM npc_faction LEFT JOIN npc_faction_entries ON npc_faction.id = npc_faction_entries.npc_faction_id ORDER BY " + "npc_faction.id;"; - char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - NPCFactionList faction; + char errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *result; + MYSQL_ROW row; + NPCFactionList faction; - if(RunQuery(query, strlen(query), errbuf, &result)) { - uint32 current_id = 0; - uint32 current_entry = 0; - while(row = mysql_fetch_row(result)) { - uint32 id = static_cast(atoul(row[0])); - if(id != current_id) { - if(current_id != 0) { - hash.insert(current_id, faction); - } + if(RunQuery(query, strlen(query), errbuf, &result)) { + uint32 current_id = 0; + uint32 current_entry = 0; + while(row = mysql_fetch_row(result)) { + uint32 id = static_cast(atoul(row[0])); + if(id != current_id) { + if(current_id != 0) { + hash.insert(current_id, faction); + } - memset(&faction, 0, sizeof(faction)); - current_entry = 0; - current_id = id; - faction.id = id; - faction.primaryfaction = static_cast(atoul(row[1])); - faction.assistprimaryfaction = (atoi(row[2]) == 0); - } + memset(&faction, 0, sizeof(faction)); + current_entry = 0; + current_id = id; + faction.id = id; + faction.primaryfaction = static_cast(atoul(row[1])); + faction.assistprimaryfaction = (atoi(row[2]) == 0); + } - if(!row[3]) { - continue; - } + if(!row[3]) { + continue; + } - if(current_entry >= MAX_NPC_FACTIONS) { - continue; - } + if(current_entry >= MAX_NPC_FACTIONS) { + continue; + } - faction.factionid[current_entry] = static_cast(atoul(row[3])); - faction.factionvalue[current_entry] = static_cast(atoi(row[4])); - faction.factionnpcvalue[current_entry] = static_cast(atoi(row[5])); - faction.factiontemp[current_entry] = static_cast(atoi(row[6])); - ++current_entry; - } + faction.factionid[current_entry] = static_cast(atoul(row[3])); + faction.factionvalue[current_entry] = static_cast(atoi(row[4])); + faction.factionnpcvalue[current_entry] = static_cast(atoi(row[5])); + faction.factiontemp[current_entry] = static_cast(atoi(row[6])); + ++current_entry; + } - if(current_id != 0) { - hash.insert(current_id, faction); - } + if(current_id != 0) { + hash.insert(current_id, faction); + } - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error getting npc faction info from database: %s, %s", query, errbuf); - } + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error getting npc faction info from database: %s, %s", query, errbuf); +} } bool SharedDatabase::LoadNPCFactionLists() { - if(faction_hash) { - return true; - } + if(faction_hash) { + return true; + } - try { - EQEmu::IPCMutex mutex("faction"); - mutex.Lock(); - faction_mmf = new EQEmu::MemoryMappedFile("shared/faction"); + try { + EQEmu::IPCMutex mutex("faction"); + mutex.Lock(); + faction_mmf = new EQEmu::MemoryMappedFile("shared/faction"); - uint32 list_count = 0; - uint32 max_lists = 0; - GetFactionListInfo(list_count, max_lists); - if(list_count == 0) { - EQ_EXCEPT("SharedDatabase", "Database returned no result"); - } - uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size( - list_count, max_lists)); + uint32 list_count = 0; + uint32 max_lists = 0; + GetFactionListInfo(list_count, max_lists); + if(list_count == 0) { + EQ_EXCEPT("SharedDatabase", "Database returned no result"); + } + uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size( + list_count, max_lists)); - if(faction_mmf->Size() != size) { - EQ_EXCEPT("SharedDatabase", "Couldn't load npc factions because faction_mmf->Size() != size"); - } + if(faction_mmf->Size() != size) { + EQ_EXCEPT("SharedDatabase", "Couldn't load npc factions because faction_mmf->Size() != size"); + } - faction_hash = new EQEmu::FixedMemoryHashSet(reinterpret_cast(faction_mmf->Get()), size); - mutex.Unlock(); - } catch(std::exception& ex) { - LogFile->write(EQEMuLog::Error, "Error Loading npc factions: %s", ex.what()); - return false; - } + faction_hash = new EQEmu::FixedMemoryHashSet(reinterpret_cast(faction_mmf->Get()), size); + mutex.Unlock(); + } catch(std::exception& ex) { + LogFile->write(EQEMuLog::Error, "Error Loading npc factions: %s", ex.what()); + return false; + } - return true; + return true; } // Get the player profile and inventory for the given account "account_id" and -// character name "name". Return true if the character was found, otherwise false. +// character name "name". Return true if the character was found, otherwise false. // False will also be returned if there is a database error. bool SharedDatabase::GetPlayerProfile(uint32 account_id, char* name, PlayerProfile_Struct* pp, Inventory* inv, ExtendedProfile_Struct *ext, char* current_zone, uint32 *current_instance) { _CP(Database_GetPlayerProfile); char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES* result; - MYSQL_ROW row; + char* query = 0; + MYSQL_RES* result; + MYSQL_ROW row; bool ret = false; unsigned long* lengths; @@ -1272,7 +1271,7 @@ bool SharedDatabase::SetPlayerProfile(uint32 account_id, uint32 charid, PlayerPr if (!ret) { LogFile->write(EQEMuLog::Error, "SetPlayerProfile query '%s' %s", query, errbuf); - } + } safe_delete_array(query); return ret; @@ -1280,7 +1279,7 @@ bool SharedDatabase::SetPlayerProfile(uint32 account_id, uint32 charid, PlayerPr // Generate SQL for updating player profile uint32 SharedDatabase::SetPlayerProfile_MQ(char** query, uint32 account_id, uint32 charid, PlayerProfile_Struct* pp, Inventory* inv, ExtendedProfile_Struct *ext, uint32 current_zone, uint32 current_instance, uint8 MaxXTargets) { - *query = new char[396 + sizeof(PlayerProfile_Struct)*2 + sizeof(ExtendedProfile_Struct)*2 + 4]; + *query = new char[396 + sizeof(PlayerProfile_Struct)*2 + sizeof(ExtendedProfile_Struct)*2 + 4]; char* end = *query; if (!current_zone) current_zone = pp->zone_id; @@ -1295,7 +1294,7 @@ uint32 SharedDatabase::SetPlayerProfile_MQ(char** query, uint32 account_id, uint end += DoEscapeString(end, (char*)pp, sizeof(PlayerProfile_Struct)); end += sprintf(end,"\', extprofile=\'"); end += DoEscapeString(end, (char*)ext, sizeof(ExtendedProfile_Struct)); - end += sprintf(end,"\',class=%d,level=%d,xtargets=%u WHERE id=%u", pp->class_, pp->level, MaxXTargets, charid); + end += sprintf(end,"\',class=%d,level=%d,xtargets=%u WHERE id=%u", pp->class_, pp->level, MaxXTargets, charid); return (uint32) (end - (*query)); } @@ -1357,7 +1356,7 @@ ItemInst* SharedDatabase::CreateBaseItem(const Item_Struct* item, int16 charges) int32 SharedDatabase::DeleteStalePlayerCorpses() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if(RuleB(Zone, EnableShadowrest)) @@ -1387,7 +1386,7 @@ int32 SharedDatabase::DeleteStalePlayerCorpses() { int32 SharedDatabase::DeleteStalePlayerBackups() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; // 1209600 seconds = 2 weeks @@ -1402,9 +1401,9 @@ int32 SharedDatabase::DeleteStalePlayerBackups() { bool SharedDatabase::GetCommandSettings(map &commands) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; strcpy(query, "SELECT command,access from commands"); commands.clear(); @@ -1425,146 +1424,146 @@ bool SharedDatabase::GetCommandSettings(map &commands) { } bool SharedDatabase::LoadSkillCaps() { - if(skill_caps_mmf) - return true; + if(skill_caps_mmf) + return true; uint32 class_count = PLAYER_CLASS_COUNT; uint32 skill_count = HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; - uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); + uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); - try { - EQEmu::IPCMutex mutex("skill_caps"); - mutex.Lock(); - skill_caps_mmf = new EQEmu::MemoryMappedFile("shared/skill_caps"); - if(skill_caps_mmf->Size() != size) { - EQ_EXCEPT("SharedDatabase", "Unable to load skill caps: skill_caps_mmf->Size() != size"); - } + try { + EQEmu::IPCMutex mutex("skill_caps"); + mutex.Lock(); + skill_caps_mmf = new EQEmu::MemoryMappedFile("shared/skill_caps"); + if(skill_caps_mmf->Size() != size) { + EQ_EXCEPT("SharedDatabase", "Unable to load skill caps: skill_caps_mmf->Size() != size"); + } - mutex.Unlock(); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "Error loading skill caps: %s", ex.what()); - return false; - } + mutex.Unlock(); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "Error loading skill caps: %s", ex.what()); + return false; + } - return true; + return true; } void SharedDatabase::LoadSkillCaps(void *data) { - uint32 class_count = PLAYER_CLASS_COUNT; + uint32 class_count = PLAYER_CLASS_COUNT; uint32 skill_count = HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; - uint16 *skill_caps_table = reinterpret_cast(data); + uint16 *skill_caps_table = reinterpret_cast(data); - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if(RunQuery(query, MakeAnyLenString(&query, - "SELECT skillID, class, level, cap FROM skill_caps ORDER BY skillID, class, level"), - errbuf, &result)) { - safe_delete_array(query); + "SELECT skillID, class, level, cap FROM skill_caps ORDER BY skillID, class, level"), + errbuf, &result)) { + safe_delete_array(query); - while((row = mysql_fetch_row(result))) { - uint8 skillID = atoi(row[0]); - uint8 class_ = atoi(row[1]) - 1; - uint8 level = atoi(row[2]); - uint16 cap = atoi(row[3]); - if(skillID >= skill_count || class_ >= class_count || level >= level_count) - continue; + while((row = mysql_fetch_row(result))) { + uint8 skillID = atoi(row[0]); + uint8 class_ = atoi(row[1]) - 1; + uint8 level = atoi(row[2]); + uint16 cap = atoi(row[3]); + if(skillID >= skill_count || class_ >= class_count || level >= level_count) + continue; - uint32 index = (((class_ * skill_count) + skillID) * level_count) + level; - skill_caps_table[index] = cap; + uint32 index = (((class_ * skill_count) + skillID) * level_count) + level; + skill_caps_table[index] = cap; } mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error loading skill caps from database: %s", errbuf); - safe_delete_array(query); - } + } else { + LogFile->write(EQEMuLog::Error, "Error loading skill caps from database: %s", errbuf); + safe_delete_array(query); + } } uint16 SharedDatabase::GetSkillCap(uint8 Class_, SkillType Skill, uint8 Level) { - if(!skill_caps_mmf) { - return 0; - } + if(!skill_caps_mmf) { + return 0; + } - if(Class_ == 0) - return 0; + if(Class_ == 0) + return 0; - int SkillMaxLevel = RuleI(Character, SkillCapMaxLevel); - if(SkillMaxLevel < 1) { - SkillMaxLevel = RuleI(Character, MaxLevel); - } + int SkillMaxLevel = RuleI(Character, SkillCapMaxLevel); + if(SkillMaxLevel < 1) { + SkillMaxLevel = RuleI(Character, MaxLevel); + } - uint32 class_count = PLAYER_CLASS_COUNT; + uint32 class_count = PLAYER_CLASS_COUNT; uint32 skill_count = HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; - if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { - return 0; - } + if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { + return 0; + } - if(Level > static_cast(SkillMaxLevel)){ - Level = static_cast(SkillMaxLevel); - } + if(Level > static_cast(SkillMaxLevel)){ + Level = static_cast(SkillMaxLevel); + } - uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count) + Level; - uint16 *skill_caps_table = reinterpret_cast(skill_caps_mmf->Get()); - return skill_caps_table[index]; + uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count) + Level; + uint16 *skill_caps_table = reinterpret_cast(skill_caps_mmf->Get()); + return skill_caps_table[index]; } uint8 SharedDatabase::GetTrainLevel(uint8 Class_, SkillType Skill, uint8 Level) { - if(!skill_caps_mmf) { - return 0; - } + if(!skill_caps_mmf) { + return 0; + } - if(Class_ == 0) - return 0; + if(Class_ == 0) + return 0; - int SkillMaxLevel = RuleI(Character, SkillCapMaxLevel); - if (SkillMaxLevel < 1) { - SkillMaxLevel = RuleI(Character, MaxLevel); - } + int SkillMaxLevel = RuleI(Character, SkillCapMaxLevel); + if (SkillMaxLevel < 1) { + SkillMaxLevel = RuleI(Character, MaxLevel); + } - uint32 class_count = PLAYER_CLASS_COUNT; + uint32 class_count = PLAYER_CLASS_COUNT; uint32 skill_count = HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; - if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { - return 0; - } + if(Class_ > class_count || static_cast(Skill) > skill_count || Level > level_count) { + return 0; + } - uint8 ret = 0; + uint8 ret = 0; if(Level > static_cast(SkillMaxLevel)) { - uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count); - uint16 *skill_caps_table = reinterpret_cast(skill_caps_mmf->Get()); - for(uint8 x = 0; x < Level; x++){ - if(skill_caps_table[index + x]){ - ret = x; - break; - } - } + uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count); + uint16 *skill_caps_table = reinterpret_cast(skill_caps_mmf->Get()); + for(uint8 x = 0; x < Level; x++){ + if(skill_caps_table[index + x]){ + ret = x; + break; + } + } } else { - uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count); - uint16 *skill_caps_table = reinterpret_cast(skill_caps_mmf->Get()); - for(int x = 0; x < SkillMaxLevel; x++){ - if(skill_caps_table[index + x]){ - ret = x; - break; - } - } + uint32 index = ((((Class_ - 1) * skill_count) + Skill) * level_count); + uint16 *skill_caps_table = reinterpret_cast(skill_caps_mmf->Get()); + for(int x = 0; x < SkillMaxLevel; x++){ + if(skill_caps_table[index + x]){ + ret = x; + break; + } + } } - if(ret > GetSkillCap(Class_, Skill, Level)) - ret = static_cast(GetSkillCap(Class_, Skill, Level)); + if(ret > GetSkillCap(Class_, Skill, Level)) + ret = static_cast(GetSkillCap(Class_, Skill, Level)); - return ret; + return ret; } void SharedDatabase::LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpellID) { const char *DSQuery = "SELECT `spellid`, `type` from `damageshieldtypes` WHERE `spellid` > 0 " - "AND `spellid` <= %i"; + "AND `spellid` <= %i"; const char *ERR_MYSQLERROR = "Error in LoadDamageShieldTypes: %s %s"; @@ -1578,7 +1577,7 @@ void SharedDatabase::LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpe while((row = mysql_fetch_row(result))) { int SpellID = atoi(row[0]); - if((SpellID > 0) && (SpellID <= iMaxSpellID)) { + if((SpellID > 0) && (SpellID <= iMaxSpellID)) { sp[SpellID].DamageShieldType = atoi(row[1]); } } @@ -1597,9 +1596,9 @@ const EvolveInfo* SharedDatabase::GetEvolveInfo(uint32 loregroup) { int SharedDatabase::GetMaxSpellID() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = nullptr; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = nullptr; + MYSQL_RES *result; + MYSQL_ROW row; int32 ret = 0; if(RunQuery(query, MakeAnyLenString(&query, "SELECT MAX(id) FROM spells_new"), errbuf, &result)) { @@ -1616,344 +1615,344 @@ int SharedDatabase::GetMaxSpellID() { } void SharedDatabase::LoadSpells(void *data, int max_spells) { - SPDat_Spell_Struct *sp = reinterpret_cast(data); + SPDat_Spell_Struct *sp = reinterpret_cast(data); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; - if(RunQuery(query, MakeAnyLenString(&query, + if(RunQuery(query, MakeAnyLenString(&query, "SELECT * FROM spells_new ORDER BY id ASC"), errbuf, &result)) { safe_delete_array(query); - int tempid = 0; + int tempid = 0; int counter = 0; - while (row = mysql_fetch_row(result)) { - tempid = atoi(row[0]); - if(tempid >= max_spells) { - _log(SPELLS__LOAD_ERR, "Non fatal error: spell.id >= max_spells, ignoring."); - continue; - } + while (row = mysql_fetch_row(result)) { + tempid = atoi(row[0]); + if(tempid >= max_spells) { + _log(SPELLS__LOAD_ERR, "Non fatal error: spell.id >= max_spells, ignoring."); + continue; + } - ++counter; - strn0cpy(sp[tempid].name, row[1], sizeof(sp[tempid].name)); - strn0cpy(sp[tempid].player_1, row[2], sizeof(sp[tempid].player_1)); - strn0cpy(sp[tempid].teleport_zone, row[3], sizeof(sp[tempid].teleport_zone)); - strn0cpy(sp[tempid].you_cast, row[4], sizeof(sp[tempid].you_cast)); - strn0cpy(sp[tempid].other_casts, row[5], sizeof(sp[tempid].other_casts)); - strn0cpy(sp[tempid].cast_on_you, row[6], sizeof(sp[tempid].cast_on_you)); - strn0cpy(sp[tempid].cast_on_other, row[7], sizeof(sp[tempid].cast_on_other)); - strn0cpy(sp[tempid].spell_fades, row[8], sizeof(sp[tempid].spell_fades)); + ++counter; + strn0cpy(sp[tempid].name, row[1], sizeof(sp[tempid].name)); + strn0cpy(sp[tempid].player_1, row[2], sizeof(sp[tempid].player_1)); + strn0cpy(sp[tempid].teleport_zone, row[3], sizeof(sp[tempid].teleport_zone)); + strn0cpy(sp[tempid].you_cast, row[4], sizeof(sp[tempid].you_cast)); + strn0cpy(sp[tempid].other_casts, row[5], sizeof(sp[tempid].other_casts)); + strn0cpy(sp[tempid].cast_on_you, row[6], sizeof(sp[tempid].cast_on_you)); + strn0cpy(sp[tempid].cast_on_other, row[7], sizeof(sp[tempid].cast_on_other)); + strn0cpy(sp[tempid].spell_fades, row[8], sizeof(sp[tempid].spell_fades)); - sp[tempid].range=static_cast(atof(row[9])); - sp[tempid].aoerange=static_cast(atof(row[10])); - sp[tempid].pushback=static_cast(atof(row[11])); - sp[tempid].pushup=static_cast(atof(row[12])); - sp[tempid].cast_time=atoi(row[13]); - sp[tempid].recovery_time=atoi(row[14]); - sp[tempid].recast_time=atoi(row[15]); - sp[tempid].buffdurationformula=atoi(row[16]); - sp[tempid].buffduration=atoi(row[17]); - sp[tempid].AEDuration=atoi(row[18]); - sp[tempid].mana=atoi(row[19]); + sp[tempid].range=static_cast(atof(row[9])); + sp[tempid].aoerange=static_cast(atof(row[10])); + sp[tempid].pushback=static_cast(atof(row[11])); + sp[tempid].pushup=static_cast(atof(row[12])); + sp[tempid].cast_time=atoi(row[13]); + sp[tempid].recovery_time=atoi(row[14]); + sp[tempid].recast_time=atoi(row[15]); + sp[tempid].buffdurationformula=atoi(row[16]); + sp[tempid].buffduration=atoi(row[17]); + sp[tempid].AEDuration=atoi(row[18]); + sp[tempid].mana=atoi(row[19]); - int y=0; - for(y=0; y< EFFECT_COUNT;y++) - sp[tempid].base[y]=atoi(row[20+y]); // effect_base_value - for(y=0; y < EFFECT_COUNT; y++) - sp[tempid].base2[y]=atoi(row[32+y]); // effect_limit_value - for(y=0; y< EFFECT_COUNT;y++) - sp[tempid].max[y]=atoi(row[44+y]); + int y=0; + for(y=0; y< EFFECT_COUNT;y++) + sp[tempid].base[y]=atoi(row[20+y]); // effect_base_value + for(y=0; y < EFFECT_COUNT; y++) + sp[tempid].base2[y]=atoi(row[32+y]); // effect_limit_value + for(y=0; y< EFFECT_COUNT;y++) + sp[tempid].max[y]=atoi(row[44+y]); - for(y=0; y< 4;y++) - sp[tempid].components[y]=atoi(row[58+y]); + for(y=0; y< 4;y++) + sp[tempid].components[y]=atoi(row[58+y]); - for(y=0; y< 4;y++) - sp[tempid].component_counts[y]=atoi(row[62+y]); + for(y=0; y< 4;y++) + sp[tempid].component_counts[y]=atoi(row[62+y]); - for(y=0; y< 4;y++) - sp[tempid].NoexpendReagent[y]=atoi(row[66+y]); + for(y=0; y< 4;y++) + sp[tempid].NoexpendReagent[y]=atoi(row[66+y]); - for(y=0; y< EFFECT_COUNT;y++) - sp[tempid].formula[y]=atoi(row[70+y]); + for(y=0; y< EFFECT_COUNT;y++) + sp[tempid].formula[y]=atoi(row[70+y]); - sp[tempid].goodEffect=atoi(row[83]); - sp[tempid].Activated=atoi(row[84]); - sp[tempid].resisttype=atoi(row[85]); + sp[tempid].goodEffect=atoi(row[83]); + sp[tempid].Activated=atoi(row[84]); + sp[tempid].resisttype=atoi(row[85]); - for(y=0; y< EFFECT_COUNT;y++) - sp[tempid].effectid[y]=atoi(row[86+y]); + for(y=0; y< EFFECT_COUNT;y++) + sp[tempid].effectid[y]=atoi(row[86+y]); - sp[tempid].targettype = (SpellTargetType) atoi(row[98]); - sp[tempid].basediff=atoi(row[99]); - int tmp_skill = atoi(row[100]);; - if(tmp_skill < 0 || tmp_skill > HIGHEST_SKILL) - sp[tempid].skill = BEGGING; /* not much better we can do. */ - else - sp[tempid].skill = (SkillType) tmp_skill; - sp[tempid].zonetype=atoi(row[101]); - sp[tempid].EnvironmentType=atoi(row[102]); - sp[tempid].TimeOfDay=atoi(row[103]); + sp[tempid].targettype = (SpellTargetType) atoi(row[98]); + sp[tempid].basediff=atoi(row[99]); + int tmp_skill = atoi(row[100]);; + if(tmp_skill < 0 || tmp_skill > HIGHEST_SKILL) + sp[tempid].skill = BEGGING; /* not much better we can do. */ + else + sp[tempid].skill = (SkillType) tmp_skill; + sp[tempid].zonetype=atoi(row[101]); + sp[tempid].EnvironmentType=atoi(row[102]); + sp[tempid].TimeOfDay=atoi(row[103]); - for(y=0; y < PLAYER_CLASS_COUNT;y++) - sp[tempid].classes[y]=atoi(row[104+y]); + for(y=0; y < PLAYER_CLASS_COUNT;y++) + sp[tempid].classes[y]=atoi(row[104+y]); - sp[tempid].CastingAnim=atoi(row[120]); - sp[tempid].SpellAffectIndex=atoi(row[123]); - sp[tempid].disallow_sit=atoi(row[124]); + sp[tempid].CastingAnim=atoi(row[120]); + sp[tempid].SpellAffectIndex=atoi(row[123]); + sp[tempid].disallow_sit=atoi(row[124]); - for (y = 0; y < 16; y++) - sp[tempid].deities[y]=atoi(row[126+y]); + for (y = 0; y < 16; y++) + sp[tempid].deities[y]=atoi(row[126+y]); - sp[tempid].uninterruptable=atoi(row[146]); - sp[tempid].ResistDiff=atoi(row[147]); - sp[tempid].RecourseLink = atoi(row[150]); + sp[tempid].uninterruptable=atoi(row[146]); + sp[tempid].ResistDiff=atoi(row[147]); + sp[tempid].RecourseLink = atoi(row[150]); - sp[tempid].short_buff_box = atoi(row[154]); - sp[tempid].descnum = atoi(row[155]); - sp[tempid].effectdescnum = atoi(row[157]); + sp[tempid].short_buff_box = atoi(row[154]); + sp[tempid].descnum = atoi(row[155]); + sp[tempid].effectdescnum = atoi(row[157]); - sp[tempid].bonushate=atoi(row[162]); + sp[tempid].bonushate=atoi(row[162]); - sp[tempid].EndurCost=atoi(row[166]); - sp[tempid].EndurTimerIndex=atoi(row[167]); - sp[tempid].HateAdded=atoi(row[173]); - sp[tempid].EndurUpkeep=atoi(row[174]); - sp[tempid].numhits = atoi(row[176]); - sp[tempid].pvpresistbase=atoi(row[177]); - sp[tempid].pvpresistcalc=atoi(row[178]); - sp[tempid].pvpresistcap=atoi(row[179]); - sp[tempid].spell_category=atoi(row[180]); - sp[tempid].can_mgb=atoi(row[185]); - sp[tempid].dispel_flag = atoi(row[186]); - sp[tempid].MinResist = atoi(row[189]); - sp[tempid].MaxResist = atoi(row[190]); - sp[tempid].viral_targets = atoi(row[191]); - sp[tempid].viral_timer = atoi(row[192]); - sp[tempid].NimbusEffect = atoi(row[193]); - sp[tempid].directional_start = (float)atoi(row[194]); - sp[tempid].directional_end = (float)atoi(row[195]); - sp[tempid].spellgroup=atoi(row[207]); - sp[tempid].powerful_flag=atoi(row[209]); - sp[tempid].CastRestriction = atoi(row[211]); - sp[tempid].AllowRest = atoi(row[212]) != 0; - sp[tempid].DamageShieldType = 0; - } - mysql_free_result(result); + sp[tempid].EndurCost=atoi(row[166]); + sp[tempid].EndurTimerIndex=atoi(row[167]); + sp[tempid].HateAdded=atoi(row[173]); + sp[tempid].EndurUpkeep=atoi(row[174]); + sp[tempid].numhits = atoi(row[176]); + sp[tempid].pvpresistbase=atoi(row[177]); + sp[tempid].pvpresistcalc=atoi(row[178]); + sp[tempid].pvpresistcap=atoi(row[179]); + sp[tempid].spell_category=atoi(row[180]); + sp[tempid].can_mgb=atoi(row[185]); + sp[tempid].dispel_flag = atoi(row[186]); + sp[tempid].MinResist = atoi(row[189]); + sp[tempid].MaxResist = atoi(row[190]); + sp[tempid].viral_targets = atoi(row[191]); + sp[tempid].viral_timer = atoi(row[192]); + sp[tempid].NimbusEffect = atoi(row[193]); + sp[tempid].directional_start = (float)atoi(row[194]); + sp[tempid].directional_end = (float)atoi(row[195]); + sp[tempid].spellgroup=atoi(row[207]); + sp[tempid].powerful_flag=atoi(row[209]); + sp[tempid].CastRestriction = atoi(row[211]); + sp[tempid].AllowRest = atoi(row[212]) != 0; + sp[tempid].DamageShieldType = 0; + } + mysql_free_result(result); - LoadDamageShieldTypes(sp, max_spells); - } else { + LoadDamageShieldTypes(sp, max_spells); + } else { _log(SPELLS__LOAD_ERR, "Error in LoadSpells query '%s' %s", query, errbuf); safe_delete_array(query); } } void SharedDatabase::GetLootTableInfo(uint32 &loot_table_count, uint32 &max_loot_table, uint32 &loot_table_entries) { - loot_table_count = 0; - max_loot_table = 0; - loot_table_entries = 0; - const char *query = "SELECT COUNT(*), MAX(id), (SELECT COUNT(*) FROM loottable_entries) FROM loottable"; - char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + loot_table_count = 0; + max_loot_table = 0; + loot_table_entries = 0; + const char *query = "SELECT COUNT(*), MAX(id), (SELECT COUNT(*) FROM loottable_entries) FROM loottable"; + char errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *result; + MYSQL_ROW row; - if(RunQuery(query, strlen(query), errbuf, &result)) { - if(row = mysql_fetch_row(result)) { - loot_table_count = static_cast(atoul(row[0])); - max_loot_table = static_cast(atoul(row[1])); - loot_table_entries = static_cast(atoul(row[2])); - } - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error getting loot table info from database: %s, %s", query, errbuf); - } + if(RunQuery(query, strlen(query), errbuf, &result)) { + if(row = mysql_fetch_row(result)) { + loot_table_count = static_cast(atoul(row[0])); + max_loot_table = static_cast(atoul(row[1])); + loot_table_entries = static_cast(atoul(row[2])); + } + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error getting loot table info from database: %s, %s", query, errbuf); + } } void SharedDatabase::GetLootDropInfo(uint32 &loot_drop_count, uint32 &max_loot_drop, uint32 &loot_drop_entries) { - loot_drop_count = 0; - max_loot_drop = 0; - loot_drop_entries = 0; - const char *query = "SELECT COUNT(*), MAX(id), (SELECT COUNT(*) FROM lootdrop_entries) FROM lootdrop"; - char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + loot_drop_count = 0; + max_loot_drop = 0; + loot_drop_entries = 0; + const char *query = "SELECT COUNT(*), MAX(id), (SELECT COUNT(*) FROM lootdrop_entries) FROM lootdrop"; + char errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *result; + MYSQL_ROW row; - if(RunQuery(query, strlen(query), errbuf, &result)) { - if(row = mysql_fetch_row(result)) { - loot_drop_count = static_cast(atoul(row[0])); - max_loot_drop = static_cast(atoul(row[1])); - loot_drop_entries = static_cast(atoul(row[2])); - } - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error getting loot table info from database: %s, %s", query, errbuf); - } + if(RunQuery(query, strlen(query), errbuf, &result)) { + if(row = mysql_fetch_row(result)) { + loot_drop_count = static_cast(atoul(row[0])); + max_loot_drop = static_cast(atoul(row[1])); + loot_drop_entries = static_cast(atoul(row[2])); + } + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error getting loot table info from database: %s, %s", query, errbuf); + } } void SharedDatabase::LoadLootTables(void *data, uint32 size) { - EQEmu::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); - const char *query = "SELECT loottable.id, loottable.mincash, loottable.maxcash, loottable.avgcoin," - " loottable_entries.lootdrop_id, loottable_entries.multiplier, loottable_entries.droplimit, " - "loottable_entries.mindrop, loottable_entries.probability FROM loottable LEFT JOIN loottable_entries" - " ON loottable.id = loottable_entries.loottable_id ORDER BY id"; - char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - uint8 loot_table[sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128)]; - LootTable_Struct *lt = reinterpret_cast(loot_table); + EQEmu::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); + const char *query = "SELECT loottable.id, loottable.mincash, loottable.maxcash, loottable.avgcoin," + " loottable_entries.lootdrop_id, loottable_entries.multiplier, loottable_entries.droplimit, " + "loottable_entries.mindrop, loottable_entries.probability FROM loottable LEFT JOIN loottable_entries" + " ON loottable.id = loottable_entries.loottable_id ORDER BY id"; + char errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *result; + MYSQL_ROW row; + uint8 loot_table[sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128)]; + LootTable_Struct *lt = reinterpret_cast(loot_table); - if(RunQuery(query, strlen(query), errbuf, &result)) { - uint32 current_id = 0; - uint32 current_entry = 0; - while(row = mysql_fetch_row(result)) { - uint32 id = static_cast(atoul(row[0])); - if(id != current_id) { - if(current_id != 0) { - hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + - (sizeof(LootTableEntries_Struct) * lt->NumEntries))); - } + if(RunQuery(query, strlen(query), errbuf, &result)) { + uint32 current_id = 0; + uint32 current_entry = 0; + while(row = mysql_fetch_row(result)) { + uint32 id = static_cast(atoul(row[0])); + if(id != current_id) { + if(current_id != 0) { + hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + + (sizeof(LootTableEntries_Struct) * lt->NumEntries))); + } - memset(loot_table, 0, sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128)); - current_entry = 0; - current_id = id; - lt->mincash = static_cast(atoul(row[1])); - lt->maxcash = static_cast(atoul(row[2])); - lt->avgcoin = static_cast(atoul(row[3])); - } + memset(loot_table, 0, sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128)); + current_entry = 0; + current_id = id; + lt->mincash = static_cast(atoul(row[1])); + lt->maxcash = static_cast(atoul(row[2])); + lt->avgcoin = static_cast(atoul(row[3])); + } - if(current_entry > 128) { - continue; - } + if(current_entry > 128) { + continue; + } - if(!row[4]) { - continue; - } + if(!row[4]) { + continue; + } - lt->Entries[current_entry].lootdrop_id = static_cast(atoul(row[4])); - lt->Entries[current_entry].multiplier = static_cast(atoi(row[5])); - lt->Entries[current_entry].droplimit = static_cast(atoi(row[6])); - lt->Entries[current_entry].mindrop = static_cast(atoi(row[7])); - lt->Entries[current_entry].probability = static_cast(atof(row[8])); + lt->Entries[current_entry].lootdrop_id = static_cast(atoul(row[4])); + lt->Entries[current_entry].multiplier = static_cast(atoi(row[5])); + lt->Entries[current_entry].droplimit = static_cast(atoi(row[6])); + lt->Entries[current_entry].mindrop = static_cast(atoi(row[7])); + lt->Entries[current_entry].probability = static_cast(atof(row[8])); - ++(lt->NumEntries); - ++current_entry; - } - if(current_id != 0) { - hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + - (sizeof(LootTableEntries_Struct) * lt->NumEntries))); - } + ++(lt->NumEntries); + ++current_entry; + } + if(current_id != 0) { + hash.insert(current_id, loot_table, (sizeof(LootTable_Struct) + + (sizeof(LootTableEntries_Struct) * lt->NumEntries))); + } - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error getting loot table info from database: %s, %s", query, errbuf); - } + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error getting loot table info from database: %s, %s", query, errbuf); + } } void SharedDatabase::LoadLootDrops(void *data, uint32 size) { - EQEmu::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); - const char *query = "SELECT lootdrop.id, lootdrop_entries.item_id, lootdrop_entries.item_charges, " - "lootdrop_entries.equip_item, lootdrop_entries.chance, lootdrop_entries.minlevel, " - "lootdrop_entries.maxlevel, lootdrop_entries.multiplier FROM lootdrop JOIN lootdrop_entries " - "ON lootdrop.id = lootdrop_entries.lootdrop_id ORDER BY lootdrop_id"; - char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + EQEmu::FixedMemoryVariableHashSet hash(reinterpret_cast(data), size); + const char *query = "SELECT lootdrop.id, lootdrop_entries.item_id, lootdrop_entries.item_charges, " + "lootdrop_entries.equip_item, lootdrop_entries.chance, lootdrop_entries.minlevel, " + "lootdrop_entries.maxlevel, lootdrop_entries.multiplier FROM lootdrop JOIN lootdrop_entries " + "ON lootdrop.id = lootdrop_entries.lootdrop_id ORDER BY lootdrop_id"; + char errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *result; + MYSQL_ROW row; - uint8 loot_drop[sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)]; - LootDrop_Struct *ld = reinterpret_cast(loot_drop); - if(RunQuery(query, strlen(query), errbuf, &result)) { - uint32 current_id = 0; - uint32 current_entry = 0; - while(row = mysql_fetch_row(result)) { - uint32 id = static_cast(atoul(row[0])); - if(id != current_id) { - if(current_id != 0) { - hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + - (sizeof(LootDropEntries_Struct) * ld->NumEntries))); - } + uint8 loot_drop[sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)]; + LootDrop_Struct *ld = reinterpret_cast(loot_drop); + if(RunQuery(query, strlen(query), errbuf, &result)) { + uint32 current_id = 0; + uint32 current_entry = 0; + while(row = mysql_fetch_row(result)) { + uint32 id = static_cast(atoul(row[0])); + if(id != current_id) { + if(current_id != 0) { + hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + + (sizeof(LootDropEntries_Struct) * ld->NumEntries))); + } - memset(loot_drop, 0, sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)); - current_entry = 0; - current_id = id; - } + memset(loot_drop, 0, sizeof(LootDrop_Struct) + (sizeof(LootDropEntries_Struct) * 1260)); + current_entry = 0; + current_id = id; + } - if(current_entry > 1260) { - continue; - } + if(current_entry > 1260) { + continue; + } - ld->Entries[current_entry].item_id = static_cast(atoul(row[1])); - ld->Entries[current_entry].item_charges = static_cast(atoi(row[2])); - ld->Entries[current_entry].equip_item = static_cast(atoi(row[3])); - ld->Entries[current_entry].chance = static_cast(atof(row[4])); - ld->Entries[current_entry].minlevel = static_cast(atoi(row[5])); - ld->Entries[current_entry].maxlevel = static_cast(atoi(row[6])); - ld->Entries[current_entry].multiplier = static_cast(atoi(row[7])); + ld->Entries[current_entry].item_id = static_cast(atoul(row[1])); + ld->Entries[current_entry].item_charges = static_cast(atoi(row[2])); + ld->Entries[current_entry].equip_item = static_cast(atoi(row[3])); + ld->Entries[current_entry].chance = static_cast(atof(row[4])); + ld->Entries[current_entry].minlevel = static_cast(atoi(row[5])); + ld->Entries[current_entry].maxlevel = static_cast(atoi(row[6])); + ld->Entries[current_entry].multiplier = static_cast(atoi(row[7])); - ++(ld->NumEntries); - ++current_entry; - } - if(current_id != 0) { - hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + - (sizeof(LootDropEntries_Struct) * ld->NumEntries))); - } + ++(ld->NumEntries); + ++current_entry; + } + if(current_id != 0) { + hash.insert(current_id, loot_drop, (sizeof(LootDrop_Struct) + + (sizeof(LootDropEntries_Struct) * ld->NumEntries))); + } - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error getting loot drop info from database: %s, %s", query, errbuf); - } + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error getting loot drop info from database: %s, %s", query, errbuf); + } } bool SharedDatabase::LoadLoot() { - if(loot_table_mmf || loot_drop_mmf) - return true; + if(loot_table_mmf || loot_drop_mmf) + return true; - try { - EQEmu::IPCMutex mutex("loot"); - mutex.Lock(); - loot_table_mmf = new EQEmu::MemoryMappedFile("shared/loot_table"); - loot_table_hash = new EQEmu::FixedMemoryVariableHashSet( - reinterpret_cast(loot_table_mmf->Get()), - loot_table_mmf->Size()); - loot_drop_mmf = new EQEmu::MemoryMappedFile("shared/loot_drop"); - loot_drop_hash = new EQEmu::FixedMemoryVariableHashSet( - reinterpret_cast(loot_drop_mmf->Get()), - loot_drop_mmf->Size()); - mutex.Unlock(); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "Error loading loot: %s", ex.what()); - return false; - } + try { + EQEmu::IPCMutex mutex("loot"); + mutex.Lock(); + loot_table_mmf = new EQEmu::MemoryMappedFile("shared/loot_table"); + loot_table_hash = new EQEmu::FixedMemoryVariableHashSet( + reinterpret_cast(loot_table_mmf->Get()), + loot_table_mmf->Size()); + loot_drop_mmf = new EQEmu::MemoryMappedFile("shared/loot_drop"); + loot_drop_hash = new EQEmu::FixedMemoryVariableHashSet( + reinterpret_cast(loot_drop_mmf->Get()), + loot_drop_mmf->Size()); + mutex.Unlock(); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "Error loading loot: %s", ex.what()); + return false; + } - return true; + return true; } const LootTable_Struct* SharedDatabase::GetLootTable(uint32 loottable_id) { if(!loot_table_hash) - return nullptr; + return nullptr; - try { - if(loot_table_hash->exists(loottable_id)) { - return &loot_table_hash->at(loottable_id); - } - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "Could not get loot table: %s", ex.what()); - } - return nullptr; + try { + if(loot_table_hash->exists(loottable_id)) { + return &loot_table_hash->at(loottable_id); + } + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "Could not get loot table: %s", ex.what()); + } + return nullptr; } const LootDrop_Struct* SharedDatabase::GetLootDrop(uint32 lootdrop_id) { if(!loot_drop_hash) - return nullptr; + return nullptr; - try { - if(loot_drop_hash->exists(lootdrop_id)) { - return &loot_drop_hash->at(lootdrop_id); - } - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "Could not get loot drop: %s", ex.what()); - } - return nullptr; + try { + if(loot_drop_hash->exists(lootdrop_id)) { + return &loot_drop_hash->at(lootdrop_id); + } + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "Could not get loot drop: %s", ex.what()); + } + return nullptr; } void SharedDatabase::GetPlayerInspectMessage(char* playername, InspectMessage_Struct* message) { @@ -1982,7 +1981,7 @@ void SharedDatabase::GetPlayerInspectMessage(char* playername, InspectMessage_St void SharedDatabase::SetPlayerInspectMessage(char* playername, const InspectMessage_Struct* message) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET inspectmessage='%s' WHERE name='%s'", message->text, playername), errbuf)) { cerr << "Error in SetPlayerInspectMessage query '" << query << "' " << errbuf << endl; @@ -2017,7 +2016,7 @@ void SharedDatabase::GetBotInspectMessage(uint32 botid, InspectMessage_Struct* m void SharedDatabase::SetBotInspectMessage(uint32 botid, const InspectMessage_Struct* message) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE bots SET BotInspectMessage='%s' WHERE BotID=%i", message->text, botid), errbuf)) { cerr << "Error in SetBotInspectMessage query '" << query << "' " << errbuf << endl; diff --git a/common/shareddb.h b/common/shareddb.h index fe20bdee1..33ca3aae0 100644 --- a/common/shareddb.h +++ b/common/shareddb.h @@ -19,7 +19,7 @@ struct Faction; struct LootTable_Struct; struct LootDrop_Struct; namespace EQEmu { - class MemoryMappedFile; + class MemoryMappedFile; } /* @@ -34,8 +34,8 @@ public: virtual ~SharedDatabase(); /* - * General Character Related Stuff - */ + * General Character Related Stuff + */ bool SetGMSpeed(uint32 account_id, uint8 gmspeed); uint8 GetGMSpeed(uint32 account_id); bool SetHideMe(uint32 account_id, uint8 hideme); @@ -48,12 +48,12 @@ public: void SetPlayerInspectMessage(char* playername, const InspectMessage_Struct* message); void GetBotInspectMessage(uint32 botid, InspectMessage_Struct* message); void SetBotInspectMessage(uint32 botid, const InspectMessage_Struct* message); - bool GetCommandSettings(map &commands); + bool GetCommandSettings(map &commands); uint32 GetTotalTimeEntitledOnAccount(uint32 AccountID); /* - * Character Inventory - */ + * Character Inventory + */ bool SaveCursor(uint32 char_id, std::list::const_iterator &start, std::list::const_iterator &end); bool SaveInventory(uint32 char_id, const ItemInst* inst, int16 slot_id); bool VerifyInventory(uint32 account_id, int16 slot_id, const ItemInst* inst); @@ -62,65 +62,65 @@ public: bool SetSharedPlatinum(uint32 account_id, int32 amount_to_add); bool GetInventory(uint32 char_id, Inventory* inv); bool GetInventory(uint32 account_id, char* name, Inventory* inv); - bool SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin); + bool SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv, uint32 si_race, uint32 si_class, uint32 si_deity, uint32 si_current_zone, char* si_name, int admin); string GetBook(const char *txtfile); /* - * Item Methods - */ + * Item Methods + */ ItemInst* CreateItem(uint32 item_id, int16 charges=0, uint32 aug1=0, uint32 aug2=0, uint32 aug3=0, uint32 aug4=0, uint32 aug5=0); ItemInst* CreateItem(const Item_Struct* item, int16 charges=0, uint32 aug1=0, uint32 aug2=0, uint32 aug3=0, uint32 aug4=0, uint32 aug5=0); ItemInst* CreateBaseItem(const Item_Struct* item, int16 charges=0); /* - * Shared Memory crap - */ + * Shared Memory crap + */ - //items - void GetItemsCount(int32 &item_count, uint32 &max_id); - void LoadItems(void *data, uint32 size, int32 items, uint32 max_item_id); - bool LoadItems(); - const Item_Struct* IterateItems(uint32* id); - const Item_Struct* GetItem(uint32 id); - const EvolveInfo* GetEvolveInfo(uint32 loregroup); + //items + void GetItemsCount(int32 &item_count, uint32 &max_id); + void LoadItems(void *data, uint32 size, int32 items, uint32 max_item_id); + bool LoadItems(); + const Item_Struct* IterateItems(uint32* id); + const Item_Struct* GetItem(uint32 id); + const EvolveInfo* GetEvolveInfo(uint32 loregroup); - //faction lists - void GetFactionListInfo(uint32 &list_count, uint32 &max_lists); + //faction lists + void GetFactionListInfo(uint32 &list_count, uint32 &max_lists); const NPCFactionList* GetNPCFactionEntry(uint32 id); - void LoadNPCFactionLists(void *data, uint32 size, uint32 list_count, uint32 max_lists); + void LoadNPCFactionLists(void *data, uint32 size, uint32 list_count, uint32 max_lists); bool LoadNPCFactionLists(); - //loot - void GetLootTableInfo(uint32 &loot_table_count, uint32 &max_loot_table, uint32 &loot_table_entries); - void GetLootDropInfo(uint32 &loot_drop_count, uint32 &max_loot_drop, uint32 &loot_drop_entries); - void LoadLootTables(void *data, uint32 size); - void LoadLootDrops(void *data, uint32 size); - bool LoadLoot(); - const LootTable_Struct* GetLootTable(uint32 loottable_id); + //loot + void GetLootTableInfo(uint32 &loot_table_count, uint32 &max_loot_table, uint32 &loot_table_entries); + void GetLootDropInfo(uint32 &loot_drop_count, uint32 &max_loot_drop, uint32 &loot_drop_entries); + void LoadLootTables(void *data, uint32 size); + void LoadLootDrops(void *data, uint32 size); + bool LoadLoot(); + const LootTable_Struct* GetLootTable(uint32 loottable_id); const LootDrop_Struct* GetLootDrop(uint32 lootdrop_id); - void LoadSkillCaps(void *data); - bool LoadSkillCaps(); + void LoadSkillCaps(void *data); + bool LoadSkillCaps(); uint16 GetSkillCap(uint8 Class_, SkillType Skill, uint8 Level); uint8 GetTrainLevel(uint8 Class_, SkillType Skill, uint8 Level); - int GetMaxSpellID(); - void LoadSpells(void *data, int max_spells); - void LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpellID); + int GetMaxSpellID(); + void LoadSpells(void *data, int max_spells); + void LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpellID); protected: - EQEmu::MemoryMappedFile *items_mmf; - EQEmu::FixedMemoryHashSet *items_hash; - EQEmu::MemoryMappedFile *faction_mmf; - EQEmu::FixedMemoryHashSet *faction_hash; - EQEmu::MemoryMappedFile *loot_table_mmf; - EQEmu::FixedMemoryVariableHashSet *loot_table_hash; - EQEmu::MemoryMappedFile *loot_drop_mmf; - EQEmu::FixedMemoryVariableHashSet *loot_drop_hash; - EQEmu::MemoryMappedFile *skill_caps_mmf; + EQEmu::MemoryMappedFile *items_mmf; + EQEmu::FixedMemoryHashSet *items_hash; + EQEmu::MemoryMappedFile *faction_mmf; + EQEmu::FixedMemoryHashSet *faction_hash; + EQEmu::MemoryMappedFile *loot_table_mmf; + EQEmu::FixedMemoryVariableHashSet *loot_table_hash; + EQEmu::MemoryMappedFile *loot_drop_mmf; + EQEmu::FixedMemoryVariableHashSet *loot_drop_hash; + EQEmu::MemoryMappedFile *skill_caps_mmf; }; #endif /*SHAREDDB_H_*/ diff --git a/common/skills.h b/common/skills.h index 43b8227bc..0b0c6e025 100644 --- a/common/skills.h +++ b/common/skills.h @@ -1,101 +1,101 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef SKILLS_H #define SKILLS_H // Correct Skill Numbers as of 4-14-2002 typedef enum { - _1H_BLUNT = 0, - _1H_SLASHING = 1, - _2H_BLUNT = 2, - _2H_SLASHING = 3, - ABJURE = 4, - ALTERATION = 5, - APPLY_POISON = 6, - ARCHERY = 7, - BACKSTAB = 8, - BIND_WOUND = 9, - BASH = 10, - BLOCKSKILL = 11, - BRASS_INSTRUMENTS = 12, - CHANNELING = 13, - CONJURATION = 14, - DEFENSE = 15, - DISARM = 16, - DISARM_TRAPS = 17, - DIVINATION = 18, - DODGE = 19, - DOUBLE_ATTACK = 20, - DRAGON_PUNCH = 21 , //aka Tail Rake - DUAL_WIELD = 22, - EAGLE_STRIKE = 23, - EVOCATION = 24, - FEIGN_DEATH = 25, - FLYING_KICK = 26, - FORAGE = 27, - HAND_TO_HAND = 28, - HIDE = 29, - KICK = 30, - MEDITATE = 31, - MEND = 32, - OFFENSE = 33, - PARRY = 34, - PICK_LOCK = 35, - PIERCING = 36, - RIPOSTE = 37, - ROUND_KICK = 38, - SAFE_FALL = 39, - SENSE_HEADING = 40, - SINGING = 41, - SNEAK = 42, - SPECIALIZE_ABJURE = 43, - SPECIALIZE_ALTERATION = 44, - SPECIALIZE_CONJURATION = 45, - SPECIALIZE_DIVINATION = 46, - SPECIALIZE_EVOCATION = 47, - PICK_POCKETS = 48, - STRINGED_INSTRUMENTS = 49, - SWIMMING = 50, - THROWING = 51, - TIGER_CLAW = 52, - TRACKING = 53, - WIND_INSTRUMENTS = 54, - FISHING = 55, - MAKE_POISON = 56, - TINKERING = 57, - RESEARCH = 58, - ALCHEMY = 59, - BAKING = 60, - TAILORING = 61, - SENSE_TRAPS = 62, - BLACKSMITHING = 63, - FLETCHING = 64, - BREWING = 65, - ALCOHOL_TOLERANCE = 66, - BEGGING = 67, - JEWELRY_MAKING = 68, - POTTERY = 69, - PERCUSSION_INSTRUMENTS = 70, - INTIMIDATION = 71, - BERSERKING = 72, - TAUNT = 73, - FRENZY = 74, - GENERIC_TRADESKILL = 75 + _1H_BLUNT = 0, + _1H_SLASHING = 1, + _2H_BLUNT = 2, + _2H_SLASHING = 3, + ABJURE = 4, + ALTERATION = 5, + APPLY_POISON = 6, + ARCHERY = 7, + BACKSTAB = 8, + BIND_WOUND = 9, + BASH = 10, + BLOCKSKILL = 11, + BRASS_INSTRUMENTS = 12, + CHANNELING = 13, + CONJURATION = 14, + DEFENSE = 15, + DISARM = 16, + DISARM_TRAPS = 17, + DIVINATION = 18, + DODGE = 19, + DOUBLE_ATTACK = 20, + DRAGON_PUNCH = 21 , //aka Tail Rake + DUAL_WIELD = 22, + EAGLE_STRIKE = 23, + EVOCATION = 24, + FEIGN_DEATH = 25, + FLYING_KICK = 26, + FORAGE = 27, + HAND_TO_HAND = 28, + HIDE = 29, + KICK = 30, + MEDITATE = 31, + MEND = 32, + OFFENSE = 33, + PARRY = 34, + PICK_LOCK = 35, + PIERCING = 36, + RIPOSTE = 37, + ROUND_KICK = 38, + SAFE_FALL = 39, + SENSE_HEADING = 40, + SINGING = 41, + SNEAK = 42, + SPECIALIZE_ABJURE = 43, + SPECIALIZE_ALTERATION = 44, + SPECIALIZE_CONJURATION = 45, + SPECIALIZE_DIVINATION = 46, + SPECIALIZE_EVOCATION = 47, + PICK_POCKETS = 48, + STRINGED_INSTRUMENTS = 49, + SWIMMING = 50, + THROWING = 51, + TIGER_CLAW = 52, + TRACKING = 53, + WIND_INSTRUMENTS = 54, + FISHING = 55, + MAKE_POISON = 56, + TINKERING = 57, + RESEARCH = 58, + ALCHEMY = 59, + BAKING = 60, + TAILORING = 61, + SENSE_TRAPS = 62, + BLACKSMITHING = 63, + FLETCHING = 64, + BREWING = 65, + ALCOHOL_TOLERANCE = 66, + BEGGING = 67, + JEWELRY_MAKING = 68, + POTTERY = 69, + PERCUSSION_INSTRUMENTS = 70, + INTIMIDATION = 71, + BERSERKING = 72, + TAUNT = 73, + FRENZY = 74, + GENERIC_TRADESKILL = 75 } SkillType; #define HIGHEST_SKILL FRENZY diff --git a/common/spdat.cpp b/common/spdat.cpp index 4e0a6c1c6..4cf4ab1a6 100644 --- a/common/spdat.cpp +++ b/common/spdat.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -22,11 +22,11 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) solar: General outline of spell casting process 1. - a) Client clicks a spell bar gem, ability, or item. client_process.cpp + a) Client clicks a spell bar gem, ability, or item. client_process.cpp gets the op and calls CastSpell() with all the relevant info including cast time. - b) NPC does CastSpell() from AI + b) NPC does CastSpell() from AI 2. a) CastSpell() determines there is a cast time and sets some state keeping @@ -41,7 +41,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) 4. CastedSpellFinished() checks some timed spell specific things, like - wether to interrupt or not, due to movement or melee. If successful + wether to interrupt or not, due to movement or melee. If successful SpellFinished() is called. 5. @@ -383,7 +383,7 @@ bool IsPartialCapableSpell(uint16 spell_id) bool IsResistableSpell(uint16 spell_id) { - // solar: for now only detrimental spells are resistable. later on i will + // solar: for now only detrimental spells are resistable. later on i will // add specific exceptions for the beneficial spells that are resistable if(IsDetrimentalSpell(spell_id)) { @@ -475,7 +475,7 @@ bool IsValidSpell(uint32 spellid) { return ( - SPDAT_RECORDS > 0 && + SPDAT_RECORDS > 0 && spellid != 0 && spellid != 1 && spellid != 0xFFFFFFFF && @@ -503,15 +503,15 @@ int GetMinLevel(uint16 spell_id) { } int GetSpellLevel(uint16 spell_id, int classa) { - if(classa >= PLAYER_CLASS_COUNT) { - return 255; - } + if(classa >= PLAYER_CLASS_COUNT) { + return 255; + } const SPDat_Spell_Struct &spell = spells[spell_id]; return spell.classes[classa - 1]; } -// solar: this will find the first occurance of effect. this is handy +// solar: this will find the first occurance of effect. this is handy // for spells like mez and charm, but if the effect appears more than once // in a spell this will just give back the first one. int GetSpellEffectIndex(uint16 spell_id, int effect) @@ -598,7 +598,7 @@ int32 CalculatePoisonCounters(uint16 spell_id){ Counters += spells[spell_id].base[i]; } } - return Counters; + return Counters; } int32 CalculateDiseaseCounters(uint16 spell_id){ @@ -612,7 +612,7 @@ int32 CalculateDiseaseCounters(uint16 spell_id){ Counters += spells[spell_id].base[i]; } } - return Counters; + return Counters; } int32 CalculateCurseCounters(uint16 spell_id){ @@ -626,7 +626,7 @@ int32 CalculateCurseCounters(uint16 spell_id){ Counters += spells[spell_id].base[i]; } } - return Counters; + return Counters; } int32 CalculateCorruptionCounters(uint16 spell_id){ @@ -640,27 +640,27 @@ int32 CalculateCorruptionCounters(uint16 spell_id){ Counters += spells[spell_id].base[i]; } } - return Counters; + return Counters; } int32 CalculateCounters(uint16 spell_id) { - int32 counter = CalculatePoisonCounters(spell_id); - if(counter != 0) { - return counter; - } + int32 counter = CalculatePoisonCounters(spell_id); + if(counter != 0) { + return counter; + } - counter = CalculateDiseaseCounters(spell_id); - if(counter != 0) { - return counter; - } + counter = CalculateDiseaseCounters(spell_id); + if(counter != 0) { + return counter; + } - counter = CalculateCurseCounters(spell_id); - if(counter != 0) { - return counter; - } + counter = CalculateCurseCounters(spell_id); + if(counter != 0) { + return counter; + } - counter = CalculateCorruptionCounters(spell_id); - return counter; + counter = CalculateCorruptionCounters(spell_id); + return counter; } bool IsDisciplineBuff(uint16 spell_id) @@ -936,55 +936,55 @@ bool IsRegularSingleTargetHealSpell(uint16 spell_id) { bool IsRegularGroupHealSpell(uint16 spell_id) { - if(IsGroupSpell(spell_id) && !IsCompleteHealSpell(spell_id) && !IsHealOverTimeSpell(spell_id)) - return true; - else - return false; + if(IsGroupSpell(spell_id) && !IsCompleteHealSpell(spell_id) && !IsHealOverTimeSpell(spell_id)) + return true; + else + return false; } bool IsGroupCompleteHealSpell(uint16 spell_id) { - if(IsGroupSpell(spell_id) && IsCompleteHealSpell(spell_id)) - return true; - else - return false; + if(IsGroupSpell(spell_id) && IsCompleteHealSpell(spell_id)) + return true; + else + return false; } bool IsGroupHealOverTimeSpell(uint16 spell_id) { - if(IsGroupSpell(spell_id) && IsHealOverTimeSpell(spell_id) && spells[spell_id].buffduration < 10) - return true; - else - return false; + if(IsGroupSpell(spell_id) && IsHealOverTimeSpell(spell_id) && spells[spell_id].buffduration < 10) + return true; + else + return false; } bool IsDebuffSpell(uint16 spell_id) { - if(IsBeneficialSpell(spell_id) || IsEffectHitpointsSpell(spell_id) || IsStunSpell(spell_id) || IsMezSpell(spell_id) - || IsCharmSpell(spell_id) || IsSlowSpell(spell_id) || IsEffectInSpell(spell_id, SE_Root) || IsEffectInSpell(spell_id, SE_CancelMagic) - || IsEffectInSpell(spell_id, SE_MovementSpeed) || IsFearSpell(spell_id) || IsEffectInSpell(spell_id, SE_Calm)) - return false; - else - return true; + if(IsBeneficialSpell(spell_id) || IsEffectHitpointsSpell(spell_id) || IsStunSpell(spell_id) || IsMezSpell(spell_id) + || IsCharmSpell(spell_id) || IsSlowSpell(spell_id) || IsEffectInSpell(spell_id, SE_Root) || IsEffectInSpell(spell_id, SE_CancelMagic) + || IsEffectInSpell(spell_id, SE_MovementSpeed) || IsFearSpell(spell_id) || IsEffectInSpell(spell_id, SE_Calm)) + return false; + else + return true; } bool IsResistDebuffSpell(uint16 spell_id) { - if((IsEffectInSpell(spell_id, SE_ResistFire) || IsEffectInSpell(spell_id, SE_ResistCold) || IsEffectInSpell(spell_id, SE_ResistPoison) - || IsEffectInSpell(spell_id, SE_ResistDisease) || IsEffectInSpell(spell_id, SE_ResistMagic) || IsEffectInSpell(spell_id, SE_ResistAll) - || IsEffectInSpell(spell_id, SE_ResistCorruption)) && !IsBeneficialSpell(spell_id)) - return true; - else - return false; + if((IsEffectInSpell(spell_id, SE_ResistFire) || IsEffectInSpell(spell_id, SE_ResistCold) || IsEffectInSpell(spell_id, SE_ResistPoison) + || IsEffectInSpell(spell_id, SE_ResistDisease) || IsEffectInSpell(spell_id, SE_ResistMagic) || IsEffectInSpell(spell_id, SE_ResistAll) + || IsEffectInSpell(spell_id, SE_ResistCorruption)) && !IsBeneficialSpell(spell_id)) + return true; + else + return false; } bool IsSelfConversionSpell(uint16 spell_id) { - if(GetSpellTargetType(spell_id) == ST_Self && IsEffectInSpell(spell_id, SE_CurrentMana) && IsEffectInSpell(spell_id, SE_CurrentHP) - && spells[spell_id].base[GetSpellEffectIndex(spell_id, SE_CurrentMana)] > 0 && spells[spell_id].base[GetSpellEffectIndex(spell_id, SE_CurrentHP)] < 0) - return true; - else - return false; + if(GetSpellTargetType(spell_id) == ST_Self && IsEffectInSpell(spell_id, SE_CurrentMana) && IsEffectInSpell(spell_id, SE_CurrentHP) + && spells[spell_id].base[GetSpellEffectIndex(spell_id, SE_CurrentMana)] > 0 && spells[spell_id].base[GetSpellEffectIndex(spell_id, SE_CurrentHP)] < 0) + return true; + else + return false; } uint32 GetMorphTrigger(uint32 spell_id) diff --git a/common/spdat.h b/common/spdat.h index 43efe3182..7e3cd71a4 100644 --- a/common/spdat.h +++ b/common/spdat.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef SPDAT_H #define SPDAT_H @@ -67,7 +67,7 @@ enum SpellAffectIndex { SAI_Calm = 12, // Lull and Alliance Spells SAI_Dispell_Sight = 14, // Dispells and Spells like Bind Sight SAI_Memory_Blur = 27, - SAI_Calm_Song = 43 // Lull and Alliance Songs + SAI_Calm_Song = 43 // Lull and Alliance Songs }; enum RESISTTYPE { @@ -134,7 +134,7 @@ typedef enum { /* 47 */ //ST_PetMaster = 0x2e, // uses the master as target } SpellTargetType; -typedef enum { +typedef enum { DS_DECAY = 244, DS_CHILLED = 245, DS_FREEZING = 246, @@ -293,7 +293,7 @@ typedef enum { //#define SE_Unknown146 146 // not used (Lightning Rod) Electrical Resist? (exp. VoA) #define SE_PercentalHeal 147 // implemented #define SE_StackingCommand_Block 148 // implemented? -#define SE_StackingCommand_Overwrite 149 // implemented? +#define SE_StackingCommand_Overwrite 149 // implemented? #define SE_DeathSave 150 // implemented #define SE_SuspendPet 151 // *not implemented as bonus #define SE_TemporaryPets 152 // implemented @@ -358,7 +358,7 @@ typedef enum { #define SE_AEMelee 211 // implemented #define SE_CastingSkills 212 // *not implemented -Include/Exclude Casting Skill type. (*no longer used on live) #define SE_PetMaxHP 213 // implemented[AA] - increases the maximum hit points of your pet -#define SE_MaxHPChange 214 // implemented +#define SE_MaxHPChange 214 // implemented #define SE_PetAvoidance 215 // implemented[AA] - increases pet ability to avoid melee damage #define SE_Accuracy 216 // implemented #define SE_HeadShot 217 // not implemented as bonus - ability to head shot (base2 = damage) @@ -384,7 +384,7 @@ typedef enum { #define SE_GivePetGroupTarget 237 // implemented[AA] - (Pet Affinity) #define SE_IllusionPersistence 238 // *not implemented - lends persistence to your illusionary disguises, causing them to last until you die or the illusion is forcibly removed. #define SE_FeignedCastOnChance 239 // *not implemented as bonus - ability gives you an increasing chance for your feigned deaths to not be revealed by spells cast upon you. -//#define SE_Unknown240 240 // not used [Likely related to above - you become immune to feign breaking on a resisted spell and have a good chance of feigning through a spell that successfully lands upon you.] +//#define SE_Unknown240 240 // not used [Likely related to above - you become immune to feign breaking on a resisted spell and have a good chance of feigning through a spell that successfully lands upon you.] #define SE_ImprovedReclaimEnergy 241 // not implemented as bonus - increase the amount of mana returned to you when reclaiming your pet. #define SE_ChanceWipeHateList 242 // *not implemented - increases the chance to wipe hate with memory blurr #define SE_CharmBreakChance 243 // implemented - Total Domination @@ -410,7 +410,7 @@ typedef enum { #define SE_TradeSkillMastery 263 // implemented - lets you raise more than one tradeskill above master. #define SE_HastenedAASkill 264 // not implemented as bonus - Use redux field in aa_actions table for this effect #define SE_MasteryofPast 265 // implemented[AA] - Spells less than effect values level can not be fizzled -#define SE_ExtraAttackChance 266 // implemented - increase chance to score an extra attack with a 2-Handed Weapon. +#define SE_ExtraAttackChance 266 // implemented - increase chance to score an extra attack with a 2-Handed Weapon. #define SE_PetDiscipline2 267 // *not implemented - /pet focus, /pet no cast #define SE_ReduceTradeskillFail 268 // *not implemented? - reduces chance to fail with given tradeskill by a percent chance #define SE_MaxBindWound 269 // implemented[AA] - Increase max HP you can bind wound. @@ -425,7 +425,7 @@ typedef enum { #define SE_FinishingBlow 278 // implemented[AA] - chance to do massive damage under 10% HP (base1 = chance, base2 = damage) #define SE_Flurry 279 // implemented #define SE_PetFlurry 280 // implemented[AA] -#define SE_FeignedMinion 281 // *not implemented[AA] ability allows you to instruct your pet to feign death via the '/pet feign' command. value = succeed chance +#define SE_FeignedMinion 281 // *not implemented[AA] ability allows you to instruct your pet to feign death via the '/pet feign' command. value = succeed chance #define SE_ImprovedBindWound 282 // implemented[AA] - increase bind wound amount by percent. #define SE_DoubleSpecialAttack 283 // implemented[AA] - Chance to perform second special attack as monk //#define SE_Unknown284 284 // not used @@ -450,7 +450,7 @@ typedef enum { #define SE_FF_Damage_Amount 303 // implemented - adds direct spell damage #define SE_OffhandRiposteFail 304 // not implemented as bonus - enemy cannot riposte offhand attacks #define SE_MitigateDamageShield 305 // implemented - off hand attacks only (Shielding Resistance) -#define SE_ArmyOfTheDead 306 // *not implemented NecroAA - This ability calls up to five shades of nearby corpses back to life to serve the necromancer. The soulless abominations will mindlessly fight the target until called back to the afterlife some time later. The first rank summons up to three shades that serve for 60 seconds, and each additional rank adds one more possible shade and increases their duration by 15 seconds +#define SE_ArmyOfTheDead 306 // *not implemented NecroAA - This ability calls up to five shades of nearby corpses back to life to serve the necromancer. The soulless abominations will mindlessly fight the target until called back to the afterlife some time later. The first rank summons up to three shades that serve for 60 seconds, and each additional rank adds one more possible shade and increases their duration by 15 seconds #define SE_Appraisal 307 // *not implemented Rogue AA - This ability allows you to estimate the selling price of an item you are holding on your cursor. #define SE_SuspendMinion 308 // not implemented as bonus #define SE_YetAnotherGate 309 // implemented @@ -484,7 +484,7 @@ typedef enum { #define SE_PercentXPIncrease 337 // implemented #define SE_SummonAndResAllCorpses 338 // implemented #define SE_TriggerOnCast 339 // implemented -#define SE_SpellTrigger 340 // implemented - chance to trigger spell +#define SE_SpellTrigger 340 // implemented - chance to trigger spell #define SE_ItemAttackCapIncrease 341 // implemented[AA] - increases the maximum amount of attack you can gain from items. #define SE_ImmuneFleeing 342 // implemented - stop mob from fleeing #define SE_InterruptCasting 343 // implemented - % chance to interrupt spells being cast every tic. Cacophony (8272) @@ -597,8 +597,8 @@ typedef enum { // solar: note this struct is historical, we don't actually need it to be // aligned to anything, but for maintaining it it is kept in the order that -// the fields in the text file are. the numbering is not offset, but field -// number. note that the id field is counted as 0, this way the numbers +// the fields in the text file are. the numbering is not offset, but field +// number. note that the id field is counted as 0, this way the numbers // here match the numbers given to sep in the loading function net.cpp // struct SPDat_Spell_Struct @@ -623,14 +623,14 @@ struct SPDat_Spell_Struct /* 017 */ uint32 buffduration; /* 018 */ uint32 AEDuration; // sentinel, rain of something /* 019 */ uint16 mana; // Mana Used -/* 020 */ int base[EFFECT_COUNT]; //various purposes -/* 032 */ int base2[EFFECT_COUNT]; //various purposes +/* 020 */ int base[EFFECT_COUNT]; //various purposes +/* 032 */ int base2[EFFECT_COUNT]; //various purposes /* 044 */ int16 max[EFFECT_COUNT]; /* 056 */ //uint16 icon; // Spell icon /* 057 */ //uint16 memicon; // Icon on membarthing /* 058 */ int32 components[4]; // reagents /* 062 */ int component_counts[4]; // amount of regents used -/* 066 */ int NoexpendReagent[4]; // focus items (Need but not used; Flame Lick has a Fire Beetle Eye focus.) +/* 066 */ int NoexpendReagent[4]; // focus items (Need but not used; Flame Lick has a Fire Beetle Eye focus.) // If it is a number between 1-4 it means components[number] is a focus and not to expend it // If it is a valid itemid it means this item is a focus as well /* 070 */ uint16 formula[EFFECT_COUNT]; // Spell's value formula @@ -650,54 +650,54 @@ struct SPDat_Spell_Struct /* 121 */ //uint8 TargetAnim; /* 122 */ //uint32 TravelType; /* 123 */ uint16 SpellAffectIndex; -/* 124 */ int8 disallow_sit; // 124: high-end Yaulp spells (V, VI, VII, VIII [Rk 1, 2, & 3], & Gallenite's Bark of Fury -/* 125 */ // 125: Words of the Skeptic +/* 124 */ int8 disallow_sit; // 124: high-end Yaulp spells (V, VI, VII, VIII [Rk 1, 2, & 3], & Gallenite's Bark of Fury +/* 125 */ // 125: Words of the Skeptic /* 126 */ int8 deities[16]; // Deity check. 201 - 216 per http://www.eqemulator.net/wiki/wikka.php?wakka=DeityList // -1: Restrict to Deity; 1: Restrict to Deity, but only used on non-Live (Test Server "Blessing of ...") spells; 0: Don't restrict -/* 142 */ // 142: between 0 & 100 +/* 142 */ // 142: between 0 & 100 // 143: always set to 0 -/* 144 */ //int16 new_icon // Spell icon used by the client in uifiles/default/spells??.tga, both for spell gems & buff window. Looks to depreciate icon & memicon -/* 145 */ //int16 spellanim; // Doesn't look like it's the same as #doanim, so not sure what this is +/* 144 */ //int16 new_icon // Spell icon used by the client in uifiles/default/spells??.tga, both for spell gems & buff window. Looks to depreciate icon & memicon +/* 145 */ //int16 spellanim; // Doesn't look like it's the same as #doanim, so not sure what this is /* 146 */ int8 uninterruptable; // Looks like anything != 0 is uninterruptable. Values are mostly -1, 0, & 1 (Fetid Breath = 90?) /* 147 */ int16 ResistDiff; -/* 148 */ //int dot_stacking_exempt; -/* 149 */ //int deletable; +/* 148 */ //int dot_stacking_exempt; +/* 149 */ //int deletable; /* 150 */ uint16 RecourseLink; -/* 151 */ // 151: -1, 0, or 1 +/* 151 */ // 151: -1, 0, or 1 // 152 & 153: all set to 0 /* 154 */ int8 short_buff_box; // != 0, goes to short buff box. -/* 155 */ int descnum; // eqstr of description of spell -/* 156 */ //int typedescnum; // eqstr of type description -/* 157 */ int effectdescnum; // eqstr of effect description +/* 155 */ int descnum; // eqstr of description of spell +/* 156 */ //int typedescnum; // eqstr of type description +/* 157 */ int effectdescnum; // eqstr of effect description /* 158 */ -/* 162 */ int bonushate; +/* 162 */ int bonushate; /* 163 */ -/* 166 */ int EndurCost; -/* 167 */ int8 EndurTimerIndex; -/* 168 */ //int IsDisciplineBuff; //Will goto the combat window when cast +/* 166 */ int EndurCost; +/* 167 */ int8 EndurTimerIndex; +/* 168 */ //int IsDisciplineBuff; //Will goto the combat window when cast /* 169 */ -/* 173 */ int HateAdded; -/* 174 */ int EndurUpkeep; +/* 173 */ int HateAdded; +/* 174 */ int EndurUpkeep; /* 175 */ -/* 176 */ int numhits; -/* 177 */ int pvpresistbase; -/* 178 */ int pvpresistcalc; -/* 179 */ int pvpresistcap; -/* 180 */ int spell_category; +/* 176 */ int numhits; +/* 177 */ int pvpresistbase; +/* 178 */ int pvpresistcalc; +/* 179 */ int pvpresistcap; +/* 180 */ int spell_category; /* 181 */ -/* 185 */ int8 can_mgb; // 0=no, -1 or 1 = yes -/* 186 */ int dispel_flag; -/* 189 */ int MinResist; -/* 190 */ int MaxResist; -/* 191 */ uint8 viral_targets; -/* 192 */ uint8 viral_timer; -/* 193 */ int NimbusEffect; -/* 194 */ float directional_start; -/* 195 */ float directional_end; -/* 207 */ int spellgroup; -/* 209 */ int powerful_flag; // Need more investigation to figure out what to call this, for now we know -1 makes charm spells not break before their duration is complete, it does alot more though -/* 211 */ int CastRestriction; //Various restriction categories for spells most seem targetable race related but have also seen others for instance only castable if target hp 20% or lower or only if target out of combat -/* 212 */ bool AllowRest; +/* 185 */ int8 can_mgb; // 0=no, -1 or 1 = yes +/* 186 */ int dispel_flag; +/* 189 */ int MinResist; +/* 190 */ int MaxResist; +/* 191 */ uint8 viral_targets; +/* 192 */ uint8 viral_timer; +/* 193 */ int NimbusEffect; +/* 194 */ float directional_start; +/* 195 */ float directional_end; +/* 207 */ int spellgroup; +/* 209 */ int powerful_flag; // Need more investigation to figure out what to call this, for now we know -1 makes charm spells not break before their duration is complete, it does alot more though +/* 211 */ int CastRestriction; //Various restriction categories for spells most seem targetable race related but have also seen others for instance only castable if target hp 20% or lower or only if target out of combat +/* 212 */ bool AllowRest; /* 219 */ //int maxtargets; // not in DB yet, is used for beam and ring spells for target # limits uint8 DamageShieldType; // This field does not exist in spells_us.txt }; diff --git a/common/timeoutmgr.cpp b/common/timeoutmgr.cpp index 99120f029..cb3ee775b 100644 --- a/common/timeoutmgr.cpp +++ b/common/timeoutmgr.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" diff --git a/common/timeoutmgr.h b/common/timeoutmgr.h index 50d9369f8..43e85a2c2 100644 --- a/common/timeoutmgr.h +++ b/common/timeoutmgr.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef TIMEOUT_MANAGER_H #define TIMEOUT_MANAGER_H diff --git a/common/timer.cpp b/common/timer.cpp index 616581bdd..280c49545 100644 --- a/common/timer.cpp +++ b/common/timer.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" // Disgrace: for windows compile @@ -65,7 +65,7 @@ int gettimeofday (timeval *tp, ...) ftime (&tb); - tp->tv_sec = tb.time; + tp->tv_sec = tb.time; tp->tv_usec = tb.millitm * 1000; return 0; @@ -76,13 +76,13 @@ int gettimeofday (timeval *tp, ...) bool Timer::Check(bool iReset) { _CP(Timer_Check); - if (this==0) { + if (this==0) { cerr << "Null timer during ->Check()!?\n"; return true; } // if (!current_time || !start_time || !timer_time) {cerr << "Timer::Check on a timer that does not have a vital member defined."; // return true;} - if (enabled && current_time-start_time > timer_time) { + if (enabled && current_time-start_time > timer_time) { if (iReset) { if (pUseAcurateTiming) start_time += timer_time; @@ -91,9 +91,9 @@ bool Timer::Check(bool iReset) timer_time = set_at_trigger; } return true; - } + } - return false; + return false; } /* This function disables the timer */ @@ -107,36 +107,36 @@ void Timer::Enable() { /* This function set the timer and restart it */ void Timer::Start(uint32 set_timer_time, bool ChangeResetTimer) { - start_time = current_time; + start_time = current_time; enabled = true; - if (set_timer_time != 0) - { + if (set_timer_time != 0) + { timer_time = set_timer_time; if (ChangeResetTimer) set_at_trigger = set_timer_time; - } + } } /* This timer updates the timer without restarting it */ void Timer::SetTimer(uint32 set_timer_time) { - /* If we were disabled before => restart the timer */ - if (!enabled) { + /* If we were disabled before => restart the timer */ + if (!enabled) { start_time = current_time; enabled = true; - } - if (set_timer_time != 0) { + } + if (set_timer_time != 0) { timer_time = set_timer_time; set_at_trigger = set_timer_time; - } + } } uint32 Timer::GetRemainingTime() { - if (enabled) { - if (current_time-start_time > timer_time) + if (enabled) { + if (current_time-start_time > timer_time) return 0; else return (start_time + timer_time) - current_time; - } + } else { return 0xFFFFFFFF; } @@ -159,36 +159,37 @@ void Timer::Trigger() const uint32 Timer::GetCurrentTime() { - return current_time; + return current_time; } //just to keep all time related crap in one place... not really related to timers. const uint32 Timer::GetTimeSeconds() { - struct timeval read_time; + struct timeval read_time; - gettimeofday(&read_time,0); - return(read_time.tv_sec); + gettimeofday(&read_time,0); + return(read_time.tv_sec); } const uint32 Timer::SetCurrentTime() { - struct timeval read_time; - uint32 this_time; + struct timeval read_time; + uint32 this_time; - gettimeofday(&read_time,0); - this_time = read_time.tv_sec * 1000 + read_time.tv_usec / 1000; + gettimeofday(&read_time,0); + this_time = read_time.tv_sec * 1000 + read_time.tv_usec / 1000; - if (last_time == 0) - { + if (last_time == 0) + { current_time = 0; - } - else - { + } + else + { current_time += this_time - last_time; - } + } last_time = this_time; // cerr << "Current time:" << current_time << endl; return current_time; } + diff --git a/common/timer.h b/common/timer.h index b9f489d31..7ac31e489 100644 --- a/common/timer.h +++ b/common/timer.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef TIMER_H #define TIMER_H diff --git a/common/types.h b/common/types.h index 258ee992c..d5ac9297e 100644 --- a/common/types.h +++ b/common/types.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef TYPES_H #define TYPES_H @@ -32,11 +32,11 @@ typedef int64_t int64; #else typedef unsigned char byte; typedef unsigned char uint8; -typedef signed char int8; +typedef signed char int8; typedef unsigned short uint16; -typedef signed short int16; +typedef signed short int16; typedef unsigned int uint32; -typedef signed int int32; +typedef signed int int32; #ifdef _WINDOWS #if defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 @@ -54,7 +54,7 @@ typedef signed long long int64; #endif #ifdef _WINDOWS - #pragma warning( disable : 4200 ) + #pragma warning( disable : 4200 ) #endif #ifndef __cplusplus @@ -72,7 +72,7 @@ typedef const char Const_char; //for perl XS #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp typedef void ThreadReturnType; #define THREAD_RETURN(x) _endthread(); return; #else @@ -110,6 +110,4 @@ typedef const char Const_char; //for perl XS #define DLLFUNC extern "C" #endif - - #endif diff --git a/common/unix.cpp b/common/unix.cpp index 953eeff99..0e69a3b69 100644 --- a/common/unix.cpp +++ b/common/unix.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _WINDOWS @@ -43,7 +43,6 @@ char* strlwr(char* tmp) { } #else - int joe = 1; + int joe = 1; #endif /* !WIN32 */ - diff --git a/common/unix.h b/common/unix.h index dd974ba79..c78d05cb2 100644 --- a/common/unix.h +++ b/common/unix.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _WINDOWS #ifndef __UNIX_H__ @@ -32,3 +32,4 @@ char* strlwr(char* tmp); #endif #endif #endif + diff --git a/common/useperl.h b/common/useperl.h index 8087e4204..3c0bf8f1c 100644 --- a/common/useperl.h +++ b/common/useperl.h @@ -17,11 +17,11 @@ extern "C" { //the perl headers dont do this for us... #ifdef WIN32 #ifndef snprintf -#define snprintf _snprintf +#define snprintf _snprintf #endif #endif -//perl defines these macros and dosent clean them up, lazy bastards. -- I hate them too! +//perl defines these macros and dosent clean them up, lazy bastards. -- I hate them too! #ifdef Copy #undef Copy #endif @@ -42,9 +42,10 @@ extern "C" { //the perl headers dont do this for us... #undef Zero #endif -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif #endif /*EMU_PERL_H_*/ + diff --git a/common/version.h b/common/version.h index 531064665..432d8157f 100644 --- a/common/version.h +++ b/common/version.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _EQEMU_VERSION_H diff --git a/common/worldconn.cpp b/common/worldconn.cpp index 633d9d0e4..d6f6cccb3 100644 --- a/common/worldconn.cpp +++ b/common/worldconn.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -94,8 +94,3 @@ void WorldConnection::Disconnect() { tcpc.Disconnect(); } - - - - - diff --git a/common/worldconn.h b/common/worldconn.h index c4fa4ad17..08ceafb37 100644 --- a/common/worldconn.h +++ b/common/worldconn.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WORLDCONNECTION_H @@ -30,7 +30,7 @@ class ServerPacket; class WorldConnection { public: WorldConnection(EmuTCPConnection::ePacketMode mode, const char *password = ""); - virtual ~WorldConnection(); + virtual ~WorldConnection(); virtual void Process(); bool SendPacket(ServerPacket* pack); diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt index 663f2e674..7c0995411 100644 --- a/eqlaunch/CMakeLists.txt +++ b/eqlaunch/CMakeLists.txt @@ -1,14 +1,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(eqlaunch_sources - eqlaunch.cpp - worldserver.cpp - ZoneLaunch.cpp + eqlaunch.cpp + worldserver.cpp + ZoneLaunch.cpp ) SET(eqlaunch_headers - worldserver.h - ZoneLaunch.h + worldserver.h + ZoneLaunch.h ) ADD_EXECUTABLE(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers}) @@ -17,21 +17,21 @@ TARGET_LINK_LIBRARIES(eqlaunch Common debug ${MySQL_LIBRARY_DEBUG} optimized ${M IF(MSVC) - SET_TARGET_PROPERTIES(eqlaunch PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(eqlaunch "Ws2_32.lib") + SET_TARGET_PROPERTIES(eqlaunch PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(eqlaunch "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(eqlaunch "WS2_32") + TARGET_LINK_LIBRARIES(eqlaunch "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(eqlaunch "dl") - TARGET_LINK_LIBRARIES(eqlaunch "z") - TARGET_LINK_LIBRARIES(eqlaunch "m") - TARGET_LINK_LIBRARIES(eqlaunch "rt") - TARGET_LINK_LIBRARIES(eqlaunch "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(eqlaunch "dl") + TARGET_LINK_LIBRARIES(eqlaunch "z") + TARGET_LINK_LIBRARIES(eqlaunch "m") + TARGET_LINK_LIBRARIES(eqlaunch "rt") + TARGET_LINK_LIBRARIES(eqlaunch "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/eqlaunch/ZoneLaunch.cpp b/eqlaunch/ZoneLaunch.cpp index 3e7efba77..e1332fdce 100644 --- a/eqlaunch/ZoneLaunch.cpp +++ b/eqlaunch/ZoneLaunch.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -34,16 +34,16 @@ void ZoneLaunch::InitStartTimer() { } ZoneLaunch::ZoneLaunch(WorldServer *world, const char *launcher_name, - const char *zone_name, const EQEmuConfig *config) +const char *zone_name, const EQEmuConfig *config) : m_state(StateStartPending), - m_world(world), - m_zone(zone_name), - m_launcherName(launcher_name), - m_config(config), - m_timer(config->RestartWait), - m_ref(ProcLauncher::ProcError), - m_startCount(0), - m_killFails(0) + m_world(world), + m_zone(zone_name), + m_launcherName(launcher_name), + m_config(config), + m_timer(config->RestartWait), + m_ref(ProcLauncher::ProcError), + m_startCount(0), + m_killFails(0) { //trigger the startup timer initially so it boots the first time. m_timer.Trigger(); @@ -250,38 +250,3 @@ void ZoneLaunch::OnTerminate(const ProcLauncher::ProcRef &ref, const ProcLaunche SendStatus(); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eqlaunch/ZoneLaunch.h b/eqlaunch/ZoneLaunch.h index 0f684af0e..2694e5bd5 100644 --- a/eqlaunch/ZoneLaunch.h +++ b/eqlaunch/ZoneLaunch.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ZONELAUNCH_H_ #define ZONELAUNCH_H_ @@ -75,13 +75,4 @@ private: static Timer s_startTimer; }; - - - - - - - - - #endif /*ZONELAUNCH_H_*/ diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp index 4c7950025..121fc1b55 100644 --- a/eqlaunch/eqlaunch.cpp +++ b/eqlaunch/eqlaunch.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -37,8 +37,8 @@ bool RunLoops = false; void CatchSignal(int sig_num); int main(int argc, char *argv[]) { - RegisterExecutablePlatform(ExePlatformLaunch); - set_exception_handler(); + RegisterExecutablePlatform(ExePlatformLaunch); + set_exception_handler(); string launcher_name; if(argc == 2) { @@ -57,8 +57,8 @@ int main(int argc, char *argv[]) { const EQEmuConfig *Config = EQEmuConfig::get(); /* - * Setup nice signal handlers - */ + * Setup nice signal handlers + */ if (signal(SIGINT, CatchSignal) == SIG_ERR) { _log(LAUNCHER__ERROR, "Could not set signal handler"); return 1; @@ -74,8 +74,8 @@ int main(int argc, char *argv[]) { } /* - * Add '.' to LD_LIBRARY_PATH - */ + * Add '.' to LD_LIBRARY_PATH + */ //the storage passed to putenv must remain valid... crazy unix people const char *pv = getenv("LD_LIBRARY_PATH"); if(pv == nullptr) { @@ -109,18 +109,18 @@ int main(int argc, char *argv[]) { Timer::SetCurrentTime(); /* - * Process the world connection - */ + * Process the world connection + */ world.Process(); /* - * Let the process manager look for dead children - */ + * Let the process manager look for dead children + */ launch->Process(); /* - * Give all zones a chance to process. - */ + * Give all zones a chance to process. + */ zone = zones.begin(); zend = zones.end(); for(; zone != zend; zone++) { @@ -129,8 +129,8 @@ int main(int argc, char *argv[]) { } /* - * Kill off any zones which have stopped - */ + * Kill off any zones which have stopped + */ while(!to_remove.empty()) { string rem = *to_remove.begin(); to_remove.erase(rem); @@ -150,8 +150,8 @@ int main(int argc, char *argv[]) { } /* - * Take a nice nap until next cycle - */ + * Take a nice nap until next cycle + */ if(zones.empty()) Sleep(5000); else diff --git a/eqlaunch/worldserver.cpp b/eqlaunch/worldserver.cpp index 672525dbd..d97b5877f 100644 --- a/eqlaunch/worldserver.cpp +++ b/eqlaunch/worldserver.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "worldserver.h" @@ -24,9 +24,9 @@ WorldServer::WorldServer(map &zones, const char *name, const EQEmuConfig *config) : WorldConnection(EmuTCPConnection::packetModeLauncher, config->SharedKey.c_str()), - m_name(name), - m_config(config), - m_zones(zones) + m_name(name), + m_config(config), + m_zones(zones) { } diff --git a/eqlaunch/worldserver.h b/eqlaunch/worldserver.h index 113dc1ae4..ee74c3916 100644 --- a/eqlaunch/worldserver.h +++ b/eqlaunch/worldserver.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WORLDSERVER_H #define WORLDSERVER_H @@ -29,7 +29,7 @@ class EQEmuConfig; class WorldServer : public WorldConnection { public: WorldServer(std::map &zones, const char *name, const EQEmuConfig *config); - virtual ~WorldServer(); + virtual ~WorldServer(); virtual void Process(); diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt index 96599d4b3..f79ae54a0 100644 --- a/loginserver/CMakeLists.txt +++ b/loginserver/CMakeLists.txt @@ -1,41 +1,41 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(eqlogin_sources - Client.cpp - ClientManager.cpp - Config.cpp - DatabaseMySQL.cpp - DatabasePostgreSQL.cpp - ErrorLog.cpp - Main.cpp - ServerManager.cpp - WorldServer.cpp + Client.cpp + ClientManager.cpp + Config.cpp + DatabaseMySQL.cpp + DatabasePostgreSQL.cpp + ErrorLog.cpp + Main.cpp + ServerManager.cpp + WorldServer.cpp ) IF(MSVC OR MINGW) - SET(eqlogin_sources ${eqlogin_sources} Encryption.cpp) + SET(eqlogin_sources ${eqlogin_sources} Encryption.cpp) ENDIF(MSVC OR MINGW) SET(eqlogin_headers - Client.h - ClientManager.h - Config.h - Database.h - DatabaseMySQL.h - DatabasePostgreSQL.h - Encryption.h - EQCryptoAPI.h - ErrorLog.h - LoginServer.h - LoginStructures.h - Options.h - ServerManager.h - WorldServer.h + Client.h + ClientManager.h + Config.h + Database.h + DatabaseMySQL.h + DatabasePostgreSQL.h + Encryption.h + EQCryptoAPI.h + ErrorLog.h + LoginServer.h + LoginStructures.h + Options.h + ServerManager.h + WorldServer.h ) IF(UNIX) - SET(EQEMU_UNIX_ENC_LIBRARY_LOC "${CMAKE_SOURCE_DIR}/dependencies" CACHE PATH "Location of EQEmuAuthCrypto and cryptopp") - LINK_DIRECTORIES(${EQEMU_UNIX_ENC_LIBRARY_LOC}) + SET(EQEMU_UNIX_ENC_LIBRARY_LOC "${CMAKE_SOURCE_DIR}/dependencies" CACHE PATH "Location of EQEmuAuthCrypto and cryptopp") + LINK_DIRECTORIES(${EQEMU_UNIX_ENC_LIBRARY_LOC}) ENDIF(UNIX) ADD_EXECUTABLE(loginserver ${eqlogin_sources} ${eqlogin_headers}) @@ -44,23 +44,23 @@ TARGET_LINK_LIBRARIES(loginserver Common debug ${MySQL_LIBRARY_DEBUG} optimized IF(MSVC) - SET_TARGET_PROPERTIES(loginserver PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(loginserver "Ws2_32.lib") + SET_TARGET_PROPERTIES(loginserver PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(loginserver "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(loginserver "WS2_32") + TARGET_LINK_LIBRARIES(loginserver "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(loginserver "dl") - TARGET_LINK_LIBRARIES(loginserver "z") - TARGET_LINK_LIBRARIES(loginserver "m") - TARGET_LINK_LIBRARIES(loginserver "rt") - TARGET_LINK_LIBRARIES(loginserver "pthread") - TARGET_LINK_LIBRARIES(loginserver "EQEmuAuthCrypto") - TARGET_LINK_LIBRARIES(loginserver "cryptopp") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(loginserver "dl") + TARGET_LINK_LIBRARIES(loginserver "z") + TARGET_LINK_LIBRARIES(loginserver "m") + TARGET_LINK_LIBRARIES(loginserver "rt") + TARGET_LINK_LIBRARIES(loginserver "pthread") + TARGET_LINK_LIBRARIES(loginserver "EQEmuAuthCrypto") + TARGET_LINK_LIBRARIES(loginserver "cryptopp") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/loginserver/Client.cpp b/loginserver/Client.cpp index 0ae477ff0..9fd96118a 100644 --- a/loginserver/Client.cpp +++ b/loginserver/Client.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "Client.h" #include "ErrorLog.h" @@ -137,8 +137,8 @@ void Client::Handle_SessionReady(const char* data, unsigned int size) status = cs_waiting_for_login; /** - * The packets are mostly the same but slightly different between the two versions. - */ + * The packets are mostly the same but slightly different between the two versions. + */ if(version == cv_sod) { EQApplicationPacket *outapp = new EQApplicationPacket(OP_ChatMessage, 17); diff --git a/loginserver/Client.h b/loginserver/Client.h index b670e88c0..1cb248344 100644 --- a/loginserver/Client.h +++ b/loginserver/Client.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_CLIENT_H #define EQEMU_CLIENT_H @@ -49,85 +49,85 @@ enum LoginMode }; /** - * Client class, controls a single client and it's - * connection to the login server. - */ +* Client class, controls a single client and it's +* connection to the login server. +*/ class Client { public: /** - * Constructor, sets our connection to c and version to v - */ + * Constructor, sets our connection to c and version to v + */ Client(EQStream *c, ClientVersion v); /** - * Destructor. - */ + * Destructor. + */ ~Client() { } /** - * Processes the client's connection and does various actions. - */ + * Processes the client's connection and does various actions. + */ bool Process(); /** - * Sends our reply to session ready packet. - */ + * Sends our reply to session ready packet. + */ void Handle_SessionReady(const char* data, unsigned int size); /** - * Verifies login and send a reply. - */ + * Verifies login and send a reply. + */ void Handle_Login(const char* data, unsigned int size); /** - * Sends a packet to the requested server to see if the client is allowed or not. - */ + * Sends a packet to the requested server to see if the client is allowed or not. + */ void Handle_Play(const char* data); /** - * Sends a server list packet to the client. - */ + * Sends a server list packet to the client. + */ void SendServerListPacket(); /** - * Sends the input packet to the client and clears our play response states. - */ + * Sends the input packet to the client and clears our play response states. + */ void SendPlayResponse(EQApplicationPacket *outapp); /** - * Generates a random login key for the client during login. - */ + * Generates a random login key for the client during login. + */ void GenerateKey(); /** - * Gets the account id of this client. - */ + * Gets the account id of this client. + */ unsigned int GetAccountID() const { return account_id; } /** - * Gets the account name of this client. - */ + * Gets the account name of this client. + */ string GetAccountName() const { return account_name; } /** - * Gets the key generated at login for this client. - */ + * Gets the key generated at login for this client. + */ string GetKey() const { return key; } /** - * Gets the server selected to be played on for this client. - */ + * Gets the server selected to be played on for this client. + */ unsigned int GetPlayServerID() const { return play_server_id; } /** - * Gets the play sequence state for this client. - */ + * Gets the play sequence state for this client. + */ unsigned int GetPlaySequence() const { return play_sequence_id; } /** - * Gets the connection for this client. - */ + * Gets the connection for this client. + */ EQStream *GetConnection() { return connection; } private: EQStream *connection; diff --git a/loginserver/ClientManager.cpp b/loginserver/ClientManager.cpp index c6ad7093f..06b44aaf4 100644 --- a/loginserver/ClientManager.cpp +++ b/loginserver/ClientManager.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "ClientManager.h" #include "ErrorLog.h" diff --git a/loginserver/ClientManager.h b/loginserver/ClientManager.h index 4b279c116..287a9212d 100644 --- a/loginserver/ClientManager.h +++ b/loginserver/ClientManager.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_CLIENTMANAGER_H #define EQEMU_CLIENTMANAGER_H @@ -28,45 +28,45 @@ using namespace std; /** - * Client manager class, holds all the client objects and does basic processing. - */ +* Client manager class, holds all the client objects and does basic processing. +*/ class ClientManager { public: /** - * Constructor, sets up the stream factories and opcode managers. - */ + * Constructor, sets up the stream factories and opcode managers. + */ ClientManager(); /** - * Destructor, shuts down the streams and opcode managers. - */ + * Destructor, shuts down the streams and opcode managers. + */ ~ClientManager(); /** - * Processes every client in the internal list, removes them if necessary. - */ + * Processes every client in the internal list, removes them if necessary. + */ void Process(); /** - * Sends a new server list to every client. - */ + * Sends a new server list to every client. + */ void UpdateServerList(); /** - * Removes a client with a certain account id. - */ + * Removes a client with a certain account id. + */ void RemoveExistingClient(unsigned int account_id); /** - * Gets a client (if exists) by their account id. - */ + * Gets a client (if exists) by their account id. + */ Client *GetClient(unsigned int account_id); private: /** - * Processes disconnected clients, removes them if necessary. - */ + * Processes disconnected clients, removes them if necessary. + */ void ProcessDisconnect(); list clients; diff --git a/loginserver/Config.cpp b/loginserver/Config.cpp index 487a88588..419a668d0 100644 --- a/loginserver/Config.cpp +++ b/loginserver/Config.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "Config.h" @@ -21,10 +21,10 @@ extern ErrorLog *server_log; /** - * Retrieves the variable we want from our title or theme - * First gets the map from the title - * Then gets the argument from the map we got from title - */ +* Retrieves the variable we want from our title or theme +* First gets the map from the title +* Then gets the argument from the map we got from title +*/ string Config::GetVariable(string title, string parameter) { map >::iterator iter = vars.find(title); @@ -41,9 +41,9 @@ string Config::GetVariable(string title, string parameter) } /** - * Opens a file and passes it to the tokenizer - * Then it parses the tokens returned and puts them into titles and variables. - */ +* Opens a file and passes it to the tokenizer +* Then it parses the tokens returned and puts them into titles and variables. +*/ void Config::Parse(const char *file_name) { if(file_name == nullptr) @@ -138,10 +138,10 @@ void Config::Parse(const char *file_name) } /** - * Pretty basic lexical analyzer - * Breaks up the input character stream into tokens and puts them into the list provided. - * Ignores # as a line comment - */ +* Pretty basic lexical analyzer +* Breaks up the input character stream into tokens and puts them into the list provided. +* Ignores # as a line comment +*/ void Config::Tokenize(FILE *input, list &tokens) { char c = fgetc(input); diff --git a/loginserver/Config.h b/loginserver/Config.h index c9b2b1bca..e00f8447d 100644 --- a/loginserver/Config.h +++ b/loginserver/Config.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_CONFIG_H #define EQEMU_CONFIG_H @@ -37,13 +37,13 @@ public: ~Config() { } /** - * Parses the selected file for variables, will clear current variables if selected. - */ + * Parses the selected file for variables, will clear current variables if selected. + */ virtual void Parse(const char *file_name); /** - * Gets a variable if it exists. - */ + * Gets a variable if it exists. + */ string GetVariable(string title, string parameter); protected: @@ -51,11 +51,11 @@ protected: private: /** - * Breaks our input up into tokens for Parse(). - * This is private because it's not intended to be overloaded by a derived class which - * may get it's input from other places than a C file pointer. (a http get request for example). - * The programmer of a derived class would be expected to make their own Tokenize function for their own Parse(). - */ + * Breaks our input up into tokens for Parse(). + * This is private because it's not intended to be overloaded by a derived class which + * may get it's input from other places than a C file pointer. (a http get request for example). + * The programmer of a derived class would be expected to make their own Tokenize function for their own Parse(). + */ void Tokenize(FILE* input, list &tokens); }; diff --git a/loginserver/Database.h b/loginserver/Database.h index 71917518b..318d15793 100644 --- a/loginserver/Database.h +++ b/loginserver/Database.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_DATABASE_H #define EQEMU_DATABASE_H @@ -26,8 +26,8 @@ using namespace std; //#define EQEMU_POSTGRESQL_ENABLED /** - * Base database class, intended to be extended. - */ +* Base database class, intended to be extended. +*/ class Database { public: @@ -35,43 +35,43 @@ public: virtual ~Database() { } /** - * Returns true if the database successfully connected. - */ + * Returns true if the database successfully connected. + */ virtual bool IsConnected() { return false; } /** - * Retrieves the login data (password hash and account id) from the account name provided - * Needed for client login procedure. - * Returns true if the record was found, false otherwise. - */ + * Retrieves the login data (password hash and account id) from the account name provided + * Needed for client login procedure. + * Returns true if the record was found, false otherwise. + */ virtual bool GetLoginDataFromAccountName(string name, string &password, unsigned int &id) { return false; } /** - * Retrieves the world registration from the long and short names provided. - * Needed for world login procedure. - * Returns true if the record was found, false otherwise. - */ + * Retrieves the world registration from the long and short names provided. + * Needed for world login procedure. + * Returns true if the record was found, false otherwise. + */ virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password) { return false; } /** - * Updates the ip address of the client with account id = id - */ + * Updates the ip address of the client with account id = id + */ virtual void UpdateLSAccountData(unsigned int id, string ip_address) { } /** - * Updates or creates the login server account with info from world server - */ + * Updates or creates the login server account with info from world server + */ virtual void UpdateLSAccountInfo(unsigned int id, string name, string password, string email) { } /** - * Updates the ip address of the world with account id = id - */ + * Updates the ip address of the world with account id = id + */ virtual void UpdateWorldRegistration(unsigned int id, string long_name, string ip_address) { } /** - * Creates new world registration for unregistered servers and returns new id - */ + * Creates new world registration for unregistered servers and returns new id + */ virtual bool CreateWorldRegistration(string long_name, string short_name, unsigned int &id) { return false; } protected: string user, pass, host, port, name; diff --git a/loginserver/DatabaseMySQL.cpp b/loginserver/DatabaseMySQL.cpp index 9294cb059..780fbac17 100644 --- a/loginserver/DatabaseMySQL.cpp +++ b/loginserver/DatabaseMySQL.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "Database.h" diff --git a/loginserver/DatabaseMySQL.h b/loginserver/DatabaseMySQL.h index 9a1cea425..21e3f10c4 100644 --- a/loginserver/DatabaseMySQL.h +++ b/loginserver/DatabaseMySQL.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_DATABASEMYSQL_H #define EQEMU_DATABASEMYSQL_H @@ -29,64 +29,64 @@ using namespace std; /** - * Mysql Database class - */ +* Mysql Database class +*/ class DatabaseMySQL : public Database { public: /** - * Constructor, sets our database to null. - */ + * Constructor, sets our database to null. + */ DatabaseMySQL() { db = nullptr; } /** - * Constructor, tries to set our database to connect to the supplied options. - */ + * Constructor, tries to set our database to connect to the supplied options. + */ DatabaseMySQL(string user, string pass, string host, string port, string name); /** - * Destructor, frees our database if needed. - */ + * Destructor, frees our database if needed. + */ virtual ~DatabaseMySQL(); /** - * @return Returns true if the database successfully connected. - */ + * @return Returns true if the database successfully connected. + */ virtual bool IsConnected() { return (db != nullptr); } /** - * Retrieves the login data (password hash and account id) from the account name provided - * Needed for client login procedure. - * Returns true if the record was found, false otherwise. - */ + * Retrieves the login data (password hash and account id) from the account name provided + * Needed for client login procedure. + * Returns true if the record was found, false otherwise. + */ virtual bool GetLoginDataFromAccountName(string name, string &password, unsigned int &id); /** - * Retrieves the world registration from the long and short names provided. - * Needed for world login procedure. - * Returns true if the record was found, false otherwise. - */ + * Retrieves the world registration from the long and short names provided. + * Needed for world login procedure. + * Returns true if the record was found, false otherwise. + */ virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password); /** - * Updates the ip address of the client with account id = id - */ + * Updates the ip address of the client with account id = id + */ virtual void UpdateLSAccountData(unsigned int id, string ip_address); /** - * Updates or creates the login server account with info from world server - */ + * Updates or creates the login server account with info from world server + */ virtual void UpdateLSAccountInfo(unsigned int id, string name, string password, string email); /** - * Updates the ip address of the world with account id = id - */ + * Updates the ip address of the world with account id = id + */ virtual void UpdateWorldRegistration(unsigned int id, string long_name, string ip_address); /** - * Creates new world registration for unregistered servers and returns new id - */ + * Creates new world registration for unregistered servers and returns new id + */ virtual bool CreateWorldRegistration(string long_name, string short_name, unsigned int &id); protected: string user, pass, host, port, name; diff --git a/loginserver/DatabasePostgreSQL.cpp b/loginserver/DatabasePostgreSQL.cpp index f6a3c5ac4..9effac49b 100644 --- a/loginserver/DatabasePostgreSQL.cpp +++ b/loginserver/DatabasePostgreSQL.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "Database.h" @@ -61,9 +61,9 @@ bool DatabasePostgreSQL::GetLoginDataFromAccountName(string name, string &passwo } /** - * PostgreSQL doesn't have automatic reconnection option like mysql - * but it's easy to check and reconnect - */ + * PostgreSQL doesn't have automatic reconnection option like mysql + * but it's easy to check and reconnect + */ if(PQstatus(db) != CONNECTION_OK) { PQreset(db); @@ -109,9 +109,9 @@ bool DatabasePostgreSQL::GetWorldRegistration(string long_name, string short_nam } /** - * PostgreSQL doesn't have automatic reconnection option like mysql - * but it's easy to check and reconnect - */ + * PostgreSQL doesn't have automatic reconnection option like mysql + * but it's easy to check and reconnect + */ if(PQstatus(db) != CONNECTION_OK) { PQreset(db); @@ -166,9 +166,9 @@ void DatabasePostgreSQL::UpdateLSAccountData(unsigned int id, string ip_address) } /** - * PostgreSQL doesn't have automatic reconnection option like mysql - * but it's easy to check and reconnect - */ + * PostgreSQL doesn't have automatic reconnection option like mysql + * but it's easy to check and reconnect + */ if(PQstatus(db) != CONNECTION_OK) { PQreset(db); @@ -201,9 +201,9 @@ void DatabasePostgreSQL::UpdateWorldRegistration(unsigned int id, string long_na } /** - * PostgreSQL doesn't have automatic reconnection option like mysql - * but it's easy to check and reconnect - */ + * PostgreSQL doesn't have automatic reconnection option like mysql + * but it's easy to check and reconnect + */ if(PQstatus(db) != CONNECTION_OK) { PQreset(db); diff --git a/loginserver/DatabasePostgreSQL.h b/loginserver/DatabasePostgreSQL.h index ef7ad30ed..8d2685fcc 100644 --- a/loginserver/DatabasePostgreSQL.h +++ b/loginserver/DatabasePostgreSQL.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_DATABASEPOSTGRESQL_H #define EQEMU_DATABASEPOSTGRESQL_H @@ -35,53 +35,53 @@ class DatabasePostgreSQL : public Database { public: /** - * Constructor, sets our database to null. - */ + * Constructor, sets our database to null. + */ DatabasePostgreSQL() { db = nullptr; } /** - * Constructor, tries to set our database to connect to the supplied options. - */ + * Constructor, tries to set our database to connect to the supplied options. + */ DatabasePostgreSQL(string user, string pass, string host, string port, string name); /** - * Destructor, frees our database if needed. - */ + * Destructor, frees our database if needed. + */ virtual ~DatabasePostgreSQL(); /** - * Returns true if the database successfully connected. - */ + * Returns true if the database successfully connected. + */ virtual bool IsConnected() { return (db != nullptr); } /** - * Retrieves the login data (password hash and account id) from the account name provided - * Needed for client login procedure. - * Returns true if the record was found, false otherwise. - */ + * Retrieves the login data (password hash and account id) from the account name provided + * Needed for client login procedure. + * Returns true if the record was found, false otherwise. + */ virtual bool GetLoginDataFromAccountName(string name, string &password, unsigned int &id); /** - * Retrieves the world registration from the long and short names provided. - * Needed for world login procedure. - * Returns true if the record was found, false otherwise. - */ + * Retrieves the world registration from the long and short names provided. + * Needed for world login procedure. + * Returns true if the record was found, false otherwise. + */ virtual bool GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id, unsigned int &trusted, string &list_desc, string &account, string &password); /** - * Updates the ip address of the client with account id = id - */ + * Updates the ip address of the client with account id = id + */ virtual void UpdateLSAccountData(unsigned int id, string ip_address); /** - * Updates the ip address of the world with account id = id - */ + * Updates the ip address of the world with account id = id + */ virtual void UpdateWorldRegistration(unsigned int id, string long_name, string ip_address); /** - * Creates new world registration for unregistered servers and returns new id - */ + * Creates new world registration for unregistered servers and returns new id + */ virtual bool CreateWorldRegistration(string long_name, string short_name, unsigned int &id); protected: string user, pass, host, port, name; diff --git a/loginserver/EQCryptoAPI.h b/loginserver/EQCryptoAPI.h index b0a890193..d722bcb53 100644 --- a/loginserver/EQCryptoAPI.h +++ b/loginserver/EQCryptoAPI.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMUCAPI__H #define EQEMUCAPI__H @@ -23,3 +23,4 @@ char* Encrypt(const char* buffer, unsigned int bufferSize, unsigned int &outSize void _HeapDeleteCharBuffer(char *buffer); #endif + diff --git a/loginserver/Encryption.cpp b/loginserver/Encryption.cpp index 66498965d..129ab18e3 100644 --- a/loginserver/Encryption.cpp +++ b/loginserver/Encryption.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "Encryption.h" @@ -100,7 +100,7 @@ bool Encryption::Load(const char *name) { return false; } - else + else { SetLastError(0); } diff --git a/loginserver/Encryption.h b/loginserver/Encryption.h index 10c432794..907b3e325 100644 --- a/loginserver/Encryption.h +++ b/loginserver/Encryption.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_ENCRYPTION_H #define EQEMU_ENCRYPTION_H @@ -29,70 +29,70 @@ typedef char*(*DLLFUNC_Encrypt)(const char*, unsigned int, unsigned int&); typedef void(*DLLFUNC_HeapDelete)(char*); /** - * Basic windows encryption plugin. - * Handles the managment of the plugin. - */ +* Basic windows encryption plugin. +* Handles the managment of the plugin. +*/ class Encryption { public: /** - * Constructor, sets all member pointers to nullptr. - */ + * Constructor, sets all member pointers to nullptr. + */ Encryption() : h_dll(nullptr), encrypt_func(nullptr), decrypt_func(nullptr), delete_func(nullptr) { }; /** - * Destructor, if it's loaded it unloads this library. - */ + * Destructor, if it's loaded it unloads this library. + */ ~Encryption() { if(Loaded()) { Unload(); } } /** - * Returns true if the dll is loaded, otherwise false. - */ + * Returns true if the dll is loaded, otherwise false. + */ inline bool Loaded() { return (h_dll != nullptr); } /** - * Loads the plugin. - * True if there are no errors, false if there was an error. - */ + * Loads the plugin. + * True if there are no errors, false if there was an error. + */ bool LoadCrypto(string name); /** - * Wrapper around the plugin's decrypt function. - */ + * Wrapper around the plugin's decrypt function. + */ char* DecryptUsernamePassword(const char* encryptedBuffer, unsigned int bufferSize, int mode); /** - * Wrapper around the plugin's encrypt function. - */ + * Wrapper around the plugin's encrypt function. + */ char* Encrypt(const char* buffer, unsigned int bufferSize, unsigned int &outSize); /** - * Wrapper around the plugin's delete function. - */ + * Wrapper around the plugin's delete function. + */ void DeleteHeap(char* buffer); private: /** - * Loads the named dll into memory. - * Returns true if there were no errors, otherwise return false. - */ + * Loads the named dll into memory. + * Returns true if there were no errors, otherwise return false. + */ bool Load(const char *name); /** - * Frees the dll from memory if it's loaded. - */ + * Frees the dll from memory if it's loaded. + */ void Unload(); /** - * Similar in function to *sym = GetProcAddress(h_dll, name). - * Returns true if there were no errors, false otherwise. - */ + * Similar in function to *sym = GetProcAddress(h_dll, name). + * Returns true if there were no errors, false otherwise. + */ bool GetSym(const char *name, void **sym); /** - * Similar in function to return GetProcAddress(h_dll, name). - * Returns a pointer to the function if it is found, null on an error. - */ + * Similar in function to return GetProcAddress(h_dll, name). + * Returns a pointer to the function if it is found, null on an error. + */ void *GetSym(const char *name); HINSTANCE h_dll; diff --git a/loginserver/ErrorLog.cpp b/loginserver/ErrorLog.cpp index ecc5a7ba6..db5b6c89a 100644 --- a/loginserver/ErrorLog.cpp +++ b/loginserver/ErrorLog.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include "ErrorLog.h" @@ -207,3 +207,4 @@ void ErrorLog::LogPacket(eqLogType type, const char *data, size_t size) log_mutex->unlock(); } + diff --git a/loginserver/ErrorLog.h b/loginserver/ErrorLog.h index 13f2a2ab0..bcc8fb9c7 100644 --- a/loginserver/ErrorLog.h +++ b/loginserver/ErrorLog.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_ERROR_LOG_H #define EQEMU_ERROR_LOG_H @@ -53,23 +53,23 @@ class ErrorLog { public: /** - * Constructor: opens the log file for writing and creates our mutex for writing to the log. - */ + * Constructor: opens the log file for writing and creates our mutex for writing to the log. + */ ErrorLog(const char* file_name); /** - * Closes the file and destroys the mutex. - */ + * Closes the file and destroys the mutex. + */ ~ErrorLog(); /** - * Writes to the log system a variable message. - */ + * Writes to the log system a variable message. + */ void Log(eqLogType type, const char *message, ...); /** - * Writes to the log system a packet. - */ + * Writes to the log system a packet. + */ void LogPacket(eqLogType type, const char *data, size_t size); protected: diff --git a/loginserver/LoginServer.h b/loginserver/LoginServer.h index f64cd5fae..54e62e551 100644 --- a/loginserver/LoginServer.h +++ b/loginserver/LoginServer.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_LOGINSERVER_H #define EQEMU_LOGINSERVER_H @@ -29,16 +29,16 @@ #include "ClientManager.h" /** - * Login server struct, contains every variable for the server that needs to exist - * outside the scope of main(). - */ +* Login server struct, contains every variable for the server that needs to exist +* outside the scope of main(). +*/ struct LoginServer { public: /** - * I don't really like how this looks with all the ifdefs... - * but it's the most trivial way to do this. - */ + * I don't really like how this looks with all the ifdefs... + * but it's the most trivial way to do this. + */ #ifdef WIN32 LoginServer() : config(nullptr), db(nullptr), eq_crypto(nullptr), SM(nullptr) { } #else diff --git a/loginserver/LoginStructures.h b/loginserver/LoginStructures.h index 01c6ab9d5..60d10a653 100644 --- a/loginserver/LoginStructures.h +++ b/loginserver/LoginStructures.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_LOGINSTRUCTURES_H #define EQEMU_LOGINSTRUCTURES_H @@ -21,11 +21,11 @@ #pragma pack(1) struct LoginChatMessage_Struct { - short Unknown0; + short Unknown0; uint32 Unknown1; uint32 Unknown2; uint32 Unknown3; - uint8 Unknown4; + uint8 Unknown4; char ChatMessage[1]; }; @@ -35,7 +35,7 @@ struct LoginLoginRequest_Struct { short unknown3; short unknown4; short unknown5; - char unknown6[16]; + char unknown6[16]; }; struct LoginLoginAccepted_Struct { @@ -44,7 +44,7 @@ struct LoginLoginAccepted_Struct { short unknown3; short unknown4; short unknown5; - char encrypt[80]; + char encrypt[80]; }; struct Login_ReplyBlock_Struct @@ -74,7 +74,7 @@ struct LoginLoginFailed_Struct { short unknown3; short unknown4; short unknown5; - char unknown6[74]; + char unknown6[74]; }; struct ServerListHeader_Struct { @@ -104,9 +104,9 @@ struct PlayEverquestResponse_Struct { }; static const unsigned char FailedLoginResponseData[] = { - 0xf6, 0x85, 0x9c, 0x23, 0x57, 0x7e, 0x3e, 0x55, 0xb3, 0x4c, 0xf8, 0xc8, 0xcb, 0x77, 0xd5, 0x16, - 0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3, 0x4c, 0xf8, 0xc8, 0xcb, 0x77, 0xd5, 0x16, - 0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3 }; + 0xf6, 0x85, 0x9c, 0x23, 0x57, 0x7e, 0x3e, 0x55, 0xb3, 0x4c, 0xf8, 0xc8, 0xcb, 0x77, 0xd5, 0x16, + 0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3, 0x4c, 0xf8, 0xc8, 0xcb, 0x77, 0xd5, 0x16, + 0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3 }; #pragma pack() diff --git a/loginserver/Main.cpp b/loginserver/Main.cpp index cc4ed579d..fa127673f 100644 --- a/loginserver/Main.cpp +++ b/loginserver/Main.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/types.h" @@ -40,8 +40,8 @@ void CatchSignal(int sig_num) int main() { - RegisterExecutablePlatform(ExePlatformLogin); - set_exception_handler(); + RegisterExecutablePlatform(ExePlatformLogin); + set_exception_handler(); //Create our error log, is of format login_.log time_t current_time = time(nullptr); diff --git a/loginserver/Options.h b/loginserver/Options.h index 74d1904b3..38d5d109f 100644 --- a/loginserver/Options.h +++ b/loginserver/Options.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_OPTIONS_H #define EQEMU_OPTIONS_H @@ -26,10 +26,10 @@ class Options { public: /** - * Constructor, sets the default options. - */ + * Constructor, sets the default options. + */ Options() : - allow_unregistered(true), + allow_unregistered(true), trace(false), dump_in_packets(false), dump_out_packets(false), @@ -38,123 +38,123 @@ public: reject_duplicate_servers(false) { } /** - * Sets allow_unregistered. - */ + * Sets allow_unregistered. + */ inline void AllowUnregistered(bool b) { allow_unregistered = b; } /** - * Returns the value of allow_unregistered. - */ + * Returns the value of allow_unregistered. + */ inline bool IsUnregisteredAllowed() const { return allow_unregistered; } /** - * Sets trace. - */ + * Sets trace. + */ inline void Trace(bool b) { trace = b; } /** - * Returns the value of trace. - */ + * Returns the value of trace. + */ inline bool IsTraceOn() const { return trace; } /** - * Sets trace. - */ + * Sets trace. + */ inline void WorldTrace(bool b) { world_trace = b; } /** - * Returns the value of trace. - */ + * Returns the value of trace. + */ inline bool IsWorldTraceOn() const { return world_trace; } /** - * Sets dump_in_packets. - */ + * Sets dump_in_packets. + */ inline void DumpInPackets(bool b) { dump_in_packets = b; } /** - * Returns the value of dump_in_packets. - */ + * Returns the value of dump_in_packets. + */ inline bool IsDumpInPacketsOn() const { return dump_in_packets; } /** - * Sets dump_out_packets. - */ + * Sets dump_out_packets. + */ inline void DumpOutPackets(bool b) { dump_out_packets = b; } /** - * Returns the value of dump_out_packets. - */ + * Returns the value of dump_out_packets. + */ inline bool IsDumpOutPacketsOn() const { return dump_out_packets; } /** - * Sets encryption_mode. - */ + * Sets encryption_mode. + */ inline void EncryptionMode(int m) { encryption_mode = m; } /** - * Returns the value of encryption_mode. - */ + * Returns the value of encryption_mode. + */ inline int GetEncryptionMode() const { return encryption_mode; } /** - * Sets local_network. - */ + * Sets local_network. + */ inline void LocalNetwork(string n) { local_network = n; } /** - * Return the value of local_network. - */ + * Return the value of local_network. + */ inline string GetLocalNetwork() const { return local_network; } /** - * Sets account table. - */ + * Sets account table. + */ inline void AccountTable(string t) { account_table = t; } /** - * Return the value of local_network. - */ + * Return the value of local_network. + */ inline string GetAccountTable() const { return account_table; } /** - * Sets world account table. - */ + * Sets world account table. + */ inline void WorldRegistrationTable(string t) { world_registration_table = t; } /** - * Return the value of world account table. - */ + * Return the value of world account table. + */ inline string GetWorldRegistrationTable() const { return world_registration_table; } /** - * Sets world admin account table. - */ + * Sets world admin account table. + */ inline void WorldAdminRegistrationTable(string t) { world_admin_registration_table = t; } /** - * Return the value of world admin account table. - */ + * Return the value of world admin account table. + */ inline string GetWorldAdminRegistrationTable() const { return world_admin_registration_table; } /** - * Sets world server type table. - */ + * Sets world server type table. + */ inline void WorldServerTypeTable(string t) { world_server_type_table = t; } /** - * Return the value of world admin account table. - */ + * Return the value of world admin account table. + */ inline string GetWorldServerTypeTable() const { return world_server_type_table; } /** - * Sets whether we are rejecting duplicate servers or not. - */ + * Sets whether we are rejecting duplicate servers or not. + */ inline void RejectDuplicateServers(bool b) { reject_duplicate_servers = b; } /** - * Returns whether we are rejecting duplicate servers or not. - */ + * Returns whether we are rejecting duplicate servers or not. + */ inline bool IsRejectingDuplicateServers() { return reject_duplicate_servers; } private: diff --git a/loginserver/ServerManager.cpp b/loginserver/ServerManager.cpp index 58aa6fd87..042963c43 100644 --- a/loginserver/ServerManager.cpp +++ b/loginserver/ServerManager.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "ServerManager.h" #include "LoginServer.h" @@ -172,9 +172,9 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c) sl->Unknown2 = 0x00000000; sl->Unknown3 = 0x01650000; /** - * Not sure what this is but it should be noted setting it to - * 0xFFFFFFFF crashes the client so: don't do that. - */ + * Not sure what this is but it should be noted setting it to + * 0xFFFFFFFF crashes the client so: don't do that. + */ sl->Unknown4 = 0x00000000; sl->NumberOfServers = server_count; @@ -342,3 +342,4 @@ void ServerManager::DestroyServerByName(string l_name, string s_name, WorldServe iter++; } } + diff --git a/loginserver/ServerManager.h b/loginserver/ServerManager.h index c3b410b3f..aac10f09e 100644 --- a/loginserver/ServerManager.h +++ b/loginserver/ServerManager.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_SERVERMANAGER_H #define EQEMU_SERVERMANAGER_H @@ -31,56 +31,56 @@ using namespace std; /** - * Server manager class, deals with management of the world servers. - */ +* Server manager class, deals with management of the world servers. +*/ class ServerManager { public: /** - * Constructor, sets up the TCP server and starts listening. - */ + * Constructor, sets up the TCP server and starts listening. + */ ServerManager(); /** - * Destructor, shuts down the TCP server. - */ + * Destructor, shuts down the TCP server. + */ ~ServerManager(); /** - * Does basic processing for all the servers. - */ + * Does basic processing for all the servers. + */ void Process(); /** - * Sends a request to world to see if the client is banned or suspended. - */ + * Sends a request to world to see if the client is banned or suspended. + */ void SendUserToWorldRequest(unsigned int server_id, unsigned int client_account_id); /** - * Creates a server list packet for the client. - */ + * Creates a server list packet for the client. + */ EQApplicationPacket *CreateServerListPacket(Client *c); /** - * Checks to see if there is a server exists with this name, ignoring option. - */ + * Checks to see if there is a server exists with this name, ignoring option. + */ bool ServerExists(string l_name, string s_name, WorldServer *ignore = nullptr); /** - * Destroys a server with this name, ignoring option. - */ + * Destroys a server with this name, ignoring option. + */ void DestroyServerByName(string l_name, string s_name, WorldServer *ignore = nullptr); private: /** - * Processes all the disconnected connections in Process(), not used outside. - */ + * Processes all the disconnected connections in Process(), not used outside. + */ void ProcessDisconnect(); /** - * Retrieves a server(if exists) by ip address - * Useful utility for the reconnect process. - */ + * Retrieves a server(if exists) by ip address + * Useful utility for the reconnect process. + */ WorldServer* GetServerByAddress(unsigned int address); EmuTCPServer* tcps; diff --git a/loginserver/WorldServer.cpp b/loginserver/WorldServer.cpp index 8763480a3..4d688f416 100644 --- a/loginserver/WorldServer.cpp +++ b/loginserver/WorldServer.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "WorldServer.h" #include "ErrorLog.h" @@ -448,7 +448,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) { // this is the first of two cases where we should deny access even if unregistered is allowed server_log->Log(log_world, "Server %s(%s) attempted to log in but account and password did not match the entry in the database.", - long_name.c_str(), short_name.c_str()); + long_name.c_str(), short_name.c_str()); } } else @@ -457,7 +457,7 @@ void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i) { // this is the second of two cases where we should deny access even if unregistered is allowed server_log->Log(log_world, "Server %s(%s) did not attempt to log in but this server requires a password.", - long_name.c_str(), short_name.c_str()); + long_name.c_str(), short_name.c_str()); } else { diff --git a/loginserver/WorldServer.h b/loginserver/WorldServer.h index 8b3133965..4ee5b19bb 100644 --- a/loginserver/WorldServer.h +++ b/loginserver/WorldServer.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQEMU_WORLDSERVER_H #define EQEMU_WORLDSERVER_H @@ -35,104 +35,104 @@ class WorldServer { public: /** - * Constructor, sets our connection to c. - */ + * Constructor, sets our connection to c. + */ WorldServer(EmuTCPConnection *c); /** - * Destructor, frees our connection if it exists. - */ + * Destructor, frees our connection if it exists. + */ ~WorldServer(); /** - * Resets the basic stats of this server. - */ + * Resets the basic stats of this server. + */ void Reset(); /** - * Does processing of all the connections for this world. - * Returns true except for a fatal error that requires disconnection. - */ + * Does processing of all the connections for this world. + * Returns true except for a fatal error that requires disconnection. + */ bool Process(); /** - * Accesses connection, it is intentional that this is not const (trust me). - */ + * Accesses connection, it is intentional that this is not const (trust me). + */ EmuTCPConnection *GetConnection() { return connection; } /** - * Sets the connection to c. - */ + * Sets the connection to c. + */ void SetConnection(EmuTCPConnection *c) { connection = c; } /** - * Gets the runtime id of this server. - */ + * Gets the runtime id of this server. + */ unsigned int GetRuntimeID() const { return runtime_id; } /** - * Sets the runtime id of this server. - */ + * Sets the runtime id of this server. + */ void SetRuntimeID(unsigned int id) { runtime_id = id; } /** - * Gets the long name of the server. - */ + * Gets the long name of the server. + */ string GetLongName() const { return long_name; } /** - * Gets the short name of the server. - */ + * Gets the short name of the server. + */ string GetShortName() const { return short_name; } /** - * Gets whether the server is authorized to show up on the server list or not. - */ + * Gets whether the server is authorized to show up on the server list or not. + */ bool IsAuthorized() const { return authorized; } /** - * Gets the local ip of the server. - */ + * Gets the local ip of the server. + */ string GetLocalIP() const { return local_ip; } /** - * Gets the remote ip of the server. - */ + * Gets the remote ip of the server. + */ string GetRemoteIP() const { return remote_ip; } /** - * Gets what kind of server this server is (legends, preferred, normal) - */ + * Gets what kind of server this server is (legends, preferred, normal) + */ unsigned int GetServerListID() const { return server_list_id; } /** - * Gets the status of the server. - */ + * Gets the status of the server. + */ int GetStatus() const { return status; } /** - * Gets the number of zones online on the server. - */ + * Gets the number of zones online on the server. + */ unsigned int GetZonesBooted() const { return zones_booted; } /** - * Gets the number of players on the server. - */ + * Gets the number of players on the server. + */ unsigned int GetPlayersOnline() const { return players_online; } /** - * Takes the info struct we received from world and processes it. - */ + * Takes the info struct we received from world and processes it. + */ void Handle_NewLSInfo(ServerNewLSInfo_Struct* i); /** - * Takes the status struct we received from world and processes it. - */ + * Takes the status struct we received from world and processes it. + */ void Handle_LSStatus(ServerLSStatus_Struct *s); /** - * Informs world that there is a client incoming with the following data. - */ + * Informs world that there is a client incoming with the following data. + */ void SendClientAuth(unsigned int ip, string account, string key, unsigned int account_id); private: diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt index 6af899854..9a04123e4 100644 --- a/queryserv/CMakeLists.txt +++ b/queryserv/CMakeLists.txt @@ -1,18 +1,18 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(qserv_sources - database.cpp - lfguild.cpp - queryserv.cpp - queryservconfig.cpp - worldserver.cpp + database.cpp + lfguild.cpp + queryserv.cpp + queryservconfig.cpp + worldserver.cpp ) SET(qserv_headers - database.h - lfguild.h - queryservconfig.h - worldserver.h + database.h + lfguild.h + queryservconfig.h + worldserver.h ) ADD_EXECUTABLE(queryserv ${qserv_sources} ${qserv_headers}) @@ -23,21 +23,21 @@ TARGET_LINK_LIBRARIES(queryserv Common debug ${MySQL_LIBRARY_DEBUG} optimized ${ IF(MSVC) - SET_TARGET_PROPERTIES(queryserv PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(queryserv "Ws2_32.lib") + SET_TARGET_PROPERTIES(queryserv PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(queryserv "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(queryserv "WS2_32") + TARGET_LINK_LIBRARIES(queryserv "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(queryserv "dl") - TARGET_LINK_LIBRARIES(queryserv "z") - TARGET_LINK_LIBRARIES(queryserv "m") - TARGET_LINK_LIBRARIES(queryserv "rt") - TARGET_LINK_LIBRARIES(queryserv "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(queryserv "dl") + TARGET_LINK_LIBRARIES(queryserv "z") + TARGET_LINK_LIBRARIES(queryserv "m") + TARGET_LINK_LIBRARIES(queryserv "rt") + TARGET_LINK_LIBRARIES(queryserv "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/queryserv/database.cpp b/queryserv/database.cpp index 4e5f5a95c..1cfd41f44 100644 --- a/queryserv/database.cpp +++ b/queryserv/database.cpp @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -321,3 +319,4 @@ void Database::LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint3 } } } + diff --git a/queryserv/database.h b/queryserv/database.h index b788e7c20..f1f364025 100644 --- a/queryserv/database.h +++ b/queryserv/database.h @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -61,3 +59,4 @@ private: }; #endif + diff --git a/queryserv/lfguild.cpp b/queryserv/lfguild.cpp index c884d45f6..3de5a30e7 100644 --- a/queryserv/lfguild.cpp +++ b/queryserv/lfguild.cpp @@ -39,7 +39,7 @@ bool LFGuildManager::LoadDatabase() MYSQL_RES *result; MYSQL_ROW row; - if (!database.RunQuery(query,MakeAnyLenString(&query, "SELECT `type`,`name`,`comment`, `fromlevel`, `tolevel`, `classes`, `aacount`, `timezone`, `timeposted` FROM `lfguild`"),errbuf,&result)){ + if (!database.RunQuery(query,MakeAnyLenString(&query, "SELECT `type`,`name`,`comment`, `fromlevel`, `tolevel`, `classes`, `aacount`, `timezone`, `timeposted` FROM `lfguild`"),errbuf,&result)){ _log(QUERYSERV__ERROR, "Failed to load LFGuild info from database. %s %s", query, errbuf); safe_delete_array(query); @@ -258,7 +258,7 @@ void LFGuildManager::TogglePlayer(uint32 FromZoneID, uint32 FromInstanceID, char } if(!database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `lfguild` WHERE `type` = 0 AND `name` = '%s'", From), errbuf, 0, 0)) - _log(QUERYSERV__ERROR, "Error removing player from LFGuild table, query was %s, %s", query, errbuf); + _log(QUERYSERV__ERROR, "Error removing player from LFGuild table, query was %s, %s", query, errbuf); safe_delete_array(query); @@ -433,3 +433,4 @@ void LFGuildManager::SendGuildStatus(uint32 FromZoneID, uint32 FromInstanceID, c } } } + diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp index a69a94281..2154f396d 100644 --- a/queryserv/queryserv.cpp +++ b/queryserv/queryserv.cpp @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -38,7 +36,7 @@ volatile bool RunLoops = true; uint32 MailMessagesSent = 0; uint32 ChatMessagesSent = 0; -TimeoutManager timeout_manager; +TimeoutManager timeout_manager; Database database; LFGuildManager lfguildmanager; @@ -58,8 +56,8 @@ void CatchSignal(int sig_num) { } int main() { - RegisterExecutablePlatform(ExePlatformQueryServ); - set_exception_handler(); + RegisterExecutablePlatform(ExePlatformQueryServ); + set_exception_handler(); Timer LFGuildExpireTimer(60000); @@ -131,13 +129,13 @@ int main() { void UpdateWindowTitle(char* iNewTitle) { #ifdef _WINDOWS - char tmp[500]; - if (iNewTitle) { - snprintf(tmp, sizeof(tmp), "QueryServ: %s", iNewTitle); - } - else { - snprintf(tmp, sizeof(tmp), "QueryServ"); - } - SetConsoleTitle(tmp); + char tmp[500]; + if (iNewTitle) { + snprintf(tmp, sizeof(tmp), "QueryServ: %s", iNewTitle); + } + else { + snprintf(tmp, sizeof(tmp), "QueryServ"); + } + SetConsoleTitle(tmp); #endif } diff --git a/queryserv/queryservconfig.cpp b/queryserv/queryservconfig.cpp index 7680648ed..6088806f4 100644 --- a/queryserv/queryservconfig.cpp +++ b/queryserv/queryservconfig.cpp @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -27,3 +25,4 @@ queryservconfig *queryservconfig::_chat_config = nullptr; string queryservconfig::GetByName(const string &var_name) const { return(EQEmuConfig::GetByName(var_name)); } + diff --git a/queryserv/queryservconfig.h b/queryserv/queryservconfig.h index a403d379f..e4bdcf5ba 100644 --- a/queryserv/queryservconfig.h +++ b/queryserv/queryservconfig.h @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -54,3 +52,4 @@ public: }; #endif + diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp index fae1be01f..4486a38fd 100644 --- a/queryserv/worldserver.cpp +++ b/queryserv/worldserver.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -140,7 +140,7 @@ void WorldServer::Process() // uint32 SourceZoneID // uint32 SourceInstanceID // char OriginatingCharacterName[0] // Null terminated name of the character this packet came from. This could be just - // // an empty string if it has no meaning in the context of a particular packet. + // // an empty string if it has no meaning in the context of a particular packet. // uint32 Type // // The 'Type' field is a 'sub-opcode'. A value of 0 is used for the LFGuild packets. The next feature to be added diff --git a/queryserv/worldserver.h b/queryserv/worldserver.h index c42ca5ceb..167342248 100644 --- a/queryserv/worldserver.h +++ b/queryserv/worldserver.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WORLDSERVER_H #define WORLDSERVER_H @@ -23,13 +23,13 @@ class WorldServer : public WorldConnection { -public: - WorldServer(); - virtual ~WorldServer(); - virtual void Process(); + public: + WorldServer(); + virtual ~WorldServer(); + virtual void Process(); -private: - virtual void OnConnected(); + private: + virtual void OnConnected(); }; #endif diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt index 902ffb2ff..35dc8bfd3 100644 --- a/shared_memory/CMakeLists.txt +++ b/shared_memory/CMakeLists.txt @@ -1,20 +1,20 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(shared_memory_sources - items.cpp - loot.cpp - main.cpp - npc_faction.cpp - spells.cpp - skill_caps.cpp + items.cpp + loot.cpp + main.cpp + npc_faction.cpp + spells.cpp + skill_caps.cpp ) SET(shared_memory_headers - items.h - loot.h - npc_faction.h - spells.h - skill_caps.h + items.h + loot.h + npc_faction.h + spells.h + skill_caps.h ) ADD_EXECUTABLE(shared_memory ${shared_memory_sources} ${shared_memory_headers}) @@ -22,21 +22,21 @@ ADD_EXECUTABLE(shared_memory ${shared_memory_sources} ${shared_memory_headers}) TARGET_LINK_LIBRARIES(shared_memory Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY}) IF(MSVC) - SET_TARGET_PROPERTIES(shared_memory PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(shared_memory "Ws2_32.lib") + SET_TARGET_PROPERTIES(shared_memory PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(shared_memory "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(shared_memory "WS2_32") + TARGET_LINK_LIBRARIES(shared_memory "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(shared_memory "dl") - TARGET_LINK_LIBRARIES(shared_memory "z") - TARGET_LINK_LIBRARIES(shared_memory "m") - TARGET_LINK_LIBRARIES(shared_memory "rt") - TARGET_LINK_LIBRARIES(shared_memory "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(shared_memory "dl") + TARGET_LINK_LIBRARIES(shared_memory "z") + TARGET_LINK_LIBRARIES(shared_memory "m") + TARGET_LINK_LIBRARIES(shared_memory "rt") + TARGET_LINK_LIBRARIES(shared_memory "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/shared_memory/items.cpp b/shared_memory/items.cpp index f6ed659d2..432458701 100644 --- a/shared_memory/items.cpp +++ b/shared_memory/items.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "items.h" @@ -25,21 +25,21 @@ #include "../common/item_struct.h" void LoadItems(SharedDatabase *database) { - EQEmu::IPCMutex mutex("items"); - mutex.Lock(); + EQEmu::IPCMutex mutex("items"); + mutex.Lock(); - int32 items = -1; - uint32 max_item = 0; - database->GetItemsCount(items, max_item); - if(items == -1) { - EQ_EXCEPT("Shared Memory", "Unable to get any items from the database."); - } + int32 items = -1; + uint32 max_item = 0; + database->GetItemsCount(items, max_item); + if(items == -1) { + EQ_EXCEPT("Shared Memory", "Unable to get any items from the database."); + } - uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(items, max_item)); - EQEmu::MemoryMappedFile mmf("shared/items", size); - mmf.ZeroFile(); + uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(items, max_item)); + EQEmu::MemoryMappedFile mmf("shared/items", size); + mmf.ZeroFile(); - void *ptr = mmf.Get(); - database->LoadItems(ptr, size, items, max_item); - mutex.Unlock(); + void *ptr = mmf.Get(); + database->LoadItems(ptr, size, items, max_item); + mutex.Unlock(); } diff --git a/shared_memory/items.h b/shared_memory/items.h index c292563ec..21702eb50 100644 --- a/shared_memory/items.h +++ b/shared_memory/items.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_SHARED_MEMORY_ITEMS_H diff --git a/shared_memory/loot.cpp b/shared_memory/loot.cpp index ed9bc4577..81c0ef5a5 100644 --- a/shared_memory/loot.cpp +++ b/shared_memory/loot.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "loot.h" @@ -26,36 +26,36 @@ #include "../common/loottable.h" void LoadLoot(SharedDatabase *database) { - EQEmu::IPCMutex mutex("loot"); - mutex.Lock(); + EQEmu::IPCMutex mutex("loot"); + mutex.Lock(); - uint32 loot_table_count, loot_table_max, loot_table_entries_count; - uint32 loot_drop_count, loot_drop_max, loot_drop_entries_count; - database->GetLootTableInfo(loot_table_count, loot_table_max, loot_table_entries_count); - database->GetLootDropInfo(loot_drop_count, loot_drop_max, loot_drop_entries_count); + uint32 loot_table_count, loot_table_max, loot_table_entries_count; + uint32 loot_drop_count, loot_drop_max, loot_drop_entries_count; + database->GetLootTableInfo(loot_table_count, loot_table_max, loot_table_entries_count); + database->GetLootDropInfo(loot_drop_count, loot_drop_max, loot_drop_entries_count); - uint32 loot_table_size = (3 * sizeof(uint32)) + //header - ((loot_table_max + 1) * sizeof(uint32)) + //offset list - (loot_table_count * sizeof(LootTable_Struct)) + //loot table headers - (loot_table_entries_count * sizeof(LootTableEntries_Struct)); //number of loot table entries + uint32 loot_table_size = (3 * sizeof(uint32)) + //header + ((loot_table_max + 1) * sizeof(uint32)) + //offset list + (loot_table_count * sizeof(LootTable_Struct)) + //loot table headers + (loot_table_entries_count * sizeof(LootTableEntries_Struct)); //number of loot table entries - uint32 loot_drop_size = (3 * sizeof(uint32)) + //header - ((loot_drop_max + 1) * sizeof(uint32)) + //offset list - (loot_drop_count * sizeof(LootDrop_Struct)) + //loot table headers - (loot_drop_entries_count * sizeof(LootDropEntries_Struct)); //number of loot table entries + uint32 loot_drop_size = (3 * sizeof(uint32)) + //header + ((loot_drop_max + 1) * sizeof(uint32)) + //offset list + (loot_drop_count * sizeof(LootDrop_Struct)) + //loot table headers + (loot_drop_entries_count * sizeof(LootDropEntries_Struct)); //number of loot table entries - EQEmu::MemoryMappedFile mmf_loot_table("shared/loot_table", loot_table_size); - EQEmu::MemoryMappedFile mmf_loot_drop("shared/loot_drop", loot_drop_size); - mmf_loot_table.ZeroFile(); - mmf_loot_drop.ZeroFile(); + EQEmu::MemoryMappedFile mmf_loot_table("shared/loot_table", loot_table_size); + EQEmu::MemoryMappedFile mmf_loot_drop("shared/loot_drop", loot_drop_size); + mmf_loot_table.ZeroFile(); + mmf_loot_drop.ZeroFile(); - EQEmu::FixedMemoryVariableHashSet loot_table_hash(reinterpret_cast(mmf_loot_table.Get()), - loot_table_size, loot_table_max); + EQEmu::FixedMemoryVariableHashSet loot_table_hash(reinterpret_cast(mmf_loot_table.Get()), + loot_table_size, loot_table_max); - EQEmu::FixedMemoryVariableHashSet loot_drop_hash(reinterpret_cast(mmf_loot_drop.Get()), - loot_drop_size, loot_drop_max); + EQEmu::FixedMemoryVariableHashSet loot_drop_hash(reinterpret_cast(mmf_loot_drop.Get()), + loot_drop_size, loot_drop_max); - database->LoadLootTables(mmf_loot_table.Get(), loot_table_max); - database->LoadLootDrops(mmf_loot_drop.Get(), loot_drop_max); - mutex.Unlock(); + database->LoadLootTables(mmf_loot_table.Get(), loot_table_max); + database->LoadLootDrops(mmf_loot_drop.Get(), loot_drop_max); + mutex.Unlock(); } diff --git a/shared_memory/loot.h b/shared_memory/loot.h index 89f470c09..df97ad321 100644 --- a/shared_memory/loot.h +++ b/shared_memory/loot.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_SHARED_MEMORY_LOOT_H diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index 7e717434e..52d85668d 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include @@ -31,129 +31,129 @@ #include "spells.h" int main(int argc, char **argv) { - RegisterExecutablePlatform(ExePlatformSharedMemory); - set_exception_handler(); + RegisterExecutablePlatform(ExePlatformSharedMemory); + set_exception_handler(); - LogFile->write(EQEMuLog::Status, "Shared Memory Loader Program"); - if(!EQEmuConfig::LoadConfig()) { - LogFile->write(EQEMuLog::Error, "Unable to load configuration file."); - return 0; - } - - const EQEmuConfig *config = EQEmuConfig::get(); - if(!load_log_settings(config->LogSettingsFile.c_str())) { - LogFile->write(EQEMuLog::Error, "Warning: unable to read %s.", config->LogSettingsFile.c_str()); - } - - SharedDatabase database; - LogFile->write(EQEMuLog::Status, "Connecting to database..."); - if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(), - config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) { - LogFile->write(EQEMuLog::Error, "Unable to connect to the database, cannot continue without a " - "database connection"); + LogFile->write(EQEMuLog::Status, "Shared Memory Loader Program"); + if(!EQEmuConfig::LoadConfig()) { + LogFile->write(EQEMuLog::Error, "Unable to load configuration file."); return 0; } - bool load_all = true; - bool load_items = true; - bool load_factions = true; - bool load_loot = true; - bool load_skill_caps = true; - bool load_spells = true; - if(argc > 1) { - load_all = false; - load_items = false; - load_factions = false; - load_loot = false; - load_skill_caps = false; - load_spells = false; + const EQEmuConfig *config = EQEmuConfig::get(); + if(!load_log_settings(config->LogSettingsFile.c_str())) { + LogFile->write(EQEMuLog::Error, "Warning: unable to read %s.", config->LogSettingsFile.c_str()); + } - for(int i = 1; i < argc; ++i) { - switch(argv[i][0]) { - case 'a': - if(strcasecmp("all", argv[i]) == 0) { - load_all = true; - } - break; + SharedDatabase database; + LogFile->write(EQEMuLog::Status, "Connecting to database..."); + if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(), + config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) { + LogFile->write(EQEMuLog::Error, "Unable to connect to the database, cannot continue without a " + "database connection"); + return 0; + } - case 'i': - if(strcasecmp("items", argv[i]) == 0) { - load_items = true; - } - break; + bool load_all = true; + bool load_items = true; + bool load_factions = true; + bool load_loot = true; + bool load_skill_caps = true; + bool load_spells = true; + if(argc > 1) { + load_all = false; + load_items = false; + load_factions = false; + load_loot = false; + load_skill_caps = false; + load_spells = false; - case 'f': - if(strcasecmp("factions", argv[i]) == 0) { - load_factions = true; - } - break; + for(int i = 1; i < argc; ++i) { + switch(argv[i][0]) { + case 'a': + if(strcasecmp("all", argv[i]) == 0) { + load_all = true; + } + break; - case 'l': - if(strcasecmp("loot", argv[i]) == 0) { - load_loot = true; - } - break; + case 'i': + if(strcasecmp("items", argv[i]) == 0) { + load_items = true; + } + break; - case 's': - if(strcasecmp("skill_caps", argv[i]) == 0) { - load_skill_caps = true; - } else if(strcasecmp("spells", argv[i]) == 0) { - load_spells = true; - } - break; - } - } - } + case 'f': + if(strcasecmp("factions", argv[i]) == 0) { + load_factions = true; + } + break; - if(load_all || load_items) { - LogFile->write(EQEMuLog::Status, "Loading items..."); - try { - LoadItems(&database); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "%s", ex.what()); - return 0; - } - } + case 'l': + if(strcasecmp("loot", argv[i]) == 0) { + load_loot = true; + } + break; - if(load_all || load_factions) { - LogFile->write(EQEMuLog::Status, "Loading factions..."); - try { - LoadFactions(&database); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "%s", ex.what()); - return 0; - } - } + case 's': + if(strcasecmp("skill_caps", argv[i]) == 0) { + load_skill_caps = true; + } else if(strcasecmp("spells", argv[i]) == 0) { + load_spells = true; + } + break; + } + } + } - if(load_all || load_loot) { - LogFile->write(EQEMuLog::Status, "Loading loot..."); - try { - LoadLoot(&database); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "%s", ex.what()); - return 0; - } - } + if(load_all || load_items) { + LogFile->write(EQEMuLog::Status, "Loading items..."); + try { + LoadItems(&database); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "%s", ex.what()); + return 0; + } + } - if(load_all || load_skill_caps) { - LogFile->write(EQEMuLog::Status, "Loading skill caps..."); - try { - LoadSkillCaps(&database); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "%s", ex.what()); - return 0; - } - } + if(load_all || load_factions) { + LogFile->write(EQEMuLog::Status, "Loading factions..."); + try { + LoadFactions(&database); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "%s", ex.what()); + return 0; + } + } - if(load_all || load_spells) { - LogFile->write(EQEMuLog::Status, "Loading spells..."); - try { - LoadSpells(&database); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "%s", ex.what()); - return 0; - } - } + if(load_all || load_loot) { + LogFile->write(EQEMuLog::Status, "Loading loot..."); + try { + LoadLoot(&database); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "%s", ex.what()); + return 0; + } + } - return 0; + if(load_all || load_skill_caps) { + LogFile->write(EQEMuLog::Status, "Loading skill caps..."); + try { + LoadSkillCaps(&database); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "%s", ex.what()); + return 0; + } + } + + if(load_all || load_spells) { + LogFile->write(EQEMuLog::Status, "Loading spells..."); + try { + LoadSpells(&database); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "%s", ex.what()); + return 0; + } + } + + return 0; } diff --git a/shared_memory/npc_faction.cpp b/shared_memory/npc_faction.cpp index 5fc2d6845..8a9575497 100644 --- a/shared_memory/npc_faction.cpp +++ b/shared_memory/npc_faction.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "npc_faction.h" @@ -25,21 +25,21 @@ #include "../common/faction.h" void LoadFactions(SharedDatabase *database) { - EQEmu::IPCMutex mutex("faction"); - mutex.Lock(); + EQEmu::IPCMutex mutex("faction"); + mutex.Lock(); - uint32 lists = 0; - uint32 max_list = 0; - database->GetFactionListInfo(lists, max_list); - if(lists == 0) { - EQ_EXCEPT("Shared Memory", "Unable to get any factions from the database."); - } + uint32 lists = 0; + uint32 max_list = 0; + database->GetFactionListInfo(lists, max_list); + if(lists == 0) { + EQ_EXCEPT("Shared Memory", "Unable to get any factions from the database."); + } - uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(lists, max_list)); - EQEmu::MemoryMappedFile mmf("shared/faction", size); - mmf.ZeroFile(); + uint32 size = static_cast(EQEmu::FixedMemoryHashSet::estimated_size(lists, max_list)); + EQEmu::MemoryMappedFile mmf("shared/faction", size); + mmf.ZeroFile(); - void *ptr = mmf.Get(); - database->LoadNPCFactionLists(ptr, size, lists, max_list); - mutex.Unlock(); + void *ptr = mmf.Get(); + database->LoadNPCFactionLists(ptr, size, lists, max_list); + mutex.Unlock(); } diff --git a/shared_memory/npc_faction.h b/shared_memory/npc_faction.h index 57313bb8e..52038dd9b 100644 --- a/shared_memory/npc_faction.h +++ b/shared_memory/npc_faction.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_SHARED_MEMORY_NPC_FACTION_H diff --git a/shared_memory/skill_caps.cpp b/shared_memory/skill_caps.cpp index 8cfae69fc..c8cc0838b 100644 --- a/shared_memory/skill_caps.cpp +++ b/shared_memory/skill_caps.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "skill_caps.h" @@ -26,17 +26,17 @@ #include "../common/features.h" void LoadSkillCaps(SharedDatabase *database) { - EQEmu::IPCMutex mutex("skill_caps"); - mutex.Lock(); + EQEmu::IPCMutex mutex("skill_caps"); + mutex.Lock(); - uint32 class_count = PLAYER_CLASS_COUNT; + uint32 class_count = PLAYER_CLASS_COUNT; uint32 skill_count = HIGHEST_SKILL + 1; uint32 level_count = HARD_LEVEL_CAP + 1; - uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); - EQEmu::MemoryMappedFile mmf("shared/skill_caps", size); - mmf.ZeroFile(); + uint32 size = (class_count * skill_count * level_count * sizeof(uint16)); + EQEmu::MemoryMappedFile mmf("shared/skill_caps", size); + mmf.ZeroFile(); - void *ptr = mmf.Get(); - database->LoadSkillCaps(ptr); - mutex.Unlock(); -} \ No newline at end of file + void *ptr = mmf.Get(); + database->LoadSkillCaps(ptr); + mutex.Unlock(); +} diff --git a/shared_memory/skill_caps.h b/shared_memory/skill_caps.h index 75c18bffa..e01dab4f4 100644 --- a/shared_memory/skill_caps.h +++ b/shared_memory/skill_caps.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_SHARED_MEMORY_SKILL_CAPS_H @@ -23,3 +23,4 @@ class SharedDatabase; void LoadSkillCaps(SharedDatabase *database); #endif + diff --git a/shared_memory/spells.cpp b/shared_memory/spells.cpp index 635d57c29..eb8f34777 100644 --- a/shared_memory/spells.cpp +++ b/shared_memory/spells.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "spells.h" @@ -25,18 +25,19 @@ #include "../common/spdat.h" void LoadSpells(SharedDatabase *database) { - EQEmu::IPCMutex mutex("spells"); - mutex.Lock(); - int records = database->GetMaxSpellID() + 1; - if(records == 0) { - EQ_EXCEPT("Shared Memory", "Unable to get any spells from the database."); - } + EQEmu::IPCMutex mutex("spells"); + mutex.Lock(); + int records = database->GetMaxSpellID() + 1; + if(records == 0) { + EQ_EXCEPT("Shared Memory", "Unable to get any spells from the database."); + } - uint32 size = records * sizeof(SPDat_Spell_Struct); - EQEmu::MemoryMappedFile mmf("shared/spells", size); - mmf.ZeroFile(); + uint32 size = records * sizeof(SPDat_Spell_Struct); + EQEmu::MemoryMappedFile mmf("shared/spells", size); + mmf.ZeroFile(); + + void *ptr = mmf.Get(); + database->LoadSpells(ptr, records); + mutex.Unlock(); +} - void *ptr = mmf.Get(); - database->LoadSpells(ptr, records); - mutex.Unlock(); -} \ No newline at end of file diff --git a/shared_memory/spells.h b/shared_memory/spells.h index 7959382a4..590ee0536 100644 --- a/shared_memory/spells.h +++ b/shared_memory/spells.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_SHARED_MEMORY_SPELLS_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5288e78e7..649285b8b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,14 +3,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ADD_SUBDIRECTORY(cppunit) SET(tests_sources - main.cpp + main.cpp ) SET(tests_headers - fixed_memory_test.h - fixed_memory_variable_test.h - ipc_mutex_test.h - memory_mapped_file_test.h + fixed_memory_test.h + fixed_memory_variable_test.h + ipc_mutex_test.h + memory_mapped_file_test.h ) ADD_EXECUTABLE(tests ${tests_sources} ${tests_headers}) @@ -18,21 +18,21 @@ ADD_EXECUTABLE(tests ${tests_sources} ${tests_headers}) TARGET_LINK_LIBRARIES(tests Common cppunit) IF(MSVC) - SET_TARGET_PROPERTIES(tests PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(tests "Ws2_32.lib") + SET_TARGET_PROPERTIES(tests PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(tests "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(tests "WS2_32") + TARGET_LINK_LIBRARIES(tests "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(tests "dl") - TARGET_LINK_LIBRARIES(tests "z") - TARGET_LINK_LIBRARIES(tests "m") - TARGET_LINK_LIBRARIES(tests "rt") - TARGET_LINK_LIBRARIES(tests "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(tests "dl") + TARGET_LINK_LIBRARIES(tests "z") + TARGET_LINK_LIBRARIES(tests "m") + TARGET_LINK_LIBRARIES(tests "rt") + TARGET_LINK_LIBRARIES(tests "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/tests/cppunit/CMakeLists.txt b/tests/cppunit/CMakeLists.txt index 4ff178523..e60e2134f 100644 --- a/tests/cppunit/CMakeLists.txt +++ b/tests/cppunit/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(cppunit_sources - collectoroutput.cpp + collectoroutput.cpp compileroutput.cpp htmloutput.cpp missing.cpp @@ -13,7 +13,7 @@ SET(cppunit_sources ) SET(cppunit_headers - cpptest-assert.h + cpptest-assert.h cpptest-collectoroutput.h cpptest-compileroutput.h cpptest-htmloutput.h @@ -23,16 +23,16 @@ SET(cppunit_headers cpptest-textoutput.h cpptest-time.h cpptest.h - missing.h + missing.h utils.h - winconfig.h + winconfig.h ) ADD_LIBRARY(cppunit ${cppunit_sources} ${cppunit_headers}) IF(UNIX) - ADD_DEFINITIONS(-fPIC) + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(LIBRARY_OUTPUT_PATH ../../Bin) diff --git a/tests/fixed_memory_test.h b/tests/fixed_memory_test.h index 89d6dad46..089b8f7c0 100644 --- a/tests/fixed_memory_test.h +++ b/tests/fixed_memory_test.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_TESTS_FIXED_MEMORY_H @@ -24,214 +24,214 @@ #include "../common/Item.h" class FixedMemoryHashTest : public Test::Suite { - typedef void(FixedMemoryHashTest::*TestFunction)(void); + typedef void(FixedMemoryHashTest::*TestFunction)(void); public: - FixedMemoryHashTest() { - size_ = EQEmu::FixedMemoryHashSet::estimated_size(72000, 190000); - data_ = new uint8[size_]; - memset(data_, 0, size_); - TEST_ADD(FixedMemoryHashTest::InitTest); - TEST_ADD(FixedMemoryHashTest::LoadTest); - TEST_ADD(FixedMemoryHashTest::InsertTest); - TEST_ADD(FixedMemoryHashTest::RetrieveTest); - TEST_ADD(FixedMemoryHashTest::OverwriteTest); - TEST_ADD(FixedMemoryHashTest::OverwriteRetrieveTest); - TEST_ADD(FixedMemoryHashTest::InsertAgainTest); - TEST_ADD(FixedMemoryHashTest::RetrieveAgainTest); - TEST_ADD(FixedMemoryHashTest::InsertBeginTest); - TEST_ADD(FixedMemoryHashTest::RetrieveBeginTest); - TEST_ADD(FixedMemoryHashTest::InsertEndTest); - TEST_ADD(FixedMemoryHashTest::RetrieveEndTest); - } - ~FixedMemoryHashTest() { - delete[] data_; - } + FixedMemoryHashTest() { + size_ = EQEmu::FixedMemoryHashSet::estimated_size(72000, 190000); + data_ = new uint8[size_]; + memset(data_, 0, size_); + TEST_ADD(FixedMemoryHashTest::InitTest); + TEST_ADD(FixedMemoryHashTest::LoadTest); + TEST_ADD(FixedMemoryHashTest::InsertTest); + TEST_ADD(FixedMemoryHashTest::RetrieveTest); + TEST_ADD(FixedMemoryHashTest::OverwriteTest); + TEST_ADD(FixedMemoryHashTest::OverwriteRetrieveTest); + TEST_ADD(FixedMemoryHashTest::InsertAgainTest); + TEST_ADD(FixedMemoryHashTest::RetrieveAgainTest); + TEST_ADD(FixedMemoryHashTest::InsertBeginTest); + TEST_ADD(FixedMemoryHashTest::RetrieveBeginTest); + TEST_ADD(FixedMemoryHashTest::InsertEndTest); + TEST_ADD(FixedMemoryHashTest::RetrieveEndTest); + } + ~FixedMemoryHashTest() { + delete[] data_; + } - private: - void InitTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_, 72000, 190000); - TEST_ASSERT(!hash.exists(1001)); - TEST_ASSERT(hash.size() == 0); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(hash.empty()); - } + private: + void InitTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_, 72000, 190000); + TEST_ASSERT(!hash.exists(1001)); + TEST_ASSERT(hash.size() == 0); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(hash.empty()); + } - void LoadTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - TEST_ASSERT(!hash.exists(1001)); - TEST_ASSERT(hash.size() == 0); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(hash.empty()); - } + void LoadTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + TEST_ASSERT(!hash.exists(1001)); + TEST_ASSERT(hash.size() == 0); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(hash.empty()); + } - void InsertTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - Item_Struct item; - memset(&item, 0, sizeof(item)); - strcpy(item.Name, "Iron Sword"); - item.ID = 1001; - hash.insert(1001, item); + void InsertTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + Item_Struct item; + memset(&item, 0, sizeof(item)); + strcpy(item.Name, "Iron Sword"); + item.ID = 1001; + hash.insert(1001, item); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.size() == 1); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); - } + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.size() == 1); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); + } - void RetrieveTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.size() == 1); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); + void RetrieveTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.size() == 1); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); - Item_Struct item = hash[1001]; - TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); - TEST_ASSERT(item.ID == 1001); - } + Item_Struct item = hash[1001]; + TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); + TEST_ASSERT(item.ID == 1001); + } - void OverwriteTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - Item_Struct item; - memset(&item, 0, sizeof(item)); - strcpy(item.Name, "Steel Sword"); - item.ID = 1001; - hash.insert(1001, item); + void OverwriteTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + Item_Struct item; + memset(&item, 0, sizeof(item)); + strcpy(item.Name, "Steel Sword"); + item.ID = 1001; + hash.insert(1001, item); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.size() == 1); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); - } + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.size() == 1); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); + } - void OverwriteRetrieveTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.size() == 1); - TEST_ASSERT((hash.max_size() == 72000)); - TEST_ASSERT(!hash.empty()); + void OverwriteRetrieveTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.size() == 1); + TEST_ASSERT((hash.max_size() == 72000)); + TEST_ASSERT(!hash.empty()); - Item_Struct item = hash[1001]; - TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); - TEST_ASSERT(item.ID == 1001); - } + Item_Struct item = hash[1001]; + TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); + TEST_ASSERT(item.ID == 1001); + } - void InsertAgainTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - Item_Struct item; - memset(&item, 0, sizeof(item)); - strcpy(item.Name, "Iron Sword"); - item.ID = 1000; - hash.insert(1000, item); + void InsertAgainTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + Item_Struct item; + memset(&item, 0, sizeof(item)); + strcpy(item.Name, "Iron Sword"); + item.ID = 1000; + hash.insert(1000, item); - TEST_ASSERT(hash.exists(1000)); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.size() == 2); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); - } + TEST_ASSERT(hash.exists(1000)); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.size() == 2); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); + } - void RetrieveAgainTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(1000)); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.size() == 2); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); + void RetrieveAgainTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(1000)); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.size() == 2); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); - Item_Struct item = hash[1000]; - TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); - TEST_ASSERT(item.ID == 1000); + Item_Struct item = hash[1000]; + TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); + TEST_ASSERT(item.ID == 1000); - item = hash[1001]; - TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); - TEST_ASSERT(item.ID == 1001); - } + item = hash[1001]; + TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); + TEST_ASSERT(item.ID == 1001); + } - void InsertBeginTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - Item_Struct item; - memset(&item, 0, sizeof(item)); - strcpy(item.Name, "Bronze Sword"); - item.ID = 0; - hash.insert(0, item); + void InsertBeginTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + Item_Struct item; + memset(&item, 0, sizeof(item)); + strcpy(item.Name, "Bronze Sword"); + item.ID = 0; + hash.insert(0, item); - TEST_ASSERT(hash.exists(1000)); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.size() == 3); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); - } + TEST_ASSERT(hash.exists(1000)); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.size() == 3); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); + } - void RetrieveBeginTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(1000)); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.size() == 3); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); + void RetrieveBeginTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(1000)); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.size() == 3); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); - Item_Struct item = hash[1000]; - TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); - TEST_ASSERT(item.ID == 1000); + Item_Struct item = hash[1000]; + TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); + TEST_ASSERT(item.ID == 1000); - item = hash[1001]; - TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); - TEST_ASSERT(item.ID == 1001); + item = hash[1001]; + TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); + TEST_ASSERT(item.ID == 1001); - item = hash[0]; - TEST_ASSERT(strcmp(item.Name, "Bronze Sword") == 0); - TEST_ASSERT(item.ID == 0); - } + item = hash[0]; + TEST_ASSERT(strcmp(item.Name, "Bronze Sword") == 0); + TEST_ASSERT(item.ID == 0); + } - void InsertEndTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - Item_Struct item; - memset(&item, 0, sizeof(item)); - strcpy(item.Name, "Jade Sword"); - item.ID = 190000; - hash.insert(190000, item); + void InsertEndTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + Item_Struct item; + memset(&item, 0, sizeof(item)); + strcpy(item.Name, "Jade Sword"); + item.ID = 190000; + hash.insert(190000, item); - TEST_ASSERT(hash.exists(1000)); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.exists(190000)); - TEST_ASSERT(hash.size() == 4); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); - } + TEST_ASSERT(hash.exists(1000)); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.exists(190000)); + TEST_ASSERT(hash.size() == 4); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); + } - void RetrieveEndTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(1000)); - TEST_ASSERT(hash.exists(1001)); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.exists(190000)); - TEST_ASSERT(hash.size() == 4); - TEST_ASSERT(hash.max_size() == 72000); - TEST_ASSERT(!hash.empty()); + void RetrieveEndTest() { + EQEmu::FixedMemoryHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(1000)); + TEST_ASSERT(hash.exists(1001)); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.exists(190000)); + TEST_ASSERT(hash.size() == 4); + TEST_ASSERT(hash.max_size() == 72000); + TEST_ASSERT(!hash.empty()); - Item_Struct item = hash[1000]; - TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); - TEST_ASSERT(item.ID == 1000); + Item_Struct item = hash[1000]; + TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); + TEST_ASSERT(item.ID == 1000); - item = hash[1001]; - TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); - TEST_ASSERT(item.ID == 1001); + item = hash[1001]; + TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); + TEST_ASSERT(item.ID == 1001); - item = hash[0]; - TEST_ASSERT(strcmp(item.Name, "Bronze Sword") == 0); - TEST_ASSERT(item.ID == 0); + item = hash[0]; + TEST_ASSERT(strcmp(item.Name, "Bronze Sword") == 0); + TEST_ASSERT(item.ID == 0); - item = hash[190000]; - TEST_ASSERT(strcmp(item.Name, "Jade Sword") == 0); - TEST_ASSERT(item.ID == 190000); - } + item = hash[190000]; + TEST_ASSERT(strcmp(item.Name, "Jade Sword") == 0); + TEST_ASSERT(item.ID == 190000); + } private: - uint8 *data_; - size_t size_; + uint8 *data_; + size_t size_; }; #endif diff --git a/tests/fixed_memory_variable_test.h b/tests/fixed_memory_variable_test.h index fcc04ad7f..a728093ef 100644 --- a/tests/fixed_memory_variable_test.h +++ b/tests/fixed_memory_variable_test.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_TESTS_FIXED_MEMORY_VARIABLE_H @@ -23,111 +23,111 @@ #include "../common/fixed_memory_variable_hash_set.h" struct test_struct { - char name[512]; + char name[512]; }; class FixedMemoryVariableHashTest : public Test::Suite { - typedef void(FixedMemoryVariableHashTest::*TestFunction)(void); + typedef void(FixedMemoryVariableHashTest::*TestFunction)(void); public: - FixedMemoryVariableHashTest() { - size_ = 1024 + 12 + 2008; - data_ = new uint8[size_]; - memset(data_, 0, size_); - TEST_ADD(FixedMemoryVariableHashTest::InitTest); - TEST_ADD(FixedMemoryVariableHashTest::LoadTest); - TEST_ADD(FixedMemoryVariableHashTest::InsertTest); - TEST_ADD(FixedMemoryVariableHashTest::RetrieveTest); - TEST_ADD(FixedMemoryVariableHashTest::InsertAgainTest); - TEST_ADD(FixedMemoryVariableHashTest::RetrieveAgainTest); - TEST_ADD(FixedMemoryVariableHashTest::InsertAgainFailTest); - TEST_ADD(FixedMemoryVariableHashTest::RetrieveAgainFailTest); - } - ~FixedMemoryVariableHashTest() { - delete[] data_; - } + FixedMemoryVariableHashTest() { + size_ = 1024 + 12 + 2008; + data_ = new uint8[size_]; + memset(data_, 0, size_); + TEST_ADD(FixedMemoryVariableHashTest::InitTest); + TEST_ADD(FixedMemoryVariableHashTest::LoadTest); + TEST_ADD(FixedMemoryVariableHashTest::InsertTest); + TEST_ADD(FixedMemoryVariableHashTest::RetrieveTest); + TEST_ADD(FixedMemoryVariableHashTest::InsertAgainTest); + TEST_ADD(FixedMemoryVariableHashTest::RetrieveAgainTest); + TEST_ADD(FixedMemoryVariableHashTest::InsertAgainFailTest); + TEST_ADD(FixedMemoryVariableHashTest::RetrieveAgainFailTest); + } + ~FixedMemoryVariableHashTest() { + delete[] data_; + } - private: - void InitTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_, 501); - TEST_ASSERT(!hash.exists(0)); - TEST_ASSERT(!hash.exists(501)); - } + private: + void InitTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_, 501); + TEST_ASSERT(!hash.exists(0)); + TEST_ASSERT(!hash.exists(501)); + } - void LoadTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - TEST_ASSERT(!hash.exists(0)); - TEST_ASSERT(!hash.exists(501)); - } + void LoadTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + TEST_ASSERT(!hash.exists(0)); + TEST_ASSERT(!hash.exists(501)); + } - void InsertTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - test_struct test; - memset(&test, 0, sizeof(test)); - strcpy(test.name, "Bill D."); + void InsertTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + test_struct test; + memset(&test, 0, sizeof(test)); + strcpy(test.name, "Bill D."); - hash.insert(0, reinterpret_cast(&test), sizeof(test)); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(!hash.exists(501)); - } + hash.insert(0, reinterpret_cast(&test), sizeof(test)); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(!hash.exists(501)); + } - void RetrieveTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(!hash.exists(501)); + void RetrieveTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(!hash.exists(501)); - test_struct test = hash[0]; - TEST_ASSERT(strcmp(test.name, "Bill D.") == 0); - } + test_struct test = hash[0]; + TEST_ASSERT(strcmp(test.name, "Bill D.") == 0); + } - void InsertAgainTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - test_struct test; - memset(&test, 0, sizeof(test)); - strcpy(test.name, "Jimmy P."); + void InsertAgainTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + test_struct test; + memset(&test, 0, sizeof(test)); + strcpy(test.name, "Jimmy P."); - hash.insert(501, reinterpret_cast(&test), sizeof(test)); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.exists(501)); - } + hash.insert(501, reinterpret_cast(&test), sizeof(test)); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.exists(501)); + } - void RetrieveAgainTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.exists(501)); + void RetrieveAgainTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.exists(501)); - test_struct test = hash[501]; - TEST_ASSERT(strcmp(test.name, "Jimmy P.") == 0); - } + test_struct test = hash[501]; + TEST_ASSERT(strcmp(test.name, "Jimmy P.") == 0); + } - void InsertAgainFailTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - test_struct test; - memset(&test, 0, sizeof(test)); - strcpy(test.name, "Tommy M."); + void InsertAgainFailTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + test_struct test; + memset(&test, 0, sizeof(test)); + strcpy(test.name, "Tommy M."); - try { - hash.insert(500, reinterpret_cast(&test), sizeof(test)); - } catch(std::exception&) { } + try { + hash.insert(500, reinterpret_cast(&test), sizeof(test)); + } catch(std::exception&) { } - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.exists(501)); - TEST_ASSERT(!hash.exists(500)); - } + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.exists(501)); + TEST_ASSERT(!hash.exists(500)); + } - void RetrieveAgainFailTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); - TEST_ASSERT(hash.exists(0)); - TEST_ASSERT(hash.exists(501)); - TEST_ASSERT(!hash.exists(500)); + void RetrieveAgainFailTest() { + EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + TEST_ASSERT(hash.exists(0)); + TEST_ASSERT(hash.exists(501)); + TEST_ASSERT(!hash.exists(500)); - try { - test_struct test = hash[500]; - TEST_ASSERT(false); - } catch(std::exception&) { } - } + try { + test_struct test = hash[500]; + TEST_ASSERT(false); + } catch(std::exception&) { } + } private: - uint8 *data_; - uint32 size_; + uint8 *data_; + uint32 size_; }; #endif diff --git a/tests/ipc_mutex_test.h b/tests/ipc_mutex_test.h index 799fa83e4..69c70ca93 100644 --- a/tests/ipc_mutex_test.h +++ b/tests/ipc_mutex_test.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_TESTS_IPC_MUTEX_H @@ -23,42 +23,42 @@ #include "../common/ipc_mutex.h" class IPCMutexTest : public Test::Suite { - typedef void(IPCMutexTest::*TestFunction)(void); + typedef void(IPCMutexTest::*TestFunction)(void); public: - IPCMutexTest() { - TEST_ADD(IPCMutexTest::LockMutexTest); - TEST_ADD(IPCMutexTest::UnlockMutexTest); - TEST_ADD(IPCMutexTest::DoubleLockMutexTest); - TEST_ADD(IPCMutexTest::DoubleUnlockMutexTest); - } + IPCMutexTest() { + TEST_ADD(IPCMutexTest::LockMutexTest); + TEST_ADD(IPCMutexTest::UnlockMutexTest); + TEST_ADD(IPCMutexTest::DoubleLockMutexTest); + TEST_ADD(IPCMutexTest::DoubleUnlockMutexTest); + } - ~IPCMutexTest() { - } + ~IPCMutexTest() { + } - private: - void LockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex1"); - TEST_ASSERT(mutex.Lock()); - TEST_ASSERT(mutex.Unlock()); - } + private: + void LockMutexTest() { + EQEmu::IPCMutex mutex("TestMutex1"); + TEST_ASSERT(mutex.Lock()); + TEST_ASSERT(mutex.Unlock()); + } - void UnlockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex2"); - TEST_ASSERT(!mutex.Unlock()); - } + void UnlockMutexTest() { + EQEmu::IPCMutex mutex("TestMutex2"); + TEST_ASSERT(!mutex.Unlock()); + } - void DoubleLockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex3"); - TEST_ASSERT(mutex.Lock()); - TEST_ASSERT(!mutex.Lock()); - } + void DoubleLockMutexTest() { + EQEmu::IPCMutex mutex("TestMutex3"); + TEST_ASSERT(mutex.Lock()); + TEST_ASSERT(!mutex.Lock()); + } - void DoubleUnlockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex4"); - TEST_ASSERT(mutex.Lock()); - TEST_ASSERT(mutex.Unlock()); - TEST_ASSERT(!mutex.Unlock()); - } + void DoubleUnlockMutexTest() { + EQEmu::IPCMutex mutex("TestMutex4"); + TEST_ASSERT(mutex.Lock()); + TEST_ASSERT(mutex.Unlock()); + TEST_ASSERT(!mutex.Unlock()); + } }; #endif diff --git a/tests/main.cpp b/tests/main.cpp index f3cf0e20a..d12aa143c 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -26,17 +26,17 @@ #include "fixed_memory_variable_test.h" int main() { - try { - std::ofstream outfile("test_output.txt"); - std::unique_ptr output(new Test::TextOutput(Test::TextOutput::Verbose, outfile)); - Test::Suite tests; - tests.add(new MemoryMappedFileTest()); - tests.add(new IPCMutexTest()); - tests.add(new FixedMemoryHashTest()); - tests.add(new FixedMemoryVariableHashTest()); - tests.run(*output, true); - } catch(...) { - return -1; - } - return 0; + try { + std::ofstream outfile("test_output.txt"); + std::unique_ptr output(new Test::TextOutput(Test::TextOutput::Verbose, outfile)); + Test::Suite tests; + tests.add(new MemoryMappedFileTest()); + tests.add(new IPCMutexTest()); + tests.add(new FixedMemoryHashTest()); + tests.add(new FixedMemoryVariableHashTest()); + tests.run(*output, true); + } catch(...) { + return -1; + } + return 0; } diff --git a/tests/memory_mapped_file_test.h b/tests/memory_mapped_file_test.h index 3f77353eb..3ce61d44e 100644 --- a/tests/memory_mapped_file_test.h +++ b/tests/memory_mapped_file_test.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __EQEMU_TESTS_MEMORY_MAPPED_FILE_H @@ -23,38 +23,38 @@ #include "../common/memory_mapped_file.h" class MemoryMappedFileTest : public Test::Suite { - typedef void(MemoryMappedFileTest::*TestFunction)(void); + typedef void(MemoryMappedFileTest::*TestFunction)(void); public: - MemoryMappedFileTest() { - TEST_ADD(MemoryMappedFileTest::LoadAndZeroMMF) - TEST_ADD(MemoryMappedFileTest::LoadExistingMMF) - } + MemoryMappedFileTest() { + TEST_ADD(MemoryMappedFileTest::LoadAndZeroMMF) + TEST_ADD(MemoryMappedFileTest::LoadExistingMMF) + } - ~MemoryMappedFileTest() { - } + ~MemoryMappedFileTest() { + } - private: - void LoadAndZeroMMF() { - EQEmu::MemoryMappedFile mmf("testfile.txt", 512); - mmf.ZeroFile(); - TEST_ASSERT(mmf.Size() == 512); + private: + void LoadAndZeroMMF() { + EQEmu::MemoryMappedFile mmf("testfile.txt", 512); + mmf.ZeroFile(); + TEST_ASSERT(mmf.Size() == 512); - unsigned char *data = reinterpret_cast(mmf.Get()); - TEST_ASSERT(data != nullptr); + unsigned char *data = reinterpret_cast(mmf.Get()); + TEST_ASSERT(data != nullptr); - *reinterpret_cast(data) = 562; - } + *reinterpret_cast(data) = 562; + } - void LoadExistingMMF() { - EQEmu::MemoryMappedFile mmf("testfile.txt"); - TEST_ASSERT(mmf.Size() == 512); + void LoadExistingMMF() { + EQEmu::MemoryMappedFile mmf("testfile.txt"); + TEST_ASSERT(mmf.Size() == 512); - unsigned char *data = reinterpret_cast(mmf.Get()); - TEST_ASSERT(data != nullptr); + unsigned char *data = reinterpret_cast(mmf.Get()); + TEST_ASSERT(data != nullptr); - uint32 val = *reinterpret_cast(data); - TEST_ASSERT(val == 562); - } + uint32 val = *reinterpret_cast(data); + TEST_ASSERT(val == 562); + } }; #endif diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt index 4493d8461..fc813baf6 100644 --- a/ucs/CMakeLists.txt +++ b/ucs/CMakeLists.txt @@ -1,20 +1,20 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(ucs_sources - chatchannel.cpp - clientlist.cpp - database.cpp - ucs.cpp - ucsconfig.cpp - worldserver.cpp + chatchannel.cpp + clientlist.cpp + database.cpp + ucs.cpp + ucsconfig.cpp + worldserver.cpp ) SET(ucs_headers - chatchannel.h - clientlist.h - database.h - ucsconfig.h - worldserver.h + chatchannel.h + clientlist.h + database.h + ucsconfig.h + worldserver.h ) ADD_EXECUTABLE(ucs ${ucs_sources} ${ucs_headers}) @@ -25,21 +25,21 @@ TARGET_LINK_LIBRARIES(ucs Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_ IF(MSVC) - SET_TARGET_PROPERTIES(ucs PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(ucs "Ws2_32.lib") + SET_TARGET_PROPERTIES(ucs PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(ucs "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(ucs "WS2_32") + TARGET_LINK_LIBRARIES(ucs "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(ucs "dl") - TARGET_LINK_LIBRARIES(ucs "z") - TARGET_LINK_LIBRARIES(ucs "m") - TARGET_LINK_LIBRARIES(ucs "rt") - TARGET_LINK_LIBRARIES(ucs "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(ucs "dl") + TARGET_LINK_LIBRARIES(ucs "z") + TARGET_LINK_LIBRARIES(ucs "m") + TARGET_LINK_LIBRARIES(ucs "rt") + TARGET_LINK_LIBRARIES(ucs "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp index c3f3ad6f0..140ccdb68 100644 --- a/ucs/chatchannel.cpp +++ b/ucs/chatchannel.cpp @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -44,7 +42,7 @@ ChatChannel::ChatChannel(string inName, string inOwner, string inPassword, bool Moderated = false; _log(UCS__TRACE, "New ChatChannel created: Name: [%s], Owner: [%s], Password: [%s], MinStatus: %i", - Name.c_str(), Owner.c_str(), Password.c_str(), MinimumStatus); + Name.c_str(), Owner.c_str(), Password.c_str(), MinimumStatus); } @@ -399,7 +397,7 @@ void ChatChannel::SendMessageToChannel(string Message, Client* Sender) { if(ChannelClient) { _log(UCS__TRACE, "Sending message to %s from %s", - ChannelClient->GetName().c_str(), Sender->GetName().c_str()); + ChannelClient->GetName().c_str(), Sender->GetName().c_str()); ChannelClient->SendChannelMessage(Name, Message, Sender); } @@ -509,7 +507,7 @@ ChatChannel *ChatChannelList::AddClientToChannel(string ChannelName, Client *c) } if(RequiredChannel->CheckPassword(Password) || RequiredChannel->IsOwner(c->GetName()) || RequiredChannel->IsModerator(c->GetName()) || - c->IsChannelAdmin()) { + c->IsChannelAdmin()) { RequiredChannel->AddClient(c); @@ -704,3 +702,4 @@ string CapitaliseName(string inString) { return NormalisedName; } + diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index 49374a7a9..4c57190c8 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -209,7 +207,7 @@ vector ParseRecipients(string RecipientString) { LastPeriod = (*Iterator).find_last_of("."); - if(LastPeriod != string::npos) { + if(LastPeriod != string::npos) { (*Iterator) = (*Iterator).substr(LastPeriod + 1); @@ -309,7 +307,7 @@ static void ProcessMailTo(Client *c, string MailMessage) { if(!database.SendMail(Recipients[i], c->MailBoxName(), Subject, Body, RecipientsString)) { _log(UCS__ERROR, "Failed in SendMail(%s, %s, %s, %s)", Recipients[i].c_str(), - c->MailBoxName().c_str(), Subject.c_str(), RecipientsString.c_str()); + c->MailBoxName().c_str(), Subject.c_str(), RecipientsString.c_str()); int PacketLength = 10 + Recipients[i].length() + Subject.length(); @@ -561,16 +559,16 @@ void Clientlist::CheckForStaleConnections(Client *c) { for(Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); Iterator++) { if(((*Iterator) != c) && ((c->GetName() == (*Iterator)->GetName()) - && (c->GetConnectionType() == (*Iterator)->GetConnectionType()))) { + && (c->GetConnectionType() == (*Iterator)->GetConnectionType()))) { _log(UCS__CLIENT, "Removing old connection for %s", c->GetName().c_str()); - struct in_addr in; + struct in_addr in; in.s_addr = (*Iterator)->ClientStream->GetRemoteIP(); _log(UCS__CLIENT, "Client connection from %s:%d closed.", inet_ntoa(in), - ntohs((*Iterator)->ClientStream->GetRemotePort())); + ntohs((*Iterator)->ClientStream->GetRemotePort())); safe_delete((*Iterator)); @@ -585,7 +583,7 @@ void Clientlist::Process() { while((eqs = chatsf->Pop())) { - struct in_addr in; + struct in_addr in; in.s_addr = eqs->GetRemoteIP(); @@ -605,12 +603,12 @@ void Clientlist::Process() { (*Iterator)->AccountUpdate(); if((*Iterator)->ClientStream->CheckClosed()) { - struct in_addr in; + struct in_addr in; in.s_addr = (*Iterator)->ClientStream->GetRemoteIP(); _log(UCS__CLIENT, "Client connection from %s:%d closed.", inet_ntoa(in), - ntohs((*Iterator)->ClientStream->GetRemotePort())); + ntohs((*Iterator)->ClientStream->GetRemotePort())); safe_delete((*Iterator)); @@ -627,7 +625,7 @@ void Clientlist::Process() { bool KeyValid = true; while( KeyValid && !(*Iterator)->GetForceDisconnect() && - (app = (EQApplicationPacket *)(*Iterator)->ClientStream->PopPacket())) { + (app = (EQApplicationPacket *)(*Iterator)->ClientStream->PopPacket())) { _pkt(UCS__PACKETS, app); @@ -715,13 +713,13 @@ void Clientlist::Process() { } if(!KeyValid || (*Iterator)->GetForceDisconnect()) { - struct in_addr in; + struct in_addr in; in.s_addr = (*Iterator)->ClientStream->GetRemoteIP(); _log(UCS__TRACE, "Force disconnecting client: %s:%d, KeyValid=%i, GetForceDisconnect()=%i", - inet_ntoa(in), ntohs((*Iterator)->ClientStream->GetRemotePort()), - KeyValid, (*Iterator)->GetForceDisconnect()); + inet_ntoa(in), ntohs((*Iterator)->ClientStream->GetRemotePort()), + KeyValid, (*Iterator)->GetForceDisconnect()); (*Iterator)->ClientStream->Close(); @@ -870,7 +868,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, string CommandString) case CommandSelectMailBox: { string::size_type NumStart = Parameters.find_first_of("0123456789"); - c->ChangeMailBox(atoi(Parameters.substr(NumStart).c_str())); + c->ChangeMailBox(atoi(Parameters.substr(NumStart).c_str())); break; } case CommandSetMailForwarding: @@ -1311,7 +1309,7 @@ void Client::SendChannelMessage(string Message) if(ChannelName.compare("Newplayers") != 0) { - if(GetKarma() < RuleI(Chat, KarmaGlobalChatLimit)) + if(GetKarma() < RuleI(Chat, KarmaGlobalChatLimit)) { CharacterEntry *char_ent = nullptr; for(int x = 0; x < Characters.size(); ++x) @@ -1424,7 +1422,7 @@ void Client::SendChannelMessageByNumber(string Message) { if(RequiredChannel->GetName().compare("Newplayers") != 0) { - if(GetKarma() < RuleI(Chat, KarmaGlobalChatLimit)) + if(GetKarma() < RuleI(Chat, KarmaGlobalChatLimit)) { CharacterEntry *char_ent = nullptr; for(int x = 0; x < Characters.size(); ++x) @@ -1447,7 +1445,7 @@ void Client::SendChannelMessageByNumber(string Message) { } _log(UCS__TRACE, "%s tells %s, [%s]", GetName().c_str(), RequiredChannel->GetName().c_str(), - Message.substr(MessageStart + 1).c_str()); + Message.substr(MessageStart + 1).c_str()); if(RuleB(Chat, EnableAntiSpam)) { @@ -2139,7 +2137,7 @@ void Client::ChannelKick(string CommandString) { return; } - if(RequiredChannel->IsModerator(Kickee)) { + if(RequiredChannel->IsModerator(Kickee)) { RequiredChannel->RemoveModerator(Kickee); @@ -2388,13 +2386,13 @@ string Client::MailBoxName() { if((Characters.size() == 0) || (CurrentMailBox > (Characters.size() - 1))) { _log(UCS__ERROR, "MailBoxName() called with CurrentMailBox set to %i and Characters.size() is %i", - CurrentMailBox, Characters.size()); + CurrentMailBox, Characters.size()); return ""; } _log(UCS__TRACE, "MailBoxName() called with CurrentMailBox set to %i and Characters.size() is %i", - CurrentMailBox, Characters.size()); + CurrentMailBox, Characters.size()); return Characters[CurrentMailBox].Name; @@ -2407,3 +2405,4 @@ int Client::GetCharID() { return Characters[0].CharID; } + diff --git a/ucs/clientlist.h b/ucs/clientlist.h index 91264a395..1876ec58b 100644 --- a/ucs/clientlist.h +++ b/ucs/clientlist.h @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -32,48 +30,50 @@ #define MAX_JOINED_CHANNELS 10 -enum { CommandJoin = 0, CommandLeaveAll, CommandLeave, CommandListAll, CommandList, CommandSet, CommandAnnounce, CommandSetOwner, - CommandOPList, CommandInvite, CommandGrant, CommandModerate, CommandVoice, CommandKick, - CommandPassword, CommandToggleInvites, CommandAFK, CommandUptime, - CommandGetHeaders, CommandGetBody, CommandMailTo, CommandSetMessageStatus, CommandSelectMailBox, - CommandSetMailForwarding, CommandBuddy, CommandIgnorePlayer, - CommandEndOfList }; +enum { + CommandJoin = 0, CommandLeaveAll, CommandLeave, CommandListAll, CommandList, CommandSet, CommandAnnounce, CommandSetOwner, + CommandOPList, CommandInvite, CommandGrant, CommandModerate, CommandVoice, CommandKick, + CommandPassword, CommandToggleInvites, CommandAFK, CommandUptime, + CommandGetHeaders, CommandGetBody, CommandMailTo, CommandSetMessageStatus, CommandSelectMailBox, + CommandSetMailForwarding, CommandBuddy, CommandIgnorePlayer, + CommandEndOfList +}; struct CommandEntry { const char *CommandString; - int CommandCode; + int CommandCode; }; typedef enum { ConnectionTypeUnknown, ConnectionTypeCombined, ConnectionTypeMail, ConnectionTypeChat } ConnectionType; static const CommandEntry Commands[] = { - { "join", CommandJoin }, - { "leaveall", CommandLeaveAll }, - { "leave", CommandLeave }, - { "listall", CommandListAll }, - { "list", CommandList }, - { "set", CommandSet }, - { "announce", CommandAnnounce }, - { "setowner", CommandSetOwner }, - { "oplist", CommandOPList }, - { "invite", CommandInvite }, - { "grant", CommandGrant }, - { "moderate", CommandModerate }, - { "voice", CommandVoice }, - { "kick", CommandKick }, - { "password", CommandPassword }, - { "toggleinvites", CommandToggleInvites }, - { "afk", CommandAFK }, - { "uptime", CommandUptime }, - { "getheaders", CommandGetHeaders }, - { "getbody", CommandGetBody }, - { "mailto", CommandMailTo }, - { "setmessagestatus", CommandSetMessageStatus }, - { "selectmailbox", CommandSelectMailBox }, - { "setmailforwarding", CommandSetMailForwarding }, - { "buddy", CommandBuddy }, - { "ignoreplayer", CommandIgnorePlayer }, - { "", CommandEndOfList } }; + { "join", CommandJoin }, + { "leaveall", CommandLeaveAll }, + { "leave", CommandLeave }, + { "listall", CommandListAll }, + { "list", CommandList }, + { "set", CommandSet }, + { "announce", CommandAnnounce }, + { "setowner", CommandSetOwner }, + { "oplist", CommandOPList }, + { "invite", CommandInvite }, + { "grant", CommandGrant }, + { "moderate", CommandModerate }, + { "voice", CommandVoice }, + { "kick", CommandKick }, + { "password", CommandPassword }, + { "toggleinvites", CommandToggleInvites }, + { "afk", CommandAFK }, + { "uptime", CommandUptime }, + { "getheaders", CommandGetHeaders }, + { "getbody", CommandGetBody }, + { "mailto", CommandMailTo }, + { "setmessagestatus", CommandSetMessageStatus }, + { "selectmailbox", CommandSelectMailBox }, + { "setmailforwarding", CommandSetMailForwarding }, + { "buddy", CommandBuddy }, + { "ignoreplayer", CommandIgnorePlayer }, + { "", CommandEndOfList } }; struct CharacterEntry { int CharID; diff --git a/ucs/database.cpp b/ucs/database.cpp index eb60b0c5c..9f349b82a 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -1,6 +1,4 @@ -/* - EQEMu: Everquest Server Emulator - +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -11,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -112,7 +110,7 @@ void Database::GetAccountStatus(Client *c) { MYSQL_ROW row; if (!RunQuery(query,MakeAnyLenString(&query, "select `status`, `hideme`, `karma`, `revoked` from `account` where `id`='%i' limit 1", - c->GetAccountID()),errbuf,&result)){ + c->GetAccountID()),errbuf,&result)){ _log(UCS__ERROR, "Unable to get account status for character %s, error %s", c->GetName().c_str(), errbuf); @@ -153,7 +151,7 @@ int Database::FindAccount(const char *CharacterName, Client *c) { c->ClearCharacters(); if (!RunQuery(query,MakeAnyLenString(&query, "select `id`, `account_id`, `level` from `character_` where `name`='%s' limit 1", - CharacterName),errbuf,&result)) + CharacterName),errbuf,&result)) { _log(UCS__ERROR, "FindAccount query failed: %s", query); safe_delete_array(query); @@ -176,7 +174,7 @@ int Database::FindAccount(const char *CharacterName, Client *c) { _log(UCS__TRACE, "Account ID for %s is %i", CharacterName, AccountID); if (!RunQuery(query,MakeAnyLenString(&query, "select `id`, `name`, `level` from `character_` where `account_id`=%i and `name` !='%s'", - AccountID, CharacterName),errbuf,&result)) + AccountID, CharacterName),errbuf,&result)) { safe_delete_array(query); return AccountID; @@ -200,7 +198,7 @@ bool Database::VerifyMailKey(string CharacterName, int IPAddress, string MailKey MYSQL_ROW row; if (!RunQuery(query,MakeAnyLenString(&query, "select `mailkey` from `character_` where `name`='%s' limit 1", - CharacterName.c_str()),errbuf,&result)){ + CharacterName.c_str()),errbuf,&result)){ safe_delete_array(query); @@ -243,7 +241,7 @@ int Database::FindCharacter(const char *CharacterName) { char *SafeCharName = RemoveApostrophes(CharacterName); if (!RunQuery(query,MakeAnyLenString(&query, "select `id` from `character_` where `name`='%s' limit 1", - SafeCharName),errbuf,&result)){ + SafeCharName),errbuf,&result)){ _log(UCS__ERROR, "FindCharacter failed. %s %s", query, errbuf); @@ -350,7 +348,7 @@ void Database::SetChannelPassword(string ChannelName, string Password) { char *query = 0; if(!RunQuery(query, MakeAnyLenString(&query, "UPDATE `chatchannels` set `password`='%s' where `name`='%s'", Password.c_str(), - ChannelName.c_str()), errbuf)) { + ChannelName.c_str()), errbuf)) { _log(UCS__ERROR, "Error updating password in database: %s, %s", query, errbuf); @@ -367,7 +365,7 @@ void Database::SetChannelOwner(string ChannelName, string Owner) { char *query = 0; if(!RunQuery(query, MakeAnyLenString(&query, "UPDATE `chatchannels` set `owner`='%s' where `name`='%s'", Owner.c_str(), - ChannelName.c_str()), errbuf)) { + ChannelName.c_str()), errbuf)) { _log(UCS__ERROR, "Error updating Owner in database: %s, %s", query, errbuf); @@ -393,7 +391,7 @@ void Database::SendHeaders(Client *c) { MYSQL_ROW row; if (!RunQuery(query,MakeAnyLenString(&query, "select `msgid`,`timestamp`,`from`,`subject`, `status` from `mail` " - "where `charid`=%i", CharacterID),errbuf,&result)){ + "where `charid`=%i", CharacterID),errbuf,&result)){ safe_delete_array(query); @@ -497,7 +495,7 @@ void Database::SendBody(Client *c, int MessageNumber) { MYSQL_ROW row; if (!RunQuery(query,MakeAnyLenString(&query, "select `msgid`, `body`, `to` from `mail` " - "where `charid`=%i and `msgid`=%i", CharacterID, MessageNumber), errbuf, &result)){ + "where `charid`=%i and `msgid`=%i", CharacterID, MessageNumber), errbuf, &result)){ safe_delete_array(query); return ; @@ -579,14 +577,14 @@ bool Database::SendMail(string Recipient, string From, string Subject, string Bo DoEscapeString(EscBody, Body.c_str(), Body.length()); const char *MailQuery="INSERT INTO `mail` (`charid`, `timestamp`, `from`, `subject`, `body`, `to`, `status`) " - "VALUES ('%i', %i, '%s', '%s', '%s', '%s', %i)"; + "VALUES ('%i', %i, '%s', '%s', '%s', '%s', %i)"; uint32 LastMsgID; int Now = time(nullptr); // time returns a 64 bit int on Windows at least, which vsnprintf doesn't like. if(!RunQuery(query, MakeAnyLenString(&query, MailQuery, CharacterID, Now, From.c_str(), EscSubject, EscBody, - RecipientsString.c_str(), 1), errbuf, 0, 0, &LastMsgID)) { + RecipientsString.c_str(), 1), errbuf, 0, 0, &LastMsgID)) { _log(UCS__ERROR, "SendMail: Query %s failed with error %s", query, errbuf); @@ -601,7 +599,7 @@ bool Database::SendMail(string Recipient, string From, string Subject, string Bo safe_delete_array(EscSubject); safe_delete_array(EscBody); - safe_delete_array(query); + safe_delete_array(query); Client *c = CL->IsCharacterOnline(CharacterName); @@ -624,7 +622,7 @@ void Database::SetMessageStatus(int MessageNumber, int Status) { char *query = 0; if(Status == 0) - RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `msgid`=%i", MessageNumber), errbuf); + RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `msgid`=%i", MessageNumber), errbuf); else if (!RunQuery(query, MakeAnyLenString(&query, "update `mail` set `status`=%i where `msgid`=%i", Status, MessageNumber), errbuf)) { _log(UCS__ERROR, "Error updating status %s, %s", query, errbuf); @@ -660,9 +658,9 @@ void Database::ExpireMail() { // Expire Trash if(RuleI(Mail, ExpireTrash) >= 0) { - if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=4 and `timestamp` < %i", - time(nullptr) - RuleI(Mail, ExpireTrash)), errbuf, 0, &AffectedRows)) { - _log(UCS__INIT, "Expired %i trash messages.", AffectedRows); + if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=4 and `timestamp` < %i", + time(nullptr) - RuleI(Mail, ExpireTrash)), errbuf, 0, &AffectedRows)) { + _log(UCS__INIT, "Expired %i trash messages.", AffectedRows); } else { _log(UCS__ERROR, "Error expiring trash messages, %s %s", query, errbuf); @@ -671,9 +669,9 @@ void Database::ExpireMail() { } // Expire Read if(RuleI(Mail, ExpireRead) >= 0) { - if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=3 and `timestamp` < %i", - time(nullptr) - RuleI(Mail, ExpireRead)), errbuf, 0, &AffectedRows)) { - _log(UCS__INIT, "Expired %i read messages.", AffectedRows); + if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=3 and `timestamp` < %i", + time(nullptr) - RuleI(Mail, ExpireRead)), errbuf, 0, &AffectedRows)) { + _log(UCS__INIT, "Expired %i read messages.", AffectedRows); } else { _log(UCS__ERROR, "Error expiring read messages, %s %s", query, errbuf); @@ -682,9 +680,9 @@ void Database::ExpireMail() { } // Expire Unread if(RuleI(Mail, ExpireUnread) >= 0) { - if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=1 and `timestamp` < %i", - time(nullptr) - RuleI(Mail, ExpireUnread)), errbuf, 0, &AffectedRows)) { - _log(UCS__INIT, "Expired %i unread messages.", AffectedRows); + if(RunQuery(query, MakeAnyLenString(&query, "delete from `mail` where `status`=1 and `timestamp` < %i", + time(nullptr) - RuleI(Mail, ExpireUnread)), errbuf, 0, &AffectedRows)) { + _log(UCS__INIT, "Expired %i unread messages.", AffectedRows); } else { _log(UCS__ERROR, "Error expiring unread messages, %s %s", query, errbuf); @@ -705,7 +703,7 @@ void Database::AddFriendOrIgnore(int CharID, int Type, string Name) { _log(UCS__ERROR, "Error adding friend/ignore, query was %s : %s", query, errbuf); else _log(UCS__TRACE, "Wrote Friend/Ignore entry for charid %i, type %i, name %s to database.", - CharID, Type, Name.c_str()); + CharID, Type, Name.c_str()); safe_delete_array(query); @@ -722,7 +720,7 @@ void Database::RemoveFriendOrIgnore(int CharID, int Type, string Name) { _log(UCS__ERROR, "Error removing friend/ignore, query was %s", query); else _log(UCS__TRACE, "Removed Friend/Ignore entry for charid %i, type %i, name %s from database.", - CharID, Type, Name.c_str()); + CharID, Type, Name.c_str()); safe_delete_array(query); @@ -768,3 +766,4 @@ void Database::GetFriendsAndIgnore(int CharID, vector &Friends, vector @@ -115,16 +115,16 @@ void WorldServer::Process() break; } - case ServerOP_UCSMailMessage: - { - ServerMailMessageHeader_Struct *mail = (ServerMailMessageHeader_Struct*)pack->pBuffer; - database.SendMail(string("SOE.EQ.") + Config->ShortName + string(".") + string(mail->to), - string(mail->from), - mail->subject, - mail->message, - string()); - break; - } + case ServerOP_UCSMailMessage: + { + ServerMailMessageHeader_Struct *mail = (ServerMailMessageHeader_Struct*)pack->pBuffer; + database.SendMail(string("SOE.EQ.") + Config->ShortName + string(".") + string(mail->to), + string(mail->from), + mail->subject, + mail->message, + string()); + break; + } } } diff --git a/ucs/worldserver.h b/ucs/worldserver.h index c42ca5ceb..0b9bebacd 100644 --- a/ucs/worldserver.h +++ b/ucs/worldserver.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WORLDSERVER_H #define WORLDSERVER_H diff --git a/world/Adventure.cpp b/world/Adventure.cpp index f8b4a0611..c5542f7be 100644 --- a/world/Adventure.cpp +++ b/world/Adventure.cpp @@ -115,8 +115,8 @@ bool Adventure::Process() else if(status == AS_WaitingForPrimaryEndTime) { //Do partial failure: send a message to the clients that they can only get a certain amount of points. - SendAdventureMessage(13, "You failed to complete your adventure in time. Complete your adventure goal within 30 minutes to " - "receive a lesser reward. This adventure will end in 30 minutes and your party will be ejected from the dungeon."); + SendAdventureMessage(13, "You failed to complete your adventure in time. Complete your adventure goal within 30 minutes to " + "receive a lesser reward. This adventure will end in 30 minutes and your party will be ejected from the dungeon."); SetStatus(AS_WaitingForSecondaryEndTime); } else @@ -435,4 +435,5 @@ void Adventure::MoveCorpsesToGraveyard() iter++; c_iter++; } -} \ No newline at end of file +} + diff --git a/world/AdventureManager.cpp b/world/AdventureManager.cpp index abd202d61..4a8321a4d 100644 --- a/world/AdventureManager.cpp +++ b/world/AdventureManager.cpp @@ -68,8 +68,8 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } /** - * This block checks to see if we actually have any adventures for the requested theme. - */ + * This block checks to see if we actually have any adventures for the requested theme. + */ map >::iterator adv_list_iter = adventure_entries.find(sar->template_id); if(adv_list_iter == adventure_entries.end()) { @@ -84,10 +84,10 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } /** - * This block checks to see if our requested group has anyone with an "Active" adventure - * Active being in progress, finished adventures that are still waiting to expire do not count - * Though they will count against you for which new adventure you can get. - */ + * This block checks to see if our requested group has anyone with an "Active" adventure + * Active being in progress, finished adventures that are still waiting to expire do not count + * Though they will count against you for which new adventure you can get. + */ list::iterator iter = adventure_list.begin(); while(iter != adventure_list.end()) { @@ -117,9 +117,9 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } /** - * Now we need to get every available adventure for our selected theme and exclude ones we can't use. - * ie. the ones that would cause overlap issues for new adventures with the old unexpired adventures. - */ + * Now we need to get every available adventure for our selected theme and exclude ones we can't use. + * ie. the ones that would cause overlap issues for new adventures with the old unexpired adventures. + */ list excluded_zones; list excluded_zone_ins; for(int i = 0; i < sar->member_count; ++i) @@ -149,9 +149,9 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) list eligible_adventures = adventure_entries[sar->template_id]; /** - * Remove zones from eligible zones based on their difficulty and type. - * ie only use difficult zones for difficult, collect for collect, etc. - */ + * Remove zones from eligible zones based on their difficulty and type. + * ie only use difficult zones for difficult, collect for collect, etc. + */ list::iterator ea_iter = eligible_adventures.begin(); while(ea_iter != eligible_adventures.end()) { @@ -170,8 +170,8 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } /** - * Get levels for this group. - */ + * Get levels for this group. + */ int valid_count = 0; int avg_level = 0; int min_level = 40000; @@ -263,8 +263,8 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } /** - * Remove the zones from our eligible zones based on the exclusion above - */ + * Remove the zones from our eligible zones based on the exclusion above + */ list::iterator ez_iter = excluded_zones.begin(); while(ez_iter != excluded_zones.end()) { @@ -282,7 +282,7 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) } list::iterator ezi_iter = excluded_zone_ins.begin(); - while(ezi_iter != excluded_zone_ins.end()) + while(ezi_iter != excluded_zone_ins.end()) { list::iterator ea_iter = eligible_adventures.begin(); while(ea_iter != eligible_adventures.end()) @@ -297,9 +297,9 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data) ezi_iter++; } - /** - * Remove Zones based on level - */ + /** + * Remove Zones based on level + */ ea_iter = eligible_adventures.begin(); while(ea_iter != eligible_adventures.end()) { diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt index 85423e5f1..8ea3397fe 100644 --- a/world/CMakeLists.txt +++ b/world/CMakeLists.txt @@ -1,66 +1,66 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(world_sources - Adventure.cpp - AdventureManager.cpp - client.cpp - cliententry.cpp - clientlist.cpp - CMakeLists.txt - console.cpp - EQLConfig.cpp - EQW.cpp - EQWHTTPHandler.cpp - EQWParser.cpp - HTTPRequest.cpp - LauncherLink.cpp - LauncherList.cpp - lfplist.cpp - LoginServer.cpp - LoginServerList.cpp - net.cpp - perl_EQLConfig.cpp - perl_EQW.cpp - perl_HTTPRequest.cpp - queryserv.cpp - ucs.cpp - wguild_mgr.cpp - world_logsys.cpp - WorldConfig.cpp - worlddb.cpp - zonelist.cpp - zoneserver.cpp + Adventure.cpp + AdventureManager.cpp + client.cpp + cliententry.cpp + clientlist.cpp + CMakeLists.txt + console.cpp + EQLConfig.cpp + EQW.cpp + EQWHTTPHandler.cpp + EQWParser.cpp + HTTPRequest.cpp + LauncherLink.cpp + LauncherList.cpp + lfplist.cpp + LoginServer.cpp + LoginServerList.cpp + net.cpp + perl_EQLConfig.cpp + perl_EQW.cpp + perl_HTTPRequest.cpp + queryserv.cpp + ucs.cpp + wguild_mgr.cpp + world_logsys.cpp + WorldConfig.cpp + worlddb.cpp + zonelist.cpp + zoneserver.cpp ) SET(world_headers - Adventure.h - AdventureManager.h - AdventureTemplate.h - client.h - cliententry.h - clientlist.h - CMakeLists.txt - console.h - EQLConfig.h - EQW.h - EQWHTTPHandler.h - EQWParser.h - HTTPRequest.h - LauncherLink.h - LauncherList.h - lfplist.h - LoginServer.h - LoginServerList.h - net.h - queryserv.h - SoFCharCreateData.h - ucs.h - wguild_mgr.h - WorldConfig.h - worlddb.h - WorldTCPConnection.h - zonelist.h - zoneserver.h + Adventure.h + AdventureManager.h + AdventureTemplate.h + client.h + cliententry.h + clientlist.h + CMakeLists.txt + console.h + EQLConfig.h + EQW.h + EQWHTTPHandler.h + EQWParser.h + HTTPRequest.h + LauncherLink.h + LauncherList.h + lfplist.h + LoginServer.h + LoginServerList.h + net.h + queryserv.h + SoFCharCreateData.h + ucs.h + wguild_mgr.h + WorldConfig.h + worlddb.h + WorldTCPConnection.h + zonelist.h + zoneserver.h ) ADD_EXECUTABLE(world ${world_sources} ${world_headers}) @@ -71,21 +71,21 @@ TARGET_LINK_LIBRARIES(world Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} IF(MSVC) - SET_TARGET_PROPERTIES(world PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(world "Ws2_32.lib") + SET_TARGET_PROPERTIES(world PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(world "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(world "WS2_32") + TARGET_LINK_LIBRARIES(world "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(world "dl") - TARGET_LINK_LIBRARIES(world "z") - TARGET_LINK_LIBRARIES(world "m") - TARGET_LINK_LIBRARIES(world "rt") - TARGET_LINK_LIBRARIES(world "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(world "dl") + TARGET_LINK_LIBRARIES(world "z") + TARGET_LINK_LIBRARIES(world "m") + TARGET_LINK_LIBRARIES(world "rt") + TARGET_LINK_LIBRARIES(world "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) SET(EXECUTABLE_OUTPUT_PATH ../Bin) diff --git a/world/EQLConfig.cpp b/world/EQLConfig.cpp index fe88008d6..09ebf52b6 100644 --- a/world/EQLConfig.cpp +++ b/world/EQLConfig.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "EQLConfig.h" @@ -39,7 +39,7 @@ void EQLConfig::LoadSettings() { MYSQL_ROW row; LauncherZone tmp; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; @@ -77,15 +77,15 @@ void EQLConfig::LoadSettings() { EQLConfig *EQLConfig::CreateLauncher(const char *name, uint8 dynamic_count) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, name, strlen(name)&0x3F); //limit len to 64 namebuf[127] = '\0'; if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO launcher (name,dynamics) VALUES('%s', %d)", - namebuf, dynamic_count), errbuf)) { + namebuf, dynamic_count), errbuf)) { LogFile->write(EQEMuLog::Error, "Error in CreateLauncher query: %s", errbuf); safe_delete_array(query); return nullptr; @@ -127,9 +127,9 @@ void EQLConfig::DeleteLauncher() { launcher_list.Remove(m_name.c_str()); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; @@ -185,18 +185,18 @@ bool EQLConfig::BootStaticZone(Const_char *short_name, uint16 port) { //database update char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; - char zonebuf[32]; + char zonebuf[32]; database.DoEscapeString(zonebuf, short_name, strlen(short_name)&0xF); //limit len to 16 zonebuf[31] = '\0'; if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO launcher_zones (launcher,zone,port) VALUES('%s', '%s', %d)", - namebuf, zonebuf, port), errbuf)) { + namebuf, zonebuf, port), errbuf)) { LogFile->write(EQEMuLog::Error, "Error in BootStaticZone query: %s", errbuf); safe_delete_array(query); return false; @@ -235,18 +235,18 @@ bool EQLConfig::ChangeStaticZone(Const_char *short_name, uint16 port) { //database update char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; - char zonebuf[32]; + char zonebuf[32]; database.DoEscapeString(zonebuf, short_name, strlen(short_name)&0xF); //limit len to 16 zonebuf[31] = '\0'; if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE launcher_zones SET port=%d WHERE launcher='%s' AND zone='%s'", - port, namebuf, zonebuf), errbuf)) { + port, namebuf, zonebuf), errbuf)) { LogFile->write(EQEMuLog::Error, "Error in ChangeStaticZone query: %s", errbuf); safe_delete_array(query); return false; @@ -278,12 +278,12 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) { //database update char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; - char zonebuf[32]; + char zonebuf[32]; database.DoEscapeString(zonebuf, short_name, strlen(short_name)&0xF); //limit len to 16 zonebuf[31] = '\0'; @@ -310,15 +310,15 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) { bool EQLConfig::SetDynamicCount(int count) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - char namebuf[128]; + char namebuf[128]; database.DoEscapeString(namebuf, m_name.c_str(), m_name.length()&0x3F); //limit len to 64 namebuf[127] = '\0'; if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE launcher SET dynamics=%d WHERE name='%s'", - count, namebuf), errbuf)) { + count, namebuf), errbuf)) { LogFile->write(EQEMuLog::Error, "Error in SetDynamicCount query: %s", errbuf); safe_delete_array(query); return false; @@ -357,28 +357,3 @@ map EQLConfig::GetZoneDetails(Const_char *zone_ref) { return(res); } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/world/EQLConfig.h b/world/EQLConfig.h index 1588c5d60..f4d1a4488 100644 --- a/world/EQLConfig.h +++ b/world/EQLConfig.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQLCONFIG_H_ #define EQLCONFIG_H_ @@ -58,7 +58,7 @@ public: bool DeleteStaticZone(Const_char *short_name); bool SetDynamicCount(int count); - int GetDynamicCount() const; + int GetDynamicCount() const; vector ListZones(); //returns an array of zone refs map GetZoneDetails(Const_char *zone_ref); @@ -72,11 +72,5 @@ protected: map m_zones; //static zones. }; - - - - - #endif /*EQLCONFIG_H_*/ - diff --git a/world/EQW.cpp b/world/EQW.cpp index 0214b2a6c..5746f06c0 100644 --- a/world/EQW.cpp +++ b/world/EQW.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef EMBPERL @@ -55,26 +55,23 @@ extern LoginServerList loginserverlist; extern LauncherList launcher_list; extern volatile bool RunLoops; - - - EQW EQW::s_EQW; //IO Capture routine XS(XS_EQWIO_PRINT); /* prototype to pass -Wmissing-prototypes */ XS(XS_EQWIO_PRINT) { - dXSARGS; - if (items < 2) - return; + dXSARGS; + if (items < 2) + return; int r; for(r = 1; r < items; r++) { char *str = SvPV_nolen(ST(r)); EQW::Singleton()->AppendOutput(str); - } + } - XSRETURN_EMPTY; + XSRETURN_EMPTY; } EQW::EQW() { @@ -341,7 +338,7 @@ bool EQW::SetDynamicCount(Const_char *launcher_name, int count) { return(false); } -int EQW::GetDynamicCount(Const_char *launcher_name) { +int EQW::GetDynamicCount(Const_char *launcher_name) { return(0); } */ @@ -391,72 +388,72 @@ bool EQW::SetPublicNote(uint32 charid, const char *note) { } int EQW::CountBugs() { - char errbuf[MYSQL_ERRMSG_SIZE]; + char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; MYSQL_RES *result; MYSQL_ROW row; - if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT count(*) FROM bugs where status = 0"), errbuf, &result)) { + if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT count(*) FROM bugs where status = 0"), errbuf, &result)) { safe_delete_array(query); - if((row = mysql_fetch_row(result))) { - int count = atoi(row[0]); - mysql_free_result(result); - return count; - } - mysql_free_result(result); - } - safe_delete_array(query); - return 0; + if((row = mysql_fetch_row(result))) { + int count = atoi(row[0]); + mysql_free_result(result); + return count; + } + mysql_free_result(result); + } + safe_delete_array(query); + return 0; } vector EQW::ListBugs(uint32 offset) { - vector res; - char errbuf[MYSQL_ERRMSG_SIZE]; + vector res; + char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; MYSQL_RES *result; MYSQL_ROW row; - if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM bugs WHERE status = 0 limit %d, 30", offset), errbuf, &result)) { + if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT id FROM bugs WHERE status = 0 limit %d, 30", offset), errbuf, &result)) { safe_delete_array(query); - while((row = mysql_fetch_row(result))) { - res.push_back(row[0]); - } - mysql_free_result(result); - } - safe_delete_array(query); - return res; + while((row = mysql_fetch_row(result))) { + res.push_back(row[0]); + } + mysql_free_result(result); + } + safe_delete_array(query); + return res; } map EQW::GetBugDetails(Const_char *id) { - map res; - char errbuf[MYSQL_ERRMSG_SIZE]; + map res; + char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; MYSQL_RES *result; MYSQL_ROW row; - if(database.RunQuery(query, MakeAnyLenString(&query, "select name, zone, x, y, z, target, bug from bugs where id = %s", id), errbuf, &result)) { + if(database.RunQuery(query, MakeAnyLenString(&query, "select name, zone, x, y, z, target, bug from bugs where id = %s", id), errbuf, &result)) { safe_delete_array(query); - while((row = mysql_fetch_row(result))) { - res["name"] = row[0]; - res["zone"] = row[1]; - res["x"] = row[2]; - res["y"] = row[3]; - res["z"] = row[4]; - res["target"] = row[5]; - res["bug"] = row[6]; - res["id"] = id; - } - mysql_free_result(result); - } - safe_delete_array(query); - return res; + while((row = mysql_fetch_row(result))) { + res["name"] = row[0]; + res["zone"] = row[1]; + res["x"] = row[2]; + res["y"] = row[3]; + res["z"] = row[4]; + res["target"] = row[5]; + res["bug"] = row[6]; + res["id"] = id; + } + mysql_free_result(result); + } + safe_delete_array(query); + return res; } void EQW::ResolveBug(const char *id) { - vector res; - char errbuf[MYSQL_ERRMSG_SIZE]; + vector res; + char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE bugs SET status=1 WHERE id=%s", id), errbuf)) { + if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE bugs SET status=1 WHERE id=%s", id), errbuf)) { safe_delete_array(query); - } - safe_delete_array(query); + } + safe_delete_array(query); } void EQW::SendMessage(uint32 type, const char *msg) { @@ -469,18 +466,3 @@ void EQW::WorldShutDown(uint32 time, uint32 interval) { #endif //EMBPERL - - - - - - - - - - - - - - - diff --git a/world/EQW.h b/world/EQW.h index c1527435b..d08a5bf4b 100644 --- a/world/EQW.h +++ b/world/EQW.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQW_H_ #define EQW_H_ @@ -45,15 +45,15 @@ public: bool LSConnected(); void LSReconnect(); - int CountZones(); + int CountZones(); vector ListBootedZones(); //returns an array of zone_refs (opaque) map GetZoneDetails(Const_char *zone_ref); //returns a hash ref of details - int CountPlayers(); + int CountPlayers(); vector ListPlayers(Const_char *zone_name = ""); //returns an array of player refs (opaque) map GetPlayerDetails(Const_char *player_ref); //returns a hash ref of details - int CountLaunchers(bool active_only); + int CountLaunchers(bool active_only); // vector ListActiveLaunchers(); //returns an array of launcher names vector ListLaunchers(); //returns an array of launcher names EQLConfig * GetLauncher(Const_char *launcher_name); //returns the EQLConfig object for the specified launcher. @@ -72,9 +72,9 @@ public: bool SetTributeFlag(uint32 charid, bool enabled); bool SetPublicNote(uint32 charid, const char *note); - //bugs - int CountBugs(); - vector ListBugs(uint32 offset); //returns an array of zone_refs (opaque) + //bugs + int CountBugs(); + vector ListBugs(uint32 offset); //returns an array of zone_refs (opaque) map GetBugDetails(const char *id); void ResolveBug(const char *id); diff --git a/world/EQWHTTPHandler.cpp b/world/EQWHTTPHandler.cpp index 8bba5c476..7b47ad30f 100644 --- a/world/EQWHTTPHandler.cpp +++ b/world/EQWHTTPHandler.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "EQWHTTPHandler.h" @@ -34,8 +34,8 @@ EQWParser *EQWHTTPHandler::s_parser = nullptr; const int EQWHTTPHandler::READ_BUFFER_LEN = 1024; //for page IO, was a static const member, but VC6 got mad. EQWHTTPHandler::EQWHTTPHandler(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort) -: HttpdSocket(ID,in_socket,irIP,irPort), - m_closeOnFinish(false) +: HttpdSocket(ID,in_socket,irIP,irPort), + m_closeOnFinish(false) { } @@ -192,7 +192,7 @@ void EQWHTTPHandler::SendPage(const std::string &file) { SendBuf(buffer, len); } delete[] buffer; - fclose(f); + fclose(f); #ifdef EMBPERL if(process) { //convert the base form into a useful perl exportable form @@ -336,5 +336,3 @@ ThreadReturnType EQWHTTPServer::ThreadProc(void *data) { THREAD_RETURN(nullptr); }*/ - - diff --git a/world/EQWHTTPHandler.h b/world/EQWHTTPHandler.h index 793d5b0c6..ab88a6e0b 100644 --- a/world/EQWHTTPHandler.h +++ b/world/EQWHTTPHandler.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQWHTTPHandler_H #define EQWHTTPHandler_H @@ -96,6 +96,3 @@ protected: #endif - - - diff --git a/world/EQWParser.cpp b/world/EQWParser.cpp index def0c4ec3..bdeedca2c 100644 --- a/world/EQWParser.cpp +++ b/world/EQWParser.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ //a lot of this is copied from embperl.cpp, but I didnt feel like factoring the common stuff out @@ -30,7 +30,7 @@ using namespace std; #ifndef GvCV_set -#define GvCV_set(gv,cv) (GvCV(gv) = (cv)) +#define GvCV_set(gv,cv) (GvCV(gv) = (cv)) #endif @@ -130,18 +130,18 @@ void EQWParser::DoInit() { eval_pv( "package EQWIO; " // "&boot_EQEmuIO;" - "sub TIEHANDLE { my $me = bless {}, $_[0]; $me->PRINT('Creating '.$me); return($me); } " - "sub WRITE { } " - "sub PRINTF { my $me = shift; my $fmt = shift; $me->PRINT(sprintf($fmt, @_)); } " - "sub CLOSE { my $me = shift; $me->PRINT('Closing '.$me); } " - "sub DESTROY { my $me = shift; $me->PRINT('Destroying '.$me); } " + "sub TIEHANDLE { my $me = bless {}, $_[0]; $me->PRINT('Creating '.$me); return($me); } " + "sub WRITE { } " + "sub PRINTF { my $me = shift; my $fmt = shift; $me->PRINT(sprintf($fmt, @_)); } " + "sub CLOSE { my $me = shift; $me->PRINT('Closing '.$me); } " + "sub DESTROY { my $me = shift; $me->PRINT('Destroying '.$me); } " //this ties us for all packages - "package MAIN;" - " if(tied *STDOUT) { untie(*STDOUT); }" - " if(tied *STDERR) { untie(*STDERR); }" - " tie *STDOUT, 'EQWIO';" - " tie *STDERR, 'EQWIO';" - ,FALSE); + "package MAIN;" + " if(tied *STDOUT) { untie(*STDOUT); }" + " if(tied *STDERR) { untie(*STDERR); }" + " tie *STDOUT, 'EQWIO';" + " tie *STDERR, 'EQWIO';" + ,FALSE); eval_pv( "package world; " @@ -171,16 +171,16 @@ void EQWParser::DoInit() { //load up EQW eval_pv( - "package EQW;" - "&boot_EQW;" //load our EQW XS - "package EQDB;" - "&boot_EQDB;" //load our EQW XS - "package EQDBRes;" - "&boot_EQDBRes;" //load our EQW XS - "package HTTPRequest;" - "&boot_HTTPRequest;" //load our HTTPRequest XS - "package EQLConfig;" - "&boot_EQLConfig;" //load our EQLConfig XS + "package EQW;" + "&boot_EQW;" //load our EQW XS + "package EQDB;" + "&boot_EQDB;" //load our EQW XS + "package EQDBRes;" + "&boot_EQDBRes;" //load our EQW XS + "package HTTPRequest;" + "&boot_HTTPRequest;" //load our HTTPRequest XS + "package EQLConfig;" + "&boot_EQLConfig;" //load our EQLConfig XS , FALSE ); @@ -211,7 +211,7 @@ EQWParser::~EQWParser() { "package quest;" " untie *STDOUT;" " untie *STDERR;" - ,FALSE); + ,FALSE); */ perl_free(my_perl); } @@ -226,25 +226,25 @@ bool EQWParser::eval_file(const char * packagename, const char * filename, std:: bool EQWParser::dosub(const char * subname, const std::vector &args, string &error, int mode) { bool err = false; - dSP; /* initialize stack pointer */ - ENTER; /* everything created after here */ - SAVETMPS; /* ...is a temporary variable. */ - PUSHMARK(SP); /* remember the stack pointer */ + dSP; // initialize stack pointer + ENTER; // everything created after here + SAVETMPS; // ...is a temporary variable + PUSHMARK(SP); // remember the stack pointer if(args.size() > 0) { for(std::vector::const_iterator i = args.begin(); i != args.end(); ++i) - {/* push the arguments onto the perl stack */ + {/* push the arguments onto the perl stack */ XPUSHs(sv_2mortal(newSVpv(i->c_str(), i->length()))); } } - PUTBACK; /* make local stack pointer global */ - call_pv(subname, mode); /*eval our code*/ - SPAGAIN; /* refresh stack pointer */ + PUTBACK; // make local stack pointer global + call_pv(subname, mode); /*eval our code*/ + SPAGAIN; // refresh stack pointer if(SvTRUE(ERRSV)) { err = true; } - FREETMPS; /* free temp values */ - LEAVE; /* ...and the XPUSHed "mortal" args.*/ + FREETMPS; // free temp values + LEAVE; // ...and the XPUSHed "mortal" args. if(err) { error = "Perl runtime error: "; @@ -260,7 +260,6 @@ bool EQWParser::eval(const char * code, string &error) { return(dosub("my_eval", arg, error, G_SCALAR|G_DISCARD|G_EVAL|G_KEEPERR)); } - void EQWParser::EQW_eval(const char *pkg, const char *code) { char namebuf[64]; @@ -330,7 +329,6 @@ class MerchantEditor extends BaseEditor { } } - function dispatch() { my $dispatcher = $this->_dispatchers[$action]; $body = new Template($dispatcher["template"]); @@ -348,5 +346,5 @@ function dispatch() { */ - #endif //EMBPERL + diff --git a/world/EQWParser.h b/world/EQWParser.h index 357bdcc8f..564ea0b11 100644 --- a/world/EQWParser.h +++ b/world/EQWParser.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EQWPARSER_H_ #define EQWPARSER_H_ @@ -68,12 +68,5 @@ protected: }; #endif //EMBPERL - - - - - - - - #endif /*EQWPARSER_H_*/ + diff --git a/world/HTTPRequest.cpp b/world/HTTPRequest.cpp index 34e375244..bc0b8ab2b 100644 --- a/world/HTTPRequest.cpp +++ b/world/HTTPRequest.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "HTTPRequest.h" @@ -80,14 +80,3 @@ void HTTPRequest::redirect(Const_char *URL) { SetResponseCode("302"); } - - - - - - - - - - - diff --git a/world/HTTPRequest.h b/world/HTTPRequest.h index eb4b05a9f..1fd96eadf 100644 --- a/world/HTTPRequest.h +++ b/world/HTTPRequest.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef HTTPREQUEST_H_ #define HTTPREQUEST_H_ @@ -37,7 +37,6 @@ public: //BEGIN PERL EXPORT - Const_char * get(Const_char *name, Const_char *default_value = "") const; int getInt(Const_char *name, int default_value = 0) const; float getFloat(Const_char *name, float default_value = 0.0) const; @@ -57,8 +56,5 @@ protected: std::map m_values; }; - #endif /*HTTPREQUEST_H_*/ - - diff --git a/world/LauncherLink.cpp b/world/LauncherLink.cpp index 802ecfd79..ad580beab 100644 --- a/world/LauncherLink.cpp +++ b/world/LauncherLink.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -37,10 +37,10 @@ extern LauncherList launcher_list; LauncherLink::LauncherLink(int id, EmuTCPConnection *c) : ID(id), - tcpc(c), - authenticated(false), - m_name(""), - m_bootTimer(2000) + tcpc(c), + authenticated(false), + m_name(""), + m_bootTimer(2000) { m_dynamicCount = 0; m_bootTimer.Disable(); @@ -78,7 +78,7 @@ bool LauncherLink::Process() { if (memcmp(pack->pBuffer, tmppass, 16) == 0) authenticated = true; else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(WORLD__LAUNCH_ERR, "Launcher authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -89,7 +89,7 @@ bool LauncherLink::Process() { } } else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(WORLD__LAUNCH_ERR, "Launcher authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -188,7 +188,7 @@ bool LauncherLink::ContainsZone(const char *short_name) const { return(m_states.find(short_name) != m_states.end()); /* - * std::map::const_iterator cur, end; + * std::map::const_iterator cur, end; cur = m_states.begin(); end = m_states.end(); for(; cur != end; cur++) { diff --git a/world/LauncherLink.h b/world/LauncherLink.h index 7aaf27e3b..c5936bd3d 100644 --- a/world/LauncherLink.h +++ b/world/LauncherLink.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LAUNCHERLINK_H_ #define LAUNCHERLINK_H_ @@ -42,7 +42,7 @@ public: inline uint32 GetIP() const { return tcpc->GetrIP(); } inline uint16 GetPort() const { return tcpc->GetrPort(); } inline const char * GetName() const { return(m_name.c_str()); } - inline int CountZones() const { return(m_states.size()); } + inline int CountZones() const { return(m_states.size()); } bool ContainsZone(const char *short_name) const; @@ -58,10 +58,10 @@ public: void GetZoneDetails(const char *short_name, std::map &result); protected: - const int ID; + const int ID; EmuTCPConnection*const tcpc; bool authenticated; - std::string m_name; + std::string m_name; Timer m_bootTimer; uint8 m_dynamicCount; @@ -74,8 +74,5 @@ protected: std::map m_states; }; - - - - #endif /*LAUNCHERLINK_H_*/ + diff --git a/world/LauncherList.cpp b/world/LauncherList.cpp index b7c886b10..d55990e7f 100644 --- a/world/LauncherList.cpp +++ b/world/LauncherList.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -194,29 +194,3 @@ void LauncherList::Remove(const char *name) { } } - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/world/LauncherList.h b/world/LauncherList.h index 37d9e1aae..d40aa64e2 100644 --- a/world/LauncherList.h +++ b/world/LauncherList.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LAUNCHERLIST_H_ #define LAUNCHERLIST_H_ @@ -54,14 +54,5 @@ protected: int nextID; }; - - - - - - - - - - #endif /*LAUNCHERLIST_H_*/ + diff --git a/world/LoginServer.cpp b/world/LoginServer.cpp index f30d92431..7d7bb446b 100644 --- a/world/LoginServer.cpp +++ b/world/LoginServer.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -105,100 +105,99 @@ bool LoginServer::Process() { _hex(WORLD__LS_TRACE,pack->pBuffer,pack->size); switch(pack->opcode) { - case 0: - break; - case ServerOP_KeepAlive: { - // ignore this - break; - } - case ServerOP_UsertoWorldReq: { - UsertoWorldRequest_Struct* utwr = (UsertoWorldRequest_Struct*) pack->pBuffer; - uint32 id = database.GetAccountIDFromLSID(utwr->lsaccountid); - int16 status = database.CheckStatus(id); + case 0: + break; + case ServerOP_KeepAlive: { + // ignore this + break; + } + case ServerOP_UsertoWorldReq: { + UsertoWorldRequest_Struct* utwr = (UsertoWorldRequest_Struct*) pack->pBuffer; + uint32 id = database.GetAccountIDFromLSID(utwr->lsaccountid); + int16 status = database.CheckStatus(id); - ServerPacket* outpack = new ServerPacket; - outpack->opcode = ServerOP_UsertoWorldResp; - outpack->size = sizeof(UsertoWorldResponse_Struct); - outpack->pBuffer = new uchar[outpack->size]; - memset(outpack->pBuffer, 0, outpack->size); - UsertoWorldResponse_Struct* utwrs = (UsertoWorldResponse_Struct*) outpack->pBuffer; - utwrs->lsaccountid = utwr->lsaccountid; - utwrs->ToID = utwr->FromID; + ServerPacket* outpack = new ServerPacket; + outpack->opcode = ServerOP_UsertoWorldResp; + outpack->size = sizeof(UsertoWorldResponse_Struct); + outpack->pBuffer = new uchar[outpack->size]; + memset(outpack->pBuffer, 0, outpack->size); + UsertoWorldResponse_Struct* utwrs = (UsertoWorldResponse_Struct*) outpack->pBuffer; + utwrs->lsaccountid = utwr->lsaccountid; + utwrs->ToID = utwr->FromID; - if(Config->Locked == true) - { - if((status == 0 || status < 100) && (status != -2 || status != -1)) - utwrs->response = 0; - if(status >= 100) + if(Config->Locked == true) + { + if((status == 0 || status < 100) && (status != -2 || status != -1)) + utwrs->response = 0; + if(status >= 100) + utwrs->response = 1; + } + else { utwrs->response = 1; + } + + int32 x = Config->MaxClients; + if( (int32)numplayers >= x && x != -1 && x != 255 && status < 80) + utwrs->response = -3; + + if(status == -1) + utwrs->response = -1; + if(status == -2) + utwrs->response = -2; + + utwrs->worldid = utwr->worldid; + SendPacket(outpack); + delete outpack; + break; } - else { - utwrs->response = 1; + case ServerOP_LSClientAuth: { + ServerLSClientAuth* slsca = (ServerLSClientAuth*) pack->pBuffer; + + if (RuleI(World, AccountSessionLimit) >= 0) { + // Enforce the limit on the number of characters on the same account that can be + // online at the same time. + client_list.EnforceSessionLimit(slsca->lsaccount_id); + } + + client_list.CLEAdd(slsca->lsaccount_id, slsca->name, slsca->key, slsca->worldadmin, slsca->ip, slsca->local); + break; } - - int32 x = Config->MaxClients; - if( (int32)numplayers >= x && x != -1 && x != 255 && status < 80) - utwrs->response = -3; - - if(status == -1) - utwrs->response = -1; - if(status == -2) - utwrs->response = -2; - - utwrs->worldid = utwr->worldid; - SendPacket(outpack); - delete outpack; - break; - } - case ServerOP_LSClientAuth: { - ServerLSClientAuth* slsca = (ServerLSClientAuth*) pack->pBuffer; - - if (RuleI(World, AccountSessionLimit) >= 0) { - // Enforce the limit on the number of characters on the same account that can be - // online at the same time. - client_list.EnforceSessionLimit(slsca->lsaccount_id); + case ServerOP_LSFatalError: { + #ifndef IGNORE_LS_FATAL_ERROR + WorldConfig::DisableLoginserver(); + _log(WORLD__LS_ERR, "Login server responded with FatalError. Disabling reconnect."); + #else + _log(WORLD__LS_ERR, "Login server responded with FatalError."); + #endif + if (pack->size > 1) { + _log(WORLD__LS_ERR, " %s",pack->pBuffer); + } + break; } - - client_list.CLEAdd(slsca->lsaccount_id, slsca->name, slsca->key, slsca->worldadmin, slsca->ip, slsca->local); - break; - } - case ServerOP_LSFatalError: { -#ifndef IGNORE_LS_FATAL_ERROR - WorldConfig::DisableLoginserver(); - _log(WORLD__LS_ERR, "Login server responded with FatalError. Disabling reconnect."); -#else - _log(WORLD__LS_ERR, "Login server responded with FatalError."); -#endif - if (pack->size > 1) { - _log(WORLD__LS_ERR, " %s",pack->pBuffer); + case ServerOP_SystemwideMessage: { + ServerSystemwideMessage* swm = (ServerSystemwideMessage*) pack->pBuffer; + zoneserver_list.SendEmoteMessageRaw(0, 0, 0, swm->type, swm->message); + break; } - break; - } - case ServerOP_SystemwideMessage: { - ServerSystemwideMessage* swm = (ServerSystemwideMessage*) pack->pBuffer; - zoneserver_list.SendEmoteMessageRaw(0, 0, 0, swm->type, swm->message); - break; - } - case ServerOP_LSRemoteAddr: { - if (!Config->WorldAddress.length()) { - WorldConfig::SetWorldAddress((char *)pack->pBuffer); - _log(WORLD__LS, "Loginserver provided %s as world address",pack->pBuffer); + case ServerOP_LSRemoteAddr: { + if (!Config->WorldAddress.length()) { + WorldConfig::SetWorldAddress((char *)pack->pBuffer); + _log(WORLD__LS, "Loginserver provided %s as world address",pack->pBuffer); + } + break; + } + case ServerOP_LSAccountUpdate: { + _log(WORLD__LS, "Received ServerOP_LSAccountUpdate packet from loginserver"); + CanAccountUpdate = true; + break; + } + default: + { + _log(WORLD__LS_ERR, "Unknown LSOpCode: 0x%04x size=%d",(int)pack->opcode,pack->size); + DumpPacket(pack->pBuffer, pack->size); + break; } - break; } - case ServerOP_LSAccountUpdate: { - _log(WORLD__LS, "Received ServerOP_LSAccountUpdate packet from loginserver"); - CanAccountUpdate = true; - break; - } - default: - { - _log(WORLD__LS_ERR, "Unknown LSOpCode: 0x%04x size=%d",(int)pack->opcode,pack->size); -DumpPacket(pack->pBuffer, pack->size); - break; - } - } - delete pack; } diff --git a/world/LoginServer.h b/world/LoginServer.h index 807874cb9..6cb6957cf 100644 --- a/world/LoginServer.h +++ b/world/LoginServer.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LOGINSERVER_H #define LOGINSERVER_H diff --git a/world/LoginServerList.cpp b/world/LoginServerList.cpp index 1b133a597..6af65c7b9 100644 --- a/world/LoginServerList.cpp +++ b/world/LoginServerList.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -69,9 +69,9 @@ bool LoginServerList::Process() { } #ifdef _WINDOWS - void AutoInitLoginServer(void *tmp) { +void AutoInitLoginServer(void *tmp) { #else - void *AutoInitLoginServer(void *tmp) { +void *AutoInitLoginServer(void *tmp) { #endif loginserverlist.InitLoginServer(); #ifndef WIN32 diff --git a/world/WorldConfig.cpp b/world/WorldConfig.cpp index fc377db86..7ef819655 100644 --- a/world/WorldConfig.cpp +++ b/world/WorldConfig.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "WorldConfig.h" diff --git a/world/WorldConfig.h b/world/WorldConfig.h index d1209ea35..419339732 100644 --- a/world/WorldConfig.h +++ b/world/WorldConfig.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __WorldConfig_H #define __WorldConfig_H diff --git a/world/WorldTCPConnection.h b/world/WorldTCPConnection.h index d01207814..dd9ff7a5b 100644 --- a/world/WorldTCPConnection.h +++ b/world/WorldTCPConnection.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WorldTCPCONNECTION_H #define WorldTCPCONNECTION_H diff --git a/world/client.cpp b/world/client.cpp index 2023af71f..12dd7180d 100644 --- a/world/client.cpp +++ b/world/client.cpp @@ -24,7 +24,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #ifdef FREEBSD //Timothy Whitman - January 7, 2003 @@ -72,10 +72,10 @@ extern volatile bool RunLoops; Client::Client(EQStreamInterface* ieqs) -: autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)), - CLE_keepalive_timer(RuleI(World, ClientKeepaliveTimeoutMS)), - connect(1000), - eqs(ieqs) +: autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)), + CLE_keepalive_timer(RuleI(World, ClientKeepaliveTimeoutMS)), + connect(1000), + eqs(ieqs) { // Live does not send datarate as of 3/11/2005 //eqs->SetDataRate(7); @@ -415,7 +415,7 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) { #endif { if (cle->AccountID() == 0 || (!minilogin && cle->LSID()==0)) { - clog(WORLD__CLIENT_ERR,"ID is 0. Is this server connected to minilogin?"); + clog(WORLD__CLIENT_ERR,"ID is 0. Is this server connected to minilogin?"); if(!minilogin) clog(WORLD__CLIENT_ERR,"If so you forget the minilogin variable..."); else @@ -487,7 +487,7 @@ bool Client::HandleNameApprovalPacket(const EQApplicationPacket *app) { uchar race = app->pBuffer[64]; uchar clas = app->pBuffer[68]; - clog(WORLD__CLIENT,"Name approval request. Name=%s, race=%s, class=%s",char_name,GetRaceName(race),GetEQClassName(clas)); + clog(WORLD__CLIENT,"Name approval request. Name=%s, race=%s, class=%s",char_name,GetRaceName(race),GetEQClassName(clas)); EQApplicationPacket *outapp; outapp = new EQApplicationPacket; @@ -513,9 +513,9 @@ bool Client::HandleNameApprovalPacket(const EQApplicationPacket *app) { QueuePacket(outapp); safe_delete(outapp); - if(!valid) { - memset(char_name, 0, sizeof(char_name)); - } + if(!valid) { + memset(char_name, 0, sizeof(char_name)); + } return true; } @@ -601,45 +601,45 @@ bool Client::HandleGenerateRandomNamePacket(const EQApplicationPacket *app) { bool Client::HandleCharacterCreateRequestPacket(const EQApplicationPacket *app) { // New OpCode in SoF - uint32 allocs = character_create_allocations.size(); - uint32 combos = character_create_race_class_combos.size(); - uint32 len = sizeof(RaceClassAllocation) * allocs; - len += sizeof(RaceClassCombos) * combos; - len += sizeof(uint8); - len += sizeof(uint32); - len += sizeof(uint32); + uint32 allocs = character_create_allocations.size(); + uint32 combos = character_create_race_class_combos.size(); + uint32 len = sizeof(RaceClassAllocation) * allocs; + len += sizeof(RaceClassCombos) * combos; + len += sizeof(uint8); + len += sizeof(uint32); + len += sizeof(uint32); EQApplicationPacket *outapp = new EQApplicationPacket(OP_CharacterCreateRequest, len); - unsigned char *ptr = outapp->pBuffer; - *((uint8*)ptr) = 0; - ptr += sizeof(uint8); + unsigned char *ptr = outapp->pBuffer; + *((uint8*)ptr) = 0; + ptr += sizeof(uint8); - *((uint32*)ptr) = allocs; - ptr += sizeof(uint32); + *((uint32*)ptr) = allocs; + ptr += sizeof(uint32); - for(int i = 0; i < allocs; ++i) { - RaceClassAllocation *alc = (RaceClassAllocation*)ptr; + for(int i = 0; i < allocs; ++i) { + RaceClassAllocation *alc = (RaceClassAllocation*)ptr; - alc->Index = character_create_allocations[i].Index; - for(int j = 0; j < 7; ++j) { - alc->BaseStats[j] = character_create_allocations[i].BaseStats[j]; - alc->DefaultPointAllocation[j] = character_create_allocations[i].DefaultPointAllocation[j]; - } - ptr += sizeof(RaceClassAllocation); - } + alc->Index = character_create_allocations[i].Index; + for(int j = 0; j < 7; ++j) { + alc->BaseStats[j] = character_create_allocations[i].BaseStats[j]; + alc->DefaultPointAllocation[j] = character_create_allocations[i].DefaultPointAllocation[j]; + } + ptr += sizeof(RaceClassAllocation); + } - *((uint32*)ptr) = combos; - ptr += sizeof(uint32); - for(int i = 0; i < combos; ++i) { - RaceClassCombos *cmb = (RaceClassCombos*)ptr; - cmb->ExpansionRequired = character_create_race_class_combos[i].ExpansionRequired; - cmb->Race = character_create_race_class_combos[i].Race; - cmb->Class = character_create_race_class_combos[i].Class; - cmb->Deity = character_create_race_class_combos[i].Deity; - cmb->AllocationIndex = character_create_race_class_combos[i].AllocationIndex; - cmb->Zone = character_create_race_class_combos[i].Zone; - ptr += sizeof(RaceClassCombos); - } + *((uint32*)ptr) = combos; + ptr += sizeof(uint32); + for(int i = 0; i < combos; ++i) { + RaceClassCombos *cmb = (RaceClassCombos*)ptr; + cmb->ExpansionRequired = character_create_race_class_combos[i].ExpansionRequired; + cmb->Race = character_create_race_class_combos[i].Race; + cmb->Class = character_create_race_class_combos[i].Class; + cmb->Deity = character_create_race_class_combos[i].Deity; + cmb->AllocationIndex = character_create_race_class_combos[i].AllocationIndex; + cmb->Zone = character_create_race_class_combos[i].Zone; + ptr += sizeof(RaceClassCombos); + } QueuePacket(outapp); safe_delete(outapp); @@ -670,7 +670,7 @@ bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) { QueuePacket(outapp); safe_delete(outapp); } - else + else SendCharInfo(); return true; @@ -692,8 +692,8 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { } if (RuleI(World, MaxClientsPerIP) >= 0) { - client_list.GetCLEIP(this->GetIP()); //Check current CLE Entry IPs against incoming connection - } + client_list.GetCLEIP(this->GetIP()); //Check current CLE Entry IPs against incoming connection + } EnterWorld_Struct *ew=(EnterWorld_Struct *)app->pBuffer; strn0cpy(char_name, ew->name, 64); @@ -1020,12 +1020,12 @@ bool Client::HandlePacket(const EQApplicationPacket *app) { bool Client::Process() { bool ret = true; //bool sendguilds = true; - sockaddr_in to; + sockaddr_in to; memset((char *) &to, 0, sizeof(to)); - to.sin_family = AF_INET; - to.sin_port = port; - to.sin_addr.s_addr = ip; + to.sin_family = AF_INET; + to.sin_port = port; + to.sin_addr.s_addr = ip; if (autobootup_timeout.Check()) { clog(WORLD__CLIENT_ERR, "Zone bootup timer expired, bootup failed or too slow."); @@ -1135,7 +1135,7 @@ void Client::EnterWorld(bool TryBootup) { if (seencharsel) { if (GetAdmin() < 80 && zoneserver_list.IsZoneLocked(zoneID)) { - clog(WORLD__CLIENT_ERR,"Enter world failed. Zone is locked."); + clog(WORLD__CLIENT_ERR,"Enter world failed. Zone is locked."); ZoneUnavail(); return; } @@ -1169,39 +1169,39 @@ void Client::Clearance(int8 response) zs = zoneserver_list.FindByZoneID(zoneID); } - if(zs == 0 || response == -1 || response == 0) - { - if (zs == 0) - { - clog(WORLD__CLIENT_ERR,"Unable to find zoneserver in Client::Clearance!!"); - } else { - clog(WORLD__CLIENT_ERR, "Invalid response %d in Client::Clearance", response); - } + if(zs == 0 || response == -1 || response == 0) + { + if (zs == 0) + { + clog(WORLD__CLIENT_ERR,"Unable to find zoneserver in Client::Clearance!!"); + } else { + clog(WORLD__CLIENT_ERR, "Invalid response %d in Client::Clearance", response); + } - ZoneUnavail(); - return; - } + ZoneUnavail(); + return; + } EQApplicationPacket* outapp; - if (zs->GetCAddress() == nullptr) { - clog(WORLD__CLIENT_ERR, "Unable to do zs->GetCAddress() in Client::Clearance!!"); - ZoneUnavail(); - return; - } + if (zs->GetCAddress() == nullptr) { + clog(WORLD__CLIENT_ERR, "Unable to do zs->GetCAddress() in Client::Clearance!!"); + ZoneUnavail(); + return; + } - if (zoneID == 0) { - clog(WORLD__CLIENT_ERR, "zoneID is nullptr in Client::Clearance!!"); - ZoneUnavail(); - return; - } + if (zoneID == 0) { + clog(WORLD__CLIENT_ERR, "zoneID is nullptr in Client::Clearance!!"); + ZoneUnavail(); + return; + } const char* zonename = database.GetZoneName(zoneID); - if (zonename == 0) { - clog(WORLD__CLIENT_ERR, "zonename is nullptr in Client::Clearance!!"); - ZoneUnavail(); - return; - } + if (zonename == 0) { + clog(WORLD__CLIENT_ERR, "zonename is nullptr in Client::Clearance!!"); + ZoneUnavail(); + return; + } // @bp This is the chat server /* @@ -1218,7 +1218,7 @@ void Client::Clearance(int8 response) const char *zs_addr=zs->GetCAddress(); if (!zs_addr[0]) { if (cle->IsLocalClient()) { - struct in_addr in; + struct in_addr in; in.s_addr = zs->GetIP(); zs_addr=inet_ntoa(in); if (!strcmp(zs_addr,"127.0.0.1")) @@ -1376,19 +1376,19 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) clog(WORLD__CLIENT,"Beard: %d Beardcolor: %d", cc->beard, cc->beardcolor); // validate the char creation struct - if(ClientVersionBit & BIT_SoFAndLater) { - if(!CheckCharCreateInfoSoF(cc)) - { - clog(WORLD__CLIENT_ERR,"CheckCharCreateInfo did not validate the request (bad race/class/stats)"); - return false; - } - } else { - if(!CheckCharCreateInfoTitanium(cc)) - { - clog(WORLD__CLIENT_ERR,"CheckCharCreateInfo did not validate the request (bad race/class/stats)"); - return false; - } - } + if(ClientVersionBit & BIT_SoFAndLater) { + if(!CheckCharCreateInfoSoF(cc)) + { + clog(WORLD__CLIENT_ERR,"CheckCharCreateInfo did not validate the request (bad race/class/stats)"); + return false; + } + } else { + if(!CheckCharCreateInfoTitanium(cc)) + { + clog(WORLD__CLIENT_ERR,"CheckCharCreateInfo did not validate the request (bad race/class/stats)"); + return false; + } + } // Convert incoming cc_s to the new PlayerProfile_Struct memset(&pp, 0, sizeof(PlayerProfile_Struct)); // start building the profile @@ -1424,7 +1424,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) pp.eyecolor2 = cc->eyecolor2; pp.hairstyle = cc->hairstyle; pp.haircolor = cc->haircolor; - pp.beard = cc->beard; + pp.beard = cc->beard; pp.beardcolor = cc->beardcolor; pp.drakkin_heritage = cc->drakkin_heritage; pp.drakkin_tattoo = cc->drakkin_tattoo; @@ -1471,7 +1471,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) pp.pvp = database.GetServerType() == 1 ? 1 : 0; //If it is an SoF Client and the SoF Start Zone rule is set, send new chars there - if((ClientVersionBit & BIT_SoFAndLater) && (RuleI(World, SoFStartZoneID) > 0)) { + if((ClientVersionBit & BIT_SoFAndLater) && (RuleI(World, SoFStartZoneID) > 0)) { clog(WORLD__CLIENT,"Found 'SoFStartZoneID' rule setting: %i", (RuleI(World, SoFStartZoneID))); pp.zone_id = (RuleI(World, SoFStartZoneID)); if(pp.zone_id) @@ -1491,7 +1491,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) else clog(WORLD__CLIENT_ERR,"Error getting zone id for '%s'", startzone); } - else // otherwise use normal starting zone logic + else // otherwise use normal starting zone logic { bool ValidStartZone = false; @@ -1518,7 +1518,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc) pp.binds[0].y = pp.y; pp.binds[0].z = pp.z; pp.binds[0].heading = pp.heading; - } + } // set starting city location to the initial bind point pp.binds[4] = pp.binds[0]; @@ -1555,482 +1555,483 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc) _log(WORLD__CLIENT, "Validating char creation info..."); - RaceClassCombos class_combo; - bool found = false; - int combos = character_create_race_class_combos.size(); - for(int i = 0; i < combos; ++i) { - if(character_create_race_class_combos[i].Class == cc->class_ && - character_create_race_class_combos[i].Race == cc->race && - character_create_race_class_combos[i].Deity == cc->deity) { - if(RuleB(World, EnableTutorialButton) && - (RuleI(World, TutorialZoneID) == cc->start_zone || - (character_create_race_class_combos[i].Zone == cc->start_zone))) { - class_combo = character_create_race_class_combos[i]; - found = true; - break; - } else if(character_create_race_class_combos[i].Zone == cc->start_zone) { - class_combo = character_create_race_class_combos[i]; - found = true; - break; - } - } - } + RaceClassCombos class_combo; + bool found = false; + int combos = character_create_race_class_combos.size(); + for(int i = 0; i < combos; ++i) { + if(character_create_race_class_combos[i].Class == cc->class_ && + character_create_race_class_combos[i].Race == cc->race && + character_create_race_class_combos[i].Deity == cc->deity) { + if(RuleB(World, EnableTutorialButton) && + (RuleI(World, TutorialZoneID) == cc->start_zone || + (character_create_race_class_combos[i].Zone == cc->start_zone))) { + class_combo = character_create_race_class_combos[i]; + found = true; + break; + } else if(character_create_race_class_combos[i].Zone == cc->start_zone) { + class_combo = character_create_race_class_combos[i]; + found = true; + break; + } + } + } - if(!found) { - _log(WORLD__CLIENT_ERR, "Could not find class/race/deity/start_zone combination"); - return false; - } + if(!found) { + _log(WORLD__CLIENT_ERR, "Could not find class/race/deity/start_zone combination"); + return false; + } - uint32 max_stats = 0; - uint32 allocs = character_create_allocations.size(); - RaceClassAllocation allocation; - found = false; - for(int i = 0; i < combos; ++i) { - if(character_create_allocations[i].Index == class_combo.AllocationIndex) { - allocation = character_create_allocations[i]; - found = true; - break; - } - } + uint32 max_stats = 0; + uint32 allocs = character_create_allocations.size(); + RaceClassAllocation allocation; + found = false; + for(int i = 0; i < combos; ++i) { + if(character_create_allocations[i].Index == class_combo.AllocationIndex) { + allocation = character_create_allocations[i]; + found = true; + break; + } + } - if(!found) { - _log(WORLD__CLIENT_ERR, "Could not find starting stats for selected character combo, cannot verify stats"); - return false; - } + if(!found) { + _log(WORLD__CLIENT_ERR, "Could not find starting stats for selected character combo, cannot verify stats"); + return false; + } - max_stats = allocation.DefaultPointAllocation[0] + - allocation.DefaultPointAllocation[1] + - allocation.DefaultPointAllocation[2] + - allocation.DefaultPointAllocation[3] + - allocation.DefaultPointAllocation[4] + - allocation.DefaultPointAllocation[5] + - allocation.DefaultPointAllocation[6]; + max_stats = allocation.DefaultPointAllocation[0] + + allocation.DefaultPointAllocation[1] + + allocation.DefaultPointAllocation[2] + + allocation.DefaultPointAllocation[3] + + allocation.DefaultPointAllocation[4] + + allocation.DefaultPointAllocation[5] + + allocation.DefaultPointAllocation[6]; - if(cc->STR > allocation.BaseStats[0] + max_stats || cc->STR < allocation.BaseStats[0]) { - _log(WORLD__CLIENT_ERR, "Strength out of range"); - return false; - } + if(cc->STR > allocation.BaseStats[0] + max_stats || cc->STR < allocation.BaseStats[0]) { + _log(WORLD__CLIENT_ERR, "Strength out of range"); + return false; + } - if(cc->DEX > allocation.BaseStats[1] + max_stats || cc->DEX < allocation.BaseStats[1]) { - _log(WORLD__CLIENT_ERR, "Dexterity out of range"); - return false; - } + if(cc->DEX > allocation.BaseStats[1] + max_stats || cc->DEX < allocation.BaseStats[1]) { + _log(WORLD__CLIENT_ERR, "Dexterity out of range"); + return false; + } - if(cc->AGI > allocation.BaseStats[2] + max_stats || cc->AGI < allocation.BaseStats[2]) { - _log(WORLD__CLIENT_ERR, "Agility out of range"); - return false; - } + if(cc->AGI > allocation.BaseStats[2] + max_stats || cc->AGI < allocation.BaseStats[2]) { + _log(WORLD__CLIENT_ERR, "Agility out of range"); + return false; + } - if(cc->STA > allocation.BaseStats[3] + max_stats || cc->STA < allocation.BaseStats[3]) { - _log(WORLD__CLIENT_ERR, "Stamina out of range"); - return false; - } + if(cc->STA > allocation.BaseStats[3] + max_stats || cc->STA < allocation.BaseStats[3]) { + _log(WORLD__CLIENT_ERR, "Stamina out of range"); + return false; + } - if(cc->INT > allocation.BaseStats[4] + max_stats || cc->INT < allocation.BaseStats[4]) { - _log(WORLD__CLIENT_ERR, "Intelligence out of range"); - return false; - } + if(cc->INT > allocation.BaseStats[4] + max_stats || cc->INT < allocation.BaseStats[4]) { + _log(WORLD__CLIENT_ERR, "Intelligence out of range"); + return false; + } - if(cc->WIS > allocation.BaseStats[5] + max_stats || cc->WIS < allocation.BaseStats[5]) { - _log(WORLD__CLIENT_ERR, "Wisdom out of range"); - return false; - } + if(cc->WIS > allocation.BaseStats[5] + max_stats || cc->WIS < allocation.BaseStats[5]) { + _log(WORLD__CLIENT_ERR, "Wisdom out of range"); + return false; + } - if(cc->CHA > allocation.BaseStats[6] + max_stats || cc->CHA < allocation.BaseStats[6]) { - _log(WORLD__CLIENT_ERR, "Charisma out of range"); - return false; - } + if(cc->CHA > allocation.BaseStats[6] + max_stats || cc->CHA < allocation.BaseStats[6]) { + _log(WORLD__CLIENT_ERR, "Charisma out of range"); + return false; + } - uint32 current_stats = 0; - current_stats += cc->STR - allocation.BaseStats[0]; - current_stats += cc->DEX - allocation.BaseStats[1]; - current_stats += cc->AGI - allocation.BaseStats[2]; - current_stats += cc->STA - allocation.BaseStats[3]; - current_stats += cc->INT - allocation.BaseStats[4]; - current_stats += cc->WIS - allocation.BaseStats[5]; - current_stats += cc->CHA - allocation.BaseStats[6]; - if(current_stats > max_stats) { - _log(WORLD__CLIENT_ERR, "Current Stats > Maximum Stats"); - return false; - } + uint32 current_stats = 0; + current_stats += cc->STR - allocation.BaseStats[0]; + current_stats += cc->DEX - allocation.BaseStats[1]; + current_stats += cc->AGI - allocation.BaseStats[2]; + current_stats += cc->STA - allocation.BaseStats[3]; + current_stats += cc->INT - allocation.BaseStats[4]; + current_stats += cc->WIS - allocation.BaseStats[5]; + current_stats += cc->CHA - allocation.BaseStats[6]; + if(current_stats > max_stats) { + _log(WORLD__CLIENT_ERR, "Current Stats > Maximum Stats"); + return false; + } return true; } bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc) { - uint32 bSTR, bSTA, bAGI, bDEX, bWIS, bINT, bCHA, bTOTAL, cTOTAL, stat_points; //these are all uint32 in CharCreate_Struct, so we'll make them uint32 here to make the compiler shut up - int classtemp, racetemp; - int Charerrors = 0; + uint32 bSTR, bSTA, bAGI, bDEX, bWIS, bINT, bCHA, bTOTAL, cTOTAL, stat_points; //these are all uint32 in CharCreate_Struct, so we'll make them uint32 here to make the compiler shut up + int classtemp, racetemp; + int Charerrors = 0; // solar: if this is increased you'll have to add a column to the classrace // table below -#define _TABLE_RACES 16 +#define _TABLE_RACES 16 - static const int BaseRace[_TABLE_RACES][7] = - { /* STR STA AGI DEX WIS INT CHR */ - { /*Human*/ 75, 75, 75, 75, 75, 75, 75}, - { /*Barbarian*/ 103, 95, 82, 70, 70, 60, 55}, - { /*Erudite*/ 60, 70, 70, 70, 83, 107, 70}, - { /*Wood Elf*/ 65, 65, 95, 80, 80, 75, 75}, - { /*High Elf*/ 55, 65, 85, 70, 95, 92, 80}, - { /*Dark Elf*/ 60, 65, 90, 75, 83, 99, 60}, - { /*Half Elf*/ 70, 70, 90, 85, 60, 75, 75}, - { /*Dwarf*/ 90, 90, 70, 90, 83, 60, 45}, - { /*Troll*/ 108, 109, 83, 75, 60, 52, 40}, - { /*Ogre*/ 130, 122, 70, 70, 67, 60, 37}, - { /*Halfling*/ 70, 75, 95, 90, 80, 67, 50}, - { /*Gnome*/ 60, 70, 85, 85, 67, 98, 60}, - { /*Iksar*/ 70, 70, 90, 85, 80, 75, 55}, - { /*Vah Shir*/ 90, 75, 90, 70, 70, 65, 65}, - { /*Froglok*/ 70, 80, 100, 100, 75, 75, 50}, - { /*Drakkin*/ 70, 80, 85, 75, 80, 85, 75} - }; + static const int BaseRace[_TABLE_RACES][7] = + { /* STR STA AGI DEX WIS INT CHR */ + { /*Human*/ 75, 75, 75, 75, 75, 75, 75}, + { /*Barbarian*/ 103, 95, 82, 70, 70, 60, 55}, + { /*Erudite*/ 60, 70, 70, 70, 83, 107, 70}, + { /*Wood Elf*/ 65, 65, 95, 80, 80, 75, 75}, + { /*High Elf*/ 55, 65, 85, 70, 95, 92, 80}, + { /*Dark Elf*/ 60, 65, 90, 75, 83, 99, 60}, + { /*Half Elf*/ 70, 70, 90, 85, 60, 75, 75}, + { /*Dwarf*/ 90, 90, 70, 90, 83, 60, 45}, + { /*Troll*/ 108, 109, 83, 75, 60, 52, 40}, + { /*Ogre*/ 130, 122, 70, 70, 67, 60, 37}, + { /*Halfling*/ 70, 75, 95, 90, 80, 67, 50}, + { /*Gnome*/ 60, 70, 85, 85, 67, 98, 60}, + { /*Iksar*/ 70, 70, 90, 85, 80, 75, 55}, + { /*Vah Shir*/ 90, 75, 90, 70, 70, 65, 65}, + { /*Froglok*/ 70, 80, 100, 100, 75, 75, 50}, + { /*Drakkin*/ 70, 80, 85, 75, 80, 85, 75} + }; - static const int BaseClass[PLAYER_CLASS_COUNT][8] = - { /* STR STA AGI DEX WIS INT CHR ADD*/ - { /*Warrior*/ 10, 10, 5, 0, 0, 0, 0, 25}, - { /*Cleric*/ 5, 5, 0, 0, 10, 0, 0, 30}, - { /*Paladin*/ 10, 5, 0, 0, 5, 0, 10, 20}, - { /*Ranger*/ 5, 10, 10, 0, 5, 0, 0, 20}, - { /*ShadowKnight*/ 10, 5, 0, 0, 0, 10, 5, 20}, - { /*Druid*/ 0, 10, 0, 0, 10, 0, 0, 30}, - { /*Monk*/ 5, 5, 10, 10, 0, 0, 0, 20}, - { /*Bard*/ 5, 0, 0, 10, 0, 0, 10, 25}, - { /*Rouge*/ 0, 0, 10, 10, 0, 0, 0, 30}, - { /*Shaman*/ 0, 5, 0, 0, 10, 0, 5, 30}, - { /*Necromancer*/ 0, 0, 0, 10, 0, 10, 0, 30}, - { /*Wizard*/ 0, 10, 0, 0, 0, 10, 0, 30}, - { /*Magician*/ 0, 10, 0, 0, 0, 10, 0, 30}, - { /*Enchanter*/ 0, 0, 0, 0, 0, 10, 10, 30}, - { /*Beastlord*/ 0, 10, 5, 0, 10, 0, 5, 20}, - { /*Berserker*/ 10, 5, 0, 10, 0, 0, 0, 25} - }; + static const int BaseClass[PLAYER_CLASS_COUNT][8] = + { /* STR STA AGI DEX WIS INT CHR ADD*/ + { /*Warrior*/ 10, 10, 5, 0, 0, 0, 0, 25}, + { /*Cleric*/ 5, 5, 0, 0, 10, 0, 0, 30}, + { /*Paladin*/ 10, 5, 0, 0, 5, 0, 10, 20}, + { /*Ranger*/ 5, 10, 10, 0, 5, 0, 0, 20}, + { /*ShadowKnight*/ 10, 5, 0, 0, 0, 10, 5, 20}, + { /*Druid*/ 0, 10, 0, 0, 10, 0, 0, 30}, + { /*Monk*/ 5, 5, 10, 10, 0, 0, 0, 20}, + { /*Bard*/ 5, 0, 0, 10, 0, 0, 10, 25}, + { /*Rouge*/ 0, 0, 10, 10, 0, 0, 0, 30}, + { /*Shaman*/ 0, 5, 0, 0, 10, 0, 5, 30}, + { /*Necromancer*/ 0, 0, 0, 10, 0, 10, 0, 30}, + { /*Wizard*/ 0, 10, 0, 0, 0, 10, 0, 30}, + { /*Magician*/ 0, 10, 0, 0, 0, 10, 0, 30}, + { /*Enchanter*/ 0, 0, 0, 0, 0, 10, 10, 30}, + { /*Beastlord*/ 0, 10, 5, 0, 10, 0, 5, 20}, + { /*Berserker*/ 10, 5, 0, 10, 0, 0, 0, 25} + }; - static const bool ClassRaceLookupTable[PLAYER_CLASS_COUNT][_TABLE_RACES]= - { /*Human Barbarian Erudite Woodelf Highelf Darkelf Halfelf Dwarf Troll Ogre Halfling Gnome Iksar Vahshir Froglok Drakkin*/ - { /*Warrior*/ true, true, false, true, false, true, true, true, true, true, true, true, true, true, true, true}, - { /*Cleric*/ true, false, true, false, true, true, true, true, false, false, true, true, false, false, true, true}, - { /*Paladin*/ true, false, true, false, true, false, true, true, false, false, true, true, false, false, true, true}, - { /*Ranger*/ true, false, false, true, false, false, true, false, false, false, true, false, false, false, false, true}, - { /*ShadowKnight*/ true, false, true, false, false, true, false, false, true, true, false, true, true, false, true, true}, - { /*Druid*/ true, false, false, true, false, false, true, false, false, false, true, false, false, false, false, true}, - { /*Monk*/ true, false, false, false, false, false, false, false, false, false, false, false, true, false, false, true}, - { /*Bard*/ true, false, false, true, false, false, true, false, false, false, false, false, false, true, false, true}, - { /*Rogue*/ true, true, false, true, false, true, true, true, false, false, true, true, false, true, true, true}, - { /*Shaman*/ false, true, false, false, false, false, false, false, true, true, false, false, true, true, true, false}, - { /*Necromancer*/ true, false, true, false, false, true, false, false, false, false, false, true, true, false, true, true}, - { /*Wizard*/ true, false, true, false, true, true, false, false, false, false, false, true, false, false, true, true}, - { /*Magician*/ true, false, true, false, true, true, false, false, false, false, false, true, false, false, false, true}, - { /*Enchanter*/ true, false, true, false, true, true, false, false, false, false, false, true, false, false, false, true}, - { /*Beastlord*/ false, true, false, false, false, false, false, false, true, true, false, false, true, true, false, false}, - { /*Berserker*/ false, true, false, false, false, false, false, true, true, true, false, false, false, true, false, false} - };//Initial table by kathgar, editted by Wiz for accuracy, solar too + static const bool ClassRaceLookupTable[PLAYER_CLASS_COUNT][_TABLE_RACES]= + { /*Human Barbarian Erudite Woodelf Highelf Darkelf Halfelf Dwarf Troll Ogre Halfling Gnome Iksar Vahshir Froglok Drakkin*/ + { /*Warrior*/ true, true, false, true, false, true, true, true, true, true, true, true, true, true, true, true}, + { /*Cleric*/ true, false, true, false, true, true, true, true, false, false, true, true, false, false, true, true}, + { /*Paladin*/ true, false, true, false, true, false, true, true, false, false, true, true, false, false, true, true}, + { /*Ranger*/ true, false, false, true, false, false, true, false, false, false, true, false, false, false, false, true}, + { /*ShadowKnight*/ true, false, true, false, false, true, false, false, true, true, false, true, true, false, true, true}, + { /*Druid*/ true, false, false, true, false, false, true, false, false, false, true, false, false, false, false, true}, + { /*Monk*/ true, false, false, false, false, false, false, false, false, false, false, false, true, false, false, true}, + { /*Bard*/ true, false, false, true, false, false, true, false, false, false, false, false, false, true, false, true}, + { /*Rogue*/ true, true, false, true, false, true, true, true, false, false, true, true, false, true, true, true}, + { /*Shaman*/ false, true, false, false, false, false, false, false, true, true, false, false, true, true, true, false}, + { /*Necromancer*/ true, false, true, false, false, true, false, false, false, false, false, true, true, false, true, true}, + { /*Wizard*/ true, false, true, false, true, true, false, false, false, false, false, true, false, false, true, true}, + { /*Magician*/ true, false, true, false, true, true, false, false, false, false, false, true, false, false, false, true}, + { /*Enchanter*/ true, false, true, false, true, true, false, false, false, false, false, true, false, false, false, true}, + { /*Beastlord*/ false, true, false, false, false, false, false, false, true, true, false, false, true, true, false, false}, + { /*Berserker*/ false, true, false, false, false, false, false, true, true, true, false, false, false, true, false, false} + };//Initial table by kathgar, editted by Wiz for accuracy, solar too - if(!cc) return false; + if(!cc) return false; - _log(WORLD__CLIENT,"Validating char creation info..."); + _log(WORLD__CLIENT,"Validating char creation info..."); - classtemp = cc->class_ - 1; - racetemp = cc->race - 1; - // these have non sequential race numbers so they need to be mapped - if (cc->race == FROGLOK) racetemp = 14; - if (cc->race == VAHSHIR) racetemp = 13; - if (cc->race == IKSAR) racetemp = 12; - if (cc->race == DRAKKIN) racetemp = 15; + classtemp = cc->class_ - 1; + racetemp = cc->race - 1; + // these have non sequential race numbers so they need to be mapped + if (cc->race == FROGLOK) racetemp = 14; + if (cc->race == VAHSHIR) racetemp = 13; + if (cc->race == IKSAR) racetemp = 12; + if (cc->race == DRAKKIN) racetemp = 15; - // if out of range looking it up in the table would crash stuff - // so we return from these - if(classtemp >= PLAYER_CLASS_COUNT) - { - _log(WORLD__CLIENT_ERR," class is out of range"); - return false; - } - if(racetemp >= _TABLE_RACES) - { - _log(WORLD__CLIENT_ERR," race is out of range"); - return false; - } + // if out of range looking it up in the table would crash stuff + // so we return from these + if(classtemp >= PLAYER_CLASS_COUNT) + { + _log(WORLD__CLIENT_ERR," class is out of range"); + return false; + } + if(racetemp >= _TABLE_RACES) + { + _log(WORLD__CLIENT_ERR," race is out of range"); + return false; + } - if(!ClassRaceLookupTable[classtemp][racetemp]) //Lookup table better than a bunch of ifs? - { - _log(WORLD__CLIENT_ERR," invalid race/class combination"); - // we return from this one, since if it's an invalid combination our table - // doesn't have meaningful values for the stats - return false; - } + if(!ClassRaceLookupTable[classtemp][racetemp]) //Lookup table better than a bunch of ifs? + { + _log(WORLD__CLIENT_ERR," invalid race/class combination"); + // we return from this one, since if it's an invalid combination our table + // doesn't have meaningful values for the stats + return false; + } - // solar: add up the base values for this class/race - // this is what they start with, and they have stat_points more - // that can distributed - bSTR = BaseClass[classtemp][0] + BaseRace[racetemp][0]; - bSTA = BaseClass[classtemp][1] + BaseRace[racetemp][1]; - bAGI = BaseClass[classtemp][2] + BaseRace[racetemp][2]; - bDEX = BaseClass[classtemp][3] + BaseRace[racetemp][3]; - bWIS = BaseClass[classtemp][4] + BaseRace[racetemp][4]; - bINT = BaseClass[classtemp][5] + BaseRace[racetemp][5]; - bCHA = BaseClass[classtemp][6] + BaseRace[racetemp][6]; - stat_points = BaseClass[classtemp][7]; - bTOTAL = bSTR + bSTA + bAGI + bDEX + bWIS + bINT + bCHA; - cTOTAL = cc->STR + cc->STA + cc->AGI + cc->DEX + cc->WIS + cc->INT + cc->CHA; + // solar: add up the base values for this class/race + // this is what they start with, and they have stat_points more + // that can distributed + bSTR = BaseClass[classtemp][0] + BaseRace[racetemp][0]; + bSTA = BaseClass[classtemp][1] + BaseRace[racetemp][1]; + bAGI = BaseClass[classtemp][2] + BaseRace[racetemp][2]; + bDEX = BaseClass[classtemp][3] + BaseRace[racetemp][3]; + bWIS = BaseClass[classtemp][4] + BaseRace[racetemp][4]; + bINT = BaseClass[classtemp][5] + BaseRace[racetemp][5]; + bCHA = BaseClass[classtemp][6] + BaseRace[racetemp][6]; + stat_points = BaseClass[classtemp][7]; + bTOTAL = bSTR + bSTA + bAGI + bDEX + bWIS + bINT + bCHA; + cTOTAL = cc->STR + cc->STA + cc->AGI + cc->DEX + cc->WIS + cc->INT + cc->CHA; - // solar: the first check makes sure the total is exactly what was expected. - // this will catch all the stat cheating, but there's still the issue - // of reducing CHA or INT or something, to use for STR, so we check - // that none are lower than the base or higher than base + stat_points - // NOTE: these could just be else if, but i want to see all the stats - // that are messed up not just the first hit + // solar: the first check makes sure the total is exactly what was expected. + // this will catch all the stat cheating, but there's still the issue + // of reducing CHA or INT or something, to use for STR, so we check + // that none are lower than the base or higher than base + stat_points + // NOTE: these could just be else if, but i want to see all the stats + // that are messed up not just the first hit - if(bTOTAL + stat_points != cTOTAL) - { - _log(WORLD__CLIENT_ERR," stat points total doesn't match expected value: expecting %d got %d", bTOTAL + stat_points, cTOTAL); - Charerrors++; - } + if(bTOTAL + stat_points != cTOTAL) + { + _log(WORLD__CLIENT_ERR," stat points total doesn't match expected value: expecting %d got %d", bTOTAL + stat_points, cTOTAL); + Charerrors++; + } - if(cc->STR > bSTR + stat_points || cc->STR < bSTR) - { - _log(WORLD__CLIENT_ERR," stat STR is out of range"); - Charerrors++; - } - if(cc->STA > bSTA + stat_points || cc->STA < bSTA) - { - _log(WORLD__CLIENT_ERR," stat STA is out of range"); - Charerrors++; - } - if(cc->AGI > bAGI + stat_points || cc->AGI < bAGI) - { - _log(WORLD__CLIENT_ERR," stat AGI is out of range"); - Charerrors++; - } - if(cc->DEX > bDEX + stat_points || cc->DEX < bDEX) - { - _log(WORLD__CLIENT_ERR," stat DEX is out of range"); - Charerrors++; - } - if(cc->WIS > bWIS + stat_points || cc->WIS < bWIS) - { - _log(WORLD__CLIENT_ERR," stat WIS is out of range"); - Charerrors++; - } - if(cc->INT > bINT + stat_points || cc->INT < bINT) - { - _log(WORLD__CLIENT_ERR," stat INT is out of range"); - Charerrors++; - } - if(cc->CHA > bCHA + stat_points || cc->CHA < bCHA) - { - _log(WORLD__CLIENT_ERR," stat CHA is out of range"); - Charerrors++; - } + if(cc->STR > bSTR + stat_points || cc->STR < bSTR) + { + _log(WORLD__CLIENT_ERR," stat STR is out of range"); + Charerrors++; + } + if(cc->STA > bSTA + stat_points || cc->STA < bSTA) + { + _log(WORLD__CLIENT_ERR," stat STA is out of range"); + Charerrors++; + } + if(cc->AGI > bAGI + stat_points || cc->AGI < bAGI) + { + _log(WORLD__CLIENT_ERR," stat AGI is out of range"); + Charerrors++; + } + if(cc->DEX > bDEX + stat_points || cc->DEX < bDEX) + { + _log(WORLD__CLIENT_ERR," stat DEX is out of range"); + Charerrors++; + } + if(cc->WIS > bWIS + stat_points || cc->WIS < bWIS) + { + _log(WORLD__CLIENT_ERR," stat WIS is out of range"); + Charerrors++; + } + if(cc->INT > bINT + stat_points || cc->INT < bINT) + { + _log(WORLD__CLIENT_ERR," stat INT is out of range"); + Charerrors++; + } + if(cc->CHA > bCHA + stat_points || cc->CHA < bCHA) + { + _log(WORLD__CLIENT_ERR," stat CHA is out of range"); + Charerrors++; + } - /*TODO: Check for deity/class/race.. it'd be nice, but probably of any real use to hack(faction, deity based items are all I can think of) - I am NOT writing those tables - kathgar*/ + /*TODO: Check for deity/class/race.. it'd be nice, but probably of any real use to hack(faction, deity based items are all I can think of) + I am NOT writing those tables - kathgar*/ - _log(WORLD__CLIENT,"Found %d errors in character creation request", Charerrors); + _log(WORLD__CLIENT,"Found %d errors in character creation request", Charerrors); - return Charerrors == 0; + return Charerrors == 0; } void Client::SetClassStartingSkills( PlayerProfile_Struct *pp ) { - for(uint32 i = 0; i <= HIGHEST_SKILL; ++i) { - if(pp->skills[i] == 0) { - if(i >= SPECIALIZE_ABJURE && i <= SPECIALIZE_EVOCATION) { - continue; - } + for(uint32 i = 0; i <= HIGHEST_SKILL; ++i) { + if(pp->skills[i] == 0) { + if(i >= SPECIALIZE_ABJURE && i <= SPECIALIZE_EVOCATION) { + continue; + } - if(i == MAKE_POISON || - i == TINKERING || - i == RESEARCH || - i == ALCHEMY || - i == BAKING || - i == TAILORING || - i == BLACKSMITHING || - i == FLETCHING || - i == BREWING || - i == POTTERY || - i == JEWELRY_MAKING || - i == BEGGING) { - continue; - } + if(i == MAKE_POISON || + i == TINKERING || + i == RESEARCH || + i == ALCHEMY || + i == BAKING || + i == TAILORING || + i == BLACKSMITHING || + i == FLETCHING || + i == BREWING || + i == POTTERY || + i == JEWELRY_MAKING || + i == BEGGING) { + continue; + } - pp->skills[i] = database.GetSkillCap(pp->class_, (SkillType)i, 1); - } - } + pp->skills[i] = database.GetSkillCap(pp->class_, (SkillType)i, 1); + } + } } void Client::SetRaceStartingSkills( PlayerProfile_Struct *pp ) { - switch( pp->race ) - { - case BARBARIAN: - case DWARF: - case ERUDITE: - case HALF_ELF: - case HIGH_ELF: - case HUMAN: - case OGRE: - case TROLL: - case DRAKKIN: //Drakkin are supposed to get a starting AA Skill - { - // No Race Specific Skills - break; - } - case DARK_ELF: - { - pp->skills[HIDE] = 50; - break; - } - case FROGLOK: - { - pp->skills[SWIMMING] = 125; - break; - } - case GNOME: - { - pp->skills[TINKERING] = 50; - break; - } - case HALFLING: - { - pp->skills[HIDE] = 50; - pp->skills[SNEAK] = 50; - break; - } - case IKSAR: - { - pp->skills[FORAGE] = 50; - pp->skills[SWIMMING] = 100; - break; - } - case WOOD_ELF: - { - pp->skills[FORAGE] = 50; - pp->skills[HIDE] = 50; - break; - } - case VAHSHIR: - { - pp->skills[SAFE_FALL] = 50; - pp->skills[SNEAK] = 50; - break; - } - } + switch( pp->race ) + { + case BARBARIAN: + case DWARF: + case ERUDITE: + case HALF_ELF: + case HIGH_ELF: + case HUMAN: + case OGRE: + case TROLL: + case DRAKKIN: //Drakkin are supposed to get a starting AA Skill + { + // No Race Specific Skills + break; + } + case DARK_ELF: + { + pp->skills[HIDE] = 50; + break; + } + case FROGLOK: + { + pp->skills[SWIMMING] = 125; + break; + } + case GNOME: + { + pp->skills[TINKERING] = 50; + break; + } + case HALFLING: + { + pp->skills[HIDE] = 50; + pp->skills[SNEAK] = 50; + break; + } + case IKSAR: + { + pp->skills[FORAGE] = 50; + pp->skills[SWIMMING] = 100; + break; + } + case WOOD_ELF: + { + pp->skills[FORAGE] = 50; + pp->skills[HIDE] = 50; + break; + } + case VAHSHIR: + { + pp->skills[SAFE_FALL] = 50; + pp->skills[SNEAK] = 50; + break; + } + } } void Client::SetRacialLanguages( PlayerProfile_Struct *pp ) { - switch( pp->race ) - { - case BARBARIAN: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_BARBARIAN] = 100; - break; - } - case DARK_ELF: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_DARK_ELVISH] = 100; - pp->languages[LANG_DARK_SPEECH] = 100; - pp->languages[LANG_ELDER_ELVISH] = 100; - pp->languages[LANG_ELVISH] = 25; - break; - } - case DWARF: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_DWARVISH] = 100; - pp->languages[LANG_GNOMISH] = 25; - break; - } - case ERUDITE: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_ERUDIAN] = 100; - break; - } - case FROGLOK: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_FROGLOK] = 100; - pp->languages[LANG_TROLL] = 25; - break; - } - case GNOME: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_DWARVISH] = 25; - pp->languages[LANG_GNOMISH] = 100; - break; - } - case HALF_ELF: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_ELVISH] = 100; - break; - } - case HALFLING: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_HALFLING] = 100; - break; - } - case HIGH_ELF: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_DARK_ELVISH] = 25; - pp->languages[LANG_ELDER_ELVISH] = 25; - pp->languages[LANG_ELVISH] = 100; - break; - } - case HUMAN: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - break; - } - case IKSAR: - { - pp->languages[LANG_COMMON_TONGUE] = 95; - pp->languages[LANG_DARK_SPEECH] = 100; - pp->languages[LANG_LIZARDMAN] = 100; - break; - } - case OGRE: - { - pp->languages[LANG_COMMON_TONGUE] = 95; - pp->languages[LANG_DARK_SPEECH] = 100; - pp->languages[LANG_OGRE] = 100; - break; - } - case TROLL: - { - pp->languages[LANG_COMMON_TONGUE] = 95; - pp->languages[LANG_DARK_SPEECH] = 100; - pp->languages[LANG_TROLL] = 100; - break; - } - case WOOD_ELF: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_ELVISH] = 100; - break; - } - case VAHSHIR: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_COMBINE_TONGUE] = 100; - pp->languages[LANG_ERUDIAN] = 25; - pp->languages[LANG_VAH_SHIR] = 100; - break; - } - case DRAKKIN: - { - pp->languages[LANG_COMMON_TONGUE] = 100; - pp->languages[LANG_ELDER_DRAGON] = 100; - pp->languages[LANG_DRAGON] = 100; - break; - } - } + switch( pp->race ) + { + case BARBARIAN: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_BARBARIAN] = 100; + break; + } + case DARK_ELF: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_DARK_ELVISH] = 100; + pp->languages[LANG_DARK_SPEECH] = 100; + pp->languages[LANG_ELDER_ELVISH] = 100; + pp->languages[LANG_ELVISH] = 25; + break; + } + case DWARF: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_DWARVISH] = 100; + pp->languages[LANG_GNOMISH] = 25; + break; + } + case ERUDITE: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_ERUDIAN] = 100; + break; + } + case FROGLOK: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_FROGLOK] = 100; + pp->languages[LANG_TROLL] = 25; + break; + } + case GNOME: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_DWARVISH] = 25; + pp->languages[LANG_GNOMISH] = 100; + break; + } + case HALF_ELF: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_ELVISH] = 100; + break; + } + case HALFLING: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_HALFLING] = 100; + break; + } + case HIGH_ELF: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_DARK_ELVISH] = 25; + pp->languages[LANG_ELDER_ELVISH] = 25; + pp->languages[LANG_ELVISH] = 100; + break; + } + case HUMAN: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + break; + } + case IKSAR: + { + pp->languages[LANG_COMMON_TONGUE] = 95; + pp->languages[LANG_DARK_SPEECH] = 100; + pp->languages[LANG_LIZARDMAN] = 100; + break; + } + case OGRE: + { + pp->languages[LANG_COMMON_TONGUE] = 95; + pp->languages[LANG_DARK_SPEECH] = 100; + pp->languages[LANG_OGRE] = 100; + break; + } + case TROLL: + { + pp->languages[LANG_COMMON_TONGUE] = 95; + pp->languages[LANG_DARK_SPEECH] = 100; + pp->languages[LANG_TROLL] = 100; + break; + } + case WOOD_ELF: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_ELVISH] = 100; + break; + } + case VAHSHIR: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_COMBINE_TONGUE] = 100; + pp->languages[LANG_ERUDIAN] = 25; + pp->languages[LANG_VAH_SHIR] = 100; + break; + } + case DRAKKIN: + { + pp->languages[LANG_COMMON_TONGUE] = 100; + pp->languages[LANG_ELDER_DRAGON] = 100; + pp->languages[LANG_DRAGON] = 100; + break; + } + } } + diff --git a/world/client.h b/world/client.h index 1e8f98a74..8d17864ec 100644 --- a/world/client.h +++ b/world/client.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef CLIENT_H #define CLIENT_H @@ -36,7 +36,7 @@ class EQStreamInterface; class Client { public: Client(EQStreamInterface* ieqs); - ~Client(); + ~Client(); bool Process(); void ReceiveData(uchar* buf, int len); @@ -111,7 +111,6 @@ private: EQStreamInterface* const eqs; }; - bool CheckCharCreateInfoSoF(CharCreate_Struct *cc); bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc); diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 9651063d2..dc2f8bf1d 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "cliententry.h" @@ -295,32 +295,3 @@ bool ClientListEntry::CheckAuth(uint32 id, const char* iKey, uint32 ip) { return false; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/world/cliententry.h b/world/cliententry.h index f6a63a1b3..dcf79ca4f 100644 --- a/world/cliententry.h +++ b/world/cliententry.h @@ -34,11 +34,11 @@ public: void SetOnline(int8 iOnline = CLE_Status_Online); void SetChar(uint32 iCharID, const char* iCharName); inline int8 Online() { return pOnline; } - inline const uint32 GetID() const { return id; } - inline const uint32 GetIP() const { return pIP; } + inline const uint32 GetID() const { return id; } + inline const uint32 GetIP() const { return pIP; } inline void SetIP(const uint32& iIP) { pIP = iIP; } inline void KeepAlive() { stale = 0; } - inline uint8 GetStaleCounter() const { return stale; } + inline uint8 GetStaleCounter() const { return stale; } void LeavingZone(ZoneServer* iZS = 0, int8 iOnline = CLE_Status_Offline); void Camp(ZoneServer* iZS = 0); @@ -122,5 +122,5 @@ private: char pLFGComments[64]; }; - #endif /*CLIENTENTRY_H_*/ + diff --git a/world/clientlist.cpp b/world/clientlist.cpp index 008ec5df3..82de9cebe 100644 --- a/world/clientlist.cpp +++ b/world/clientlist.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "clientlist.h" @@ -57,7 +57,7 @@ void ClientList::Process() { iterator.Reset(); while(iterator.MoreElements()) { if (!iterator.GetData()->Process()) { - struct in_addr in; + struct in_addr in; in.s_addr = iterator.GetData()->GetIP(); _log(WORLD__CLIENTLIST,"Removing client from %s:%d", inet_ntoa(in), iterator.GetData()->GetPort()); //the client destructor should take care of this. @@ -113,7 +113,7 @@ void ClientList::EnforceSessionLimit(uint32 iLSAccountID) { ClientEntry = iterator.GetData(); if ((ClientEntry->LSAccountID() == iLSAccountID) && - ((ClientEntry->Admin() <= (RuleI(World, ExemptAccountLimitStatus))) || (RuleI(World, ExemptAccountLimitStatus) < 0))) { + ((ClientEntry->Admin() <= (RuleI(World, ExemptAccountLimitStatus))) || (RuleI(World, ExemptAccountLimitStatus) < 0))) { CharacterCount++; @@ -227,15 +227,15 @@ void ClientList::DisconnectByIP(uint32 iIP) { while(iterator.MoreElements()) { countCLEIPs = iterator.GetData(); if ((countCLEIPs->GetIP() == iIP)) { - if(strlen(countCLEIPs->name())) { - ServerPacket* pack = new ServerPacket(ServerOP_KickPlayer, sizeof(ServerKickPlayer_Struct)); - ServerKickPlayer_Struct* skp = (ServerKickPlayer_Struct*) pack->pBuffer; - strcpy(skp->adminname, "SessionLimit"); - strcpy(skp->name, countCLEIPs->name()); - skp->adminrank = 255; - zoneserver_list.SendPacket(pack); - safe_delete(pack); - } + if(strlen(countCLEIPs->name())) { + ServerPacket* pack = new ServerPacket(ServerOP_KickPlayer, sizeof(ServerKickPlayer_Struct)); + ServerKickPlayer_Struct* skp = (ServerKickPlayer_Struct*) pack->pBuffer; + strcpy(skp->adminname, "SessionLimit"); + strcpy(skp->name, countCLEIPs->name()); + skp->adminrank = 255; + zoneserver_list.SendPacket(pack); + safe_delete(pack); + } countCLEIPs->SetOnline(CLE_Status_Offline); iterator.RemoveCurrent(); } @@ -301,7 +301,7 @@ void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnect while(iterator.MoreElements()) { ClientListEntry* cle = iterator.GetData(); if (admin >= cle->Admin() && (iName == 0 || namestrlen == 0 || strncasecmp(cle->name(), iName, namestrlen) == 0 || strncasecmp(cle->AccountName(), iName, namestrlen) == 0 || strncasecmp(cle->LSName(), iName, namestrlen) == 0)) { - struct in_addr in; + struct in_addr in; in.s_addr = cle->GetIP(); if (addnewline) { AppendAnyLenString(&output, &outsize, &outlen, newline); @@ -395,7 +395,7 @@ void ClientList::CLEKeepAlive(uint32 numupdates, uint32* wid) { ClientListEntry* ClientList::CheckAuth(uint32 id, const char* iKey, uint32 ip ) { - LinkedListIterator iterator(clientlist); + LinkedListIterator iterator(clientlist); iterator.Reset(); while(iterator.MoreElements()) { @@ -406,7 +406,7 @@ ClientListEntry* ClientList::CheckAuth(uint32 id, const char* iKey, uint32 ip ) return 0; } ClientListEntry* ClientList::CheckAuth(uint32 iLSID, const char* iKey) { - LinkedListIterator iterator(clientlist); + LinkedListIterator iterator(clientlist); iterator.Reset(); while(iterator.MoreElements()) { @@ -880,7 +880,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon WAPP3->ZoneMSGID = ZoneMSGID; WAPP3->Zone = PlayerZone; WAPP3->Class_ = PlayerClass; - WAPP3->Level = PlayerLevel; + WAPP3->Level = PlayerLevel; WAPP3->Race = PlayerRace; WAPP3->Account[0] = 0; @@ -920,16 +920,16 @@ void ClientList::SendLFGMatches(ServerLFGMatchesRequest_Struct *smrs) { // First we check that the player meets the level and class criteria of the person // doing the search. if((CLE->level() >= smrs->FromLevel) && (CLE->level() <= smrs->ToLevel) && - (BitMask & smrs->Classes)) - // Then we check if if the player doing the search meets the level criteria specified + (BitMask & smrs->Classes)) + // Then we check if if the player doing the search meets the level criteria specified // by the player who is LFG. // // GetLFGMatchFilter returns the setting of the 'Only players who match my posted filters - // can query me' checkbox. + // can query me' checkbox. // // FromLevel and ToLevel are the settings of the 'Want group levels:' boxes. - if(!CLE->GetLFGMatchFilter() || ((smrs->QuerierLevel >= CLE->GetLFGFromLevel()) && - (smrs->QuerierLevel <= CLE->GetLFGToLevel()))) + if(!CLE->GetLFGMatchFilter() || ((smrs->QuerierLevel >= CLE->GetLFGFromLevel()) && + (smrs->QuerierLevel <= CLE->GetLFGToLevel()))) Matches++; } Iterator.Advance(); @@ -950,7 +950,7 @@ void ClientList::SendLFGMatches(ServerLFGMatchesRequest_Struct *smrs) { if(CLE->LFG()) { unsigned int BitMask = 1 << CLE->class_(); if((CLE->level() >= smrs->FromLevel) && (CLE->level() <= smrs->ToLevel) && - (BitMask & smrs->Classes)) { + (BitMask & smrs->Classes)) { Matches--; strcpy(Buffer->Name, CLE->name()); Buffer->Class_ = CLE->class_(); @@ -1358,5 +1358,6 @@ void ClientList::SendClientVersionSummary(const char *Name) } zoneserver_list.SendEmoteMessage(Name, 0, 0, 13, "There are %i 6.2, %i Titanium, %i SoF, %i SoD, %i UF, %i RoF clients currently connected.", - Client62Count, ClientTitaniumCount, ClientSoFCount, ClientSoDCount, ClientUnderfootCount, ClientRoFCount); + Client62Count, ClientTitaniumCount, ClientSoFCount, ClientSoDCount, ClientUnderfootCount, ClientRoFCount); } + diff --git a/world/clientlist.h b/world/clientlist.h index 025894a21..1d5fc6ab8 100644 --- a/world/clientlist.h +++ b/world/clientlist.h @@ -40,7 +40,7 @@ public: void SendOnlineGuildMembers(uint32 FromID, uint32 GuildID); void SendClientVersionSummary(const char *Name); void SendLFGMatches(ServerLFGMatchesRequest_Struct *LFGMatchesRequest); - void ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct* whom, WorldTCPConnection* connection); + void ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct* whom, WorldTCPConnection* connection); void SendCLEList(const int16& admin, const char* to, WorldTCPConnection* connection, const char* iName = 0); bool SendPacket(const char* to, ServerPacket* pack); @@ -79,7 +79,5 @@ protected: }; - - - #endif /*CLIENTLIST_H_*/ + diff --git a/world/console.cpp b/world/console.cpp index 052308654..93f73ed4d 100644 --- a/world/console.cpp +++ b/world/console.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -53,7 +53,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #endif extern ZSList zoneserver_list; @@ -69,9 +69,9 @@ ConsoleList console_list; void CatchSignal(int sig_num); Console::Console(EmuTCPConnection* itcpc) -: WorldTCPConnection(), - timeout_timer(RuleI(Console, SessionTimeOut)), - prompt_timer(1000) +: WorldTCPConnection(), + timeout_timer(RuleI(Console, SessionTimeOut)), + prompt_timer(1000) { tcpc = itcpc; tcpc->SetEcho(true); @@ -89,7 +89,7 @@ Console::~Console() { void Console::Die() { state = CONSOLE_STATE_CLOSED; - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(WORLD__CONSOLE,"Removing console from %s:%d",inet_ntoa(in),GetPort()); tcpc->Disconnect(); @@ -100,17 +100,17 @@ bool Console::SendChannelMessage(const ServerChannelMessage_Struct* scm) { return false; switch (scm->chan_num) { if(RuleB(Chat, ServerWideAuction)){ - case 4: { - SendMessage(1, "%s auctions, '%s'", scm->from, scm->message); - break; + case 4: { + SendMessage(1, "%s auctions, '%s'", scm->from, scm->message); + break; + } } - } - if(RuleB(Chat, ServerWideOOC)){ - case 5: { - SendMessage(1, "%s says ooc, '%s'", scm->from, scm->message); - break; + if(RuleB(Chat, ServerWideOOC)){ + case 5: { + SendMessage(1, "%s says ooc, '%s'", scm->from, scm->message); + break; + } } - } case 6: { SendMessage(1, "%s BROADCASTS, '%s'", scm->from, scm->message); break; @@ -219,7 +219,7 @@ bool Console::Process() { return false; if (!tcpc->Connected()) { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(WORLD__CONSOLE,"Removing console (!tcpc->Connected) from %s:%d",inet_ntoa(in),GetPort()); return false; @@ -234,7 +234,7 @@ bool Console::Process() { if (timeout_timer.Check()) { SendMessage(1, 0); SendMessage(1, "Timeout, disconnecting..."); - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(WORLD__CONSOLE,"TCP connection timeout from %s:%d",inet_ntoa(in),GetPort()); return false; @@ -307,7 +307,7 @@ void ConsoleList::KillAll() { void ConsoleList::SendConsoleWho(WorldTCPConnection* connection, const char* to, int16 admin, char** output, uint32* outsize, uint32* outlen) { LinkedListIterator iterator(list); iterator.Reset(); - struct in_addr in; + struct in_addr in; int x = 0; while(iterator.MoreElements()) { @@ -855,3 +855,4 @@ void Console::SendPrompt() { if (tcpc->GetEcho()) SendMessage(0, "%s> ", paccountname); } + diff --git a/world/console.h b/world/console.h index b0ce233aa..26aa95648 100644 --- a/world/console.h +++ b/world/console.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef CONSOLE_H #define CONSOLE_H @@ -106,3 +106,4 @@ private: LinkedList list; }; #endif + diff --git a/world/lfplist.cpp b/world/lfplist.cpp index b72e66b2e..3e2e7611c 100644 --- a/world/lfplist.cpp +++ b/world/lfplist.cpp @@ -1,5 +1,5 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -9,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "lfplist.h" @@ -115,7 +115,7 @@ void GroupLFPList::Process() { Group = Iterator.GetData(); int MemberCount = 0; if(Group) { - GroupLFPMemberEntry* GroupMembers = Group->Members; + GroupLFPMemberEntry* GroupMembers = Group->Members; if(!GroupMembers) { Iterator.Advance(); continue; @@ -193,7 +193,7 @@ void GroupLFPList::UpdateGroup(ServerLFPUpdate_Struct *Update) { Group = new GroupLFP(Update->LeaderID); - if(Group) { + if(Group) { Group->SetDetails(Update); LFPGroupList.Append(Group); } diff --git a/world/lfplist.h b/world/lfplist.h index 6801424e8..dbb4f8962 100644 --- a/world/lfplist.h +++ b/world/lfplist.h @@ -1,5 +1,5 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -9,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef LFPENTRY_H @@ -64,3 +64,4 @@ private: }; #endif + diff --git a/world/net.cpp b/world/net.cpp index 9bb0aaa3e..3545b8a31 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -51,7 +51,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #include #else #include @@ -62,11 +62,11 @@ using namespace std; #include #ifndef FREEBSD union semun { - int val; - struct semid_ds *buf; - ushort *array; - struct seminfo *__buf; - void *__pad; + int val; + struct semid_ds *buf; + ushort *array; + struct seminfo *__buf; + void *__pad; }; #endif @@ -123,8 +123,8 @@ extern ConsoleList console_list; void CatchSignal(int sig_num); int main(int argc, char** argv) { - RegisterExecutablePlatform(ExePlatformWorld); - set_exception_handler(); + RegisterExecutablePlatform(ExePlatformWorld); + set_exception_handler(); // Load server configuration _log(WORLD__INIT, "Loading server configuration.."); @@ -289,7 +289,7 @@ int main(int argc, char** argv) { database.ClearRaidDetails(); _log(WORLD__INIT, "Loading items.."); if (!database.LoadItems()) { - _log(WORLD__INIT_ERR, "Error: Could not load item data. But ignoring"); + _log(WORLD__INIT_ERR, "Error: Could not load item data. But ignoring"); } _log(WORLD__INIT, "Loading guilds.."); guild_mgr.LoadGuilds(); @@ -310,9 +310,9 @@ int main(int argc, char** argv) { } } if(RuleB(World, ClearTempMerchantlist)){ - _log(WORLD__INIT, "Clearing temporary merchant lists.."); + _log(WORLD__INIT, "Clearing temporary merchant lists.."); database.ClearMerchantTemp(); - } + } _log(WORLD__INIT, "Loading EQ time of day.."); if (!zoneserver_list.worldclock.loadFile(Config->EQTimeFile.c_str())) _log(WORLD__INIT_ERR, "Unable to load %s", Config->EQTimeFile.c_str()); @@ -351,9 +351,9 @@ int main(int argc, char** argv) { Timer PurgeInstanceTimer(450000); PurgeInstanceTimer.Start(450000); - _log(WORLD__INIT, "Loading char create info..."); - database.LoadCharacterCreateAllocations(); - database.LoadCharacterCreateCombos(); + _log(WORLD__INIT, "Loading char create info..."); + database.LoadCharacterCreateAllocations(); + database.LoadCharacterCreateCombos(); char errbuf[TCPConnection_ErrorBufferSize]; if (tcps.Open(Config->WorldTCPPort, errbuf)) { @@ -406,24 +406,24 @@ int main(int argc, char** argv) { //now that we know what patch they are running, start up their client object struct in_addr in; in.s_addr = eqsi->GetRemoteIP(); - if (RuleB(World, UseBannedIPsTable)){ //Lieka: Check to see if we have the responsibility for blocking IPs. + if (RuleB(World, UseBannedIPsTable)){ //Lieka: Check to see if we have the responsibility for blocking IPs. _log(WORLD__CLIENT, "Checking inbound connection %s against BannedIPs table", inet_ntoa(in)); - if (!database.CheckBannedIPs(inet_ntoa(in))){ //Lieka: Check inbound IP against banned IP table. - _log(WORLD__CLIENT, "Connection %s PASSED banned IPs check. Processing connection.", inet_ntoa(in)); - Client* client = new Client(eqsi); - // @merth: client->zoneattempt=0; - client_list.Add(client); - } else { - _log(WORLD__CLIENT, "Connection from %s FAILED banned IPs check. Closing connection.", inet_ntoa(in)); - eqsi->Close(); //Lieka: If the inbound IP is on the banned table, close the EQStream. - } - } - if (!RuleB(World, UseBannedIPsTable)){ - _log(WORLD__CLIENT, "New connection from %s:%d, processing connection", inet_ntoa(in), ntohs(eqsi->GetRemotePort())); - Client* client = new Client(eqsi); - // @merth: client->zoneattempt=0; - client_list.Add(client); - } + if (!database.CheckBannedIPs(inet_ntoa(in))){ //Lieka: Check inbound IP against banned IP table. + _log(WORLD__CLIENT, "Connection %s PASSED banned IPs check. Processing connection.", inet_ntoa(in)); + Client* client = new Client(eqsi); + // @merth: client->zoneattempt=0; + client_list.Add(client); + } else { + _log(WORLD__CLIENT, "Connection from %s FAILED banned IPs check. Closing connection.", inet_ntoa(in)); + eqsi->Close(); //Lieka: If the inbound IP is on the banned table, close the EQStream. + } + } + if (!RuleB(World, UseBannedIPsTable)){ + _log(WORLD__CLIENT, "New connection from %s:%d, processing connection", inet_ntoa(in), ntohs(eqsi->GetRemotePort())); + Client* client = new Client(eqsi); + // @merth: client->zoneattempt=0; + client_list.Add(client); + } } client_list.Process(); diff --git a/world/net.h b/world/net.h index 492c03a9c..b343c8d68 100644 --- a/world/net.h +++ b/world/net.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WIN32 #include @@ -83,6 +83,6 @@ private: char worldpassword[31]; char worldaddress[255]; char chataddress[255]; - uint8 DEFAULTSTATUS; + uint8 DEFAULTSTATUS; }; diff --git a/world/perl_EQLConfig.cpp b/world/perl_EQLConfig.cpp index 7321c2a78..59e86dcb9 100644 --- a/world/perl_EQLConfig.cpp +++ b/world/perl_EQLConfig.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef const char Const_char; @@ -36,7 +36,7 @@ typedef const char Const_char; #undef seed #endif -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -433,23 +433,6 @@ XS(XS_EQLConfig_GetZoneDetails) sv_setpvn(*ele, cur->second.c_str(), cur->second.length()); } } - - - - - - - - - - - - - - - - - } XSRETURN(1); } @@ -471,8 +454,6 @@ XS(boot_EQLConfig) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "GetName"), XS_EQLConfig_GetName, file, "$"); diff --git a/world/perl_EQW.cpp b/world/perl_EQW.cpp index 3ddbf669d..fd6b62262 100644 --- a/world/perl_EQW.cpp +++ b/world/perl_EQW.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef const char Const_char; @@ -36,7 +36,7 @@ typedef const char Const_char; #undef seed #endif -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -272,23 +272,6 @@ XS(XS_EQW_GetZoneDetails) sv_setpvn(*ele, cur->second.c_str(), cur->second.length()); } } - - - - - - - - - - - - - - - - - } XSRETURN(1); } @@ -409,23 +392,6 @@ XS(XS_EQW_GetPlayerDetails) sv_setpvn(*ele, cur->second.c_str(), cur->second.length()); } } - - - - - - - - - - - - - - - - - } XSRETURN(1); } @@ -864,7 +830,7 @@ XS(XS_EQW_ListBugs) Perl_croak(aTHX_ "Usage: EQW::ListBugs(THIS, id)"); { EQW * THIS; - uint32 id = (uint32)SvUV(ST(1)); + uint32 id = (uint32)SvUV(ST(1)); vector RETVAL; @@ -953,7 +919,7 @@ XS(XS_EQW_ResolveBug) Perl_croak(aTHX_ "Usage: EQW::ResolveBug(THIS, id)"); { EQW * THIS; - const char *id = (const char*)SvPV_nolen(ST(1)); + const char *id = (const char*)SvPV_nolen(ST(1)); if (sv_derived_from(ST(0), "EQW")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -972,53 +938,53 @@ XS(XS_EQW_ResolveBug) XS(XS_EQW_SendMessage); /* prototype to pass -Wmissing-prototypes */ XS(XS_EQW_SendMessage) { - dXSARGS; - if (items != 3) - Perl_croak(aTHX_ "Usage: EQW::SendMessage(THIS, type, message)"); - { - EQW * THIS; - dXSTARG; - uint32 msgtype = (uint32)SvUV(ST(1)); - char* msg = (char *)SvPV_nolen(ST(2)); + dXSARGS; + if (items != 3) + Perl_croak(aTHX_ "Usage: EQW::SendMessage(THIS, type, message)"); + { + EQW * THIS; + dXSTARG; + uint32 msgtype = (uint32)SvUV(ST(1)); + char* msg = (char *)SvPV_nolen(ST(2)); - if (sv_derived_from(ST(0), "EQW")) { - IV tmp = SvIV((SV*)SvRV(ST(0))); - THIS = INT2PTR(EQW *,tmp); - } - else - Perl_croak(aTHX_ "THIS is not of type EQW"); - if(THIS == NULL) - Perl_croak(aTHX_ "THIS is NULL, avoiding crash."); + if (sv_derived_from(ST(0), "EQW")) { + IV tmp = SvIV((SV*)SvRV(ST(0))); + THIS = INT2PTR(EQW *,tmp); + } + else + Perl_croak(aTHX_ "THIS is not of type EQW"); + if(THIS == NULL) + Perl_croak(aTHX_ "THIS is NULL, avoiding crash."); - THIS->SendMessage(msgtype, msg); - } - XSRETURN_EMPTY; + THIS->SendMessage(msgtype, msg); + } + XSRETURN_EMPTY; } XS(XS_EQW_WorldShutDown); /* prototype to pass -Wmissing-prototypes */ XS(XS_EQW_WorldShutDown) { - dXSARGS; - if (items != 3) - Perl_croak(aTHX_ "Usage: EQW::WorldShutDown(THIS, time, interval)"); - { - EQW * THIS; - dXSTARG; - uint32 time = (uint32)SvUV(ST(1)); - uint32 interval = (uint32)SvUV(ST(2)); + dXSARGS; + if (items != 3) + Perl_croak(aTHX_ "Usage: EQW::WorldShutDown(THIS, time, interval)"); + { + EQW * THIS; + dXSTARG; + uint32 time = (uint32)SvUV(ST(1)); + uint32 interval = (uint32)SvUV(ST(2)); - if (sv_derived_from(ST(0), "EQW")) { - IV tmp = SvIV((SV*)SvRV(ST(0))); - THIS = INT2PTR(EQW *,tmp); - } - else - Perl_croak(aTHX_ "THIS is not of type EQW"); - if(THIS == NULL) - Perl_croak(aTHX_ "THIS is NULL, avoiding crash."); + if (sv_derived_from(ST(0), "EQW")) { + IV tmp = SvIV((SV*)SvRV(ST(0))); + THIS = INT2PTR(EQW *,tmp); + } + else + Perl_croak(aTHX_ "THIS is not of type EQW"); + if(THIS == NULL) + Perl_croak(aTHX_ "THIS is NULL, avoiding crash."); - THIS->WorldShutDown(time, interval); - } - XSRETURN_EMPTY; + THIS->WorldShutDown(time, interval); + } + XSRETURN_EMPTY; } #ifdef __cplusplus @@ -1038,8 +1004,6 @@ XS(boot_EQW) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "GetConfig"), XS_EQW_GetConfig, file, "$$"); @@ -1067,10 +1031,10 @@ XS(boot_EQW) newXSproto(strcpy(buf, "SetBankerFlag"), XS_EQW_SetBankerFlag, file, "$$$"); newXSproto(strcpy(buf, "SetTributeFlag"), XS_EQW_SetTributeFlag, file, "$$$"); newXSproto(strcpy(buf, "SetPublicNote"), XS_EQW_SetPublicNote, file, "$$$"); - newXSproto(strcpy(buf, "CountBugs"), XS_EQW_CountBugs, file, "$"); - newXSproto(strcpy(buf, "ListBugs"), XS_EQW_ListBugs, file, "$$"); + newXSproto(strcpy(buf, "CountBugs"), XS_EQW_CountBugs, file, "$"); + newXSproto(strcpy(buf, "ListBugs"), XS_EQW_ListBugs, file, "$$"); newXSproto(strcpy(buf, "GetBugDetails"), XS_EQW_GetBugDetails, file, "$$"); - newXSproto(strcpy(buf, "ResolveBug"), XS_EQW_ResolveBug, file, "$$"); + newXSproto(strcpy(buf, "ResolveBug"), XS_EQW_ResolveBug, file, "$$"); newXSproto(strcpy(buf, "SendMessage"), XS_EQW_SendMessage, file, "$$$"); newXSproto(strcpy(buf, "WorldShutDown"), XS_EQW_WorldShutDown, file, "$$$"); XSRETURN_YES; diff --git a/world/perl_HTTPRequest.cpp b/world/perl_HTTPRequest.cpp index 0fa250739..d9427d809 100644 --- a/world/perl_HTTPRequest.cpp +++ b/world/perl_HTTPRequest.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef const char Const_char; @@ -36,7 +36,7 @@ typedef const char Const_char; #undef seed #endif -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -219,23 +219,6 @@ XS(XS_HTTPRequest_get_all) sv_setpvn(*ele, cur->second.c_str(), cur->second.length()); } } - - - - - - - - - - - - - - - - - } XSRETURN(1); } @@ -330,8 +313,6 @@ XS(boot_HTTPRequest) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "get"), XS_HTTPRequest_get, file, "$$;$"); diff --git a/world/queryserv.cpp b/world/queryserv.cpp index 4181ca362..eaa428332 100644 --- a/world/queryserv.cpp +++ b/world/queryserv.cpp @@ -54,7 +54,7 @@ bool QueryServConnection::Process() authenticated = true; else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(QUERYSERV__ERROR, "QueryServ authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -66,7 +66,7 @@ bool QueryServConnection::Process() } else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(QUERYSERV__ERROR, "QueryServ authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -131,3 +131,4 @@ bool QueryServConnection::SendPacket(ServerPacket* pack) return Stream->SendPacket(pack); } + diff --git a/world/ucs.cpp b/world/ucs.cpp index 36e29592f..262e8c187 100644 --- a/world/ucs.cpp +++ b/world/ucs.cpp @@ -49,7 +49,7 @@ bool UCSConnection::Process() authenticated = true; else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(UCS__ERROR, "UCS authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -61,7 +61,7 @@ bool UCSConnection::Process() } else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); _log(UCS__ERROR, "UCS authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -127,3 +127,4 @@ void UCSConnection::SendMessage(const char *From, const char *Message) SendPacket(pack); safe_delete(pack); } + diff --git a/world/wguild_mgr.cpp b/world/wguild_mgr.cpp index ba93980cb..45cad0f56 100644 --- a/world/wguild_mgr.cpp +++ b/world/wguild_mgr.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "wguild_mgr.h" @@ -144,29 +144,3 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) { } } - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/world/worlddb.cpp b/world/worlddb.cpp index b6f59b8ea..e99fafcf3 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "worlddb.h" @@ -46,7 +46,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* strcpy(cs->name[i], ""); cs->zone[i] = 0; cs->level[i] = 0; - cs->tutorial[i] = 0; + cs->tutorial[i] = 0; cs->gohome[i] = 0; } @@ -83,8 +83,8 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* cs->face[char_num] = pp->face; cs->haircolor[char_num] = pp->haircolor; cs->beardcolor[char_num] = pp->beardcolor; - cs->eyecolor2[char_num] = pp->eyecolor2; - cs->eyecolor1[char_num] = pp->eyecolor1; + cs->eyecolor2[char_num] = pp->eyecolor2; + cs->eyecolor1[char_num] = pp->eyecolor1; cs->hairstyle[char_num] = pp->hairstyle; cs->beard[char_num] = pp->beard; cs->drakkin_heritage[char_num] = pp->drakkin_heritage; @@ -102,7 +102,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* // This part creates home city entries for characters created before the home bind point was tracked. - // Do it here because the player profile is already loaded and it's as good a spot as any. This whole block should + // Do it here because the player profile is already loaded and it's as good a spot as any. This whole block should // probably be removed at some point, when most accounts are safely converted. if(pp->binds[4].zoneId == 0) { bool altered = false; @@ -177,7 +177,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* // @merth: Haven't done bracer01/bracer02 yet. // Also: this needs a second look after items are a little more solid // NOTE: items don't have a color, players MAY have a tint, if the - // use_tint part is set. otherwise use the regular color + // use_tint part is set. otherwise use the regular color inv = new Inventory; if(GetInventory(account_id, cs->name[char_num], inv)) { @@ -269,8 +269,8 @@ int WorldDatabase::MoveCharacterToBind(int CharID, uint8 bindnum) { if(!strcmp(BindZoneName, "UNKNWN")) return pp.zone_id; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET zonename = '%s',zoneid=%i,x=%f, y=%f, z=%f, instanceid=0 WHERE id='%i'", - BindZoneName, pp.binds[bindnum].zoneId, pp.binds[bindnum].x, pp.binds[bindnum].y, pp.binds[bindnum].z, - CharID), errbuf, 0,&affected_rows)) { + BindZoneName, pp.binds[bindnum].zoneId, pp.binds[bindnum].x, pp.binds[bindnum].y, pp.binds[bindnum].z, + CharID), errbuf, 0,&affected_rows)) { return pp.zone_id; } @@ -500,9 +500,9 @@ bool WorldDatabase::GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Stru void WorldDatabase::GetLauncherList(std::vector &rl) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; rl.clear(); @@ -534,7 +534,7 @@ void WorldDatabase::SetMailKey(int CharID, int IPAddress, int MailKey) { sprintf(MailKeyString, "%08X", MailKey); if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE character_ SET mailkey = '%s' WHERE id='%i'", - MailKeyString, CharID), errbuf)) + MailKeyString, CharID), errbuf)) LogFile->write(EQEMuLog::Error, "WorldDatabase::SetMailKey(%i, %s) : %s", CharID, MailKeyString, errbuf); @@ -545,9 +545,9 @@ void WorldDatabase::SetMailKey(int CharID, int IPAddress, int MailKey) { bool WorldDatabase::GetCharacterLevel(const char *name, int &level) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; if(RunQuery(query, MakeAnyLenString(&query, "SELECT level FROM character_ WHERE name='%s'", name), errbuf, &result)) { @@ -569,71 +569,69 @@ bool WorldDatabase::GetCharacterLevel(const char *name, int &level) } bool WorldDatabase::LoadCharacterCreateAllocations() { - character_create_allocations.clear(); + character_create_allocations.clear(); - char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char errbuf[MYSQL_ERRMSG_SIZE]; + char* query = 0; MYSQL_RES *result; - MYSQL_ROW row; - if(RunQuery(query, MakeAnyLenString(&query, "SELECT * FROM char_create_point_allocations order by id"), errbuf, &result)) { - safe_delete_array(query); - while(row = mysql_fetch_row(result)) { - RaceClassAllocation allocate; - int r = 0; - allocate.Index = atoi(row[r++]); - allocate.BaseStats[0] = atoi(row[r++]); - allocate.BaseStats[3] = atoi(row[r++]); - allocate.BaseStats[1] = atoi(row[r++]); - allocate.BaseStats[2] = atoi(row[r++]); - allocate.BaseStats[4] = atoi(row[r++]); - allocate.BaseStats[5] = atoi(row[r++]); - allocate.BaseStats[6] = atoi(row[r++]); - allocate.DefaultPointAllocation[0] = atoi(row[r++]); - allocate.DefaultPointAllocation[3] = atoi(row[r++]); - allocate.DefaultPointAllocation[1] = atoi(row[r++]); - allocate.DefaultPointAllocation[2] = atoi(row[r++]); - allocate.DefaultPointAllocation[4] = atoi(row[r++]); - allocate.DefaultPointAllocation[5] = atoi(row[r++]); - allocate.DefaultPointAllocation[6] = atoi(row[r++]); - character_create_allocations.push_back(allocate); - } - mysql_free_result(result); - } else { - safe_delete_array(query); - return false; - } + MYSQL_ROW row; + if(RunQuery(query, MakeAnyLenString(&query, "SELECT * FROM char_create_point_allocations order by id"), errbuf, &result)) { + safe_delete_array(query); + while(row = mysql_fetch_row(result)) { + RaceClassAllocation allocate; + int r = 0; + allocate.Index = atoi(row[r++]); + allocate.BaseStats[0] = atoi(row[r++]); + allocate.BaseStats[3] = atoi(row[r++]); + allocate.BaseStats[1] = atoi(row[r++]); + allocate.BaseStats[2] = atoi(row[r++]); + allocate.BaseStats[4] = atoi(row[r++]); + allocate.BaseStats[5] = atoi(row[r++]); + allocate.BaseStats[6] = atoi(row[r++]); + allocate.DefaultPointAllocation[0] = atoi(row[r++]); + allocate.DefaultPointAllocation[3] = atoi(row[r++]); + allocate.DefaultPointAllocation[1] = atoi(row[r++]); + allocate.DefaultPointAllocation[2] = atoi(row[r++]); + allocate.DefaultPointAllocation[4] = atoi(row[r++]); + allocate.DefaultPointAllocation[5] = atoi(row[r++]); + allocate.DefaultPointAllocation[6] = atoi(row[r++]); + character_create_allocations.push_back(allocate); + } + mysql_free_result(result); + } else { + safe_delete_array(query); + return false; + } - return true; + return true; } bool WorldDatabase::LoadCharacterCreateCombos() { - character_create_race_class_combos.clear(); + character_create_race_class_combos.clear(); - char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char errbuf[MYSQL_ERRMSG_SIZE]; + char* query = 0; MYSQL_RES *result; - MYSQL_ROW row; - if(RunQuery(query, MakeAnyLenString(&query, "select * from char_create_combinations order by race, class, deity, start_zone"), errbuf, &result)) { - safe_delete_array(query); - while(row = mysql_fetch_row(result)) { - RaceClassCombos combo; - int r = 0; - combo.AllocationIndex = atoi(row[r++]); - combo.Race = atoi(row[r++]); - combo.Class = atoi(row[r++]); - combo.Deity = atoi(row[r++]); - combo.Zone = atoi(row[r++]); - combo.ExpansionRequired = atoi(row[r++]); - character_create_race_class_combos.push_back(combo); - } - mysql_free_result(result); - } else { - safe_delete_array(query); - return false; - } + MYSQL_ROW row; + if(RunQuery(query, MakeAnyLenString(&query, "select * from char_create_combinations order by race, class, deity, start_zone"), errbuf, &result)) { + safe_delete_array(query); + while(row = mysql_fetch_row(result)) { + RaceClassCombos combo; + int r = 0; + combo.AllocationIndex = atoi(row[r++]); + combo.Race = atoi(row[r++]); + combo.Class = atoi(row[r++]); + combo.Deity = atoi(row[r++]); + combo.Zone = atoi(row[r++]); + combo.ExpansionRequired = atoi(row[r++]); + character_create_race_class_combos.push_back(combo); + } + mysql_free_result(result); + } else { + safe_delete_array(query); + return false; + } - return true; + return true; } - - diff --git a/world/worlddb.h b/world/worlddb.h index ea2e8a5b6..0dcb6ef44 100644 --- a/world/worlddb.h +++ b/world/worlddb.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WORLDDB_H_ #define WORLDDB_H_ @@ -38,13 +38,12 @@ public: void SetMailKey(int CharID, int IPAddress, int MailKey); bool GetCharacterLevel(const char *name, int &level); - bool LoadCharacterCreateAllocations(); - bool LoadCharacterCreateCombos(); + bool LoadCharacterCreateAllocations(); + bool LoadCharacterCreateCombos(); protected: }; extern WorldDatabase database; - #endif /*WORLDDB_H_*/ diff --git a/world/zonelist.cpp b/world/zonelist.cpp index 729409767..9a95c034d 100644 --- a/world/zonelist.cpp +++ b/world/zonelist.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "zonelist.h" @@ -87,7 +87,7 @@ void ZSList::Process() { CatchSignal(2); } if(reminder && reminder->Check()){ - SendEmoteMessage(0,0,0,15,":SYSTEM MSG:World coming down, everyone log out now. World will shut down in %i seconds...",shutdowntimer->GetRemainingTime()/1000); + SendEmoteMessage(0,0,0,15,":SYSTEM MSG:World coming down, everyone log out now. World will shut down in %i seconds...",shutdowntimer->GetRemainingTime()/1000); } LinkedListIterator iterator(list); @@ -95,7 +95,7 @@ void ZSList::Process() { while(iterator.MoreElements()) { if (!iterator.GetData()->Process()) { ZoneServer* zs = iterator.GetData(); - struct in_addr in; + struct in_addr in; in.s_addr = zs->GetIP(); _log(WORLD__ZONELIST,"Removing zoneserver #%d at %s:%d",zs->GetID(),zs->GetCAddress(),zs->GetCPort()); zs->LSShutDownUpdate(zs->GetZoneID()); @@ -204,7 +204,7 @@ ZoneServer* ZSList::FindByZoneID(uint32 ZoneID) { while(iterator.MoreElements()) { ZoneServer* tmp = iterator.GetData(); - if (tmp->GetZoneID() == ZoneID && tmp->GetInstanceID() == 0) { + if (tmp->GetZoneID() == ZoneID && tmp->GetInstanceID() == 0) { return tmp; } iterator.Advance(); @@ -282,7 +282,7 @@ void ZSList::ListLockedZones(const char* to, WorldTCPConnection* connection) { void ZSList::SendZoneStatus(const char* to, int16 admin, WorldTCPConnection* connection) { LinkedListIterator iterator(list); - struct in_addr in; + struct in_addr in; iterator.Reset(); char locked[4]; @@ -713,12 +713,11 @@ void ZSList::GetZoneIDList(vector &zones) { zones.push_back(zs->GetID()); iterator.Advance(); } - } void ZSList::WorldShutDown(uint32 time, uint32 interval) { - if( time > 0 ) { + if( time > 0 ) { SendEmoteMessage(0,0,0,15,":SYSTEM MSG:World coming down in %i seconds, everyone log out before this time.",time); time *= 1000; @@ -730,15 +729,15 @@ void ZSList::WorldShutDown(uint32 time, uint32 interval) reminder->SetAtTrigger(interval); shutdowntimer->Start(); reminder->Start(); - } - else { - SendEmoteMessage(0,0,0,15,":SYSTEM MSG:World coming down, everyone log out now."); - ServerPacket* pack = new ServerPacket; - pack->opcode = ServerOP_ShutdownAll; - pack->size=0; - SendPacket(pack); - safe_delete(pack); + } + else { + SendEmoteMessage(0,0,0,15,":SYSTEM MSG:World coming down, everyone log out now."); + ServerPacket* pack = new ServerPacket; + pack->opcode = ServerOP_ShutdownAll; + pack->size=0; + SendPacket(pack); + safe_delete(pack); Process(); CatchSignal(2); - } + } } diff --git a/world/zonelist.h b/world/zonelist.h index ce3dad431..19160f790 100644 --- a/world/zonelist.h +++ b/world/zonelist.h @@ -52,7 +52,7 @@ public: Timer* reminder; void NextGroupIDs(uint32 &start, uint32 &end); void SendLSZones(); - uint16 GetAvailableZonePort(); + uint16 GetAvailableZonePort(); int GetZoneCount(); void GetZoneIDList(std::vector &zones); @@ -68,16 +68,5 @@ protected: }; - - - - - - - - - - - - #endif /*ZONELIST_H_*/ + diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 02967cfa7..1332158cd 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "zoneserver.h" @@ -186,7 +186,7 @@ bool ZoneServer::Process() { if (memcmp(pack->pBuffer, tmppass, 16) == 0) authenticated = true; else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); zlog(WORLD__ZONE_ERR,"Zone authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -197,7 +197,7 @@ bool ZoneServer::Process() { } } else { - struct in_addr in; + struct in_addr in; in.s_addr = GetIP(); zlog(WORLD__ZONE_ERR,"Zone authorization failed."); ServerPacket* pack = new ServerPacket(ServerOP_ZAAuthFailed); @@ -214,1114 +214,1114 @@ bool ZoneServer::Process() { } } switch(pack->opcode) { - case 0: - break; - case ServerOP_KeepAlive: { - // ignore this - break; - } - case ServerOP_ZAAuth: { - break; - } - case ServerOP_LSZoneBoot:{ - if(pack->size==sizeof(ZoneBoot_Struct)){ - ZoneBoot_Struct* zbs= (ZoneBoot_Struct*)pack->pBuffer; - SetCompile(zbs->compile_time); - } - break; - } - case ServerOP_GroupInvite: { - if(pack->size != sizeof(GroupInvite_Struct)) + case 0: break; - - GroupInvite_Struct* gis = (GroupInvite_Struct*) pack->pBuffer; - - client_list.SendPacket(gis->invitee_name, pack); - break; - } - case ServerOP_GroupFollow: { - if(pack->size != sizeof(ServerGroupFollow_Struct)) - break; - - ServerGroupFollow_Struct *sgfs = (ServerGroupFollow_Struct *) pack->pBuffer; - - client_list.SendPacket(sgfs->gf.name1, pack); - break; - } - case ServerOP_GroupFollowAck: { - if(pack->size != sizeof(ServerGroupFollowAck_Struct)) - break; - - ServerGroupFollowAck_Struct *sgfas = (ServerGroupFollowAck_Struct *) pack->pBuffer; - - client_list.SendPacket(sgfas->Name, pack); - break; - } - case ServerOP_GroupCancelInvite: { - if(pack->size != sizeof(GroupCancel_Struct)) - break; - - GroupCancel_Struct *gcs = (GroupCancel_Struct *) pack->pBuffer; - - client_list.SendPacket(gcs->name1, pack); - break; - } - case ServerOP_GroupIDReq: { - SendGroupIDs(); - break; - } - case ServerOP_GroupLeave: { - if(pack->size != sizeof(ServerGroupLeave_Struct)) - break; - zoneserver_list.SendPacket(pack); //bounce it to all zones - break; - } - - case ServerOP_GroupJoin: { - if(pack->size != sizeof(ServerGroupJoin_Struct)) - break; - zoneserver_list.SendPacket(pack); //bounce it to all zones - break; - } - - case ServerOP_ForceGroupUpdate: { - if(pack->size != sizeof(ServerForceGroupUpdate_Struct)) - break; - zoneserver_list.SendPacket(pack); //bounce it to all zones - break; - } - - case ServerOP_OOZGroupMessage: { - zoneserver_list.SendPacket(pack); //bounce it to all zones - break; - } - - case ServerOP_DisbandGroup: { - if(pack->size != sizeof(ServerDisbandGroup_Struct)) - break; - zoneserver_list.SendPacket(pack); //bounce it to all zones - break; - } - - case ServerOP_RaidAdd:{ - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidRemove: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidDisband: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidLockFlag: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidChangeGroup: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_UpdateGroup: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidGroupDisband: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidGroupAdd: { - if(pack->size != sizeof(ServerRaidGroupAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidGroupRemove: { - if(pack->size != sizeof(ServerRaidGroupAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidGroupSay: { - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidSay: { - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidGroupLeader: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_RaidLeader: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_DetailsChange: { - if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) - break; - - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_SpawnCondition: { - if(pack->size != sizeof(ServerSpawnCondition_Struct)) - break; - //bounce the packet to the correct zone server, if its up - ServerSpawnCondition_Struct* ssc = (ServerSpawnCondition_Struct*)pack->pBuffer; - zoneserver_list.SendPacket(ssc->zoneID, ssc->instanceID, pack); - break; - } - case ServerOP_SpawnEvent: { - if(pack->size != sizeof(ServerSpawnEvent_Struct)) - break; - //bounce the packet to the correct zone server, if its up - ServerSpawnEvent_Struct* sse = (ServerSpawnEvent_Struct*)pack->pBuffer; - zoneserver_list.SendPacket(sse->zoneID, 0, pack); - break; - } - case ServerOP_ChannelMessage: { - ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*) pack->pBuffer; - if(scm->chan_num == 20) - { - UCSLink.SendMessage(scm->from, scm->message); + case ServerOP_KeepAlive: { + // ignore this break; } - if (scm->chan_num == 7 || scm->chan_num == 14) { - if (scm->deliverto[0] == '*') { - Console* con = 0; - con = console_list.FindByAccountName(&scm->deliverto[1]); - if (((!con) || (!con->SendChannelMessage(scm))) && (!scm->noreply)) - zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); + case ServerOP_ZAAuth: { + break; + } + case ServerOP_LSZoneBoot:{ + if(pack->size==sizeof(ZoneBoot_Struct)){ + ZoneBoot_Struct* zbs= (ZoneBoot_Struct*)pack->pBuffer; + SetCompile(zbs->compile_time); + } + break; + } + case ServerOP_GroupInvite: { + if(pack->size != sizeof(GroupInvite_Struct)) + break; + + GroupInvite_Struct* gis = (GroupInvite_Struct*) pack->pBuffer; + + client_list.SendPacket(gis->invitee_name, pack); + break; + } + case ServerOP_GroupFollow: { + if(pack->size != sizeof(ServerGroupFollow_Struct)) + break; + + ServerGroupFollow_Struct *sgfs = (ServerGroupFollow_Struct *) pack->pBuffer; + + client_list.SendPacket(sgfs->gf.name1, pack); + break; + } + case ServerOP_GroupFollowAck: { + if(pack->size != sizeof(ServerGroupFollowAck_Struct)) + break; + + ServerGroupFollowAck_Struct *sgfas = (ServerGroupFollowAck_Struct *) pack->pBuffer; + + client_list.SendPacket(sgfas->Name, pack); + break; + } + case ServerOP_GroupCancelInvite: { + if(pack->size != sizeof(GroupCancel_Struct)) + break; + + GroupCancel_Struct *gcs = (GroupCancel_Struct *) pack->pBuffer; + + client_list.SendPacket(gcs->name1, pack); + break; + } + case ServerOP_GroupIDReq: { + SendGroupIDs(); + break; + } + case ServerOP_GroupLeave: { + if(pack->size != sizeof(ServerGroupLeave_Struct)) + break; + zoneserver_list.SendPacket(pack); //bounce it to all zones + break; + } + + case ServerOP_GroupJoin: { + if(pack->size != sizeof(ServerGroupJoin_Struct)) + break; + zoneserver_list.SendPacket(pack); //bounce it to all zones + break; + } + + case ServerOP_ForceGroupUpdate: { + if(pack->size != sizeof(ServerForceGroupUpdate_Struct)) + break; + zoneserver_list.SendPacket(pack); //bounce it to all zones + break; + } + + case ServerOP_OOZGroupMessage: { + zoneserver_list.SendPacket(pack); //bounce it to all zones + break; + } + + case ServerOP_DisbandGroup: { + if(pack->size != sizeof(ServerDisbandGroup_Struct)) + break; + zoneserver_list.SendPacket(pack); //bounce it to all zones + break; + } + + case ServerOP_RaidAdd:{ + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidRemove: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidDisband: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidLockFlag: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidChangeGroup: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_UpdateGroup: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidGroupDisband: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidGroupAdd: { + if(pack->size != sizeof(ServerRaidGroupAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidGroupRemove: { + if(pack->size != sizeof(ServerRaidGroupAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidGroupSay: { + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidSay: { + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidGroupLeader: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_RaidLeader: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_DetailsChange: { + if(pack->size != sizeof(ServerRaidGeneralAction_Struct)) + break; + + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_SpawnCondition: { + if(pack->size != sizeof(ServerSpawnCondition_Struct)) + break; + //bounce the packet to the correct zone server, if its up + ServerSpawnCondition_Struct* ssc = (ServerSpawnCondition_Struct*)pack->pBuffer; + zoneserver_list.SendPacket(ssc->zoneID, ssc->instanceID, pack); + break; + } + case ServerOP_SpawnEvent: { + if(pack->size != sizeof(ServerSpawnEvent_Struct)) + break; + //bounce the packet to the correct zone server, if its up + ServerSpawnEvent_Struct* sse = (ServerSpawnEvent_Struct*)pack->pBuffer; + zoneserver_list.SendPacket(sse->zoneID, 0, pack); + break; + } + case ServerOP_ChannelMessage: { + ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*) pack->pBuffer; + if(scm->chan_num == 20) + { + UCSLink.SendMessage(scm->from, scm->message); break; } - ClientListEntry* cle = client_list.FindCharacter(scm->deliverto); - if (cle == 0 || cle->Online() < CLE_Status_Zoning || (cle->TellsOff() && ((cle->Anon() == 1 && scm->fromadmin < cle->Admin()) || scm->fromadmin < 80))) { - if (!scm->noreply) - zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); - } - else if (cle->Online() == CLE_Status_Zoning) { - if (!scm->noreply) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - //MYSQL_ROW row; Trumpcard - commenting. Currently unused. - time_t rawtime; - struct tm * timeinfo; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - char *telldate=asctime(timeinfo); - if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT name from character_ where name='%s'",scm->deliverto), errbuf, &result)) { - safe_delete(query); - if (result!=0) { - if (database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO tellque (Date,Receiver,Sender,Message) values('%s','%s','%s','%s')",telldate,scm->deliverto,scm->from,scm->message), errbuf, &result)) - zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "Your message has been added to the %s's que.", scm->to); + if (scm->chan_num == 7 || scm->chan_num == 14) { + if (scm->deliverto[0] == '*') { + Console* con = 0; + con = console_list.FindByAccountName(&scm->deliverto[1]); + if (((!con) || (!con->SendChannelMessage(scm))) && (!scm->noreply)) + zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); + break; + } + ClientListEntry* cle = client_list.FindCharacter(scm->deliverto); + if (cle == 0 || cle->Online() < CLE_Status_Zoning || (cle->TellsOff() && ((cle->Anon() == 1 && scm->fromadmin < cle->Admin()) || scm->fromadmin < 80))) { + if (!scm->noreply) + zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); + } + else if (cle->Online() == CLE_Status_Zoning) { + if (!scm->noreply) { + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; + //MYSQL_ROW row; Trumpcard - commenting. Currently unused. + time_t rawtime; + struct tm * timeinfo; + time ( &rawtime ); + timeinfo = localtime ( &rawtime ); + char *telldate=asctime(timeinfo); + if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT name from character_ where name='%s'",scm->deliverto), errbuf, &result)) { + safe_delete(query); + if (result!=0) { + if (database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO tellque (Date,Receiver,Sender,Message) values('%s','%s','%s','%s')",telldate,scm->deliverto,scm->from,scm->message), errbuf, &result)) + zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "Your message has been added to the %s's que.", scm->to); + else + zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); + safe_delete(query); + } else zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); - safe_delete(query); + mysql_free_result(result); } else - zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); - mysql_free_result(result); + safe_delete(query); } - else - safe_delete(query); + // zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); } - // zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not online at this time'", scm->to, scm->to); + else if (cle->Server() == 0) { + if (!scm->noreply) + zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not contactable at this time'", scm->to, scm->to); + } + else + cle->Server()->SendPacket(pack); } - else if (cle->Server() == 0) { - if (!scm->noreply) - zoneserver_list.SendEmoteMessage(scm->from, 0, 0, 0, "You told %s, '%s is not contactable at this time'", scm->to, scm->to); + else { + if (scm->chan_num == 5 || scm->chan_num == 6 || scm->chan_num == 11) { + console_list.SendChannelMessage(scm); + } + zoneserver_list.SendPacket(pack); + } + break; + } + case ServerOP_EmoteMessage: { + ServerEmoteMessage_Struct* sem = (ServerEmoteMessage_Struct*) pack->pBuffer; + zoneserver_list.SendEmoteMessageRaw(sem->to, sem->guilddbid, sem->minstatus, sem->type, sem->message); + break; + } + case ServerOP_VoiceMacro: { + + ServerVoiceMacro_Struct* svm = (ServerVoiceMacro_Struct*) pack->pBuffer; + + if(svm->Type == VoiceMacroTell) { + + ClientListEntry* cle = client_list.FindCharacter(svm->To); + + if (!cle || (cle->Online() < CLE_Status_Zoning) || !cle->Server()) { + + zoneserver_list.SendEmoteMessage(svm->From, 0, 0, 0, "'%s is not online at this time'", svm->To); + + break; + } + + cle->Server()->SendPacket(pack); } else - cle->Server()->SendPacket(pack); - } - else { - if (scm->chan_num == 5 || scm->chan_num == 6 || scm->chan_num == 11) { - console_list.SendChannelMessage(scm); - } - zoneserver_list.SendPacket(pack); - } - break; - } - case ServerOP_EmoteMessage: { - ServerEmoteMessage_Struct* sem = (ServerEmoteMessage_Struct*) pack->pBuffer; - zoneserver_list.SendEmoteMessageRaw(sem->to, sem->guilddbid, sem->minstatus, sem->type, sem->message); - break; - } - case ServerOP_VoiceMacro: { + zoneserver_list.SendPacket(pack); - ServerVoiceMacro_Struct* svm = (ServerVoiceMacro_Struct*) pack->pBuffer; - - if(svm->Type == VoiceMacroTell) { - - ClientListEntry* cle = client_list.FindCharacter(svm->To); - - if (!cle || (cle->Online() < CLE_Status_Zoning) || !cle->Server()) { - - zoneserver_list.SendEmoteMessage(svm->From, 0, 0, 0, "'%s is not online at this time'", svm->To); - - break; - } - - cle->Server()->SendPacket(pack); - } - else - zoneserver_list.SendPacket(pack); - - break; - } - - case ServerOP_RezzPlayerAccept: { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_RezzPlayer: { - - RezzPlayer_Struct* sRezz = (RezzPlayer_Struct*) pack->pBuffer; - if (zoneserver_list.SendPacket(pack)){ - zlog(WORLD__ZONE,"Sent Rez packet for %s",sRezz->rez.your_name); - } - else { - zlog(WORLD__ZONE,"Could not send Rez packet for %s",sRezz->rez.your_name); - } - break; - } - case ServerOP_RezzPlayerReject: - { - char *Recipient = (char *)pack->pBuffer; - client_list.SendPacket(Recipient, pack); - break; - } - - case ServerOP_MultiLineMsg: { - ServerMultiLineMsg_Struct* mlm = (ServerMultiLineMsg_Struct*) pack->pBuffer; - client_list.SendPacket(mlm->to, pack); - break; - } - case ServerOP_SetZone: { - if(pack->size != sizeof(SetZone_Struct)) break; + } - SetZone_Struct* szs = (SetZone_Struct*) pack->pBuffer; - if (szs->zoneid != 0) { - if(database.GetZoneName(szs->zoneid)) - SetZone(szs->zoneid, szs->instanceid, szs->staticzone); + case ServerOP_RezzPlayerAccept: { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_RezzPlayer: { + + RezzPlayer_Struct* sRezz = (RezzPlayer_Struct*) pack->pBuffer; + if (zoneserver_list.SendPacket(pack)){ + zlog(WORLD__ZONE,"Sent Rez packet for %s",sRezz->rez.your_name); + } + else { + zlog(WORLD__ZONE,"Could not send Rez packet for %s",sRezz->rez.your_name); + } + break; + } + case ServerOP_RezzPlayerReject: + { + char *Recipient = (char *)pack->pBuffer; + client_list.SendPacket(Recipient, pack); + break; + } + + case ServerOP_MultiLineMsg: { + ServerMultiLineMsg_Struct* mlm = (ServerMultiLineMsg_Struct*) pack->pBuffer; + client_list.SendPacket(mlm->to, pack); + break; + } + case ServerOP_SetZone: { + if(pack->size != sizeof(SetZone_Struct)) + break; + + SetZone_Struct* szs = (SetZone_Struct*) pack->pBuffer; + if (szs->zoneid != 0) { + if(database.GetZoneName(szs->zoneid)) + SetZone(szs->zoneid, szs->instanceid, szs->staticzone); + else + SetZone(0); + } else SetZone(0); - } - else - SetZone(0); - break; - } - case ServerOP_SetConnectInfo: { - if (pack->size != sizeof(ServerConnectInfo)) - break; - ServerConnectInfo* sci = (ServerConnectInfo*) pack->pBuffer; - - if (!sci->port) { - clientport=zoneserver_list.GetAvailableZonePort(); - - ServerPacket p(ServerOP_SetConnectInfo, sizeof(ServerConnectInfo)); - memset(p.pBuffer,0,sizeof(ServerConnectInfo)); - ServerConnectInfo* sci = (ServerConnectInfo*) p.pBuffer; - sci->port = clientport; - SendPacket(&p); - zlog(WORLD__ZONE,"Auto zone port configuration. Telling zone to use port %d",clientport); - } else { - clientport=sci->port; - zlog(WORLD__ZONE,"Zone specified port %d, must be a previously allocated zone reconnecting.",clientport); - } - - } - case ServerOP_SetLaunchName: { - if(pack->size != sizeof(LaunchName_Struct)) break; - const LaunchName_Struct* ln = (const LaunchName_Struct*)pack->pBuffer; - launcher_name = ln->launcher_name; - launched_name = ln->zone_name; - zlog(WORLD__ZONE, "Zone started with name %s by launcher %s", launched_name.c_str(), launcher_name.c_str()); - break; - } - case ServerOP_ShutdownAll: { - if(pack->size==0){ - zoneserver_list.SendPacket(pack); - zoneserver_list.Process(); - CatchSignal(2); } - else{ - WorldShutDown_Struct* wsd=(WorldShutDown_Struct*)pack->pBuffer; - if(wsd->time==0 && wsd->interval==0 && zoneserver_list.shutdowntimer->Enabled()){ - zoneserver_list.shutdowntimer->Disable(); - zoneserver_list.reminder->Disable(); + case ServerOP_SetConnectInfo: { + if (pack->size != sizeof(ServerConnectInfo)) + break; + ServerConnectInfo* sci = (ServerConnectInfo*) pack->pBuffer; + + if (!sci->port) { + clientport=zoneserver_list.GetAvailableZonePort(); + + ServerPacket p(ServerOP_SetConnectInfo, sizeof(ServerConnectInfo)); + memset(p.pBuffer,0,sizeof(ServerConnectInfo)); + ServerConnectInfo* sci = (ServerConnectInfo*) p.pBuffer; + sci->port = clientport; + SendPacket(&p); + zlog(WORLD__ZONE,"Auto zone port configuration. Telling zone to use port %d",clientport); + } else { + clientport=sci->port; + zlog(WORLD__ZONE,"Zone specified port %d, must be a previously allocated zone reconnecting.",clientport); + } + + } + case ServerOP_SetLaunchName: { + if(pack->size != sizeof(LaunchName_Struct)) + break; + const LaunchName_Struct* ln = (const LaunchName_Struct*)pack->pBuffer; + launcher_name = ln->launcher_name; + launched_name = ln->zone_name; + zlog(WORLD__ZONE, "Zone started with name %s by launcher %s", launched_name.c_str(), launcher_name.c_str()); + break; + } + case ServerOP_ShutdownAll: { + if(pack->size==0){ + zoneserver_list.SendPacket(pack); + zoneserver_list.Process(); + CatchSignal(2); } else{ - zoneserver_list.shutdowntimer->SetTimer(wsd->time); - zoneserver_list.reminder->SetTimer(wsd->interval-1000); - zoneserver_list.reminder->SetAtTrigger(wsd->interval); - zoneserver_list.shutdowntimer->Start(); - zoneserver_list.reminder->Start(); - } - } - break; - } - case ServerOP_ZoneShutdown: { - ServerZoneStateChange_struct* s = (ServerZoneStateChange_struct *) pack->pBuffer; - ZoneServer* zs = 0; - if (s->ZoneServerID != 0) - zs = zoneserver_list.FindByID(s->ZoneServerID); - else if (s->zoneid != 0) - zs = zoneserver_list.FindByName(database.GetZoneName(s->zoneid)); - else - zoneserver_list.SendEmoteMessage(s->adminname, 0, 0, 0, "Error: SOP_ZoneShutdown: neither ID nor name specified"); - - if (zs == 0) - zoneserver_list.SendEmoteMessage(s->adminname, 0, 0, 0, "Error: SOP_ZoneShutdown: zoneserver not found"); - else - zs->SendPacket(pack); - break; - } - case ServerOP_ZoneBootup: { - ServerZoneStateChange_struct* s = (ServerZoneStateChange_struct *) pack->pBuffer; - zoneserver_list.SOPZoneBootup(s->adminname, s->ZoneServerID, database.GetZoneName(s->zoneid), s->makestatic); - break; - } - case ServerOP_ZoneStatus: { - if (pack->size >= 1) - zoneserver_list.SendZoneStatus((char *) &pack->pBuffer[1], (uint8) pack->pBuffer[0], this); - break; - - } - case ServerOP_AcceptWorldEntrance: { - if(pack->size != sizeof(WorldToZone_Struct)) - break; - - WorldToZone_Struct* wtz = (WorldToZone_Struct*) pack->pBuffer; - Client* client = 0; - client = client_list.FindByAccountID(wtz->account_id); - if(client != 0) - client->Clearance(wtz->response); - } - case ServerOP_ZoneToZoneRequest: { - // - // solar: ZoneChange is received by the zone the player is in, then the - // zone sends a ZTZ which ends up here. This code then find the target - // (ingress point) and boots it if needed, then sends the ZTZ to it. - // The ingress server will decide wether the player can enter, then will - // send back the ZTZ to here. This packet is passed back to the egress - // server, which will send a ZoneChange response back to the client - // which can be an error, or a success, in which case the client will - // disconnect, and their zone location will be saved when ~Client is - // called, so it will be available when they ask to zone. - // - - - if(pack->size != sizeof(ZoneToZone_Struct)) - break; - ZoneToZone_Struct* ztz = (ZoneToZone_Struct*) pack->pBuffer; - ClientListEntry* client = nullptr; - if(WorldConfig::get()->UpdateStats) - client = client_list.FindCharacter(ztz->name); - - zlog(WORLD__ZONE,"ZoneToZone request for %s current zone %d req zone %d\n", - ztz->name, ztz->current_zone_id, ztz->requested_zone_id); - - if(GetZoneID() == ztz->current_zone_id && GetInstanceID() == ztz->current_instance_id) // this is a request from the egress zone - { - zlog(WORLD__ZONE,"Processing ZTZ for egress from zone for client %s\n", ztz->name); - - if - ( - ztz->admin < 80 && - ztz->ignorerestrictions < 2 && - zoneserver_list.IsZoneLocked(ztz->requested_zone_id) - ) - { - ztz->response = 0; - SendPacket(pack); - break; - } - - ZoneServer *ingress_server = nullptr; - if(ztz->requested_instance_id > 0) - { - ingress_server = zoneserver_list.FindByInstanceID(ztz->requested_instance_id); - } - else - { - ingress_server = zoneserver_list.FindByZoneID(ztz->requested_zone_id); - - } - - if(ingress_server) // found a zone already running - { - _log(WORLD__ZONE,"Found a zone already booted for %s\n", ztz->name); - ztz->response = 1; - } - else // need to boot one - { - int server_id; - if ((server_id = zoneserver_list.TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))){ - _log(WORLD__ZONE,"Successfully booted a zone for %s\n", ztz->name); - // bootup successful, ready to rock - ztz->response = 1; - ingress_server = zoneserver_list.FindByID(server_id); + WorldShutDown_Struct* wsd=(WorldShutDown_Struct*)pack->pBuffer; + if(wsd->time==0 && wsd->interval==0 && zoneserver_list.shutdowntimer->Enabled()){ + zoneserver_list.shutdowntimer->Disable(); + zoneserver_list.reminder->Disable(); } - else - { - _log(WORLD__ZONE_ERR,"FAILED to boot a zone for %s\n", ztz->name); - // bootup failed, send back error code 0 - ztz->response = 0; + else{ + zoneserver_list.shutdowntimer->SetTimer(wsd->time); + zoneserver_list.reminder->SetTimer(wsd->interval-1000); + zoneserver_list.reminder->SetAtTrigger(wsd->interval); + zoneserver_list.shutdowntimer->Start(); + zoneserver_list.reminder->Start(); } } - if(ztz->response!=0 && client) - client->LSZoneChange(ztz); - SendPacket(pack); // send back to egress server - if(ingress_server) // if we couldn't boot one, this is 0 - { - ingress_server->SendPacket(pack); // inform target server - } + break; } - else // this is response from the ingress server, route it back to the egress server - { - zlog(WORLD__ZONE,"Processing ZTZ for ingress to zone for client %s\n", ztz->name); - ZoneServer *egress_server = nullptr; - if(ztz->current_instance_id > 0) - { - egress_server = zoneserver_list.FindByInstanceID(ztz->current_instance_id); - } + case ServerOP_ZoneShutdown: { + ServerZoneStateChange_struct* s = (ServerZoneStateChange_struct *) pack->pBuffer; + ZoneServer* zs = 0; + if (s->ZoneServerID != 0) + zs = zoneserver_list.FindByID(s->ZoneServerID); + else if (s->zoneid != 0) + zs = zoneserver_list.FindByName(database.GetZoneName(s->zoneid)); else - { - egress_server = zoneserver_list.FindByZoneID(ztz->current_zone_id); - } + zoneserver_list.SendEmoteMessage(s->adminname, 0, 0, 0, "Error: SOP_ZoneShutdown: neither ID nor name specified"); - if(egress_server) - { - egress_server->SendPacket(pack); - } - } - - break; - } - case ServerOP_ClientList: { - if (pack->size != sizeof(ServerClientList_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_ClientList. Got: %d, Expected: %d",pack->size,sizeof(ServerClientList_Struct)); - break; - } - client_list.ClientUpdate(this, (ServerClientList_Struct*) pack->pBuffer); - break; - } - case ServerOP_ClientListKA: { - ServerClientListKeepAlive_Struct* sclka = (ServerClientListKeepAlive_Struct*) pack->pBuffer; - if (pack->size < 4 || pack->size != 4 + (4 * sclka->numupdates)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_ClientListKA. Got: %d, Expected: %d",pack->size, (4 + (4 * sclka->numupdates))); - break; - } - client_list.CLEKeepAlive(sclka->numupdates, sclka->wid); - break; - } - case ServerOP_Who: { - ServerWhoAll_Struct* whoall = (ServerWhoAll_Struct*) pack->pBuffer; - Who_All_Struct* whom = new Who_All_Struct; - memset(whom,0,sizeof(Who_All_Struct)); - whom->gmlookup = whoall->gmlookup; - whom->lvllow = whoall->lvllow; - whom->lvlhigh = whoall->lvlhigh; - whom->wclass = whoall->wclass; - whom->wrace = whoall->wrace; - strcpy(whom->whom,whoall->whom); - client_list.SendWhoAll(whoall->fromid,whoall->from, whoall->admin, whom, this); - delete whom; - break; - } - case ServerOP_RequestOnlineGuildMembers: - { - ServerRequestOnlineGuildMembers_Struct *srogms = (ServerRequestOnlineGuildMembers_Struct*) pack->pBuffer; - zlog(GUILDS__IN_PACKETS, "ServerOP_RequestOnlineGuildMembers Recieved. FromID=%i GuildID=%i", srogms->FromID, srogms->GuildID); - client_list.SendOnlineGuildMembers(srogms->FromID, srogms->GuildID); - break; - } - case ServerOP_ClientVersionSummary: - { - ServerRequestClientVersionSummary_Struct *srcvss = (ServerRequestClientVersionSummary_Struct*) pack->pBuffer; - client_list.SendClientVersionSummary(srcvss->Name); - break; - } - case ServerOP_ReloadRules: - { - zoneserver_list.SendPacket(pack); - RuleManager::Instance()->LoadRules(&database, "default"); - break; - } - case ServerOP_ReloadRulesWorld: - { - RuleManager::Instance()->LoadRules(&database, "default"); - break; - } - case ServerOP_CameraShake: - { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_FriendsWho: { - ServerFriendsWho_Struct* FriendsWho = (ServerFriendsWho_Struct*) pack->pBuffer; - client_list.SendFriendsWho(FriendsWho, this); - break; - } - case ServerOP_LFGMatches: { - ServerLFGMatchesRequest_Struct* smrs = (ServerLFGMatchesRequest_Struct*) pack->pBuffer; - client_list.SendLFGMatches(smrs); - break; - } - case ServerOP_LFPMatches: { - ServerLFPMatchesRequest_Struct* smrs = (ServerLFPMatchesRequest_Struct*) pack->pBuffer; - LFPGroupList.SendLFPMatches(smrs); - break; - } - case ServerOP_LFPUpdate: { - ServerLFPUpdate_Struct* sus = (ServerLFPUpdate_Struct*) pack->pBuffer; - if(sus->Action) - LFPGroupList.UpdateGroup(sus); - else - LFPGroupList.RemoveGroup(sus); - break; - } - case ServerOP_ZonePlayer: { - //ServerZonePlayer_Struct* szp = (ServerZonePlayer_Struct*) pack->pBuffer; - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_KickPlayer: { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_KillPlayer: { - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_GuildRankUpdate: - { - zoneserver_list.SendPacket(pack); - break; - } - //these opcodes get processed by the guild manager. - case ServerOP_RefreshGuild: - case ServerOP_DeleteGuild: - case ServerOP_GuildCharRefresh: - case ServerOP_GuildMemberUpdate: { - guild_mgr.ProcessZonePacket(pack); - break; - } - - case ServerOP_FlagUpdate: { - ClientListEntry* cle = client_list.FindCLEByAccountID(*((uint32*) pack->pBuffer)); - if (cle) - cle->SetAdmin(*((int16*) &pack->pBuffer[4])); - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_GMGoto: { - if (pack->size != sizeof(ServerGMGoto_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_GMGoto. Got: %d, Expected: %d",pack->size,sizeof(ServerGMGoto_Struct)); - break; - } - ServerGMGoto_Struct* gmg = (ServerGMGoto_Struct*) pack->pBuffer; - ClientListEntry* cle = client_list.FindCharacter(gmg->gotoname); - if (cle != 0) { - if (cle->Server() == 0) - this->SendEmoteMessage(gmg->myname, 0, 0, 13, "Error: Cannot identify %s's zoneserver.", gmg->gotoname); - else if (cle->Anon() == 1 && cle->Admin() > gmg->admin) // no snooping for anon GMs - this->SendEmoteMessage(gmg->myname, 0, 0, 13, "Error: %s not found", gmg->gotoname); + if (zs == 0) + zoneserver_list.SendEmoteMessage(s->adminname, 0, 0, 0, "Error: SOP_ZoneShutdown: zoneserver not found"); else - cle->Server()->SendPacket(pack); - } - else { - this->SendEmoteMessage(gmg->myname, 0, 0, 13, "Error: %s not found", gmg->gotoname); - } - break; - } - case ServerOP_Lock: { - if (pack->size != sizeof(ServerLock_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_Lock. Got: %d, Expected: %d",pack->size,sizeof(ServerLock_Struct)); - break; - } - ServerLock_Struct* slock = (ServerLock_Struct*) pack->pBuffer; - if (slock->mode >= 1) - WorldConfig::LockWorld(); - else - WorldConfig::UnlockWorld(); - if (loginserverlist.Connected()) { - loginserverlist.SendStatus(); - if (slock->mode >= 1) - this->SendEmoteMessage(slock->myname, 0, 0, 13, "World locked"); - else - this->SendEmoteMessage(slock->myname, 0, 0, 13, "World unlocked"); - } - else { - if (slock->mode >= 1) - this->SendEmoteMessage(slock->myname, 0, 0, 13, "World locked, but login server not connected."); - else - this->SendEmoteMessage(slock->myname, 0, 0, 13, "World unlocked, but login server not conencted."); - } - break; - } - case ServerOP_Motd: { - if (pack->size != sizeof(ServerMotd_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_Motd. Got: %d, Expected: %d",pack->size,sizeof(ServerMotd_Struct)); - break; - } - ServerMotd_Struct* smotd = (ServerMotd_Struct*) pack->pBuffer; - database.SetVariable("MOTD",smotd->motd); - //this->SendEmoteMessage(smotd->myname, 0, 0, 13, "Updated Motd."); - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_Uptime: { - if (pack->size != sizeof(ServerUptime_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_Uptime. Got: %d, Expected: %d",pack->size,sizeof(ServerUptime_Struct)); - break; - } - ServerUptime_Struct* sus = (ServerUptime_Struct*) pack->pBuffer; - if (sus->zoneserverid == 0) { - ZSList::ShowUpTime(this, sus->adminname); - } - else { - ZoneServer* zs = zoneserver_list.FindByID(sus->zoneserverid); - if (zs) zs->SendPacket(pack); + break; } - break; - } - case ServerOP_Petition: { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_GetWorldTime: { - zlog(WORLD__ZONE,"Broadcasting a world time update"); - ServerPacket* pack = new ServerPacket; + case ServerOP_ZoneBootup: { + ServerZoneStateChange_struct* s = (ServerZoneStateChange_struct *) pack->pBuffer; + zoneserver_list.SOPZoneBootup(s->adminname, s->ZoneServerID, database.GetZoneName(s->zoneid), s->makestatic); + break; + } + case ServerOP_ZoneStatus: { + if (pack->size >= 1) + zoneserver_list.SendZoneStatus((char *) &pack->pBuffer[1], (uint8) pack->pBuffer[0], this); + break; - pack->opcode = ServerOP_SyncWorldTime; - pack->size = sizeof(eqTimeOfDay); - pack->pBuffer = new uchar[pack->size]; - memset(pack->pBuffer, 0, pack->size); - eqTimeOfDay* tod = (eqTimeOfDay*) pack->pBuffer; - tod->start_eqtime=zoneserver_list.worldclock.getStartEQTime(); - tod->start_realtime=zoneserver_list.worldclock.getStartRealTime(); - SendPacket(pack); - delete pack; - break; - } - case ServerOP_SetWorldTime: { - zlog(WORLD__ZONE,"Received SetWorldTime"); - eqTimeOfDay* newtime = (eqTimeOfDay*) pack->pBuffer; - zoneserver_list.worldclock.setEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime); - zlog(WORLD__ZONE,"New time = %d-%d-%d %d:%d (%d)\n", newtime->start_eqtime.year, newtime->start_eqtime.month, (int)newtime->start_eqtime.day, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.minute, (int)newtime->start_realtime); - zoneserver_list.worldclock.saveFile(WorldConfig::get()->EQTimeFile.c_str()); - zoneserver_list.SendTimeSync(); - break; - } - case ServerOP_IPLookup: { - if (pack->size < sizeof(ServerGenericWorldQuery_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_IPLookup. Got: %d, Expected (at least): %d",pack->size,sizeof(ServerGenericWorldQuery_Struct)); - break; } - ServerGenericWorldQuery_Struct* sgwq = (ServerGenericWorldQuery_Struct*) pack->pBuffer; - if (pack->size == sizeof(ServerGenericWorldQuery_Struct)) - client_list.SendCLEList(sgwq->admin, sgwq->from, this); - else - client_list.SendCLEList(sgwq->admin, sgwq->from, this, sgwq->query); - break; - } - case ServerOP_LockZone: { - if (pack->size < sizeof(ServerLockZone_Struct)) { - zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_LockZone. Got: %d, Expected: %d",pack->size,sizeof(ServerLockZone_Struct)); - break; - } - ServerLockZone_Struct* s = (ServerLockZone_Struct*) pack->pBuffer; - switch (s->op) { - case 0: - zoneserver_list.ListLockedZones(s->adminname, this); + case ServerOP_AcceptWorldEntrance: { + if(pack->size != sizeof(WorldToZone_Struct)) break; - case 1: - if (zoneserver_list.SetLockedZone(s->zoneID, true)) - zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone locked: %s", database.GetZoneName(s->zoneID)); - else - this->SendEmoteMessageRaw(s->adminname, 0, 0, 0, "Failed to change lock"); + + WorldToZone_Struct* wtz = (WorldToZone_Struct*) pack->pBuffer; + Client* client = 0; + client = client_list.FindByAccountID(wtz->account_id); + if(client != 0) + client->Clearance(wtz->response); + } + case ServerOP_ZoneToZoneRequest: { + // + // solar: ZoneChange is received by the zone the player is in, then the + // zone sends a ZTZ which ends up here. This code then find the target + // (ingress point) and boots it if needed, then sends the ZTZ to it. + // The ingress server will decide wether the player can enter, then will + // send back the ZTZ to here. This packet is passed back to the egress + // server, which will send a ZoneChange response back to the client + // which can be an error, or a success, in which case the client will + // disconnect, and their zone location will be saved when ~Client is + // called, so it will be available when they ask to zone. + // + + + if(pack->size != sizeof(ZoneToZone_Struct)) break; - case 2: - if (zoneserver_list.SetLockedZone(s->zoneID, false)) - zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone unlocked: %s", database.GetZoneName(s->zoneID)); - else - this->SendEmoteMessageRaw(s->adminname, 0, 0, 0, "Failed to change lock"); - break; - } - break; - } - case ServerOP_ItemStatus: { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_OOCMute: { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_Revoke: { - RevokeStruct* rev = (RevokeStruct*)pack->pBuffer; - ClientListEntry* cle = client_list.FindCharacter(rev->name); - if (cle != 0 && cle->Server() != 0) - { - cle->Server()->SendPacket(pack); - } - break; - } - case ServerOP_SpawnPlayerCorpse: { - SpawnPlayerCorpse_Struct* s = (SpawnPlayerCorpse_Struct*)pack->pBuffer; - ZoneServer* zs = zoneserver_list.FindByZoneID(s->zone_id); - if(zs) { - if (zs->SendPacket(pack)) { - zlog(WORLD__ZONE,"Sent request to spawn player corpse id %i in zone %u.",s->player_corpse_id, s->zone_id); - } - else { - zlog(WORLD__ZONE_ERR,"Could not send request to spawn player corpse id %i in zone %u.",s->player_corpse_id, s->zone_id); - } - } - break; - } - case ServerOP_Consent: { - // Message string id's likely to be used here are: - // CONSENT_YOURSELF = 399 - // CONSENT_INVALID_NAME = 397 - // TARGET_NOT_FOUND = 101 - ZoneServer* zs; - ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer; - ClientListEntry* cle = client_list.FindCharacter(s->grantname); - if(cle) { - if(cle->instance() != 0) + ZoneToZone_Struct* ztz = (ZoneToZone_Struct*) pack->pBuffer; + ClientListEntry* client = nullptr; + if(WorldConfig::get()->UpdateStats) + client = client_list.FindCharacter(ztz->name); + + zlog(WORLD__ZONE,"ZoneToZone request for %s current zone %d req zone %d\n", + ztz->name, ztz->current_zone_id, ztz->requested_zone_id); + + if(GetZoneID() == ztz->current_zone_id && GetInstanceID() == ztz->current_instance_id) // this is a request from the egress zone { - zs = zoneserver_list.FindByInstanceID(cle->instance()); - if(zs) { - if(zs->SendPacket(pack)) { - zlog(WORLD__ZONE, "Sent consent packet from player %s to player %s in zone %u.", s->ownername, s->grantname, cle->instance()); - } - else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent operation.", s->instance_id); - } + zlog(WORLD__ZONE,"Processing ZTZ for egress from zone for client %s\n", ztz->name); + + if + ( + ztz->admin < 80 && + ztz->ignorerestrictions < 2 && + zoneserver_list.IsZoneLocked(ztz->requested_zone_id) + ) + { + ztz->response = 0; + SendPacket(pack); + break; + } + + ZoneServer *ingress_server = nullptr; + if(ztz->requested_instance_id > 0) + { + ingress_server = zoneserver_list.FindByInstanceID(ztz->requested_instance_id); } else { - delete pack; - pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct)); - ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; - strcpy(scs->grantname, s->grantname); - strcpy(scs->ownername, s->ownername); - scs->permission = s->permission; - scs->zone_id = s->zone_id; - scs->instance_id = s->instance_id; - scs->message_string_id = 101; - zs = zoneserver_list.FindByInstanceID(s->instance_id); - if(zs) { - if(!zs->SendPacket(pack)) - zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in instance %u.", s->ownername, zs->GetInstanceID()); + ingress_server = zoneserver_list.FindByZoneID(ztz->requested_zone_id); + + } + + if(ingress_server) // found a zone already running + { + _log(WORLD__ZONE,"Found a zone already booted for %s\n", ztz->name); + ztz->response = 1; + } + else // need to boot one + { + int server_id; + if ((server_id = zoneserver_list.TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))){ + _log(WORLD__ZONE,"Successfully booted a zone for %s\n", ztz->name); + // bootup successful, ready to rock + ztz->response = 1; + ingress_server = zoneserver_list.FindByID(server_id); } - else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id); + else + { + _log(WORLD__ZONE_ERR,"FAILED to boot a zone for %s\n", ztz->name); + // bootup failed, send back error code 0 + ztz->response = 0; } } + if(ztz->response!=0 && client) + client->LSZoneChange(ztz); + SendPacket(pack); // send back to egress server + if(ingress_server) // if we couldn't boot one, this is 0 + { + ingress_server->SendPacket(pack); // inform target server + } } - else + else // this is response from the ingress server, route it back to the egress server { - zs = zoneserver_list.FindByZoneID(cle->zone()); - if(zs) { - if(zs->SendPacket(pack)) { - zlog(WORLD__ZONE, "Sent consent packet from player %s to player %s in zone %u.", s->ownername, s->grantname, cle->zone()); - } - else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent operation.", s->zone_id); - } + zlog(WORLD__ZONE,"Processing ZTZ for ingress to zone for client %s\n", ztz->name); + ZoneServer *egress_server = nullptr; + if(ztz->current_instance_id > 0) + { + egress_server = zoneserver_list.FindByInstanceID(ztz->current_instance_id); } - else { - // send target not found back to requester - delete pack; - pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct)); - ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; - strcpy(scs->grantname, s->grantname); - strcpy(scs->ownername, s->ownername); - scs->permission = s->permission; - scs->zone_id = s->zone_id; - scs->message_string_id = 101; - zs = zoneserver_list.FindByZoneID(s->zone_id); - if(zs) { - if(!zs->SendPacket(pack)) - zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in zone %s.", s->ownername, zs->GetZoneName()); - } - else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); - } + else + { + egress_server = zoneserver_list.FindByZoneID(ztz->current_zone_id); + } + + if(egress_server) + { + egress_server->SendPacket(pack); } } + + break; } - else { - // send target not found back to requester + case ServerOP_ClientList: { + if (pack->size != sizeof(ServerClientList_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_ClientList. Got: %d, Expected: %d",pack->size,sizeof(ServerClientList_Struct)); + break; + } + client_list.ClientUpdate(this, (ServerClientList_Struct*) pack->pBuffer); + break; + } + case ServerOP_ClientListKA: { + ServerClientListKeepAlive_Struct* sclka = (ServerClientListKeepAlive_Struct*) pack->pBuffer; + if (pack->size < 4 || pack->size != 4 + (4 * sclka->numupdates)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_ClientListKA. Got: %d, Expected: %d",pack->size, (4 + (4 * sclka->numupdates))); + break; + } + client_list.CLEKeepAlive(sclka->numupdates, sclka->wid); + break; + } + case ServerOP_Who: { + ServerWhoAll_Struct* whoall = (ServerWhoAll_Struct*) pack->pBuffer; + Who_All_Struct* whom = new Who_All_Struct; + memset(whom,0,sizeof(Who_All_Struct)); + whom->gmlookup = whoall->gmlookup; + whom->lvllow = whoall->lvllow; + whom->lvlhigh = whoall->lvlhigh; + whom->wclass = whoall->wclass; + whom->wrace = whoall->wrace; + strcpy(whom->whom,whoall->whom); + client_list.SendWhoAll(whoall->fromid,whoall->from, whoall->admin, whom, this); + delete whom; + break; + } + case ServerOP_RequestOnlineGuildMembers: + { + ServerRequestOnlineGuildMembers_Struct *srogms = (ServerRequestOnlineGuildMembers_Struct*) pack->pBuffer; + zlog(GUILDS__IN_PACKETS, "ServerOP_RequestOnlineGuildMembers Recieved. FromID=%i GuildID=%i", srogms->FromID, srogms->GuildID); + client_list.SendOnlineGuildMembers(srogms->FromID, srogms->GuildID); + break; + } + case ServerOP_ClientVersionSummary: + { + ServerRequestClientVersionSummary_Struct *srcvss = (ServerRequestClientVersionSummary_Struct*) pack->pBuffer; + client_list.SendClientVersionSummary(srcvss->Name); + break; + } + case ServerOP_ReloadRules: + { + zoneserver_list.SendPacket(pack); + RuleManager::Instance()->LoadRules(&database, "default"); + break; + } + case ServerOP_ReloadRulesWorld: + { + RuleManager::Instance()->LoadRules(&database, "default"); + break; + } + case ServerOP_CameraShake: + { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_FriendsWho: { + ServerFriendsWho_Struct* FriendsWho = (ServerFriendsWho_Struct*) pack->pBuffer; + client_list.SendFriendsWho(FriendsWho, this); + break; + } + case ServerOP_LFGMatches: { + ServerLFGMatchesRequest_Struct* smrs = (ServerLFGMatchesRequest_Struct*) pack->pBuffer; + client_list.SendLFGMatches(smrs); + break; + } + case ServerOP_LFPMatches: { + ServerLFPMatchesRequest_Struct* smrs = (ServerLFPMatchesRequest_Struct*) pack->pBuffer; + LFPGroupList.SendLFPMatches(smrs); + break; + } + case ServerOP_LFPUpdate: { + ServerLFPUpdate_Struct* sus = (ServerLFPUpdate_Struct*) pack->pBuffer; + if(sus->Action) + LFPGroupList.UpdateGroup(sus); + else + LFPGroupList.RemoveGroup(sus); + break; + } + case ServerOP_ZonePlayer: { + //ServerZonePlayer_Struct* szp = (ServerZonePlayer_Struct*) pack->pBuffer; + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_KickPlayer: { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_KillPlayer: { + zoneserver_list.SendPacket(pack); + break; + } + + case ServerOP_GuildRankUpdate: + { + zoneserver_list.SendPacket(pack); + break; + } + //these opcodes get processed by the guild manager. + case ServerOP_RefreshGuild: + case ServerOP_DeleteGuild: + case ServerOP_GuildCharRefresh: + case ServerOP_GuildMemberUpdate: { + guild_mgr.ProcessZonePacket(pack); + break; + } + + case ServerOP_FlagUpdate: { + ClientListEntry* cle = client_list.FindCLEByAccountID(*((uint32*) pack->pBuffer)); + if (cle) + cle->SetAdmin(*((int16*) &pack->pBuffer[4])); + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_GMGoto: { + if (pack->size != sizeof(ServerGMGoto_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_GMGoto. Got: %d, Expected: %d",pack->size,sizeof(ServerGMGoto_Struct)); + break; + } + ServerGMGoto_Struct* gmg = (ServerGMGoto_Struct*) pack->pBuffer; + ClientListEntry* cle = client_list.FindCharacter(gmg->gotoname); + if (cle != 0) { + if (cle->Server() == 0) + this->SendEmoteMessage(gmg->myname, 0, 0, 13, "Error: Cannot identify %s's zoneserver.", gmg->gotoname); + else if (cle->Anon() == 1 && cle->Admin() > gmg->admin) // no snooping for anon GMs + this->SendEmoteMessage(gmg->myname, 0, 0, 13, "Error: %s not found", gmg->gotoname); + else + cle->Server()->SendPacket(pack); + } + else { + this->SendEmoteMessage(gmg->myname, 0, 0, 13, "Error: %s not found", gmg->gotoname); + } + break; + } + case ServerOP_Lock: { + if (pack->size != sizeof(ServerLock_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_Lock. Got: %d, Expected: %d",pack->size,sizeof(ServerLock_Struct)); + break; + } + ServerLock_Struct* slock = (ServerLock_Struct*) pack->pBuffer; + if (slock->mode >= 1) + WorldConfig::LockWorld(); + else + WorldConfig::UnlockWorld(); + if (loginserverlist.Connected()) { + loginserverlist.SendStatus(); + if (slock->mode >= 1) + this->SendEmoteMessage(slock->myname, 0, 0, 13, "World locked"); + else + this->SendEmoteMessage(slock->myname, 0, 0, 13, "World unlocked"); + } + else { + if (slock->mode >= 1) + this->SendEmoteMessage(slock->myname, 0, 0, 13, "World locked, but login server not connected."); + else + this->SendEmoteMessage(slock->myname, 0, 0, 13, "World unlocked, but login server not conencted."); + } + break; + } + case ServerOP_Motd: { + if (pack->size != sizeof(ServerMotd_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_Motd. Got: %d, Expected: %d",pack->size,sizeof(ServerMotd_Struct)); + break; + } + ServerMotd_Struct* smotd = (ServerMotd_Struct*) pack->pBuffer; + database.SetVariable("MOTD",smotd->motd); + //this->SendEmoteMessage(smotd->myname, 0, 0, 13, "Updated Motd."); + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_Uptime: { + if (pack->size != sizeof(ServerUptime_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_Uptime. Got: %d, Expected: %d",pack->size,sizeof(ServerUptime_Struct)); + break; + } + ServerUptime_Struct* sus = (ServerUptime_Struct*) pack->pBuffer; + if (sus->zoneserverid == 0) { + ZSList::ShowUpTime(this, sus->adminname); + } + else { + ZoneServer* zs = zoneserver_list.FindByID(sus->zoneserverid); + if (zs) + zs->SendPacket(pack); + } + break; + } + case ServerOP_Petition: { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_GetWorldTime: { + zlog(WORLD__ZONE,"Broadcasting a world time update"); + ServerPacket* pack = new ServerPacket; + + pack->opcode = ServerOP_SyncWorldTime; + pack->size = sizeof(eqTimeOfDay); + pack->pBuffer = new uchar[pack->size]; + memset(pack->pBuffer, 0, pack->size); + eqTimeOfDay* tod = (eqTimeOfDay*) pack->pBuffer; + tod->start_eqtime=zoneserver_list.worldclock.getStartEQTime(); + tod->start_realtime=zoneserver_list.worldclock.getStartRealTime(); + SendPacket(pack); delete pack; - pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct)); - ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; - strcpy(scs->grantname, s->grantname); - strcpy(scs->ownername, s->ownername); - scs->permission = s->permission; - scs->zone_id = s->zone_id; - scs->message_string_id = 397; - zs = zoneserver_list.FindByZoneID(s->zone_id); - if(zs) { - if(!zs->SendPacket(pack)) - zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in zone %s.", s->ownername, zs->GetZoneName()); - } - else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); - } + break; } - break; - } - case ServerOP_Consent_Response: { - // Message string id's likely to be used here are: - // CONSENT_YOURSELF = 399 - // CONSENT_INVALID_NAME = 397 - // TARGET_NOT_FOUND = 101 - ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer; - if(s->instance_id != 0) - { - ZoneServer* zs = zoneserver_list.FindByInstanceID(s->instance_id); - if(zs) { - if(!zs->SendPacket(pack)) - zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in instance %u.", s->ownername, zs->GetInstanceID()); - } - else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id); - } + case ServerOP_SetWorldTime: { + zlog(WORLD__ZONE,"Received SetWorldTime"); + eqTimeOfDay* newtime = (eqTimeOfDay*) pack->pBuffer; + zoneserver_list.worldclock.setEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime); + zlog(WORLD__ZONE,"New time = %d-%d-%d %d:%d (%d)\n", newtime->start_eqtime.year, newtime->start_eqtime.month, (int)newtime->start_eqtime.day, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.minute, (int)newtime->start_realtime); + zoneserver_list.worldclock.saveFile(WorldConfig::get()->EQTimeFile.c_str()); + zoneserver_list.SendTimeSync(); + break; } - else - { + case ServerOP_IPLookup: { + if (pack->size < sizeof(ServerGenericWorldQuery_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_IPLookup. Got: %d, Expected (at least): %d",pack->size,sizeof(ServerGenericWorldQuery_Struct)); + break; + } + ServerGenericWorldQuery_Struct* sgwq = (ServerGenericWorldQuery_Struct*) pack->pBuffer; + if (pack->size == sizeof(ServerGenericWorldQuery_Struct)) + client_list.SendCLEList(sgwq->admin, sgwq->from, this); + else + client_list.SendCLEList(sgwq->admin, sgwq->from, this, sgwq->query); + break; + } + case ServerOP_LockZone: { + if (pack->size < sizeof(ServerLockZone_Struct)) { + zlog(WORLD__ZONE_ERR,"Wrong size on ServerOP_LockZone. Got: %d, Expected: %d",pack->size,sizeof(ServerLockZone_Struct)); + break; + } + ServerLockZone_Struct* s = (ServerLockZone_Struct*) pack->pBuffer; + switch (s->op) { + case 0: + zoneserver_list.ListLockedZones(s->adminname, this); + break; + case 1: + if (zoneserver_list.SetLockedZone(s->zoneID, true)) + zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone locked: %s", database.GetZoneName(s->zoneID)); + else + this->SendEmoteMessageRaw(s->adminname, 0, 0, 0, "Failed to change lock"); + break; + case 2: + if (zoneserver_list.SetLockedZone(s->zoneID, false)) + zoneserver_list.SendEmoteMessage(0, 0, 80, 15, "Zone unlocked: %s", database.GetZoneName(s->zoneID)); + else + this->SendEmoteMessageRaw(s->adminname, 0, 0, 0, "Failed to change lock"); + break; + } + break; + } + case ServerOP_ItemStatus: { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_OOCMute: { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_Revoke: { + RevokeStruct* rev = (RevokeStruct*)pack->pBuffer; + ClientListEntry* cle = client_list.FindCharacter(rev->name); + if (cle != 0 && cle->Server() != 0) + { + cle->Server()->SendPacket(pack); + } + break; + } + case ServerOP_SpawnPlayerCorpse: { + SpawnPlayerCorpse_Struct* s = (SpawnPlayerCorpse_Struct*)pack->pBuffer; ZoneServer* zs = zoneserver_list.FindByZoneID(s->zone_id); if(zs) { - if(!zs->SendPacket(pack)) - zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in zone %s.", s->ownername, zs->GetZoneName()); + if (zs->SendPacket(pack)) { + zlog(WORLD__ZONE,"Sent request to spawn player corpse id %i in zone %u.",s->player_corpse_id, s->zone_id); + } + else { + zlog(WORLD__ZONE_ERR,"Could not send request to spawn player corpse id %i in zone %u.",s->player_corpse_id, s->zone_id); + } + } + break; + } + case ServerOP_Consent: { + // Message string id's likely to be used here are: + // CONSENT_YOURSELF = 399 + // CONSENT_INVALID_NAME = 397 + // TARGET_NOT_FOUND = 101 + ZoneServer* zs; + ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer; + ClientListEntry* cle = client_list.FindCharacter(s->grantname); + if(cle) { + if(cle->instance() != 0) + { + zs = zoneserver_list.FindByInstanceID(cle->instance()); + if(zs) { + if(zs->SendPacket(pack)) { + zlog(WORLD__ZONE, "Sent consent packet from player %s to player %s in zone %u.", s->ownername, s->grantname, cle->instance()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent operation.", s->instance_id); + } + } + else + { + delete pack; + pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct)); + ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; + strcpy(scs->grantname, s->grantname); + strcpy(scs->ownername, s->ownername); + scs->permission = s->permission; + scs->zone_id = s->zone_id; + scs->instance_id = s->instance_id; + scs->message_string_id = 101; + zs = zoneserver_list.FindByInstanceID(s->instance_id); + if(zs) { + if(!zs->SendPacket(pack)) + zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in instance %u.", s->ownername, zs->GetInstanceID()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id); + } + } + } + else + { + zs = zoneserver_list.FindByZoneID(cle->zone()); + if(zs) { + if(zs->SendPacket(pack)) { + zlog(WORLD__ZONE, "Sent consent packet from player %s to player %s in zone %u.", s->ownername, s->grantname, cle->zone()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent operation.", s->zone_id); + } + } + else { + // send target not found back to requester + delete pack; + pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct)); + ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; + strcpy(scs->grantname, s->grantname); + strcpy(scs->ownername, s->ownername); + scs->permission = s->permission; + scs->zone_id = s->zone_id; + scs->message_string_id = 101; + zs = zoneserver_list.FindByZoneID(s->zone_id); + if(zs) { + if(!zs->SendPacket(pack)) + zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in zone %s.", s->ownername, zs->GetZoneName()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); + } + } + } } else { - zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); + // send target not found back to requester + delete pack; + pack = new ServerPacket(ServerOP_Consent_Response, sizeof(ServerOP_Consent_Struct)); + ServerOP_Consent_Struct* scs = (ServerOP_Consent_Struct*)pack->pBuffer; + strcpy(scs->grantname, s->grantname); + strcpy(scs->ownername, s->ownername); + scs->permission = s->permission; + scs->zone_id = s->zone_id; + scs->message_string_id = 397; + zs = zoneserver_list.FindByZoneID(s->zone_id); + if(zs) { + if(!zs->SendPacket(pack)) + zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in zone %s.", s->ownername, zs->GetZoneName()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); + } } + break; } - break; - } - - case ServerOP_InstanceUpdateTime : - { - ServerInstanceUpdateTime_Struct *iut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer; - ZoneServer *zm = zoneserver_list.FindByInstanceID(iut->instance_id); - if(zm) - { - zm->SendPacket(pack); - } - break; - } - case ServerOP_QGlobalUpdate: - { - if(pack->size != sizeof(ServerQGlobalUpdate_Struct)) - { + case ServerOP_Consent_Response: { + // Message string id's likely to be used here are: + // CONSENT_YOURSELF = 399 + // CONSENT_INVALID_NAME = 397 + // TARGET_NOT_FOUND = 101 + ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer; + if(s->instance_id != 0) + { + ZoneServer* zs = zoneserver_list.FindByInstanceID(s->instance_id); + if(zs) { + if(!zs->SendPacket(pack)) + zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in instance %u.", s->ownername, zs->GetInstanceID()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id); + } + } + else + { + ZoneServer* zs = zoneserver_list.FindByZoneID(s->zone_id); + if(zs) { + if(!zs->SendPacket(pack)) + zlog(WORLD__ZONE_ERR, "Unable to send consent response back to player %s in zone %s.", s->ownername, zs->GetZoneName()); + } + else { + zlog(WORLD__ZONE_ERR, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id); + } + } break; } - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_QGlobalDelete: - { - if(pack->size != sizeof(ServerQGlobalDelete_Struct)) + case ServerOP_InstanceUpdateTime : { + ServerInstanceUpdateTime_Struct *iut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer; + ZoneServer *zm = zoneserver_list.FindByInstanceID(iut->instance_id); + if(zm) + { + zm->SendPacket(pack); + } + break; + } + case ServerOP_QGlobalUpdate: + { + if(pack->size != sizeof(ServerQGlobalUpdate_Struct)) + { + break; + } + + zoneserver_list.SendPacket(pack); break; } - zoneserver_list.SendPacket(pack); - break; - } - - case ServerOP_AdventureRequest: - { - adventure_manager.CalculateAdventureRequestReply((const char*)pack->pBuffer); - break; - } - - case ServerOP_AdventureRequestCreate: - { - adventure_manager.TryAdventureCreate((const char*)pack->pBuffer); - break; - } - - case ServerOP_AdventureDataRequest: - { - AdventureFinishEvent fe; - while(adventure_manager.PopFinishedEvent((const char*)pack->pBuffer, fe)) + case ServerOP_QGlobalDelete: { - adventure_manager.SendAdventureFinish(fe); + if(pack->size != sizeof(ServerQGlobalDelete_Struct)) + { + break; + } + + zoneserver_list.SendPacket(pack); + break; } - adventure_manager.GetAdventureData((const char*)pack->pBuffer); - break; - } - case ServerOP_AdventureClickDoor: - { - ServerPlayerClickedAdventureDoor_Struct *pcad = (ServerPlayerClickedAdventureDoor_Struct*)pack->pBuffer; - adventure_manager.PlayerClickedDoor(pcad->player, pcad->zone_id, pcad->id); - break; - } + case ServerOP_AdventureRequest: + { + adventure_manager.CalculateAdventureRequestReply((const char*)pack->pBuffer); + break; + } - case ServerOP_AdventureLeave: - { - adventure_manager.LeaveAdventure((const char*)pack->pBuffer); - break; - } + case ServerOP_AdventureRequestCreate: + { + adventure_manager.TryAdventureCreate((const char*)pack->pBuffer); + break; + } - case ServerOP_AdventureCountUpdate: - { - ServerAdventureCount_Struct *sc = (ServerAdventureCount_Struct*)pack->pBuffer; - adventure_manager.IncrementCount(sc->instance_id); - break; - } + case ServerOP_AdventureDataRequest: + { + AdventureFinishEvent fe; + while(adventure_manager.PopFinishedEvent((const char*)pack->pBuffer, fe)) + { + adventure_manager.SendAdventureFinish(fe); + } + adventure_manager.GetAdventureData((const char*)pack->pBuffer); + break; + } - case ServerOP_AdventureAssaCountUpdate: - { - adventure_manager.IncrementAssassinationCount(*((uint16*)pack->pBuffer)); - break; - } + case ServerOP_AdventureClickDoor: + { + ServerPlayerClickedAdventureDoor_Struct *pcad = (ServerPlayerClickedAdventureDoor_Struct*)pack->pBuffer; + adventure_manager.PlayerClickedDoor(pcad->player, pcad->zone_id, pcad->id); + break; + } - case ServerOP_AdventureZoneData: - { - adventure_manager.GetZoneData(*((uint16*)pack->pBuffer)); - break; - } + case ServerOP_AdventureLeave: + { + adventure_manager.LeaveAdventure((const char*)pack->pBuffer); + break; + } - case ServerOP_AdventureLeaderboard: - { - ServerLeaderboardRequest_Struct *lr = (ServerLeaderboardRequest_Struct*)pack->pBuffer; - adventure_manager.DoLeaderboardRequest(lr->player, lr->type); - break; - } + case ServerOP_AdventureCountUpdate: + { + ServerAdventureCount_Struct *sc = (ServerAdventureCount_Struct*)pack->pBuffer; + adventure_manager.IncrementCount(sc->instance_id); + break; + } - case ServerOP_LSAccountUpdate: - { - zlog(WORLD__ZONE, "Received ServerOP_LSAccountUpdate packet from zone"); - loginserverlist.SendAccountUpdate(pack); - break; - } + case ServerOP_AdventureAssaCountUpdate: + { + adventure_manager.IncrementAssassinationCount(*((uint16*)pack->pBuffer)); + break; + } - case ServerOP_UCSMailMessage: - { - UCSLink.SendPacket(pack); - break; - } + case ServerOP_AdventureZoneData: + { + adventure_manager.GetZoneData(*((uint16*)pack->pBuffer)); + break; + } - case ServerOP_QueryServGeneric: - case ServerOP_Speech: - case ServerOP_QSPlayerLogTrades: - { - QSLink.SendPacket(pack); - break; - } - case ServerOP_QSPlayerLogHandins: - { - QSLink.SendPacket(pack); - break; - } - case ServerOP_QSPlayerLogNPCKills: - { - QSLink.SendPacket(pack); - break; - } - case ServerOP_QSPlayerLogDeletes: - { - QSLink.SendPacket(pack); - break; - } - case ServerOP_QSPlayerLogMoves: - { - QSLink.SendPacket(pack); - break; - } - case ServerOP_QSMerchantLogTransactions: - { - QSLink.SendPacket(pack); - break; - } - case ServerOP_CZSignalClientByName: - case ServerOP_CZMessagePlayer: - case ServerOP_CZSignalClient: - { - zoneserver_list.SendPacket(pack); - break; - } - case ServerOP_DepopAllPlayersCorpses: - case ServerOP_DepopPlayerCorpse: - case ServerOP_ReloadTitles: - case ServerOP_SpawnStatusChange: - case ServerOP_ReloadTasks: - case ServerOP_ReloadWorld: - case ServerOP_UpdateSpawn: - { - zoneserver_list.SendPacket(pack); - break; - } - default: - { - zlog(WORLD__ZONE_ERR,"Unknown ServerOPcode from zone 0x%04x, size %d",pack->opcode,pack->size); - DumpPacket(pack->pBuffer, pack->size); - break; - } + case ServerOP_AdventureLeaderboard: + { + ServerLeaderboardRequest_Struct *lr = (ServerLeaderboardRequest_Struct*)pack->pBuffer; + adventure_manager.DoLeaderboardRequest(lr->player, lr->type); + break; + } + + case ServerOP_LSAccountUpdate: + { + zlog(WORLD__ZONE, "Received ServerOP_LSAccountUpdate packet from zone"); + loginserverlist.SendAccountUpdate(pack); + break; + } + + case ServerOP_UCSMailMessage: + { + UCSLink.SendPacket(pack); + break; + } + + case ServerOP_QueryServGeneric: + case ServerOP_Speech: + case ServerOP_QSPlayerLogTrades: + { + QSLink.SendPacket(pack); + break; + } + case ServerOP_QSPlayerLogHandins: + { + QSLink.SendPacket(pack); + break; + } + case ServerOP_QSPlayerLogNPCKills: + { + QSLink.SendPacket(pack); + break; + } + case ServerOP_QSPlayerLogDeletes: + { + QSLink.SendPacket(pack); + break; + } + case ServerOP_QSPlayerLogMoves: + { + QSLink.SendPacket(pack); + break; + } + case ServerOP_QSMerchantLogTransactions: + { + QSLink.SendPacket(pack); + break; + } + case ServerOP_CZSignalClientByName: + case ServerOP_CZMessagePlayer: + case ServerOP_CZSignalClient: + { + zoneserver_list.SendPacket(pack); + break; + } + case ServerOP_DepopAllPlayersCorpses: + case ServerOP_DepopPlayerCorpse: + case ServerOP_ReloadTitles: + case ServerOP_SpawnStatusChange: + case ServerOP_ReloadTasks: + case ServerOP_ReloadWorld: + case ServerOP_UpdateSpawn: + { + zoneserver_list.SendPacket(pack); + break; + } + default: + { + zlog(WORLD__ZONE_ERR,"Unknown ServerOPcode from zone 0x%04x, size %d",pack->opcode,pack->size); + DumpPacket(pack->pBuffer, pack->size); + break; + } } delete pack; @@ -1429,4 +1429,3 @@ void ZoneServer::IncommingClient(Client* client) { delete pack; } - diff --git a/world/zoneserver.h b/world/zoneserver.h index 8828dadec..955c0b376 100644 --- a/world/zoneserver.h +++ b/world/zoneserver.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ZONESERVER_H #define ZONESERVER_H @@ -30,14 +30,14 @@ class ServerPacket; class ZoneServer : public WorldTCPConnection { public: ZoneServer(EmuTCPConnection* itcpc); - ~ZoneServer(); + ~ZoneServer(); virtual inline bool IsZoneServer() { return true; } bool Process(); bool SendPacket(ServerPacket* pack) { return tcpc->SendPacket(pack); } void SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...); void SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message); - bool SetZone(uint32 iZoneID, uint32 iInstanceID = 0, bool iStaticZone = false); + bool SetZone(uint32 iZoneID, uint32 iInstanceID = 0, bool iStaticZone = false); void TriggerBootup(uint32 iZoneID = 0, uint32 iInstanceID = 0, const char* iAdminName = 0, bool iMakeStatic = false); void Disconnect() { tcpc->Disconnect(); } void IncommingClient(Client* client); @@ -62,7 +62,7 @@ public: inline bool IsStaticZone() const{ return staticzone; } inline uint32 NumPlayers() const { return pNumPlayers; } inline void AddPlayer() { pNumPlayers++; } - inline void RemovePlayer() { pNumPlayers--; } + inline void RemovePlayer() { pNumPlayers--; } inline const char * GetLaunchName() const { return(launcher_name.c_str()); } inline const char * GetLaunchedName() const { return(launched_name.c_str()); } @@ -89,5 +89,5 @@ private: std::string launched_name; //the name of the zone we launched. }; - #endif + diff --git a/zone/AA.cpp b/zone/AA.cpp index a9e9c146d..b8ec4ab5e 100644 --- a/zone/AA.cpp +++ b/zone/AA.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator +Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Test 1 @@ -195,21 +195,21 @@ void Client::ActivateAA(aaID activate){ uint32 aaremain_min = (aaremain / 60) % 60; uint32 aaremain_sec = aaremain % 60; - if(aa2) { - if (aaremain_hr >= 1) //1 hour or more - Message(13, "You can use the ability %s again in %u hour(s) %u minute(s) %u seconds", - aa2->name, aaremain_hr, aaremain_min, aaremain_sec); - else //less than an hour - Message(13, "You can use the ability %s again in %u minute(s) %u seconds", - aa2->name, aaremain_min, aaremain_sec); - } else { - if (aaremain_hr >= 1) //1 hour or more - Message(13, "You can use this ability again in %u hour(s) %u minute(s) %u seconds", - aaremain_hr, aaremain_min, aaremain_sec); - else //less than an hour - Message(13, "You can use this ability again in %u minute(s) %u seconds", - aaremain_min, aaremain_sec); - } + if(aa2) { + if (aaremain_hr >= 1) //1 hour or more + Message(13, "You can use the ability %s again in %u hour(s) %u minute(s) %u seconds", + aa2->name, aaremain_hr, aaremain_min, aaremain_sec); + else //less than an hour + Message(13, "You can use the ability %s again in %u minute(s) %u seconds", + aa2->name, aaremain_min, aaremain_sec); + } else { + if (aaremain_hr >= 1) //1 hour or more + Message(13, "You can use this ability again in %u hour(s) %u minute(s) %u seconds", + aaremain_hr, aaremain_min, aaremain_sec); + else //less than an hour + Message(13, "You can use this ability again in %u minute(s) %u seconds", + aaremain_min, aaremain_sec); + } return; } @@ -281,30 +281,30 @@ void Client::ActivateAA(aaID activate){ if(caa->reuse_time > 0) { uint32 timer_base = CalcAAReuseTimer(caa); - SendAATimer(AATimerID, 0, 0); - p_timers.Start(AATimerID + pTimerAAStart, timer_base); + SendAATimer(AATimerID, 0, 0); + p_timers.Start(AATimerID + pTimerAAStart, timer_base); if(activate == aaImprovedHarmTouch || activate == aaLeechTouch) { p_timers.Start(pTimerHarmTouch, HarmTouchReuseTime); } - // Bards can cast instant cast AAs while they are casting another song - if (spells[caa->spell_id].cast_time == 0 && GetClass() == BARD && IsBardSong(casting_spell_id)) { - if(!SpellFinished(caa->spell_id, entity_list.GetMob(target_id), 10, -1, -1, spells[caa->spell_id].ResistDiff, false)) { - //Reset on failed cast - SendAATimer(AATimerID, 0, 0xFFFFFF); - Message_StringID(15,ABILITY_FAILED); - p_timers.Clear(&database, AATimerID + pTimerAAStart); - return; - } - } else { - if(!CastSpell(caa->spell_id, target_id, 10, -1, -1, 0, -1, AATimerID + pTimerAAStart, timer_base, 1)) { - //Reset on failed cast - SendAATimer(AATimerID, 0, 0xFFFFFF); - Message_StringID(15,ABILITY_FAILED); - p_timers.Clear(&database, AATimerID + pTimerAAStart); - return; - } - } + // Bards can cast instant cast AAs while they are casting another song + if (spells[caa->spell_id].cast_time == 0 && GetClass() == BARD && IsBardSong(casting_spell_id)) { + if(!SpellFinished(caa->spell_id, entity_list.GetMob(target_id), 10, -1, -1, spells[caa->spell_id].ResistDiff, false)) { + //Reset on failed cast + SendAATimer(AATimerID, 0, 0xFFFFFF); + Message_StringID(15,ABILITY_FAILED); + p_timers.Clear(&database, AATimerID + pTimerAAStart); + return; + } + } else { + if(!CastSpell(caa->spell_id, target_id, 10, -1, -1, 0, -1, AATimerID + pTimerAAStart, timer_base, 1)) { + //Reset on failed cast + SendAATimer(AATimerID, 0, 0xFFFFFF); + Message_StringID(15,ABILITY_FAILED); + p_timers.Clear(&database, AATimerID + pTimerAAStart); + return; + } + } } else { @@ -405,7 +405,7 @@ void Client::HandleAAAction(aaID activate) { switch (GetClass()) { case DRUID: - spell_id = 2760; //2644? + spell_id = 2760; //2644? break; case NECROMANCER: spell_id = 2759; //2643? @@ -496,7 +496,7 @@ void Client::HandleAAAction(aaID activate) { break; case aaActionFadingMemories: - // Do nothing since spell effect works correctly, but mana isn't used. + // Do nothing since spell effect works correctly, but mana isn't used. break; default: @@ -602,10 +602,10 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u if(summon_count > MAX_SWARM_PETS) summon_count = MAX_SWARM_PETS; - static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, + static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, 10, -10, 10, -10, 8, -8, 8, -8 }; - static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, + static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, 10, 10, -10, -10, 8, 8, -8, -8 }; TempPets(true); @@ -695,10 +695,10 @@ void Mob::TypesTemporaryPets(uint32 typesid, Mob *targ, const char *name_overrid if(summon_count > MAX_SWARM_PETS) summon_count = MAX_SWARM_PETS; - static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, + static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, 10, -10, 10, -10, 8, -8, 8, -8 }; - static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, + static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, 10, 10, -10, -10, 8, 8, -8, -8 }; TempPets(true); @@ -1113,19 +1113,19 @@ void Client::SendAATimers() { } void Client::SendAATable() { - EQApplicationPacket* outapp = new EQApplicationPacket(OP_RespondAA, sizeof(AATable_Struct)); + EQApplicationPacket* outapp = new EQApplicationPacket(OP_RespondAA, sizeof(AATable_Struct)); - AATable_Struct* aa2 = (AATable_Struct *)outapp->pBuffer; + AATable_Struct* aa2 = (AATable_Struct *)outapp->pBuffer; aa2->aa_spent = GetAAPointsSpent(); - uint32 i; + uint32 i; for(i=0;i < MAX_PP_AA_ARRAY;i++){ aa2->aa_list[i].aa_skill = aa[i]->AA; aa2->aa_list[i].aa_value = aa[i]->value; aa2->aa_list[i].unknown08 = 0; } - QueuePacket(outapp); - safe_delete(outapp); + QueuePacket(outapp); + safe_delete(outapp); } void Client::SendPreviousAA(uint32 id, int seq){ @@ -1251,7 +1251,7 @@ void Client::SendAA(uint32 id, int seq) { Utilizes two new fields: sof_next_id (which is the next id in the series), sof_current_level (ranks the AA's as the current level) 1) If no AA's purchased only display the base levels of each AA series. 2) When you purchase an AA and its rank is maxed it sends the packet for the completed AA, and the packet - for the next aa in the series. The previous tier is removed from your window, and the new AA is displayed. + for the next aa in the series. The previous tier is removed from your window, and the new AA is displayed. 3) When you zone/buy your player profile will be checked and determine what AA can be displayed base on what you have already. */ @@ -1279,9 +1279,9 @@ void Client::SendAA(uint32 id, int seq) { if (saa_pp->id == saa2->id) break; //You already have this in the player profile. - else if ((saa_pp->sof_current_level < saa2->sof_current_level) && (aa_value < saa_pp->max_level)) + else if ((saa_pp->sof_current_level < saa2->sof_current_level) && (aa_value < saa_pp->max_level)) return; //DISABLE DISPLAY HIGHER - You have not reached max level yet of your current AA. - else if ((saa_pp->sof_current_level < saa2->sof_current_level) && (aa_value == saa_pp->max_level) && (saa_pp->sof_next_id == saa2->id)) + else if ((saa_pp->sof_current_level < saa2->sof_current_level) && (aa_value == saa_pp->max_level) && (saa_pp->sof_next_id == saa2->id)) IsBaseLevel = false; //ALLOW DISPLAY HIGHER } } @@ -1321,9 +1321,9 @@ void Client::SendAA(uint32 id, int seq) { SendAA_Struct* saa_next = nullptr; saa_next = zone->FindAA(saa->sof_next_id); if (saa_next && - (((GetClientVersionBit() == 4) && (saa_next->clientver > 4)) - || ((GetClientVersionBit() == 8) && (saa_next->clientver > 5)) - || ((GetClientVersionBit() == 16) && (saa_next->clientver > 6)))){ + (((GetClientVersionBit() == 4) && (saa_next->clientver > 4)) + || ((GetClientVersionBit() == 8) && (saa_next->clientver > 5)) + || ((GetClientVersionBit() == 16) && (saa_next->clientver > 6)))){ saa->next_id=0xFFFFFFFF; } } @@ -1359,7 +1359,7 @@ void Client::SendAA(uint32 id, int seq) { if(value > 0) { - // AA_Action stores the base ID + // AA_Action stores the base ID const AA_DBAction *caa = &AA_Actions[saa->id - value + 1][value - 1]; if(caa && caa->reuse_time > 0) @@ -1385,7 +1385,7 @@ void Client::SendAA(uint32 id, int seq) { QueuePacket(outapp); safe_delete(outapp); - //will outapp delete the buffer for us even though it didnt make it? --- Yes, it should + //will outapp delete the buffer for us even though it didnt make it? --- Yes, it should } void Client::SendAAList(){ @@ -1504,7 +1504,7 @@ void Client::ResetAA(){ for(itr=aa_points.begin();itr!=aa_points.end();itr++) aa_points[itr->first] = 0; - for(int i = 0; i < _maxLeaderAA; ++i) + for(int i = 0; i < _maxLeaderAA; ++i) m_pp.leader_abilities.ranks[i] = 0; m_pp.group_leadership_points = 0; @@ -1634,13 +1634,13 @@ void Client::InspectBuffs(Client* Inspector, int Rank) //this really need to be renamed to LoadAAActions() bool ZoneDatabase::LoadAAEffects() { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; memset(AA_Actions, 0, sizeof(AA_Actions)); //I hope the compiler is smart about this size... const char *query = "SELECT aaid,rank,reuse_time,spell_id,target,nonspell_action,nonspell_mana,nonspell_duration," - " redux_aa,redux_rate,redux_aa2,redux_rate2 FROM aa_actions"; + "redux_aa,redux_rate,redux_aa2,redux_rate2 FROM aa_actions"; if(RunQuery(query, static_cast(strlen(query)), errbuf, &result)) { //safe_delete_array(query); @@ -1684,9 +1684,9 @@ bool ZoneDatabase::LoadAAEffects() { //AndMetal: this may now be obsolete since we have Zone::GetTotalAALevels() uint8 ZoneDatabase::GetTotalAALevels(uint32 skill_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; int total=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(slot) from aa_effects where aaid=%i", skill_id), errbuf, &result)) { safe_delete_array(query); @@ -1704,8 +1704,8 @@ uint8 ZoneDatabase::GetTotalAALevels(uint32 skill_id) { //this will allow us to count the number of effects for an AA by pulling the info from memory instead of the database. hopefully this will same some CPU cycles uint8 Zone::GetTotalAALevels(uint32 skill_id) { - size_t sz = aa_effects[skill_id].size(); - return sz >= 255 ? 255 : static_cast(sz); + size_t sz = aa_effects[skill_id].size(); + return sz >= 255 ? 255 : static_cast(sz); } /* @@ -1728,9 +1728,9 @@ void ZoneDatabase::FillAAEffects(SendAA_Struct* aa_struct){ return; char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT effectid, base1, base2, slot from aa_effects where aaid=%i order by slot asc", aa_struct->id), errbuf, &result)) { int ndx=0; while((row = mysql_fetch_row(result))!=nullptr) { @@ -1749,9 +1749,9 @@ void ZoneDatabase::FillAAEffects(SendAA_Struct* aa_struct){ uint32 ZoneDatabase::CountAAs(){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; int count=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(title_sid) from altadv_vars"), errbuf, &result)) { if((row = mysql_fetch_row(result))!=nullptr) @@ -1766,9 +1766,9 @@ uint32 ZoneDatabase::CountAAs(){ uint32 ZoneDatabase::CountAAEffects(){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; int count=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(id) from aa_effects"), errbuf, &result)) { if((row = mysql_fetch_row(result))!=nullptr){ @@ -1864,7 +1864,7 @@ SendAA_Struct* ZoneDatabase::GetAASkillVars(uint32 skill_id) "WHERE " "p.skill_id = a.prereq_skill" "), " - "0) AS prereq_skill_index, " + "0) AS prereq_skill_index, " "a.prereq_minpoints, " "a.spell_type, " "a.spell_refresh, " @@ -1963,19 +1963,19 @@ void Client::DurationRampage(uint32 duration) AA_SwarmPetInfo::AA_SwarmPetInfo() { - target = 0; - owner_id = 0; - duration = nullptr; + target = 0; + owner_id = 0; + duration = nullptr; } AA_SwarmPetInfo::~AA_SwarmPetInfo() { - target = 0; - owner_id = 0; - safe_delete(duration); + target = 0; + owner_id = 0; + safe_delete(duration); } Mob *AA_SwarmPetInfo::GetOwner() { - return entity_list.GetMobID(owner_id); + return entity_list.GetMobID(owner_id); } diff --git a/zone/AA.h b/zone/AA.h index b813171de..334dd5176 100644 --- a/zone/AA.h +++ b/zone/AA.h @@ -24,10 +24,10 @@ typedef enum { //AA Targeting Constants typedef enum { - aaActionNone = 0, - aaActionAETaunt = 1, - aaActionMassBuff = 2, - aaActionFlamingArrows = 3, + aaActionNone = 0, + aaActionAETaunt = 1, + aaActionMassBuff = 2, + aaActionFlamingArrows = 3, aaActionFrostArrows = 4, aaActionRampage = 5, aaActionSharedHealth = 6, @@ -699,1411 +699,1411 @@ typedef enum { //AA IDs typedef enum { //AA IDs - aaNone =0, - aaInnateStrength =2,//implemented as bonus - aaInnateStamina =7,//implemented as bonus - aaInnateAgility =12,//implemented as bonus - /*aaCompleteHeal =13,*///not implemented, but is in dbstr_us.txt - aaInnateDexterity =17,//implemented as bonus - aaInnateIntelligence =22,//implemented as bonus - aaInnateWisdom =27,//implemented as bonus - aaInnateCharisma =32,//implemented as bonus - aaInnateFireProtection =37,//implemented as bonus - aaInnateColdProtection =42,//implemented as bonus - aaInnateMagicProtection =47,//implemented as bonus - aaInnatePoisonProtection =52,//implemented as bonus - aaInnateDiseaseProtection =57,//implemented as bonus - aaInnateRunSpeed =62,//implemented as bonus - aaInnateRegeneration =65,//implemented as bonus - aaInnateMetabolism =68, - aaInnateLungCapacity =71,//handled by client - aaFirstAid =74,//implemented as bonus - aaHealingAdept =77,//implemented as bonus-focus - aaHealingGift =80,//implemented as bonus - aaSpellCastingMastery =83,//untested - aaSpellCastingReinforcement =86,//untested - aaMentalClarity =89,//implemented as bonus - aaSpellCastingFury =92,//implemented as bonus - aaChanellingFocus =95,//implemented as bonus *Live AA effect removed in 2006 - aaSpellCastingSubtlety =98,//untested - aaSpellCastingExpertise =101,//untested - aaSpellCastingDeftness =104,//implemented as bonus-focus - aaNaturalDurability =107,//implemented as bonus - aaNaturalHealing =110,//implemented as bonus - aaCombatFury =113,//implemented as bonus - aaFearResistance =116,//untested - aaFinishingBlow =119,//untested - aaCombatStability =122,//implemented as bonus - aaCombatAgility =125,//implemented as bonus - aaMassGroupBuff =128,//untested - aaDivineResurrection =129,//DB - aaInnateInvisToUndead =130,//DB - aaCelestialRegeneration =131,//untested - aaBestowDivineAura =132,//DB - aaTurnUndead =133,//DB - aaPurifySoul =136,//DB - aaQuickEvacuation =137,//implemented as bonus-focus - aaExodus =140,//untested - aaQuickDamage =141,//implemented as bonus-focus - aaEnhancedRoot =144,//implemented as bonus - aaDireCharm =145,//untested - aaCannibalization =146,//DB - aaQuickBuff =147,//implemented as bonus-focus - aaAlchemyMastery =150, - aaRabidBear =153,//DB - aaManaBurn =154,//DB - aaImprovedFamiliar =155,//untested, implemented? - aaNexusGate =156,//DB - aaUnknown54 =157, - aaPermanentIllusion =158, - aaJewelCraftMastery =159, - aaGatherMana =162,//DB - aaMendCompanion =163,//DB - aaQuickSummoning =164,//implemented as bonus-focus - aaFrenziedBurnout =167,//DB - aaElementalFormFire =168,//DB - aaElementalFormWater =171,//DB - aaElementalFormEarth =174,//DB - aaElementalFormAir =177,//DB - aaImprovedReclaimEnergy =180,//untested - aaTurnSummoned =181,//DB - aaElementalPact =182,//DB - aaLifeBurn =183,//DB - aaDeadMesmerization =184,//DB - aaFearstorm =185,//DB - aaFleshToBone =186,//DB - aaCallToCorpse =187,//DB - aaDivineStun =188,//DB - aaImprovedLayOnHands =189, - aaSlayUndead =190,//implemented as bonus - aaActOfValor =193,//DB - aaHolySteed =194,//DB - aaFearless =195, - aa2HandBash =196,//works. handled by client? - aaInnateCamouflage =197,//DB - aaAmbidexterity =198,//implemented as bonus - aaArcheryMastery =199,//implemented as bonus - aaFletchingMastery =202,//removed from db? - aaEndlessQuiver =205,//implemented as bonus - aaUnholySteed =206,//DB - aaImprovedHarmTouch =207,//untested - aaLeechTouch =208,//DB - aaDeathPeace =209, - aaSoulAbrasion =210,//implemented as bonus-focus - aaInstrumentMastery =213,//untested - aaUnknown91 =216,//not used - aaUnknown92 =219,//not used - aaUnknown93 =222,//not used - aaJamFest =225,//implemented as bonus - aaUnknown95 =228, - aaSonicCall =229, - aaCriticalMend =230,//untested - aaPurifyBody =233,//DB - aaChainCombo =234, - aaRapidFeign =237,//works - aaReturnKick =240,//implemented as bonus - aaEscape =243,//DB - aaPoisonMastery =244, - aaDoubleRiposte =247,//implemented as bonus - aaQuickHide =250, - aaQuickThrow =253,//corrected from dbstr_us.txt - aaPurgePoison =254,//DB - aaFlurry =255,//implemented as bonus - aaRampage =258,//untested - aaAreaTaunt =259,//untested - aaWarcry =260,//DB - aaBandageWound =263,//implemented as bonus - aaSpellCastingReinforcementMastery =266,//untested - aaSpellCastingFuryMastery =267,//untested - aaExtendedNotes =270,//implemented as bonus - aaDragonPunch =273,//implemented as bonus - aaStrongRoot =274,//DB - aaSingingMastery =275,//untested - aaBodyAndMindRejuvenation =278,//added - aaPhysicalEnhancement =279,//implemented as bonus - aaAdvTrapNegotiation =280,//untested - aaAcrobatics =283,//untested - aaScribbleNotes =286, - aaChaoticStab =287,//implemented as bonus - aaPetDiscipline =288,//added - aaHobbleofSpirits =289,//DB - aaFrenzyofSpirit =290,//DB - aaParagonofSpirit =291,//DB - aaAdvancedInnateStrength =292,//implemented as bonus - aaAdvancedInnateStamina =302,//implemented as bonus - aaAdvancedInnateAgility =312,//implemented as bonus - aaAdvancedInnateDexterity =322,//implemented as bonus - aaAdvancedInnateIntelligence =332,//implemented as bonus - aaAdvancedInnateWisdom =342,//implemented as bonus - aaAdvancedInnateCharisma =352,//implemented as bonus - aaWardingofSolusek =362,//implemented as bonus - aaBlessingofEci =372,//implemented as bonus - aaMarrsProtection =382,//implemented as bonus - aaShroudofTheFaceless =392,//implemented as bonus - aaBertoxxulousGift =402,//implemented as bonus - aaNewTanaanCraftingMastery =412, - aaPlanarPower =418,//untested - aaPlanarDurability =423,//added - aaInnateEnlightenment =426,//added - aaAdvancedSpellCastingMastery =431,//untested - aaAdvancedHealingAdept =434,//untested - aaAdvancedHealingGift =437,//untested - aaCoupdeGrace =440,//added - aaFuryoftheAges =443,//implemented as bonus - aaMasteryofthePast =446,//implemented as bonus - aaLightningReflexes =449,//implemented as bonus - aaInnateDefense =454,//implemented as bonus - aaRadiantCure =459,//DB - aaHastenedDivinity =462,//DB - aaHastenedTurning =465,//DB - aaHastenedPurificationofSoul =468,//DB - aaHastenedGathering =471,//DB - aaHastenedRabidity =474,//DB - aaHastenedExodus =477,//DB - aaHastenedRoot =480,//DB - aaHastenedMending =483,//DB - aaHastenedBanishment =486,//DB - aaHastenedInstigation =489,//DB, maybe - aaFuriousRampage =492,//DB - aaHastenedPurificationoftheBody =495,//DB - aaHastyExit =498,//DB - aaHastenedPurification =501,//DB - aaFlashofSteel =504,//implemented as bonus - aaDivineArbitration =507,//DB - aaWrathoftheWild =510,//DB - aaVirulentParalysis =513,//DB - aaHarvestofDruzzil =516,//DB - aaEldritchRune =517,//DB - aaServantofRo =520,//DB - aaWaketheDead =523,//DB - aaSuspendedMinion =526,//untested - aaSpiritCall =528,//DB - aaCelestialRenewal =531,//DB - aaAllegiantFamiliar =533, - aaHandofPiety =534,//DB - aaMithanielsBinding =537,//implemented as bonus - aaMendingoftheTranquil =539, - aaRagingFlurry =542,//implemented as bonus - aaGuardianoftheForest =545,//DB - aaSpiritoftheWood =548,//DB - aaBestialFrenzy =551,//implemented as bonus - aaHarmoniousAttack =556,//implemented as bonus - aaKnightsAdvantage =561,//implemented as bonus - aaFerocity =564,//implemented as bonus - aaViscidRoots =567, - aaSionachiesCrescendo =568,//implemented as bonus - aaAyonaesTutelage =571, - aaFeignedMinion =574, - aaUnfailingDivinity =577, - aaAnimationEmpathy =580,// Implemented - aaRushtoJudgement =583, - aaLivingShield =586, - aaConsumptionoftheSoul =589,//untested - aaBoastfulBellow =592,//DB - aaFervrentBlessing =593,//untested - aaTouchoftheWicked =596,//untested - aaPunishingBlade =599,//implemented as bonus - aaSpeedoftheKnight =602,//implemented as bonus - aaShroudofStealth =605, - aaNimbleEvasion =606, - aaTechniqueofMasterWu =611, - aaHostoftheElements =616,//DB - aaCallofXuzl =619,//DB - aaHastenedStealth =622, - aaIngenuity =625, - aaFleetofFoot =628,//implemented as bonus - aaFadingMemories =630, - aaTacticalMastery =631,//implemented as bonus - aaTheftofLife =634,//implemented as bonus-focus - aaFuryofMagic =637, - aaFuryofMagicMastery2 =640,//whats the difference? - aaProjectIllusion =643, - aaHeadshot =644,//added - aaEntrap =645,//DB - aaUnholyTouch =646,//untested - aaTotalDomination =649,// Implemented - aaStalwartEndurance =652,//implemented as bonus - aaQuickSummoning2 =655,//*not implemented - Liva AA that replaces prior version in later exp. - aaMentalClarity2 =658,//whats the difference? - aaInnateRegeneration2 =661,//whats the difference? - aaManaBurn2 =664,//whats the difference? - aaExtendedNotes2 =665,//*not implemented - Live AA that replaces prior version in later exp. - aaSionachiesCrescendo2 =668,//*not implemented - Live AA that replaces prior version in later exp. - aaImprovedReclaimEnergy2 =671,//whats the difference? untetsed - aaSwiftJourney =672,//implemented as bonus - aaConvalescence =674,//added 9/26/08 - aaLastingBreath =676,//handled by client - aaPackrat =678,//added 9/29/08 - aaHeightenedEndurance =683, - aaWeaponAffinity =686,//implemented as bonus - aaSecondaryForte =691, - aaPersistantCasting =692, - aaTuneofPursuance =695, - aaImprovedInstrumentMastery =700, - aaImprovedSingingMastery =701, - aaExultantBellowing =702, - aaEchoofTaelosia =707, - aaInternalMetronome =710,//implemented as bonus *Live AA removed in 2006 - aaPiousSupplication =715, - aaBeastialAlignment =718,//untested - aaWrathofXuzl =721, - aaFeralSwipe =723,//DB? - aaWardersFury =724,//implemented as bonus - aaWardersAlacrity =729,//implemented as bonus - aaPetAffinity =734,//implemented as bonus - aaMasteryofthePast2 =735,//implemented as bonus [Different classes] - aaSpellCastingSubtlety2 =738,//whats the difference? - aaTouchoftheDivine =741, - aaDivineAvatar =746,//DB - aaExquisiteBenediction =749,//DB - aaQuickenedCuring =754, - aaNaturesBoon =757,//DB - aaAdvancedTracking =762, - aaCriticalAffliction =767, - aaFuryofMagicMastery =770,//whats the difference? - aaDoppelganger =773, - aaEnchancedForgetfulness =776, - aaMesmerizationMastery =781, - aaQuickMassGroupBuff =782, - aaSharedHealth =785, - aaElementalFury =790,//implemented as bonus - aaElementalAlacrity =795,//implemented as bonus - aaElementalAgility =800,//implemented as bonus - aaElementalDurability =803,//implemented as bonus - aaSinisterStrikes =806,//implemented as bonus - aaStrikethrough =807,//implemented as bonus - aaStonewall =810, - aaRapidStrikes =815,//implemented as bonus - aaKickMastery =820,//implemented as bonus - aaHightenedAwareness =823, - aaDestructiveForce =828,//DB - aaSwarmofDecay =831,//DB - aaDeathsFury =834, - aaQuickeningofDeath =839,//implemented as bonus - aaAdvancedTheftofLife =844,//implemented as bonus-focus - aaTripleBackstab =846,//implemented as bonus - aaHastenedPiety =849, - aaImmobilizingBash =852, - aaViciousSmash =855,//implemented as bonus - aaRadiantCure2 =860,//whats the difference? - aaPurification =863, - aaPrecisionofthePathfinder =864,//implemented as bonus - aaCoatofThistles =867, - aaFlamingArrows =872,//untested - aaFrostArrows =875,//untested - aaSeizedOpportunity =878, - aaTrapCircumvention =881, - aaImprovedHastyExit =886, - aaVirulentVenom =888, - aaImprovedConsumptionofSoul =893, - aaIntenseHatred =895, - aaAdvancedSpiritCall =900, - aaCalloftheAncients =902,//DB - aaSturdiness =907, - aaWarlordsTenacity =912,//implemented as effect - aaStrengthenedStrike =915,//implemented as bonus - aaExtendedShielding =918, - aaRosFlamingFamiliar =921,//DB - aaEcisIcyFamiliar =922,//DB - aaDruzzilsMysticalFamiliar =923,//DB - aaAdvancedFuryofMagicMastery =924,//added 9/29/08 - aaWardofDestruction =926,//DB - aaFrenziedDevastation =931,//DB - aaCombatFury2 =934,//implemented as bonus - aaCombatFury3 =937,//implemented as bonus - aaCombatFury4 =940,//implemented as bonus - aaFuryoftheAges2 =943,//implemented as bonus - aaFuryoftheAges3 =946,//implemented as bonus - aaFuryoftheAges4 =949,//implemented as bonus - aaPlanarDurability2 =952,//whats the difference? - aaInnateEnlightenment2 =955,//whats the difference? - aaDireCharm2 =960,//whats the difference? - aaDireCharm3 =961,//whats the difference? - aaTouchoftheDivine2 =962,//whats the difference? - aaTouchofDecay =967, - aaCalloftheAncients2 =970,//whats the difference? - aaImprovedVision =975, - aaEternalBreath =978,//handled by client - aaBlacksmithingMastery =979,//added 9/29/08 - aaBakingMastery =982,//added 9/29/08 - aaBrewingMastery =985,//added 9/29/08 - aaFletchingMastery2 =988,//added 9/29/08 - aaPotteryMastery =991,//added 9/29/08 - aaTailoringMastery =994,//added 9/29/08 - aaSalvage =997, - aaOrigin =1000,//spell - aaChaoticPotential =1001,//added - aaDiscordantDefiance =1006,//implemented as bonus - aaTrialsofMataMuram =1011, - aaMysticalAttuning =1021, - aaDelayDeath =1026,//implemented as bonus - aaHealthyAura =1031, - aaFitness =1036,//implemented as bonus - aaVeteransWrath =1041,//implemented as bonus [Different classes/values on each Veteran's Wrath] - aaVeteransWrath2 =1044,//implemented as bonus - aaVeteransWrath3 =1047,//implemented as bonus - aaVeteransWrath4 =1050,//implemented as bonus - aaDeathblow =1053,//implemented as bonus - aaReflexiveMastery =1061,//implemented as bonus - aaDefensiveInstincts =1066,//implemented as bonus - aaMnemonicRetention =1071,//Implemented - aaExpansiveMind =1072,//added 9/29/08 - aaSleightofHand =1077, - aaSleightofHand2 =1080,//whats the difference? - aaHealingAdeptMastery =1083, - aaHealingGiftMastery =1086, - aaArcaneTongues =1089, - aaMasterofDisguise =1092, - aaSlipperyAttacks =1093, - aaImprovedCriticalAffliction =1099, - aaFortifiedBellowing =1102, - aaFuryofMagic2 =1107,//whats the difference? - aaDanceofBlades =1110, - aaShieldofNotes =1116, - aaRoarofThunder =1119, - aaPersistentMinion =1122, - aaPerfectionofSpirit =1123, - aaReplentishCompanion =1126, - aaAdvancedPetDiscipline =1129, - aaThrowingMastery =1131,//implemented as bonus - aaBlurofAxes =1134,//implemented as bonus - aaHastenedWarCry =1137, - aaDeadAim =1140,//implemented as bonus - aaFrenziedDefense =1143,//*not implemented - duplicate - aaTirelessSprint =1146, - aaDesperation =1149, - aaUntamedRage =1150, - aaEchoingCries =1155, - aaViciousFrenzy =1158, - aaCrazedOnslaught =1163, - aaFrenziedDefense2 =1166,//implemented as bonus - aaOverwhelmingAttack =1172, - aaFuriousRage =1175, - aaBloodPact =1178, - aaShieldingResistance =1181,////implemented as bonus - aaHealingBoon =1186, - aaResplendentCure =1189, - aaCelestialHammer =1192, - aaDivineRetribution =1195, - aaCelestialRejuvination =1203, - aaFerventBenediction =1206, - aaSanctuary =1209, - aaDestructiveFury =1210,//implemented as bonus - added 9/29/08 - aaDestructiveFury2 =1213,//*not implemented [classes changed] - replaces id 1210 - aaBoonoftheForest =1222, - aaSpiritoftheGrove =1225, - aaCalloftheWild =1228, - aaSecondaryRecall =1229, - aaNaturesBounty =1230, - aaStasis =1233, - aaColorShock =1239, - aaMindOverMatter =1242, - aaSoothingWords =1245, - aaElementalSwarm =1248, - aaHeartofFlames =1251, - aaHeartofVapor =1252, - aaHeartofIce =1253, - aaHeartofStone =1254, - aaImitateDeath =1255, - aaCripplingStrike =1256, - aaStunningKick =1259, - aaEyeGouge =1262, - aaIronKicks =1265, - aaStyleoftheMimic =1268, - aaDeathPeace2 =1272,//whats the difference? - aaArmyoftheDead =1274, - aaCelestialStun =1277, - aaHandofDevotion =1278, - aaSteadfastWill =1284, - aaShieldBlock =1287,//implemented as bonus - aaScoutsEfficiency =1290,//implemented as bonus - aaGuardianoftheGlade =1293, - aaTrackingMastery =1296, - aaFlurryofKnives =1301,//implemented as bonus - aaPrecision =1304, - aaNervesofSteel =1307, - aaTouchoftheCursed =1313, - aaSpiritualCorrosion =1316, - aaSoulThief =1319,//implemented as bonus-focus - aaSpiritualChanneling =1323,//implemented as effect - aaBoonoftheAncients =1324, - aaAncestralAid =1327,//implemented as effect - aaResoluteDefiance =1330,//implemented as effect - aaPresstheAttack =1333, - aaMindCrash =1334, - aaProlongedDestruction =1337, - aaRosGreaterFamiliar =1340, - aaEcisGreaterFamiliar =1341, - aaDruzzilsGreaterFamiliar =1342, - aaTeleportBind =1343, - aaDevotedFamiliar =1344, - aaAuspiceoftheHunter =1345, - aaSavageSpirit =1348, - aaPresstheAttack2 =1351,//whats the difference? - aaCripplingStrike2 =1352,//whats the difference? - aaStunningKick2 =1353,//whats the difference? - aaEyeGouge2 =1358,//whats the difference? + aaNone =0, + aaInnateStrength =2,//implemented as bonus + aaInnateStamina =7,//implemented as bonus + aaInnateAgility =12,//implemented as bonus + /*aaCompleteHeal =13,*///not implemented, but is in dbstr_us.txt + aaInnateDexterity =17,//implemented as bonus + aaInnateIntelligence =22,//implemented as bonus + aaInnateWisdom =27,//implemented as bonus + aaInnateCharisma =32,//implemented as bonus + aaInnateFireProtection =37,//implemented as bonus + aaInnateColdProtection =42,//implemented as bonus + aaInnateMagicProtection =47,//implemented as bonus + aaInnatePoisonProtection =52,//implemented as bonus + aaInnateDiseaseProtection =57,//implemented as bonus + aaInnateRunSpeed =62,//implemented as bonus + aaInnateRegeneration =65,//implemented as bonus + aaInnateMetabolism =68, + aaInnateLungCapacity =71,//handled by client + aaFirstAid =74,//implemented as bonus + aaHealingAdept =77,//implemented as bonus-focus + aaHealingGift =80,//implemented as bonus + aaSpellCastingMastery =83,//untested + aaSpellCastingReinforcement =86,//untested + aaMentalClarity =89,//implemented as bonus + aaSpellCastingFury =92,//implemented as bonus + aaChanellingFocus =95,//implemented as bonus *Live AA effect removed in 2006 + aaSpellCastingSubtlety =98,//untested + aaSpellCastingExpertise =101,//untested + aaSpellCastingDeftness =104,//implemented as bonus-focus + aaNaturalDurability =107,//implemented as bonus + aaNaturalHealing =110,//implemented as bonus + aaCombatFury =113,//implemented as bonus + aaFearResistance =116,//untested + aaFinishingBlow =119,//untested + aaCombatStability =122,//implemented as bonus + aaCombatAgility =125,//implemented as bonus + aaMassGroupBuff =128,//untested + aaDivineResurrection =129,//DB + aaInnateInvisToUndead =130,//DB + aaCelestialRegeneration =131,//untested + aaBestowDivineAura =132,//DB + aaTurnUndead =133,//DB + aaPurifySoul =136,//DB + aaQuickEvacuation =137,//implemented as bonus-focus + aaExodus =140,//untested + aaQuickDamage =141,//implemented as bonus-focus + aaEnhancedRoot =144,//implemented as bonus + aaDireCharm =145,//untested + aaCannibalization =146,//DB + aaQuickBuff =147,//implemented as bonus-focus + aaAlchemyMastery =150, + aaRabidBear =153,//DB + aaManaBurn =154,//DB + aaImprovedFamiliar =155,//untested, implemented? + aaNexusGate =156,//DB + aaUnknown54 =157, + aaPermanentIllusion =158, + aaJewelCraftMastery =159, + aaGatherMana =162,//DB + aaMendCompanion =163,//DB + aaQuickSummoning =164,//implemented as bonus-focus + aaFrenziedBurnout =167,//DB + aaElementalFormFire =168,//DB + aaElementalFormWater =171,//DB + aaElementalFormEarth =174,//DB + aaElementalFormAir =177,//DB + aaImprovedReclaimEnergy =180,//untested + aaTurnSummoned =181,//DB + aaElementalPact =182,//DB + aaLifeBurn =183,//DB + aaDeadMesmerization =184,//DB + aaFearstorm =185,//DB + aaFleshToBone =186,//DB + aaCallToCorpse =187,//DB + aaDivineStun =188,//DB + aaImprovedLayOnHands =189, + aaSlayUndead =190,//implemented as bonus + aaActOfValor =193,//DB + aaHolySteed =194,//DB + aaFearless =195, + aa2HandBash =196,//works. handled by client? + aaInnateCamouflage =197,//DB + aaAmbidexterity =198,//implemented as bonus + aaArcheryMastery =199,//implemented as bonus + aaFletchingMastery =202,//removed from db? + aaEndlessQuiver =205,//implemented as bonus + aaUnholySteed =206,//DB + aaImprovedHarmTouch =207,//untested + aaLeechTouch =208,//DB + aaDeathPeace =209, + aaSoulAbrasion =210,//implemented as bonus-focus + aaInstrumentMastery =213,//untested + aaUnknown91 =216,//not used + aaUnknown92 =219,//not used + aaUnknown93 =222,//not used + aaJamFest =225,//implemented as bonus + aaUnknown95 =228, + aaSonicCall =229, + aaCriticalMend =230,//untested + aaPurifyBody =233,//DB + aaChainCombo =234, + aaRapidFeign =237,//works + aaReturnKick =240,//implemented as bonus + aaEscape =243,//DB + aaPoisonMastery =244, + aaDoubleRiposte =247,//implemented as bonus + aaQuickHide =250, + aaQuickThrow =253,//corrected from dbstr_us.txt + aaPurgePoison =254,//DB + aaFlurry =255,//implemented as bonus + aaRampage =258,//untested + aaAreaTaunt =259,//untested + aaWarcry =260,//DB + aaBandageWound =263,//implemented as bonus + aaSpellCastingReinforcementMastery =266,//untested + aaSpellCastingFuryMastery =267,//untested + aaExtendedNotes =270,//implemented as bonus + aaDragonPunch =273,//implemented as bonus + aaStrongRoot =274,//DB + aaSingingMastery =275,//untested + aaBodyAndMindRejuvenation =278,//added + aaPhysicalEnhancement =279,//implemented as bonus + aaAdvTrapNegotiation =280,//untested + aaAcrobatics =283,//untested + aaScribbleNotes =286, + aaChaoticStab =287,//implemented as bonus + aaPetDiscipline =288,//added + aaHobbleofSpirits =289,//DB + aaFrenzyofSpirit =290,//DB + aaParagonofSpirit =291,//DB + aaAdvancedInnateStrength =292,//implemented as bonus + aaAdvancedInnateStamina =302,//implemented as bonus + aaAdvancedInnateAgility =312,//implemented as bonus + aaAdvancedInnateDexterity =322,//implemented as bonus + aaAdvancedInnateIntelligence =332,//implemented as bonus + aaAdvancedInnateWisdom =342,//implemented as bonus + aaAdvancedInnateCharisma =352,//implemented as bonus + aaWardingofSolusek =362,//implemented as bonus + aaBlessingofEci =372,//implemented as bonus + aaMarrsProtection =382,//implemented as bonus + aaShroudofTheFaceless =392,//implemented as bonus + aaBertoxxulousGift =402,//implemented as bonus + aaNewTanaanCraftingMastery =412, + aaPlanarPower =418,//untested + aaPlanarDurability =423,//added + aaInnateEnlightenment =426,//added + aaAdvancedSpellCastingMastery =431,//untested + aaAdvancedHealingAdept =434,//untested + aaAdvancedHealingGift =437,//untested + aaCoupdeGrace =440,//added + aaFuryoftheAges =443,//implemented as bonus + aaMasteryofthePast =446,//implemented as bonus + aaLightningReflexes =449,//implemented as bonus + aaInnateDefense =454,//implemented as bonus + aaRadiantCure =459,//DB + aaHastenedDivinity =462,//DB + aaHastenedTurning =465,//DB + aaHastenedPurificationofSoul =468,//DB + aaHastenedGathering =471,//DB + aaHastenedRabidity =474,//DB + aaHastenedExodus =477,//DB + aaHastenedRoot =480,//DB + aaHastenedMending =483,//DB + aaHastenedBanishment =486,//DB + aaHastenedInstigation =489,//DB, maybe + aaFuriousRampage =492,//DB + aaHastenedPurificationoftheBody =495,//DB + aaHastyExit =498,//DB + aaHastenedPurification =501,//DB + aaFlashofSteel =504,//implemented as bonus + aaDivineArbitration =507,//DB + aaWrathoftheWild =510,//DB + aaVirulentParalysis =513,//DB + aaHarvestofDruzzil =516,//DB + aaEldritchRune =517,//DB + aaServantofRo =520,//DB + aaWaketheDead =523,//DB + aaSuspendedMinion =526,//untested + aaSpiritCall =528,//DB + aaCelestialRenewal =531,//DB + aaAllegiantFamiliar =533, + aaHandofPiety =534,//DB + aaMithanielsBinding =537,//implemented as bonus + aaMendingoftheTranquil =539, + aaRagingFlurry =542,//implemented as bonus + aaGuardianoftheForest =545,//DB + aaSpiritoftheWood =548,//DB + aaBestialFrenzy =551,//implemented as bonus + aaHarmoniousAttack =556,//implemented as bonus + aaKnightsAdvantage =561,//implemented as bonus + aaFerocity =564,//implemented as bonus + aaViscidRoots =567, + aaSionachiesCrescendo =568,//implemented as bonus + aaAyonaesTutelage =571, + aaFeignedMinion =574, + aaUnfailingDivinity =577, + aaAnimationEmpathy =580,// Implemented + aaRushtoJudgement =583, + aaLivingShield =586, + aaConsumptionoftheSoul =589,//untested + aaBoastfulBellow =592,//DB + aaFervrentBlessing =593,//untested + aaTouchoftheWicked =596,//untested + aaPunishingBlade =599,//implemented as bonus + aaSpeedoftheKnight =602,//implemented as bonus + aaShroudofStealth =605, + aaNimbleEvasion =606, + aaTechniqueofMasterWu =611, + aaHostoftheElements =616,//DB + aaCallofXuzl =619,//DB + aaHastenedStealth =622, + aaIngenuity =625, + aaFleetofFoot =628,//implemented as bonus + aaFadingMemories =630, + aaTacticalMastery =631,//implemented as bonus + aaTheftofLife =634,//implemented as bonus-focus + aaFuryofMagic =637, + aaFuryofMagicMastery2 =640,//whats the difference? + aaProjectIllusion =643, + aaHeadshot =644,//added + aaEntrap =645,//DB + aaUnholyTouch =646,//untested + aaTotalDomination =649,// Implemented + aaStalwartEndurance =652,//implemented as bonus + aaQuickSummoning2 =655,//*not implemented - Liva AA that replaces prior version in later exp. + aaMentalClarity2 =658,//whats the difference? + aaInnateRegeneration2 =661,//whats the difference? + aaManaBurn2 =664,//whats the difference? + aaExtendedNotes2 =665,//*not implemented - Live AA that replaces prior version in later exp. + aaSionachiesCrescendo2 =668,//*not implemented - Live AA that replaces prior version in later exp. + aaImprovedReclaimEnergy2 =671,//whats the difference? untetsed + aaSwiftJourney =672,//implemented as bonus + aaConvalescence =674,//added 9/26/08 + aaLastingBreath =676,//handled by client + aaPackrat =678,//added 9/29/08 + aaHeightenedEndurance =683, + aaWeaponAffinity =686,//implemented as bonus + aaSecondaryForte =691, + aaPersistantCasting =692, + aaTuneofPursuance =695, + aaImprovedInstrumentMastery =700, + aaImprovedSingingMastery =701, + aaExultantBellowing =702, + aaEchoofTaelosia =707, + aaInternalMetronome =710,//implemented as bonus *Live AA removed in 2006 + aaPiousSupplication =715, + aaBeastialAlignment =718,//untested + aaWrathofXuzl =721, + aaFeralSwipe =723,//DB? + aaWardersFury =724,//implemented as bonus + aaWardersAlacrity =729,//implemented as bonus + aaPetAffinity =734,//implemented as bonus + aaMasteryofthePast2 =735,//implemented as bonus [Different classes] + aaSpellCastingSubtlety2 =738,//whats the difference? + aaTouchoftheDivine =741, + aaDivineAvatar =746,//DB + aaExquisiteBenediction =749,//DB + aaQuickenedCuring =754, + aaNaturesBoon =757,//DB + aaAdvancedTracking =762, + aaCriticalAffliction =767, + aaFuryofMagicMastery =770,//whats the difference? + aaDoppelganger =773, + aaEnchancedForgetfulness =776, + aaMesmerizationMastery =781, + aaQuickMassGroupBuff =782, + aaSharedHealth =785, + aaElementalFury =790,//implemented as bonus + aaElementalAlacrity =795,//implemented as bonus + aaElementalAgility =800,//implemented as bonus + aaElementalDurability =803,//implemented as bonus + aaSinisterStrikes =806,//implemented as bonus + aaStrikethrough =807,//implemented as bonus + aaStonewall =810, + aaRapidStrikes =815,//implemented as bonus + aaKickMastery =820,//implemented as bonus + aaHightenedAwareness =823, + aaDestructiveForce =828,//DB + aaSwarmofDecay =831,//DB + aaDeathsFury =834, + aaQuickeningofDeath =839,//implemented as bonus + aaAdvancedTheftofLife =844,//implemented as bonus-focus + aaTripleBackstab =846,//implemented as bonus + aaHastenedPiety =849, + aaImmobilizingBash =852, + aaViciousSmash =855,//implemented as bonus + aaRadiantCure2 =860,//whats the difference? + aaPurification =863, + aaPrecisionofthePathfinder =864,//implemented as bonus + aaCoatofThistles =867, + aaFlamingArrows =872,//untested + aaFrostArrows =875,//untested + aaSeizedOpportunity =878, + aaTrapCircumvention =881, + aaImprovedHastyExit =886, + aaVirulentVenom =888, + aaImprovedConsumptionofSoul =893, + aaIntenseHatred =895, + aaAdvancedSpiritCall =900, + aaCalloftheAncients =902,//DB + aaSturdiness =907, + aaWarlordsTenacity =912,//implemented as effect + aaStrengthenedStrike =915,//implemented as bonus + aaExtendedShielding =918, + aaRosFlamingFamiliar =921,//DB + aaEcisIcyFamiliar =922,//DB + aaDruzzilsMysticalFamiliar =923,//DB + aaAdvancedFuryofMagicMastery =924,//added 9/29/08 + aaWardofDestruction =926,//DB + aaFrenziedDevastation =931,//DB + aaCombatFury2 =934,//implemented as bonus + aaCombatFury3 =937,//implemented as bonus + aaCombatFury4 =940,//implemented as bonus + aaFuryoftheAges2 =943,//implemented as bonus + aaFuryoftheAges3 =946,//implemented as bonus + aaFuryoftheAges4 =949,//implemented as bonus + aaPlanarDurability2 =952,//whats the difference? + aaInnateEnlightenment2 =955,//whats the difference? + aaDireCharm2 =960,//whats the difference? + aaDireCharm3 =961,//whats the difference? + aaTouchoftheDivine2 =962,//whats the difference? + aaTouchofDecay =967, + aaCalloftheAncients2 =970,//whats the difference? + aaImprovedVision =975, + aaEternalBreath =978,//handled by client + aaBlacksmithingMastery =979,//added 9/29/08 + aaBakingMastery =982,//added 9/29/08 + aaBrewingMastery =985,//added 9/29/08 + aaFletchingMastery2 =988,//added 9/29/08 + aaPotteryMastery =991,//added 9/29/08 + aaTailoringMastery =994,//added 9/29/08 + aaSalvage =997, + aaOrigin =1000,//spell + aaChaoticPotential =1001,//added + aaDiscordantDefiance =1006,//implemented as bonus + aaTrialsofMataMuram =1011, + aaMysticalAttuning =1021, + aaDelayDeath =1026,//implemented as bonus + aaHealthyAura =1031, + aaFitness =1036,//implemented as bonus + aaVeteransWrath =1041,//implemented as bonus [Different classes/values on each Veteran's Wrath] + aaVeteransWrath2 =1044,//implemented as bonus + aaVeteransWrath3 =1047,//implemented as bonus + aaVeteransWrath4 =1050,//implemented as bonus + aaDeathblow =1053,//implemented as bonus + aaReflexiveMastery =1061,//implemented as bonus + aaDefensiveInstincts =1066,//implemented as bonus + aaMnemonicRetention =1071,//Implemented + aaExpansiveMind =1072,//added 9/29/08 + aaSleightofHand =1077, + aaSleightofHand2 =1080,//whats the difference? + aaHealingAdeptMastery =1083, + aaHealingGiftMastery =1086, + aaArcaneTongues =1089, + aaMasterofDisguise =1092, + aaSlipperyAttacks =1093, + aaImprovedCriticalAffliction =1099, + aaFortifiedBellowing =1102, + aaFuryofMagic2 =1107,//whats the difference? + aaDanceofBlades =1110, + aaShieldofNotes =1116, + aaRoarofThunder =1119, + aaPersistentMinion =1122, + aaPerfectionofSpirit =1123, + aaReplentishCompanion =1126, + aaAdvancedPetDiscipline =1129, + aaThrowingMastery =1131,//implemented as bonus + aaBlurofAxes =1134,//implemented as bonus + aaHastenedWarCry =1137, + aaDeadAim =1140,//implemented as bonus + aaFrenziedDefense =1143,//*not implemented - duplicate + aaTirelessSprint =1146, + aaDesperation =1149, + aaUntamedRage =1150, + aaEchoingCries =1155, + aaViciousFrenzy =1158, + aaCrazedOnslaught =1163, + aaFrenziedDefense2 =1166,//implemented as bonus + aaOverwhelmingAttack =1172, + aaFuriousRage =1175, + aaBloodPact =1178, + aaShieldingResistance =1181,////implemented as bonus + aaHealingBoon =1186, + aaResplendentCure =1189, + aaCelestialHammer =1192, + aaDivineRetribution =1195, + aaCelestialRejuvination =1203, + aaFerventBenediction =1206, + aaSanctuary =1209, + aaDestructiveFury =1210,//implemented as bonus - added 9/29/08 + aaDestructiveFury2 =1213,//*not implemented [classes changed] - replaces id 1210 + aaBoonoftheForest =1222, + aaSpiritoftheGrove =1225, + aaCalloftheWild =1228, + aaSecondaryRecall =1229, + aaNaturesBounty =1230, + aaStasis =1233, + aaColorShock =1239, + aaMindOverMatter =1242, + aaSoothingWords =1245, + aaElementalSwarm =1248, + aaHeartofFlames =1251, + aaHeartofVapor =1252, + aaHeartofIce =1253, + aaHeartofStone =1254, + aaImitateDeath =1255, + aaCripplingStrike =1256, + aaStunningKick =1259, + aaEyeGouge =1262, + aaIronKicks =1265, + aaStyleoftheMimic =1268, + aaDeathPeace2 =1272,//whats the difference? + aaArmyoftheDead =1274, + aaCelestialStun =1277, + aaHandofDevotion =1278, + aaSteadfastWill =1284, + aaShieldBlock =1287,//implemented as bonus + aaScoutsEfficiency =1290,//implemented as bonus + aaGuardianoftheGlade =1293, + aaTrackingMastery =1296, + aaFlurryofKnives =1301,//implemented as bonus + aaPrecision =1304, + aaNervesofSteel =1307, + aaTouchoftheCursed =1313, + aaSpiritualCorrosion =1316, + aaSoulThief =1319,//implemented as bonus-focus + aaSpiritualChanneling =1323,//implemented as effect + aaBoonoftheAncients =1324, + aaAncestralAid =1327,//implemented as effect + aaResoluteDefiance =1330,//implemented as effect + aaPresstheAttack =1333, + aaMindCrash =1334, + aaProlongedDestruction =1337, + aaRosGreaterFamiliar =1340, + aaEcisGreaterFamiliar =1341, + aaDruzzilsGreaterFamiliar =1342, + aaTeleportBind =1343, + aaDevotedFamiliar =1344, + aaAuspiceoftheHunter =1345, + aaSavageSpirit =1348, + aaPresstheAttack2 =1351,//whats the difference? + aaCripplingStrike2 =1352,//whats the difference? + aaStunningKick2 =1353,//whats the difference? + aaEyeGouge2 =1358,//whats the difference? - aaGiftoftheDarkReign =1361,//from dbstr_us.txt - aaTenacityoftheDarkReign =1362,//from dbstr_us.txt - aaEmbraceoftheDarkReign =1363,//from dbstr_us.txt - aaPoweroftheDarkReign =1364,//from dbstr_us.txt - aaFervoroftheDarkReign =1365,//from dbstr_us.txt - aaGiftoftheKeepers =1366,//from dbstr_us.txt - aaValoroftheKeepers =1367,//from dbstr_us.txt - aaEmbraceoftheKeepers =1368,//from dbstr_us.txt - aaPoweroftheKeepers =1369,//from dbstr_us.txt - aaSanctityoftheKeepers =1370,//from dbstr_us.txt + aaGiftoftheDarkReign =1361,//from dbstr_us.txt + aaTenacityoftheDarkReign =1362,//from dbstr_us.txt + aaEmbraceoftheDarkReign =1363,//from dbstr_us.txt + aaPoweroftheDarkReign =1364,//from dbstr_us.txt + aaFervoroftheDarkReign =1365,//from dbstr_us.txt + aaGiftoftheKeepers =1366,//from dbstr_us.txt + aaValoroftheKeepers =1367,//from dbstr_us.txt + aaEmbraceoftheKeepers =1368,//from dbstr_us.txt + aaPoweroftheKeepers =1369,//from dbstr_us.txt + aaSanctityoftheKeepers =1370,//from dbstr_us.txt - aaLessonoftheDevoted =1371,//from dbstr_us.txt - aaInfusionoftheFaithful =1372,//from dbstr_us.txt - aaChaoticJester =1373,//from dbstr_us.txt - aaExpedientRecovery =1374,//from dbstr_us.txt - aaSteadfastServant =1375,//from dbstr_us.txt - aaStaunchRecovery =1376,//from dbstr_us.txt - aaIntensityoftheResolute =1377,//from dbstr_us.txt + aaLessonoftheDevoted =1371,//from dbstr_us.txt + aaInfusionoftheFaithful =1372,//from dbstr_us.txt + aaChaoticJester =1373,//from dbstr_us.txt + aaExpedientRecovery =1374,//from dbstr_us.txt + aaSteadfastServant =1375,//from dbstr_us.txt + aaStaunchRecovery =1376,//from dbstr_us.txt + aaIntensityoftheResolute =1377,//from dbstr_us.txt - aaCurseofBlood =1378,//from dbstr_us.txt - aaAfflictionofBlood =1379,//from dbstr_us.txt - aaTormentofBlood =1380,//from dbstr_us.txt - aaTemptationofBlood =1381,//from dbstr_us.txt - aaInvitationofBlood =1382,//from dbstr_us.txt + aaCurseofBlood =1378,//from dbstr_us.txt + aaAfflictionofBlood =1379,//from dbstr_us.txt + aaTormentofBlood =1380,//from dbstr_us.txt + aaTemptationofBlood =1381,//from dbstr_us.txt + aaInvitationofBlood =1382,//from dbstr_us.txt - aaTurnUndead2 =1383,//from dbstr_us.txt, Class AA changed in DoD - aaWrackUndead =1386,//from dbstr_us.txt, PoP Class AA changed in DoD - aaEradicateUndead =1387,//from dbstr_us.txt - aaInnateSeeInvis =1388,//implemented as bonus - aaProlongedMortality =1389,//from dbstr_us.txt - aaPrecognition =1394,//implemented as bonus - aaThickSkin =1399,//implemented as bonus - aaSilentCasting =1404,//from dbstr_us.txt - aaSilentCasting2 =1409,//from dbstr_us.txt - aaHastenedMindCrash =1414,//from dbstr_us.txt - aaFieldDressing =1417,//implemented as bonus - aaBandageWounds =1420,//implemented as bonus - aaCascadingRage =1425,//from dbstr_us.txt - aaElementalFerocity =1430,//from dbstr_us.txt - aaGiftofMana =1435,//implemented as bonus - aaRuneofShadows =1440,//from dbstr_us.txt - aaChannelingMastery =1445,//from dbstr_us.txt - aaConservation =1453,//from dbstr_us.txt - aaCryofBattle =1458,//from dbstr_us.txt - aaWardofPurity =1459,//from dbstr_us.txt - aaTurnSummoned2 =1462,//from dbstr_us.txt - aaWrackSummoned =1465,//from dbstr_us.txt - aaEradicateSummoned =1466,//from dbstr_us.txt - aaWardersSavagery =1467,//from dbstr_us.txt - aaShackleofSpirits =1470,//from dbstr_us.txt - aaHastenedThunder =1471,//from dbstr_us.txt - aaTranslocationalAnchor =1474,//from dbstr_us.txt - aaStealthyGetaway =1477,//from dbstr_us.txt - aaPyromancy =1478,//from dbstr_us.txt - aaMasteryofFury =1483,//from dbstr_us.txt - aaAbundantHealing =1486,//from dbstr_us.txt - aaGreaterAvatar =1491,//from dbstr_us.txt - aaSharedCamouflage =1494,//from dbstr_us.txt - aaConvergenceofSpirits =1495,//from dbstr_us.txt - aaNaturesGuardian =1498,//from dbstr_us.txt - aaEdictofCommand =1501,//from dbstr_us.txt - aaExtendedBurnout =1504,//from dbstr_us.txt - aaGuardianofRo =1507,//from dbstr_us.txt - aaBloodMagic =1510,//from dbstr_us.txt - aaGraverobbing =1511,//from dbstr_us.txt - aaAfflictionMastery =1514,//from dbstr_us.txt - aaGreaterRabidBear =1517,//from dbstr_us.txt - aaAncestralGuard =1520,//from dbstr_us.txt - aaCloakofLight =1523,//from dbstr_us.txt - aaVanquishUndead =1524,//from dbstr_us.txt - aaCloakofShadows =1527,//from dbstr_us.txt - aaWillfulDeath =1528,//from dbstr_us.txt - aaSwiftBlade =1533,//implemented as bonus - aaWickedBlade =1536,//implemented as bonus - aaForcedOpening =1539,//from dbstr_us.txt - aaAppraisal =1542,//from dbstr_us.txt - aaPreciseStrikes =1543,//from dbstr_us.txt - aaHastenedDeath =1546,//from dbstr_us.txt - aaUnflinchingResolve =1549,//from dbstr_us.txt - aaWeightlessSteps =1552,//from dbstr_us.txt - aaHastenedBlades =1555,//from dbstr_us.txt - aaImprovedHarmoniousAttack =1563,//from dbstr_us.txt - aaImprovedBestialFrenzy =1566,//from dbstr_us.txt - aaSongofStone =1569,//from dbstr_us.txt - aaDeepSleep =1572,//from dbstr_us.txt - aaCompanionsGift =1577,//from dbstr_us.txt - aaHastenedDefiance =1583,//implemented as redux - aaDauntlessPerseverance =1586,//implemented as bonus - aaConcentration =1587,//implemented as bonus - aaEnhancedAggression =1592,//from dbstr_us.txt - aaCallofChallenge =1597,//implemented as effect - aaCacophony =1598,//from dbstr_us.txt - aaImprovedHeadshot =1601,//from dbstr_us.txt - aaAnatomy =1604,//from dbstr_us.txt - aaFetterofSpirits =1607,//from dbstr_us.txt - aaTrickShot =1608,//from dbstr_us.txt - aaLightningStrikes =1616,//implemented as bonus - aaRelentlessAssault =1621,//implemented as bonus - aaKnightsExpertise =1624,//implemented as bonus - aaSelosEnduringCadence =1627,//implemented as bonus + aaTurnUndead2 =1383,//from dbstr_us.txt, Class AA changed in DoD + aaWrackUndead =1386,//from dbstr_us.txt, PoP Class AA changed in DoD + aaEradicateUndead =1387,//from dbstr_us.txt + aaInnateSeeInvis =1388,//implemented as bonus + aaProlongedMortality =1389,//from dbstr_us.txt + aaPrecognition =1394,//implemented as bonus + aaThickSkin =1399,//implemented as bonus + aaSilentCasting =1404,//from dbstr_us.txt + aaSilentCasting2 =1409,//from dbstr_us.txt + aaHastenedMindCrash =1414,//from dbstr_us.txt + aaFieldDressing =1417,//implemented as bonus + aaBandageWounds =1420,//implemented as bonus + aaCascadingRage =1425,//from dbstr_us.txt + aaElementalFerocity =1430,//from dbstr_us.txt + aaGiftofMana =1435,//implemented as bonus + aaRuneofShadows =1440,//from dbstr_us.txt + aaChannelingMastery =1445,//from dbstr_us.txt + aaConservation =1453,//from dbstr_us.txt + aaCryofBattle =1458,//from dbstr_us.txt + aaWardofPurity =1459,//from dbstr_us.txt + aaTurnSummoned2 =1462,//from dbstr_us.txt + aaWrackSummoned =1465,//from dbstr_us.txt + aaEradicateSummoned =1466,//from dbstr_us.txt + aaWardersSavagery =1467,//from dbstr_us.txt + aaShackleofSpirits =1470,//from dbstr_us.txt + aaHastenedThunder =1471,//from dbstr_us.txt + aaTranslocationalAnchor =1474,//from dbstr_us.txt + aaStealthyGetaway =1477,//from dbstr_us.txt + aaPyromancy =1478,//from dbstr_us.txt + aaMasteryofFury =1483,//from dbstr_us.txt + aaAbundantHealing =1486,//from dbstr_us.txt + aaGreaterAvatar =1491,//from dbstr_us.txt + aaSharedCamouflage =1494,//from dbstr_us.txt + aaConvergenceofSpirits =1495,//from dbstr_us.txt + aaNaturesGuardian =1498,//from dbstr_us.txt + aaEdictofCommand =1501,//from dbstr_us.txt + aaExtendedBurnout =1504,//from dbstr_us.txt + aaGuardianofRo =1507,//from dbstr_us.txt + aaBloodMagic =1510,//from dbstr_us.txt + aaGraverobbing =1511,//from dbstr_us.txt + aaAfflictionMastery =1514,//from dbstr_us.txt + aaGreaterRabidBear =1517,//from dbstr_us.txt + aaAncestralGuard =1520,//from dbstr_us.txt + aaCloakofLight =1523,//from dbstr_us.txt + aaVanquishUndead =1524,//from dbstr_us.txt + aaCloakofShadows =1527,//from dbstr_us.txt + aaWillfulDeath =1528,//from dbstr_us.txt + aaSwiftBlade =1533,//implemented as bonus + aaWickedBlade =1536,//implemented as bonus + aaForcedOpening =1539,//from dbstr_us.txt + aaAppraisal =1542,//from dbstr_us.txt + aaPreciseStrikes =1543,//from dbstr_us.txt + aaHastenedDeath =1546,//from dbstr_us.txt + aaUnflinchingResolve =1549,//from dbstr_us.txt + aaWeightlessSteps =1552,//from dbstr_us.txt + aaHastenedBlades =1555,//from dbstr_us.txt + aaImprovedHarmoniousAttack =1563,//from dbstr_us.txt + aaImprovedBestialFrenzy =1566,//from dbstr_us.txt + aaSongofStone =1569,//from dbstr_us.txt + aaDeepSleep =1572,//from dbstr_us.txt + aaCompanionsGift =1577,//from dbstr_us.txt + aaHastenedDefiance =1583,//implemented as redux + aaDauntlessPerseverance =1586,//implemented as bonus + aaConcentration =1587,//implemented as bonus + aaEnhancedAggression =1592,//from dbstr_us.txt + aaCallofChallenge =1597,//implemented as effect + aaCacophony =1598,//from dbstr_us.txt + aaImprovedHeadshot =1601,//from dbstr_us.txt + aaAnatomy =1604,//from dbstr_us.txt + aaFetterofSpirits =1607,//from dbstr_us.txt + aaTrickShot =1608,//from dbstr_us.txt + aaLightningStrikes =1616,//implemented as bonus + aaRelentlessAssault =1621,//implemented as bonus + aaKnightsExpertise =1624,//implemented as bonus + aaSelosEnduringCadence =1627,//implemented as bonus - aaThroneofHeroes =4655, - aaTinkeringMastery =4672, - aaCombatMedic =4688,//implemented as bonus - aaQuickDraw =4698, - aaBattleReady =4699, - aaGlyphofDragonScales =4702,//implemented as effect - aaGlyphofArcaneSecrets =4704,//implemented as effect - aaGlyphofDraconicPotential =4705,//implemented as effect - aaGlyphofDestruction =4706,//implemented as effect - aaKillingSpree =4739,//implemented as effect - aaHoldtheLine =4742, - aaBloodTithe =4761, - aaSleightofHand3 =4767, - aaGiftofRadiantMana =4773, - aaSavageAssault =4795,//Flurry - aaOverbear =4798, - aaHastenedMend =4801, - aaPrecisionofAxes =4809, - aaDeathMask =4819, - aaGrapplingStrike =4836, - aaShieldSpecialist =4844, - aaMarkoftheMageHunter =4849, - aaHamstring =4850, - aaUncannyResilience =4854, + aaThroneofHeroes =4655, + aaTinkeringMastery =4672, + aaCombatMedic =4688,//implemented as bonus + aaQuickDraw =4698, + aaBattleReady =4699, + aaGlyphofDragonScales =4702,//implemented as effect + aaGlyphofArcaneSecrets =4704,//implemented as effect + aaGlyphofDraconicPotential =4705,//implemented as effect + aaGlyphofDestruction =4706,//implemented as effect + aaKillingSpree =4739,//implemented as effect + aaHoldtheLine =4742, + aaBloodTithe =4761, + aaSleightofHand3 =4767, + aaGiftofRadiantMana =4773, + aaSavageAssault =4795,//Flurry + aaOverbear =4798, + aaHastenedMend =4801, + aaPrecisionofAxes =4809, + aaDeathMask =4819, + aaGrapplingStrike =4836, + aaShieldSpecialist =4844, + aaMarkoftheMageHunter =4849, + aaHamstring =4850, + aaUncannyResilience =4854, - aaBlindingFury =4857, - aaBattleLeap =4860, - aaSoulSeeker =4861, - aaHolyLight =4880, - aaSurreality =4887, - aaManaDraw =4890, - aaNightmareStasis =4894, - aaFireCore =4903, - aaVaporCore =4906, - aaIceCore =4909, - aaStoneCore =4912, - aaVolatileManaBlaze =4915, - aaGreaterBloodTithe =4924, - aaGatheringDusk =4927, - aaVeilofMindshadow =4931, - aaSanguineMindCrystal =4934, - aaAzureMindCrystal =4935, - aaArcaneWhisper =4938, - aaDimensionalInstability =4943, - aaCryomancy =4944, - aaSurvivalist =5000, - aaProtectionoftheSpiritWolf =5007, - aaTasteofBlood =5015, - aaHymnoftheLastStand =5017, - aaBladedSong =5020, - aaTwistedShank =5021, - aaDirtyFighting =5022, - aaLigamentSlice =5025, - aaTumble =5028, - aaSiphonSoul =5032, - aaUnflinchingWill =5035, - aaPetrifiedRoots =5061, - aaHastenedSanctuary =5083, - aaMortalCoil =5085, - aaArmoroftheInquisitor =5095, - aaHandofDisruption =5098, - aaSpiritoftheWhiteWolf =5105, - aaPactoftheWolf =5109, - aaDoppelgangersBeckon =5127, - aaBreathofAtathus =5150, - aaBreathofDratonra =5165, - aaBreathofOshvir =5180, - aaBreathofVenesh =5195, - aaBreathofMysaphar =5210, - aaBreathofKeikolin =5225, - aaHuntersFury =5248, - aaUnionofSpirits =5251, - aaShieldBlock2 =5263, - aaDeathsWrath =5264, - aaSummonersBeckon =5269, - aaShiftingElements =5276, - aaArcaneOverkill =5295, - aaFuneralDirge =5298, - aaFierceEye =5717, - aaPreciseBlow =5776, - aaForceofDisruption =5984, - aaPunchMastery =6020, - aaHastenedDestructiveForce =6023, - aaCompanionsDurability =6051, - aaGeneralSturdiness =6119, - aaRapidDefiance =6136, - aaPactoftheWurine =6218, - aaProtectionofDirewood =6232, - aaEnhancedDamageShield =6257, - aaArcomancy =6290, - aaBlessingofResurrection =6299, - aaRakesDeadlyAim =6322, - aaRoguesFury =6325, - aaEnvenomedBlades =6328, - aaCompanionofNecessity =6333, - aaRakesPowerfulAim =6334, - aaHastenedCacophony =6337, - aaHastenedFuneralDirge =6340, - aaMastersHastenedCombination =6343, - aaHastenedSilentCasting =6346, - aaHastenedSilentCasting2 =6349, - aaHastenedTrueshot =6355, - aaOutridersAccuracy =6370, - aaDestructiveCascade =6375, - aaCompanionsRelocation =6379, - aaFocusedParagonofSpirits =6380, - aaCompanionsAgility =6383, - aaMaestrosConcentration =6386, - aaBlessingofLife =6395, - aaPlanarDurability3 =6422, - aaHolyRoot =6436, - aaHastenedRoarofThunder =6442, - aaQuickenedSuspendMinion =6445, - aaQuickenedSummonAxes =6452, - aaCallHither =6455, - aaFortifiedSurvival =6458, - aaFortifiedIntervention =6461, - aaPlanarDurability4 =6467, - aaFuriousLeap =6499, - aaQuickenedHarvestofDruzzil =6503, - aaChatteringBones =6508, - aaWarlordsDeadlyAim =6511, - aaQuickenedCalloftheWild =6514, - aaGiftofExquisiteRadiantMana =6517, - aaHastenedOrigin =6528, - aaDirgeoftheSleepwalker =6533, - aaQuickTime =6534, - aaSteadyHands =6535, - aaSelosSonata =6536, - aaCompanionsBlessing =6537, - aaHastenedBestialAlignment =6538, - aaFortifyCompanion =6539, - aaBurstofPower =6540, - aaPactoftheWurine2 =6541, - aaRecklessAbandon =6542, - aaGiftofResurrection =6543, - aaTouchoftheDivine3 =6544, - aaHastenedCalloftheWild =6545, - aaHuntersAttackPower =6546, - aaHastenedExodus2 =6547, - aaClingingRoot =6548, - aaVielofInvisibility =6549, - aaCriticalAffliction2 =6550, - aaLessenedPresence =6551, - aaManaOverburn =6552, - aaHostoftheElements2 =6553, - aaEnhancedDamageShield2 =6554, - aaHastenedPurifyBody =6555, - aaWrathofLife =6556, - aaKnightsReturnStrike =6557, - aaHuntersReturnKick =6558, - aaHastenedLigamentSlice =6559, - aaKnavesReturnStrike =6560, - aaStormStrike =6561, - aaSilentPresence =6562, - aaTurgursSwarm =6563, - aaInfusedbyRage =6564, - aaGutPunch =6565, - aaWarlordsReturnKick =6566, - aaArcomancy2 =6567, - aaCallofXuzl2 =6568, - aaBETAONLYDestructiveForceTest =6600, - aaRecourseofLife =6601, - aaVehementRage =6607, - aaKneeStrike =6610, - aaHastenedFortitudeDiscipline =6611, - aaHastenedFuriousDiscipline =6614, - aaWarlordsBravery =6617, - aaDeathsRevenge =6630, - aaHarmshield =6635, - aaDestructiveFury3 =6636, - aaVoiceofThule =6639, - aaExplosionofHatred =6640, - aaCascadingTheftofLife =6641, - aaHateStep =6644, - aaViciousBiteofChaos =6645, - aaEncroachingDarkness =6646, - aaSleightofHand4 =6663, - aaEnduringVision =6664, - aaEnduringVision2 =6666, + aaBlindingFury =4857, + aaBattleLeap =4860, + aaSoulSeeker =4861, + aaHolyLight =4880, + aaSurreality =4887, + aaManaDraw =4890, + aaNightmareStasis =4894, + aaFireCore =4903, + aaVaporCore =4906, + aaIceCore =4909, + aaStoneCore =4912, + aaVolatileManaBlaze =4915, + aaGreaterBloodTithe =4924, + aaGatheringDusk =4927, + aaVeilofMindshadow =4931, + aaSanguineMindCrystal =4934, + aaAzureMindCrystal =4935, + aaArcaneWhisper =4938, + aaDimensionalInstability =4943, + aaCryomancy =4944, + aaSurvivalist =5000, + aaProtectionoftheSpiritWolf =5007, + aaTasteofBlood =5015, + aaHymnoftheLastStand =5017, + aaBladedSong =5020, + aaTwistedShank =5021, + aaDirtyFighting =5022, + aaLigamentSlice =5025, + aaTumble =5028, + aaSiphonSoul =5032, + aaUnflinchingWill =5035, + aaPetrifiedRoots =5061, + aaHastenedSanctuary =5083, + aaMortalCoil =5085, + aaArmoroftheInquisitor =5095, + aaHandofDisruption =5098, + aaSpiritoftheWhiteWolf =5105, + aaPactoftheWolf =5109, + aaDoppelgangersBeckon =5127, + aaBreathofAtathus =5150, + aaBreathofDratonra =5165, + aaBreathofOshvir =5180, + aaBreathofVenesh =5195, + aaBreathofMysaphar =5210, + aaBreathofKeikolin =5225, + aaHuntersFury =5248, + aaUnionofSpirits =5251, + aaShieldBlock2 =5263, + aaDeathsWrath =5264, + aaSummonersBeckon =5269, + aaShiftingElements =5276, + aaArcaneOverkill =5295, + aaFuneralDirge =5298, + aaFierceEye =5717, + aaPreciseBlow =5776, + aaForceofDisruption =5984, + aaPunchMastery =6020, + aaHastenedDestructiveForce =6023, + aaCompanionsDurability =6051, + aaGeneralSturdiness =6119, + aaRapidDefiance =6136, + aaPactoftheWurine =6218, + aaProtectionofDirewood =6232, + aaEnhancedDamageShield =6257, + aaArcomancy =6290, + aaBlessingofResurrection =6299, + aaRakesDeadlyAim =6322, + aaRoguesFury =6325, + aaEnvenomedBlades =6328, + aaCompanionofNecessity =6333, + aaRakesPowerfulAim =6334, + aaHastenedCacophony =6337, + aaHastenedFuneralDirge =6340, + aaMastersHastenedCombination =6343, + aaHastenedSilentCasting =6346, + aaHastenedSilentCasting2 =6349, + aaHastenedTrueshot =6355, + aaOutridersAccuracy =6370, + aaDestructiveCascade =6375, + aaCompanionsRelocation =6379, + aaFocusedParagonofSpirits =6380, + aaCompanionsAgility =6383, + aaMaestrosConcentration =6386, + aaBlessingofLife =6395, + aaPlanarDurability3 =6422, + aaHolyRoot =6436, + aaHastenedRoarofThunder =6442, + aaQuickenedSuspendMinion =6445, + aaQuickenedSummonAxes =6452, + aaCallHither =6455, + aaFortifiedSurvival =6458, + aaFortifiedIntervention =6461, + aaPlanarDurability4 =6467, + aaFuriousLeap =6499, + aaQuickenedHarvestofDruzzil =6503, + aaChatteringBones =6508, + aaWarlordsDeadlyAim =6511, + aaQuickenedCalloftheWild =6514, + aaGiftofExquisiteRadiantMana =6517, + aaHastenedOrigin =6528, + aaDirgeoftheSleepwalker =6533, + aaQuickTime =6534, + aaSteadyHands =6535, + aaSelosSonata =6536, + aaCompanionsBlessing =6537, + aaHastenedBestialAlignment =6538, + aaFortifyCompanion =6539, + aaBurstofPower =6540, + aaPactoftheWurine2 =6541, + aaRecklessAbandon =6542, + aaGiftofResurrection =6543, + aaTouchoftheDivine3 =6544, + aaHastenedCalloftheWild =6545, + aaHuntersAttackPower =6546, + aaHastenedExodus2 =6547, + aaClingingRoot =6548, + aaVielofInvisibility =6549, + aaCriticalAffliction2 =6550, + aaLessenedPresence =6551, + aaManaOverburn =6552, + aaHostoftheElements2 =6553, + aaEnhancedDamageShield2 =6554, + aaHastenedPurifyBody =6555, + aaWrathofLife =6556, + aaKnightsReturnStrike =6557, + aaHuntersReturnKick =6558, + aaHastenedLigamentSlice =6559, + aaKnavesReturnStrike =6560, + aaStormStrike =6561, + aaSilentPresence =6562, + aaTurgursSwarm =6563, + aaInfusedbyRage =6564, + aaGutPunch =6565, + aaWarlordsReturnKick =6566, + aaArcomancy2 =6567, + aaCallofXuzl2 =6568, + aaBETAONLYDestructiveForceTest =6600, + aaRecourseofLife =6601, + aaVehementRage =6607, + aaKneeStrike =6610, + aaHastenedFortitudeDiscipline =6611, + aaHastenedFuriousDiscipline =6614, + aaWarlordsBravery =6617, + aaDeathsRevenge =6630, + aaHarmshield =6635, + aaDestructiveFury3 =6636, + aaVoiceofThule =6639, + aaExplosionofHatred =6640, + aaCascadingTheftofLife =6641, + aaHateStep =6644, + aaViciousBiteofChaos =6645, + aaEncroachingDarkness =6646, + aaSleightofHand4 =6663, + aaEnduringVision =6664, + aaEnduringVision2 =6666, - aaCunningDisguiseHuman =6671, - aaCunningDisguiseHalfElf =6672, - aaCunningDisguiseBarbarian =6673, - aaCunningDisguiseErudite =6674, - aaCunningDisguiseTroll =6675, - aaCunningDisguiseGoblin =6676, - aaQuickCannibalize =6690, - aaTigirsInsectSwarm =6691, - aaDampenResistance =6692, - aaHastenedDampenResistance =6697, - aaHastenedDampenResistance2 =6698, - aaSpiritWalk =6702, - aaHastenedVirulentParalysis =6703, - aaLanguidBite =6706, - aaQuickenedBloodofNadox =6709, - aaHastenedSpiritCall =6712, - aaHarmoniousArrow =6750, - aaHastenedWeaponShield =6751, - aaOutridersAttack =6754, - aaGroupGuardianoftheForest =6755, - aaPackHunt =6758, - aaKeenBlade =6761, - aaOutridersEvasion =6764, - aaRangedFinesse =6765, - aaGroupCloakofLight =6790, - aaHealingLight =6791, - aaHalttheDead =6794, - aaDirectedForceofDisruption =6795, - aaRiseofBones =6815, - aaWhisperwind =6818, - aaHastenedBloodMagic =6819, - aaOverpowerUndead =6822, - aaHastenedSwarmofDecay =6823, - aaGiftoftheGrave =6828, - aaHastenedSongofStone =6870, - aaStompingLeap =6930, - aaJuggernautSurge =6931, - aaDistractionAttack =6932, - aaHastenedSavageSpirit =6935, - aaDyingBlow =6938, - aaHastenedDistractionAttack =6941, - aaNaturalInvisibility =6970, - aaAttackoftheWarders =6971, - aaHastenedFeralAttacks =6974, - aaHastenedFocusedParagon =6977, - aaHastenedParagon =6980, - aaGroupBestialAlignment =6983, - aaBiteoftheAsp =6984, - aaRavensClaw =6985, - aaGorillaSmash =6986, - aaAuroriaMastery =6987, - aaHastenedGetaway =7005, - aaForaging =7062, - aaPerfectedInvisibility =7069, - aaHastenedDivineAvatar =7100, - aaHastenedPurification2 =7103, - aaBeastlordsFeralKick =7106, - aaGiftofAmazingExquisiteRadiantMana =7621, - aaHastenedWrathoftheWild =7664, - aaGroupShrink =7669, - aaEnchantDwerium =7732, - aaMassEnchantDwerium =7734, - aaEnchantPalladium =7735, - aaEnchantPalladiumTrio =7736, - aaMassEnchantPalladium =7737, - aaGreaterMassEnchantPalladium =7738, - aaEnchantTemporite =7739, - aaMassEnchantTemporite =7740, + aaCunningDisguiseHuman =6671, + aaCunningDisguiseHalfElf =6672, + aaCunningDisguiseBarbarian =6673, + aaCunningDisguiseErudite =6674, + aaCunningDisguiseTroll =6675, + aaCunningDisguiseGoblin =6676, + aaQuickCannibalize =6690, + aaTigirsInsectSwarm =6691, + aaDampenResistance =6692, + aaHastenedDampenResistance =6697, + aaHastenedDampenResistance2 =6698, + aaSpiritWalk =6702, + aaHastenedVirulentParalysis =6703, + aaLanguidBite =6706, + aaQuickenedBloodofNadox =6709, + aaHastenedSpiritCall =6712, + aaHarmoniousArrow =6750, + aaHastenedWeaponShield =6751, + aaOutridersAttack =6754, + aaGroupGuardianoftheForest =6755, + aaPackHunt =6758, + aaKeenBlade =6761, + aaOutridersEvasion =6764, + aaRangedFinesse =6765, + aaGroupCloakofLight =6790, + aaHealingLight =6791, + aaHalttheDead =6794, + aaDirectedForceofDisruption =6795, + aaRiseofBones =6815, + aaWhisperwind =6818, + aaHastenedBloodMagic =6819, + aaOverpowerUndead =6822, + aaHastenedSwarmofDecay =6823, + aaGiftoftheGrave =6828, + aaHastenedSongofStone =6870, + aaStompingLeap =6930, + aaJuggernautSurge =6931, + aaDistractionAttack =6932, + aaHastenedSavageSpirit =6935, + aaDyingBlow =6938, + aaHastenedDistractionAttack =6941, + aaNaturalInvisibility =6970, + aaAttackoftheWarders =6971, + aaHastenedFeralAttacks =6974, + aaHastenedFocusedParagon =6977, + aaHastenedParagon =6980, + aaGroupBestialAlignment =6983, + aaBiteoftheAsp =6984, + aaRavensClaw =6985, + aaGorillaSmash =6986, + aaAuroriaMastery =6987, + aaHastenedGetaway =7005, + aaForaging =7062, + aaPerfectedInvisibility =7069, + aaHastenedDivineAvatar =7100, + aaHastenedPurification2 =7103, + aaBeastlordsFeralKick =7106, + aaGiftofAmazingExquisiteRadiantMana =7621, + aaHastenedWrathoftheWild =7664, + aaGroupShrink =7669, + aaEnchantDwerium =7732, + aaMassEnchantDwerium =7734, + aaEnchantPalladium =7735, + aaEnchantPalladiumTrio =7736, + aaMassEnchantPalladium =7737, + aaGreaterMassEnchantPalladium =7738, + aaEnchantTemporite =7739, + aaMassEnchantTemporite =7740, - aaLayonHandsRank16 =7866, //Duplicate ID with aaExtendedAstralProjection! + aaLayonHandsRank16 =7866, //Duplicate ID with aaExtendedAstralProjection! - aaHarmTouch =7800,//First 10 AA cost 0 per rank - aaHarmToch2 =7810,//Next 6+ AA cost 3 +1inc per rank - aaLayonHands =7850,//First 10 AA cost 0 per rank - aaLayonHands2 =7860,//Next 6+ AA cost 3 +1inc per rank - //aaExtendedAstralProjection =7866, - aaNeshikasBlink =7869, - aaZanFisWhistle =7872, - aaFivePointPalm =7875, - aaTheftofEssence =7900, - aaMalosinete =7903, - aaHastenedTurnUndead =7940, - aaCascadingDivineAura =7943, - aaGroupPurifySoul =7944, - aaQuickenedRenewal =7945, - aaSanctifiedBlessing =7948, - aaFocusedCelestialRegeneration =7951, - aaMasteryofNature =7980, - aaHastenedNaturesGuardian =7983, - aaSpiritoftheBlackWolf =7986, - aaHastenedLycanSoul =7989, - aaSelfStasis =8030, - aaHastenedVeilofMindshadow =8031, - aaPhantasmalOpponent =8034, - aaHastenedEdictofCommand =8035, - aaFogofMemories =8038, - aaBiteofTashani =8039, - aaExtendedIngenuity =8040, - aaFuryofDruzzil =8060, - aaFuryofEci =8063, - aaFuryofRo =8066, - aaFortifiedEntanglement =8069, - aaForceofWill =8072, - aaAtolsShackles =8075, - aaHastenedManaburn =8076, - aaHastenedCallofXuzl =8082, - aaCompanionsAlacrity =8190, - aaImprovedIntimidation =8193, - aaPerfectedLevitation =8194, - aaHastenedFortifyCompanion =8195, - aaEmpoweredIngenuity =8198, - aaCompanionsFury =8201, - aaQuickenedRadiantCure =8204, - aaQuickenedRadiantCure2 =8207, - aaMentalStamina =8210, - aaHardyEndurance =8215, - aaGroupPerfectInvisibility =8220, - aaFocusofArcanum =8221, - aaGroupPerfectedInvisibilitytoUndead =8222, - aaSpellCastingReinforcementMastery2 =8223, - aaCascadeofLife =8224, - aaSummonCompanion =8227, - aaMentalFortitude =8228, - aaGate =8231, - aaExtendedIngenuity2 =8232, - aaArmorofWisdom1 =8235, - aaArmorofWisdom2 =8240, - aaArmorofWisdom3 =8245, - aaArmorofWisdom4 =8250, - aaArmorofWisdom5 =8255, + aaHarmTouch =7800,//First 10 AA cost 0 per rank + aaHarmToch2 =7810,//Next 6+ AA cost 3 +1inc per rank + aaLayonHands =7850,//First 10 AA cost 0 per rank + aaLayonHands2 =7860,//Next 6+ AA cost 3 +1inc per rank + //aaExtendedAstralProjection =7866, + aaNeshikasBlink =7869, + aaZanFisWhistle =7872, + aaFivePointPalm =7875, + aaTheftofEssence =7900, + aaMalosinete =7903, + aaHastenedTurnUndead =7940, + aaCascadingDivineAura =7943, + aaGroupPurifySoul =7944, + aaQuickenedRenewal =7945, + aaSanctifiedBlessing =7948, + aaFocusedCelestialRegeneration =7951, + aaMasteryofNature =7980, + aaHastenedNaturesGuardian =7983, + aaSpiritoftheBlackWolf =7986, + aaHastenedLycanSoul =7989, + aaSelfStasis =8030, + aaHastenedVeilofMindshadow =8031, + aaPhantasmalOpponent =8034, + aaHastenedEdictofCommand =8035, + aaFogofMemories =8038, + aaBiteofTashani =8039, + aaExtendedIngenuity =8040, + aaFuryofDruzzil =8060, + aaFuryofEci =8063, + aaFuryofRo =8066, + aaFortifiedEntanglement =8069, + aaForceofWill =8072, + aaAtolsShackles =8075, + aaHastenedManaburn =8076, + aaHastenedCallofXuzl =8082, + aaCompanionsAlacrity =8190, + aaImprovedIntimidation =8193, + aaPerfectedLevitation =8194, + aaHastenedFortifyCompanion =8195, + aaEmpoweredIngenuity =8198, + aaCompanionsFury =8201, + aaQuickenedRadiantCure =8204, + aaQuickenedRadiantCure2 =8207, + aaMentalStamina =8210, + aaHardyEndurance =8215, + aaGroupPerfectInvisibility =8220, + aaFocusofArcanum =8221, + aaGroupPerfectedInvisibilitytoUndead =8222, + aaSpellCastingReinforcementMastery2 =8223, + aaCascadeofLife =8224, + aaSummonCompanion =8227, + aaMentalFortitude =8228, + aaGate =8231, + aaExtendedIngenuity2 =8232, + aaArmorofWisdom1 =8235, + aaArmorofWisdom2 =8240, + aaArmorofWisdom3 =8245, + aaArmorofWisdom4 =8250, + aaArmorofWisdom5 =8255, - aaSpellCastingReinforcementArtistry =8262, - aaEarthenBrawn =8263, - aaEarthenStability =8268, - aaEarthenAlacrity =8273, - aaEarthenArtistry =8278, - aaEarthenSagacity =8283, - aaEarthenBrilliance =8288, - aaEarthenAllure =8293, - aaResplendentGlory =8300, - aaRageofRallosZek =8303, - aaEnhancedAreaTaunt =8312, - aaFluidMarch =8314, - aaHastenedSelosKick =8317, - aaHastenedBellow =8319, - aaBelltoneMind =8322, - aaSubtleBlows =8325, - aaLitheBody =8330, - aaEnhancedThiefsEyes =8331, - aaExtendedLanguidBite =8332, - aaQuickenedMalosinete =8335, - aaDrapeofShadows =8341, - aaHostintheShell =8342, - aaHastenedManaDraw =8347, - aaHastenedMezmerization =8350, - aaDreamlikeMight =8351, - aaDreamlikeFortitude =8361, - aaDreamlikeSwiftness =8371, - aaDreamlikeCunning =8381, - aaDreamlikeSapience =8391, - aaArmorRend =8400, - aaFundamentofIntellect =9100, - aaSongwriting =9101, - aaFundamentofIntellect2 =9109, - aaHybridResearch =9111, - aaFundamentofIntellect3 =9118, - aaWrittenPrayer =9121, - aaFundamentofIntellect4 =9127, - aaFundamentofWisdom =9136, - aaFundamentofWisdom2 =9145, - aaFundamentofWisdom3 =9154, - aaFundamentofPower =9163, - aaFundamentofPower2 =9172, - aaFundamentofPower3 =9181, - aaFundamentofPower4 =9190, - aaFundamentofPower5 =9199, - aaFundamentofCombat =9208, - aaFundamentofCombat2 =9217, - aaFundamentofCombat3 =9226, - aaFundamentofCombat4 =9235, - aaFundamentFirstSpireofArcanum =9300, - aaFundamentSecondSpireofArcanum =9303, - aaFundamentThirdSpireofArcanum =9306, - aaFundamentFirstSpireoftheSensei =9309, - aaFundamentSecondSpireoftheSensei =9312, - aaFundamentThirdSpireoftheSensei =9315, - aaFundamentFirstSpireoftheElements =9318, - aaFundamentSecondSpireoftheElements =9321, - aaFundamentThirdSpireoftheElements =9324, - aaFundamentFirstSpireofEnchantment =9327, - aaFundamentSecondSpireofEnchantment =9330, - aaFundamentThirdSpireofEnchantment =9333, - aaFundamentFirstSpireofNecromancy =9336, - aaFundamentSecondSpireofNecromancy =9339, - aaFundamentThirdSpireofNecromancy =9342, - aaFundamentFirstSpireoftheWarlord =9345, - aaFundamentSecondSpireoftheWarlord =9348, - aaFundamentThirdSpireoftheWarlord =9351, - aaFundamentFirstSpireoftheRake =9354, - aaFundamentSecondSpireoftheRake =9357, - aaFundamentThirdSpireoftheRake =9360, - aaFundamentFirstSpireoftheMinstrels =9363, - aaFundamentSecondSpireoftheMinstrels =9366, - aaFundamentThirdSpireoftheMinstrels =9369, - aaFundamentFirstSpireoftheSavageLord =9372, - aaFundamentSecondSpireoftheSavageLord =9375, - aaFundamentThirdSpireoftheSavageLord =9378, - aaFundamentFirstSpireofHoliness =9381, - aaFundamentSecondSpireofHoliness =9384, - aaFundamentThirdSpireofHoliness =9387, - aaFundamentFirstSpireoftheReavers =9390, - aaFundamentSecondSpireoftheReavers =9393, - aaFundamentThirdSpireoftheReavers =9396, - aaFundamentFirstSpireofthePathfinders =9399, - aaFundamentSecondSpireofthePathfinders =9402, - aaFundamentThirdSpireofthePathfinders =9405, - aaFundamentFirstSpireofDivinity =9408, - aaFundamentSecondSpireofDivinity =9411, - aaFundamentThirdSpireofDivinity =9414, - aaFundamentFirstSpireofNature =9417, - aaFundamentSecondSpireofNature =9420, - aaFundamentThirdSpireofNature =9423, - aaFundamentFirstSpireofAncestors =9426, - aaFundamentSecondSpireofAncestors =9429, - aaFundamentThirdSpireofAncestors =9432, - aaFundamentFirstSpireofSavagery =9435, - aaFundamentSecondSpireofSavagery =9438, - aaFundamentThirdSpireofSavagery =9441, - aaHastenedDirgeoftheSleepwalker =10329, - aaVaingloriousShout =10330, - aaLyreLeap =10331, - aaDominationMastery =10332, - aaLyricalPrankster =10333, - aaSelosKick =10336, - aaATuneStuckInYourHead =10339, - aaStonefoot =10340, - aaHastenedStunningKick =10343, - aaInfusionofThunder =10346, - aaChainsofPurity =10348, - aaProjectionofFury =10351, - aaProjectionofDoom =10352, - aaProjectionofPiety =10353, - aaGiftofLife =10354, - aaBlessingofLight =10355, - aaHastenedDivineIntervention =10358, - aaImprovedAtone =10364, - aaAgelessEnmity =10367, - aaCoverTracks =10368, - aaSpellCastingSubtlety3 =10370, - aaImprovedNaturalInvisibility =10373, - aaProtectionoftheWarder =10374, - aaNaturesSalve =10377, - aaFocusofAnimus =10380, - aaImbuedFerocity =10387, - aaNaturesReprieve =10388, - aaExtendedTrickery =10389, - aaAgelessEnmity2 =10392, - aaShacklesofTunare =10393, - aaBeaconoftheRighteous =10394, - aaBobbingCorpse =10395, - aaGroupSpiritoftheWhiteWolf =10396, - aaGroupSpiritoftheBlackWolf =10397, - aaSelfPreservation =10400, - aaHastenedFrenzy =10401, - aaExtendedHavoc =10404, - aaHastenedDeflectionDiscipline =10405, - aaRogueTripleAttackSkillupTest =10410, - aaHastenedHostoftheElements =10413, - aaEnhancedWallofWind =10421, - aaHandofRo =10424, - aaFixationofRo =10425, - aaPeacefulSpiritoftheWood =10426, - aaPeacefulConvergenceofSpirits =10427, - aaQuickenedArmyoftheDead =10434, - aaHealingFrenzy =10450, - aaOverpoweringStrikes =10453, - aaQuickenedBlessingofRessurection =10456, - aaHastenedAtonement =10459, - aaImprovedSanctuary =10462, - aaBlessingofSanctuary =10463, - aaHastenedCelestialHammer =10464, - aaQuickenedTurnUndead =10470, - aaSpiritofEagle =10500, - aaFlightofEagles =10501, - aaEgress =10502, - aaSpiritsofNature =10503, - aaWallofWind =10506, - aaHastenedSpiritoftheWood =10511, - aaHastenedConvergenceofSpirits =10514, - aaHastenedProjectionofFury =10519, - aaHastenedGutPunch =10522, - aaHastenedFirstSpireoftheWarlord =10527, - aaHastenedSecondSpireoftheWarlord =10532, - aaHastenedThirdSpireoftheWarlord =10537, - aaWillingCovenant =10542, - aaWarlordsResurgence =10545, - aaWarlordsFury =10546, - aaSurgeoftheVanquisher =10547, - aaImprovedShieldSpecialist =10548, - aaBeamofSlumber =10550, - aaPhantasmicReflex =10551, - aaHastenedSelfStasis =10558, - aaForcefulBanishment =10561, - aaHastenedBlastofAnger =10579, - aaHastenedFuriousLeap =10582, - aaHastenedGrapplingStrike =10588, - aaForceofElements =10600, - aaAspectofZomm =10601, - aaExtendedSharedHealth =10610, - aaFuriousRefrain =10627, - aaAgileFeet =10650, - aaHastenedDefensivePoses =10653, - aaExtendedImpenetrableDiscipline =10656, - aaHastenedDestructiveForce2 =10657, - aaMendingofBodyandSoul =10666, - aaLevant =10700, - aaReluctantBenevolence =10701, - aaValorousRage =10711, - aaHastenedGroupGuardianoftheForest =10714, - aaHastenedOutridersAttack =10719, - aaHastenedProtectionoftheSpiritWolf =10722, - aaHastenedImbuedFerocity =10727, - aaHastenedHarmoniousArrow =10730, - aaHastenedEntrap =10733, - aaPoisonArrows =10736, - aaBestowDivineAura2 =10752, - aaBlessingofPurification =10753, - aaSensetheDead =10754, - aaBlessingofRo =10789, - aaExtendedWildGrowth =10792, - aaHastenedCalloftheWild2 =10797, - aaHastenedAuspiceoftheHunter =10800, - aaClenchedJaw =10803, - aaScoutsMasteryofFire =10806, - aaScoutsMasteryofIce =10809, - aaScoutsMasteryofMagic =10812, - aaScoutsMasteryofSlashing =10815, - aaScoutsMasteryofPiercing =10818, - aaScoutsMasteryofBluntWeapons =10821, - aaMassiveStrike =10850, - aaStrikethrough2 =10853, - aaHatesAttraction =10900, - aaFeignedMinion2 =10903, - aaHastenedSummonRemains =10909, - aaVisageofDeath =10912, - aaCascadingTheftofLife2 =10915, - aaExtendedSloth =10950, - aaHastenedAncestralAid =10951, - aaHastenedUnionofSpirits =10954, - aaGroupShrink2 =10957, - aaInconspicuousTotem =10958, - aaExtendedPestilence =10959, - aaGroupSpiritWalk =10960, - aaHastenedTaunt =11000, - aaExtendedShieldReflect =11003, - aaExtendedCommandingVoice =11004, - aaHastenedLeap =11007, - aaRefundTest =11017, - aaHastenedDestruction =11050, - aaNetherstep =11055, - aaBeamofDisplacement =11056, - aaTranslocate =11057, - aaTeleport =11058, - aaPlayingPossum =11073, - aaCatlikeReflexes =11074, - aaHastenedBiteoftheAsp =11077, - aaHastenedGorillaSmash =11078, - aaHastenedRavensClaw =11079, - aaChameleonStrike =11080, - aaBearPatriarch =11081, - aaTwoHandsNoMercy =11085, - aaHastenedCryofBattle =11088, - aaTwinproc =12416, - aaTacticalMastery2 =12419, - aaGroupPerfectedLevitation =12422, - aaDoubleRiposte2 =12429, - aaHastenedForcefulRejuvenation =12430, - aaHastenedCompanionsBlessing =12478, - aaMysticalEcho =12489, - aaHastenedJoltingKicks =12500, - aaHastenedHatesAttraction =12582, - aaHastenedFrenziedStabbing =12600, - aaExtendedFrenziedStabbingDiscipline =12603, - aaSpeedoftheScoundrel =12606, - aaHastenedPinpoint =12607, - aaHastenedTwistedChanceDiscipline =12615, - aaVileEfficacy =12634, - aaImprovedDeathPeace =12635, - aaEyesWideOpen =12636, - aaCommunionoftheCheetah =12638, - aaExtendedConvergenceofSpirit =12645, - aaExtendedSpiritoftheWood =12646, - aaSpiritoftheBear =12651, - aaTwinheal =12652, - aaNaturesBlessing =12655, - aaNaturesFury =12661, - aaHastenedStormStrike =12664, - aaExtendedImpenetrableBarrier =12678, - aaExtendedHeelofKanji =12688, - aaExtendedScaledfist =12691, - aaFistsofSteel =12706, - aaExtendedDeftdance =12709, - aaHastenedDeftdance =12710, - aaHastenedLyreLeap =12713, - aaHastenedQuickTime =12716, - aaExtendedQuickTime =12719, - aaExtendedFierceEye =12720, - aaHastenedFierceEye =12721, - aaHastenedDanceofBlades =12727, - aaResoundingDirge =12737, - aaFreeze =12752, - aaShock =12753, - aaQuickenedArmyoftheDead2 =12763, - aaLRKBolt =12764, - aaExoblast =12765, - aaMercurialTorment =12766, - aaPestilentParalysis =12770, - aaHastenedDivineCompanionAura =12773, - aaEmbalmersCarapace =12778, - aaHastenedEncroachingDarkness =12779, - aaExpandingDarkness =12782, - aaAegisofKildrukaun =12785, - aaBestialBloodrage =12804, - aaCompanionsSacrifice =12807, - aaExtendedFeralgia =12816, - aaHastenedProtectiveSpirit =12819, - aaHastenedEmpathicFury =12822, - aaWardersGemination =12825, - aaQuickenedParagonofSpirit =12831, - aaWardersGift =12837, - aaGelidRending =12846, - aaQuickenedNaturesSalve =12849, - aaImprovedWardofDestruction =12852, - aaAbscond =12864, - aaAtolsUnresistableShackles =12865, - aaDimensionalShield =12866, - aaImprovedSustainedDestruction =12867, - aaHastenedHarvestofDruzzil =12881, - aaSurvivaloftheFelicitous =12884, - aaConcussiveIntuition =12885, - aaEcisIcyBlessing =12886, - aaRosFieryBlessing =12887, - aaDruzzilsMysticalBlessing =12888, - aaKerafyrmsFavor =12889, - aaKerafyrmsFavor2 =12890, - aaKerafyrmsPrismaticFamiliar =12892, - aaImprovedTwincast =12893, - aaHastenedPhantasmalOpponent =12894, - aaHastenedFirstSpireofEnchantment =12902, - aaHastenedSecondSpireofEnchantment =12907, - aaHastenedThirdSpireofEnchantment =12912, - aaProfoundVisage =12920, - aaBeguilersBanishment =12923, - aaExtendedPacification =12926, - aaCalculatedInsanity =12931, - aaCripplingAurora =12937, - aaMentalContortion =12938, - aaGlyphSpray =12939, - aaEtherealYield =12940, - aaDiminutiveCompanion =12941, - aaElementalSpellFury =12960, - aaSmallModulationShard =12963, - aaMediumModulationShard =12964, - aaLargeModulationShard =12965, - aaHastenedMalosinete =12968, - aaShieldoftheElements =12971, - aaExtendedMalosinete =12977, - aaExtendedPestilence2 =12988, - aaArmorofAncestralSpirits =12989, - aaGroupPactoftheWolf =12992, - aaHastenedInconspicuousTotem =13001, - aaPurifiedSpirits =13004, - aaGroupSpiritWalk2 =13008, - aaGroupSilentPresence =13009, - aaHastenedCannibalization =13010, - aaHastenedSpiritChanneling =13013, - aaVengefulSpirits =13017, - aaCripplingApparition =13020, - aaHastenedSelfPreservation =13055, - aaBindingAxe =13065, - aaAgonyofAbsolution =13066, - aaHastenedAbsolution =13067, - aaGiftofDreamlikeExquisiteRadiantMana =13090, - aaLingeringDeath =13096, - aaMarrsSalvation =13100, - aaBlessingoftheFaithful =13101, - aaUnbridledStrikeofFear =13108, - aaHastenedForcefulRejuvenation2 =13129, - aaMovingMountains =13130, - aaQuickenedTerrors =13132, - aaBattleFrenzy =13134, - aaQuickenedDivineAvatar =13137, - aaQuickenedSilentCasting =13143, - aaQuickenedSilentCasting2 =13146, - aaBalefireBurst =13164, - aaExplosionofSpite =13165, - aaHastenedExplosionofHatred =13166, - aaHowloftheWarlord =13169, - aaLeapofFaith =13202, - aaHastenedTuneInYourHead =13204, - aaBloodfury =13224, - aaScentofTerris =13225, - aaDrearyDeeds =13252, - aaEnchantFeymetal =13260, - aaMassEnchantFeymetal =13261, - aaPoke =13268, - aaReplicate =13269, - aaInsight =13270, - aaEnchantAlaranMetal =13271, - aaMassEnchantAlaranMetal =13272, - aaLifetap =13274, - aaGiftofAscendantExquisiteRadiantMana =13294, - aaDivineGuardian =13385, - aaDivinePeace =13388, - aaYaulp =13389, - aaHastenedPurifiedSpirits =13416, - aaSwarmofFireflies =13419, - aaHastenedProjectionofFury2 =13441, - aaBladeGuardian =13444, - aaHastenedPossum =13449, - aaHastenedWardersGift =13463, - aaHastenedCompanionsSacrifice =13474, - aaCheetahsPounce =13483, - aaBloodlust =13484, - aaPrimalFury =13485, - aaShaurisSonoriousClouding =13527, - aaSonicDisplacement =13528, - aaLureoftheSirensSong =13529, - aaGlacialArrow =13549, - aaConvergenceofSpirits2 =13556, - aaHastenedOutridersAccuracy =13565, - aaHastenedOutridersEvasion =13568, - aaGraspofSylvanSpirits =13571, - aaBloodthirstyBlade =13616, - aaEnlightenedFocusofArcanum =13646, - aaExtendedSilentCasting =13667, - aaFuryofKerafyrm =13670, - aaHallowedSteed =13673, - aaWickedSteed =13674, - aaEmbalmersCarapace2 =13678, - aaMirroredPestilence =13684, - aaEmbraceTheDecay =13687, - aaQuickenedScentofTerris =13689, - aaFrenzyoftheDead =13693, - aaElementalUnion =13695, - aaCalculatedInsanity2 =13729, - aaHastenedCalculatedInsanity =13753, - aaHastenedMentalContortion =13758, - aaHastenedCripplingAurora =13764, - aaGlyphofIndeterminableReward =13788, - aaRoguesFury2 =13792, - aaPoisonousPerfection =13801, - aaDistantStrike =13844, - aaWarCryoftheBraxi =13872, - aaHastenedJuggernautSurge =13873, - aaHastenedResilience =13878, - aaHastenedBloodPact =13881, - aaHastenedFivePointPalm =13889, - aaPhalanxofOne =13900, - aaHastenedFlashofAnger =13905, - aaHastenedBazuRoar =13908, - aaHastenedScowl =13911, - aaHastenedMarkoftheMageHunter =13917, - aaVeiledStrength =13933, - aaVeiledFortitude =13943, - aaVeiledRapidity =13953, - aaVeiledCunning =13963, - aaVeiledAcumen =13973, - aaVeiledBrilliance =13983, - aaVeiledAllure =13993, - aaRestorationofLife =14010, - aaHastenedBeaconoftheRighteous =14011, - aaKnowledgeofAlaranCulture =14017, - aaKnowledgeofAlaranCultureAdvanced =14018, - aaBraceForImpact =14019, - aaMercilessBlade =14026, - aaCombatantsPact =14029, - aaWarlordsResolve =14032, - aaHastenedWarlordsBravery =14037, - aaHastenedWarlordsTenacity =14040, - aaHastenedLeechTouch =14046, - aaBonyGraspofDeath =14051, - aaThoughtLeech =14052, - aaHastenedLeechcurseDiscipline =14056, - aaHastenedUnholyAuraDiscipline =14059, - aaHastenedHarmshield =14062, - aaHastenedProjectionofDoom =14065, - aaHastenedProjectionofPiety =14068, - aaShieldofBrilliance =14071, - aaShieldofBrilliance2 =14072, - aaHastenedSanctificationDiscipline =14076, - aaSpeedoftheSavior =14080, - aaDivineCall =14081, - aaHastenedLeapofFaith =14085, - aaHastenedMarrsSalvation =14088, - aaHastenedArmoroftheInquisitor =14091, - aaQuickenedStuns =14100, - aaExtendedOutridersAttack =14115, - aaEtheriumBlades =14129, - aaHastenedAssassinationDisciplines =14135, - aaCunningDisguiseShissar =14139, - aaScoutsMasteryofPiercing2 =14141, - aaExtendedEnvenomedBlades =14144, - aaHastenedSpeedFocus =14148, - aaHeelofBrithrax =14151, - aaPressurePoints =14157, - aaHastenedZanFisWhistle =14160, - aaExtendedZanFisWhistle =14163, - aaHastenedThunder2 =14166, - aaHastenedThousandBlades =14169, - aaHastenedTuneStuckInYourHead =14176, - aaExtendedDanceofBlades =14179, - aaExtendedThousandBlades =14180, - aaAllegrettoofBattle =14181, - aaVivaceofConflict =14186, - aaNoteworthyDisguiseDrake =14192, - aaBulwarkofBlades =14193, - aaDecapitation =14200, - aaHastenedBerserkingDisciplines =14203, - aaQuietMiracle =14206, - aaRepeltheWicked =14207, - aaBeaconofLife =14208, - aaBlessedChains =14209, - aaHastenedFocusedCelestialRegeneration =14213, - aaShrink =14224, - aaQuickenedSpiritCalling =14225, - aaQuickenedCalloftheWild2 =14228, - aaSpiritualRebuke =14231, - aaPathosis =14232, - aaPreincarnation =14233, - aaSpiritualBlessing =14234, - aaHastenedNaturesFury =14241, - aaWrathoftheForestWalker =14244, - aaGiftofSylvanSpirits =14249, - aaExtendedVinelashCascade =14254, - aaExtendedSpiritoftheBear =14259, - aaVeiloftheUnderbrush =14262, - aaParalyticSpores =14264, - aaHiddenCommunionoftheCheetah =14265, - aaSteadfastResolve =14275, - aaExtendedGroupBestialAlignment =14278, - aaGroupPerfectedInvisibilitytoUndead2 =14281, - aaPerfectedInvisibilitytoUndead =14282, - aaQuickenedStasis =14283, - aaExtendedDrearyDeeds =14286, - aaQuickenedFrenziedBurnout =14289, - aaQuickenedHostoftheElements =14292, - aaHastenedCompanionsRelocation =14295, - aaModulationSpecialist =14298, - aaStaffBlock =14301, - aaHastenedDrapeofShadows =14304, - aaVirulentTalon =14307, - aaHastenedPestilentParalysis =14308, - aaHastenedMercurialTorment =14311, - aaHastenedWhisperwind =14314, - aaQuickenedScentofTerris2 =14316, - aaQuickenedDeathBloom =14318, - aaDeathsMalaise =14321, - aaDyingGrasp =14322, - aaAHoleInSpace =14323, - aaHastenedForceofWill =14328, - aaHastenedImprovedTwincast =14331, - aaHastenedNightmareStasis =14341, - aaScintillatingBeam =14346, - aaConvergence =14358, - aaGiftofDeathlyResolve =14359, - aaFuneralPyre =14360, - aaHastenedEldritchRune =14364, - aaHerosBarracks =14367, - aaHerosBarracks2 =14368, - aaHerosBarracks3 =14369, - aaHerosBarracks4 =14370, - aaSummonTomeoftheHerosJourney =14371, + aaSpellCastingReinforcementArtistry =8262, + aaEarthenBrawn =8263, + aaEarthenStability =8268, + aaEarthenAlacrity =8273, + aaEarthenArtistry =8278, + aaEarthenSagacity =8283, + aaEarthenBrilliance =8288, + aaEarthenAllure =8293, + aaResplendentGlory =8300, + aaRageofRallosZek =8303, + aaEnhancedAreaTaunt =8312, + aaFluidMarch =8314, + aaHastenedSelosKick =8317, + aaHastenedBellow =8319, + aaBelltoneMind =8322, + aaSubtleBlows =8325, + aaLitheBody =8330, + aaEnhancedThiefsEyes =8331, + aaExtendedLanguidBite =8332, + aaQuickenedMalosinete =8335, + aaDrapeofShadows =8341, + aaHostintheShell =8342, + aaHastenedManaDraw =8347, + aaHastenedMezmerization =8350, + aaDreamlikeMight =8351, + aaDreamlikeFortitude =8361, + aaDreamlikeSwiftness =8371, + aaDreamlikeCunning =8381, + aaDreamlikeSapience =8391, + aaArmorRend =8400, + aaFundamentofIntellect =9100, + aaSongwriting =9101, + aaFundamentofIntellect2 =9109, + aaHybridResearch =9111, + aaFundamentofIntellect3 =9118, + aaWrittenPrayer =9121, + aaFundamentofIntellect4 =9127, + aaFundamentofWisdom =9136, + aaFundamentofWisdom2 =9145, + aaFundamentofWisdom3 =9154, + aaFundamentofPower =9163, + aaFundamentofPower2 =9172, + aaFundamentofPower3 =9181, + aaFundamentofPower4 =9190, + aaFundamentofPower5 =9199, + aaFundamentofCombat =9208, + aaFundamentofCombat2 =9217, + aaFundamentofCombat3 =9226, + aaFundamentofCombat4 =9235, + aaFundamentFirstSpireofArcanum =9300, + aaFundamentSecondSpireofArcanum =9303, + aaFundamentThirdSpireofArcanum =9306, + aaFundamentFirstSpireoftheSensei =9309, + aaFundamentSecondSpireoftheSensei =9312, + aaFundamentThirdSpireoftheSensei =9315, + aaFundamentFirstSpireoftheElements =9318, + aaFundamentSecondSpireoftheElements =9321, + aaFundamentThirdSpireoftheElements =9324, + aaFundamentFirstSpireofEnchantment =9327, + aaFundamentSecondSpireofEnchantment =9330, + aaFundamentThirdSpireofEnchantment =9333, + aaFundamentFirstSpireofNecromancy =9336, + aaFundamentSecondSpireofNecromancy =9339, + aaFundamentThirdSpireofNecromancy =9342, + aaFundamentFirstSpireoftheWarlord =9345, + aaFundamentSecondSpireoftheWarlord =9348, + aaFundamentThirdSpireoftheWarlord =9351, + aaFundamentFirstSpireoftheRake =9354, + aaFundamentSecondSpireoftheRake =9357, + aaFundamentThirdSpireoftheRake =9360, + aaFundamentFirstSpireoftheMinstrels =9363, + aaFundamentSecondSpireoftheMinstrels =9366, + aaFundamentThirdSpireoftheMinstrels =9369, + aaFundamentFirstSpireoftheSavageLord =9372, + aaFundamentSecondSpireoftheSavageLord =9375, + aaFundamentThirdSpireoftheSavageLord =9378, + aaFundamentFirstSpireofHoliness =9381, + aaFundamentSecondSpireofHoliness =9384, + aaFundamentThirdSpireofHoliness =9387, + aaFundamentFirstSpireoftheReavers =9390, + aaFundamentSecondSpireoftheReavers =9393, + aaFundamentThirdSpireoftheReavers =9396, + aaFundamentFirstSpireofthePathfinders =9399, + aaFundamentSecondSpireofthePathfinders =9402, + aaFundamentThirdSpireofthePathfinders =9405, + aaFundamentFirstSpireofDivinity =9408, + aaFundamentSecondSpireofDivinity =9411, + aaFundamentThirdSpireofDivinity =9414, + aaFundamentFirstSpireofNature =9417, + aaFundamentSecondSpireofNature =9420, + aaFundamentThirdSpireofNature =9423, + aaFundamentFirstSpireofAncestors =9426, + aaFundamentSecondSpireofAncestors =9429, + aaFundamentThirdSpireofAncestors =9432, + aaFundamentFirstSpireofSavagery =9435, + aaFundamentSecondSpireofSavagery =9438, + aaFundamentThirdSpireofSavagery =9441, + aaHastenedDirgeoftheSleepwalker =10329, + aaVaingloriousShout =10330, + aaLyreLeap =10331, + aaDominationMastery =10332, + aaLyricalPrankster =10333, + aaSelosKick =10336, + aaATuneStuckInYourHead =10339, + aaStonefoot =10340, + aaHastenedStunningKick =10343, + aaInfusionofThunder =10346, + aaChainsofPurity =10348, + aaProjectionofFury =10351, + aaProjectionofDoom =10352, + aaProjectionofPiety =10353, + aaGiftofLife =10354, + aaBlessingofLight =10355, + aaHastenedDivineIntervention =10358, + aaImprovedAtone =10364, + aaAgelessEnmity =10367, + aaCoverTracks =10368, + aaSpellCastingSubtlety3 =10370, + aaImprovedNaturalInvisibility =10373, + aaProtectionoftheWarder =10374, + aaNaturesSalve =10377, + aaFocusofAnimus =10380, + aaImbuedFerocity =10387, + aaNaturesReprieve =10388, + aaExtendedTrickery =10389, + aaAgelessEnmity2 =10392, + aaShacklesofTunare =10393, + aaBeaconoftheRighteous =10394, + aaBobbingCorpse =10395, + aaGroupSpiritoftheWhiteWolf =10396, + aaGroupSpiritoftheBlackWolf =10397, + aaSelfPreservation =10400, + aaHastenedFrenzy =10401, + aaExtendedHavoc =10404, + aaHastenedDeflectionDiscipline =10405, + aaRogueTripleAttackSkillupTest =10410, + aaHastenedHostoftheElements =10413, + aaEnhancedWallofWind =10421, + aaHandofRo =10424, + aaFixationofRo =10425, + aaPeacefulSpiritoftheWood =10426, + aaPeacefulConvergenceofSpirits =10427, + aaQuickenedArmyoftheDead =10434, + aaHealingFrenzy =10450, + aaOverpoweringStrikes =10453, + aaQuickenedBlessingofRessurection =10456, + aaHastenedAtonement =10459, + aaImprovedSanctuary =10462, + aaBlessingofSanctuary =10463, + aaHastenedCelestialHammer =10464, + aaQuickenedTurnUndead =10470, + aaSpiritofEagle =10500, + aaFlightofEagles =10501, + aaEgress =10502, + aaSpiritsofNature =10503, + aaWallofWind =10506, + aaHastenedSpiritoftheWood =10511, + aaHastenedConvergenceofSpirits =10514, + aaHastenedProjectionofFury =10519, + aaHastenedGutPunch =10522, + aaHastenedFirstSpireoftheWarlord =10527, + aaHastenedSecondSpireoftheWarlord =10532, + aaHastenedThirdSpireoftheWarlord =10537, + aaWillingCovenant =10542, + aaWarlordsResurgence =10545, + aaWarlordsFury =10546, + aaSurgeoftheVanquisher =10547, + aaImprovedShieldSpecialist =10548, + aaBeamofSlumber =10550, + aaPhantasmicReflex =10551, + aaHastenedSelfStasis =10558, + aaForcefulBanishment =10561, + aaHastenedBlastofAnger =10579, + aaHastenedFuriousLeap =10582, + aaHastenedGrapplingStrike =10588, + aaForceofElements =10600, + aaAspectofZomm =10601, + aaExtendedSharedHealth =10610, + aaFuriousRefrain =10627, + aaAgileFeet =10650, + aaHastenedDefensivePoses =10653, + aaExtendedImpenetrableDiscipline =10656, + aaHastenedDestructiveForce2 =10657, + aaMendingofBodyandSoul =10666, + aaLevant =10700, + aaReluctantBenevolence =10701, + aaValorousRage =10711, + aaHastenedGroupGuardianoftheForest =10714, + aaHastenedOutridersAttack =10719, + aaHastenedProtectionoftheSpiritWolf =10722, + aaHastenedImbuedFerocity =10727, + aaHastenedHarmoniousArrow =10730, + aaHastenedEntrap =10733, + aaPoisonArrows =10736, + aaBestowDivineAura2 =10752, + aaBlessingofPurification =10753, + aaSensetheDead =10754, + aaBlessingofRo =10789, + aaExtendedWildGrowth =10792, + aaHastenedCalloftheWild2 =10797, + aaHastenedAuspiceoftheHunter =10800, + aaClenchedJaw =10803, + aaScoutsMasteryofFire =10806, + aaScoutsMasteryofIce =10809, + aaScoutsMasteryofMagic =10812, + aaScoutsMasteryofSlashing =10815, + aaScoutsMasteryofPiercing =10818, + aaScoutsMasteryofBluntWeapons =10821, + aaMassiveStrike =10850, + aaStrikethrough2 =10853, + aaHatesAttraction =10900, + aaFeignedMinion2 =10903, + aaHastenedSummonRemains =10909, + aaVisageofDeath =10912, + aaCascadingTheftofLife2 =10915, + aaExtendedSloth =10950, + aaHastenedAncestralAid =10951, + aaHastenedUnionofSpirits =10954, + aaGroupShrink2 =10957, + aaInconspicuousTotem =10958, + aaExtendedPestilence =10959, + aaGroupSpiritWalk =10960, + aaHastenedTaunt =11000, + aaExtendedShieldReflect =11003, + aaExtendedCommandingVoice =11004, + aaHastenedLeap =11007, + aaRefundTest =11017, + aaHastenedDestruction =11050, + aaNetherstep =11055, + aaBeamofDisplacement =11056, + aaTranslocate =11057, + aaTeleport =11058, + aaPlayingPossum =11073, + aaCatlikeReflexes =11074, + aaHastenedBiteoftheAsp =11077, + aaHastenedGorillaSmash =11078, + aaHastenedRavensClaw =11079, + aaChameleonStrike =11080, + aaBearPatriarch =11081, + aaTwoHandsNoMercy =11085, + aaHastenedCryofBattle =11088, + aaTwinproc =12416, + aaTacticalMastery2 =12419, + aaGroupPerfectedLevitation =12422, + aaDoubleRiposte2 =12429, + aaHastenedForcefulRejuvenation =12430, + aaHastenedCompanionsBlessing =12478, + aaMysticalEcho =12489, + aaHastenedJoltingKicks =12500, + aaHastenedHatesAttraction =12582, + aaHastenedFrenziedStabbing =12600, + aaExtendedFrenziedStabbingDiscipline =12603, + aaSpeedoftheScoundrel =12606, + aaHastenedPinpoint =12607, + aaHastenedTwistedChanceDiscipline =12615, + aaVileEfficacy =12634, + aaImprovedDeathPeace =12635, + aaEyesWideOpen =12636, + aaCommunionoftheCheetah =12638, + aaExtendedConvergenceofSpirit =12645, + aaExtendedSpiritoftheWood =12646, + aaSpiritoftheBear =12651, + aaTwinheal =12652, + aaNaturesBlessing =12655, + aaNaturesFury =12661, + aaHastenedStormStrike =12664, + aaExtendedImpenetrableBarrier =12678, + aaExtendedHeelofKanji =12688, + aaExtendedScaledfist =12691, + aaFistsofSteel =12706, + aaExtendedDeftdance =12709, + aaHastenedDeftdance =12710, + aaHastenedLyreLeap =12713, + aaHastenedQuickTime =12716, + aaExtendedQuickTime =12719, + aaExtendedFierceEye =12720, + aaHastenedFierceEye =12721, + aaHastenedDanceofBlades =12727, + aaResoundingDirge =12737, + aaFreeze =12752, + aaShock =12753, + aaQuickenedArmyoftheDead2 =12763, + aaLRKBolt =12764, + aaExoblast =12765, + aaMercurialTorment =12766, + aaPestilentParalysis =12770, + aaHastenedDivineCompanionAura =12773, + aaEmbalmersCarapace =12778, + aaHastenedEncroachingDarkness =12779, + aaExpandingDarkness =12782, + aaAegisofKildrukaun =12785, + aaBestialBloodrage =12804, + aaCompanionsSacrifice =12807, + aaExtendedFeralgia =12816, + aaHastenedProtectiveSpirit =12819, + aaHastenedEmpathicFury =12822, + aaWardersGemination =12825, + aaQuickenedParagonofSpirit =12831, + aaWardersGift =12837, + aaGelidRending =12846, + aaQuickenedNaturesSalve =12849, + aaImprovedWardofDestruction =12852, + aaAbscond =12864, + aaAtolsUnresistableShackles =12865, + aaDimensionalShield =12866, + aaImprovedSustainedDestruction =12867, + aaHastenedHarvestofDruzzil =12881, + aaSurvivaloftheFelicitous =12884, + aaConcussiveIntuition =12885, + aaEcisIcyBlessing =12886, + aaRosFieryBlessing =12887, + aaDruzzilsMysticalBlessing =12888, + aaKerafyrmsFavor =12889, + aaKerafyrmsFavor2 =12890, + aaKerafyrmsPrismaticFamiliar =12892, + aaImprovedTwincast =12893, + aaHastenedPhantasmalOpponent =12894, + aaHastenedFirstSpireofEnchantment =12902, + aaHastenedSecondSpireofEnchantment =12907, + aaHastenedThirdSpireofEnchantment =12912, + aaProfoundVisage =12920, + aaBeguilersBanishment =12923, + aaExtendedPacification =12926, + aaCalculatedInsanity =12931, + aaCripplingAurora =12937, + aaMentalContortion =12938, + aaGlyphSpray =12939, + aaEtherealYield =12940, + aaDiminutiveCompanion =12941, + aaElementalSpellFury =12960, + aaSmallModulationShard =12963, + aaMediumModulationShard =12964, + aaLargeModulationShard =12965, + aaHastenedMalosinete =12968, + aaShieldoftheElements =12971, + aaExtendedMalosinete =12977, + aaExtendedPestilence2 =12988, + aaArmorofAncestralSpirits =12989, + aaGroupPactoftheWolf =12992, + aaHastenedInconspicuousTotem =13001, + aaPurifiedSpirits =13004, + aaGroupSpiritWalk2 =13008, + aaGroupSilentPresence =13009, + aaHastenedCannibalization =13010, + aaHastenedSpiritChanneling =13013, + aaVengefulSpirits =13017, + aaCripplingApparition =13020, + aaHastenedSelfPreservation =13055, + aaBindingAxe =13065, + aaAgonyofAbsolution =13066, + aaHastenedAbsolution =13067, + aaGiftofDreamlikeExquisiteRadiantMana =13090, + aaLingeringDeath =13096, + aaMarrsSalvation =13100, + aaBlessingoftheFaithful =13101, + aaUnbridledStrikeofFear =13108, + aaHastenedForcefulRejuvenation2 =13129, + aaMovingMountains =13130, + aaQuickenedTerrors =13132, + aaBattleFrenzy =13134, + aaQuickenedDivineAvatar =13137, + aaQuickenedSilentCasting =13143, + aaQuickenedSilentCasting2 =13146, + aaBalefireBurst =13164, + aaExplosionofSpite =13165, + aaHastenedExplosionofHatred =13166, + aaHowloftheWarlord =13169, + aaLeapofFaith =13202, + aaHastenedTuneInYourHead =13204, + aaBloodfury =13224, + aaScentofTerris =13225, + aaDrearyDeeds =13252, + aaEnchantFeymetal =13260, + aaMassEnchantFeymetal =13261, + aaPoke =13268, + aaReplicate =13269, + aaInsight =13270, + aaEnchantAlaranMetal =13271, + aaMassEnchantAlaranMetal =13272, + aaLifetap =13274, + aaGiftofAscendantExquisiteRadiantMana =13294, + aaDivineGuardian =13385, + aaDivinePeace =13388, + aaYaulp =13389, + aaHastenedPurifiedSpirits =13416, + aaSwarmofFireflies =13419, + aaHastenedProjectionofFury2 =13441, + aaBladeGuardian =13444, + aaHastenedPossum =13449, + aaHastenedWardersGift =13463, + aaHastenedCompanionsSacrifice =13474, + aaCheetahsPounce =13483, + aaBloodlust =13484, + aaPrimalFury =13485, + aaShaurisSonoriousClouding =13527, + aaSonicDisplacement =13528, + aaLureoftheSirensSong =13529, + aaGlacialArrow =13549, + aaConvergenceofSpirits2 =13556, + aaHastenedOutridersAccuracy =13565, + aaHastenedOutridersEvasion =13568, + aaGraspofSylvanSpirits =13571, + aaBloodthirstyBlade =13616, + aaEnlightenedFocusofArcanum =13646, + aaExtendedSilentCasting =13667, + aaFuryofKerafyrm =13670, + aaHallowedSteed =13673, + aaWickedSteed =13674, + aaEmbalmersCarapace2 =13678, + aaMirroredPestilence =13684, + aaEmbraceTheDecay =13687, + aaQuickenedScentofTerris =13689, + aaFrenzyoftheDead =13693, + aaElementalUnion =13695, + aaCalculatedInsanity2 =13729, + aaHastenedCalculatedInsanity =13753, + aaHastenedMentalContortion =13758, + aaHastenedCripplingAurora =13764, + aaGlyphofIndeterminableReward =13788, + aaRoguesFury2 =13792, + aaPoisonousPerfection =13801, + aaDistantStrike =13844, + aaWarCryoftheBraxi =13872, + aaHastenedJuggernautSurge =13873, + aaHastenedResilience =13878, + aaHastenedBloodPact =13881, + aaHastenedFivePointPalm =13889, + aaPhalanxofOne =13900, + aaHastenedFlashofAnger =13905, + aaHastenedBazuRoar =13908, + aaHastenedScowl =13911, + aaHastenedMarkoftheMageHunter =13917, + aaVeiledStrength =13933, + aaVeiledFortitude =13943, + aaVeiledRapidity =13953, + aaVeiledCunning =13963, + aaVeiledAcumen =13973, + aaVeiledBrilliance =13983, + aaVeiledAllure =13993, + aaRestorationofLife =14010, + aaHastenedBeaconoftheRighteous =14011, + aaKnowledgeofAlaranCulture =14017, + aaKnowledgeofAlaranCultureAdvanced =14018, + aaBraceForImpact =14019, + aaMercilessBlade =14026, + aaCombatantsPact =14029, + aaWarlordsResolve =14032, + aaHastenedWarlordsBravery =14037, + aaHastenedWarlordsTenacity =14040, + aaHastenedLeechTouch =14046, + aaBonyGraspofDeath =14051, + aaThoughtLeech =14052, + aaHastenedLeechcurseDiscipline =14056, + aaHastenedUnholyAuraDiscipline =14059, + aaHastenedHarmshield =14062, + aaHastenedProjectionofDoom =14065, + aaHastenedProjectionofPiety =14068, + aaShieldofBrilliance =14071, + aaShieldofBrilliance2 =14072, + aaHastenedSanctificationDiscipline =14076, + aaSpeedoftheSavior =14080, + aaDivineCall =14081, + aaHastenedLeapofFaith =14085, + aaHastenedMarrsSalvation =14088, + aaHastenedArmoroftheInquisitor =14091, + aaQuickenedStuns =14100, + aaExtendedOutridersAttack =14115, + aaEtheriumBlades =14129, + aaHastenedAssassinationDisciplines =14135, + aaCunningDisguiseShissar =14139, + aaScoutsMasteryofPiercing2 =14141, + aaExtendedEnvenomedBlades =14144, + aaHastenedSpeedFocus =14148, + aaHeelofBrithrax =14151, + aaPressurePoints =14157, + aaHastenedZanFisWhistle =14160, + aaExtendedZanFisWhistle =14163, + aaHastenedThunder2 =14166, + aaHastenedThousandBlades =14169, + aaHastenedTuneStuckInYourHead =14176, + aaExtendedDanceofBlades =14179, + aaExtendedThousandBlades =14180, + aaAllegrettoofBattle =14181, + aaVivaceofConflict =14186, + aaNoteworthyDisguiseDrake =14192, + aaBulwarkofBlades =14193, + aaDecapitation =14200, + aaHastenedBerserkingDisciplines =14203, + aaQuietMiracle =14206, + aaRepeltheWicked =14207, + aaBeaconofLife =14208, + aaBlessedChains =14209, + aaHastenedFocusedCelestialRegeneration =14213, + aaShrink =14224, + aaQuickenedSpiritCalling =14225, + aaQuickenedCalloftheWild2 =14228, + aaSpiritualRebuke =14231, + aaPathosis =14232, + aaPreincarnation =14233, + aaSpiritualBlessing =14234, + aaHastenedNaturesFury =14241, + aaWrathoftheForestWalker =14244, + aaGiftofSylvanSpirits =14249, + aaExtendedVinelashCascade =14254, + aaExtendedSpiritoftheBear =14259, + aaVeiloftheUnderbrush =14262, + aaParalyticSpores =14264, + aaHiddenCommunionoftheCheetah =14265, + aaSteadfastResolve =14275, + aaExtendedGroupBestialAlignment =14278, + aaGroupPerfectedInvisibilitytoUndead2 =14281, + aaPerfectedInvisibilitytoUndead =14282, + aaQuickenedStasis =14283, + aaExtendedDrearyDeeds =14286, + aaQuickenedFrenziedBurnout =14289, + aaQuickenedHostoftheElements =14292, + aaHastenedCompanionsRelocation =14295, + aaModulationSpecialist =14298, + aaStaffBlock =14301, + aaHastenedDrapeofShadows =14304, + aaVirulentTalon =14307, + aaHastenedPestilentParalysis =14308, + aaHastenedMercurialTorment =14311, + aaHastenedWhisperwind =14314, + aaQuickenedScentofTerris2 =14316, + aaQuickenedDeathBloom =14318, + aaDeathsMalaise =14321, + aaDyingGrasp =14322, + aaAHoleInSpace =14323, + aaHastenedForceofWill =14328, + aaHastenedImprovedTwincast =14331, + aaHastenedNightmareStasis =14341, + aaScintillatingBeam =14346, + aaConvergence =14358, + aaGiftofDeathlyResolve =14359, + aaFuneralPyre =14360, + aaHastenedEldritchRune =14364, + aaHerosBarracks =14367, + aaHerosBarracks2 =14368, + aaHerosBarracks3 =14369, + aaHerosBarracks4 =14370, + aaSummonTomeoftheHerosJourney =14371, aaHighestID //this should always be last, and should always //follow the highest AA ID diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index 6f3ad68ee..7f45b1c06 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -1,155 +1,155 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) SET(zone_sources - AA.cpp - aggro.cpp - attack.cpp - beacon.cpp - bonuses.cpp - bot.cpp - botspellsai.cpp - client.cpp - client_logs.cpp - client_mods.cpp - client_packet.cpp - client_process.cpp - command.cpp - doors.cpp - effects.cpp - embparser.cpp - embperl.cpp - embxs.cpp - entity.cpp - exp.cpp - fearpath.cpp - forage.cpp - groups.cpp - guild.cpp - guild_mgr.cpp - hate_list.cpp - horse.cpp - inventory.cpp - loottables.cpp - Map.cpp - merc.cpp - mob.cpp - MobAI.cpp - net.cpp - npc.cpp - NpcAI.cpp - Object.cpp - parser.cpp - pathing.cpp - perl_client.cpp - perl_doors.cpp - perl_entity.cpp - perl_groups.cpp - perl_hateentry.cpp - perl_mob.cpp - perl_npc.cpp - perl_object.cpp - perl_perlpacket.cpp - perl_PlayerCorpse.cpp - perl_questitem.cpp - perl_raids.cpp - perlpacket.cpp - perlparser.cpp - petitions.cpp - pets.cpp - PlayerCorpse.cpp - QGlobals.cpp - questmgr.cpp - QuestParserCollection.cpp - raids.cpp - spawn2.cpp - spawn2.h - spawngroup.cpp - special_attacks.cpp - spell_effects.cpp - spells.cpp - tasks.cpp - titles.cpp - tradeskills.cpp - trading.cpp - trap.cpp - tribute.cpp - updatemgr.cpp - watermap.cpp - waypoints.cpp - worldserver.cpp - zone.cpp - zone_logsys.cpp - zone_profile.cpp - ZoneConfig.cpp - zonedb.cpp - zonedbasync.cpp - zoning.cpp + AA.cpp + aggro.cpp + attack.cpp + beacon.cpp + bonuses.cpp + bot.cpp + botspellsai.cpp + client.cpp + client_logs.cpp + client_mods.cpp + client_packet.cpp + client_process.cpp + command.cpp + doors.cpp + effects.cpp + embparser.cpp + embperl.cpp + embxs.cpp + entity.cpp + exp.cpp + fearpath.cpp + forage.cpp + groups.cpp + guild.cpp + guild_mgr.cpp + hate_list.cpp + horse.cpp + inventory.cpp + loottables.cpp + Map.cpp + merc.cpp + mob.cpp + MobAI.cpp + net.cpp + npc.cpp + NpcAI.cpp + Object.cpp + parser.cpp + pathing.cpp + perl_client.cpp + perl_doors.cpp + perl_entity.cpp + perl_groups.cpp + perl_hateentry.cpp + perl_mob.cpp + perl_npc.cpp + perl_object.cpp + perl_perlpacket.cpp + perl_PlayerCorpse.cpp + perl_questitem.cpp + perl_raids.cpp + perlpacket.cpp + perlparser.cpp + petitions.cpp + pets.cpp + PlayerCorpse.cpp + QGlobals.cpp + questmgr.cpp + QuestParserCollection.cpp + raids.cpp + spawn2.cpp + spawn2.h + spawngroup.cpp + special_attacks.cpp + spell_effects.cpp + spells.cpp + tasks.cpp + titles.cpp + tradeskills.cpp + trading.cpp + trap.cpp + tribute.cpp + updatemgr.cpp + watermap.cpp + waypoints.cpp + worldserver.cpp + zone.cpp + zone_logsys.cpp + zone_profile.cpp + ZoneConfig.cpp + zonedb.cpp + zonedbasync.cpp + zoning.cpp mod_functions.cpp ) SET(zone_headers - AA.h - basic_functions.h - beacon.h - bot.h - botStructs.h - client.h - client_logs.h - client_packet.h - command.h - common.h - doors.h - embparser.h - embperl.h - embxs.h - entity.h - errmsg.h - event_codes.h - forage.h - groups.h - guild_mgr.h - hate_list.h - horse.h - map.h - masterentity.h - maxskill.h - message.h - merc.h - mob.h - net.h - npc.h - NpcAI.h - object.h - parser.h - pathing.h - perlpacket.h - perlparser.h - petitions.h - pets.h - PlayerCorpse.h - QGlobals.h - QuestInterface.h - questmgr.h - QuestParserCollection.h - raid.h - raids.h - skills.h - spawn2.cpp - spawn2.h - spawngroup.h - StringIDs.h - tasks.h - titles.h - trap.h - updatemgr.h - watermap.h - worldserver.h - zone.h - zone_profile.h - ZoneConfig.h - zonedb.h - zonedbasync.h - zonedump.h + AA.h + basic_functions.h + beacon.h + bot.h + botStructs.h + client.h + client_logs.h + client_packet.h + command.h + common.h + doors.h + embparser.h + embperl.h + embxs.h + entity.h + errmsg.h + event_codes.h + forage.h + groups.h + guild_mgr.h + hate_list.h + horse.h + map.h + masterentity.h + maxskill.h + message.h + merc.h + mob.h + net.h + npc.h + NpcAI.h + object.h + parser.h + pathing.h + perlpacket.h + perlparser.h + petitions.h + pets.h + PlayerCorpse.h + QGlobals.h + QuestInterface.h + questmgr.h + QuestParserCollection.h + raid.h + raids.h + skills.h + spawn2.cpp + spawn2.h + spawngroup.h + StringIDs.h + tasks.h + titles.h + trap.h + updatemgr.h + watermap.h + worldserver.h + zone.h + zone_profile.h + ZoneConfig.h + zonedb.h + zonedbasync.h + zonedump.h ) ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers}) @@ -159,21 +159,21 @@ ADD_DEFINITIONS(-DZONE) TARGET_LINK_LIBRARIES(zone Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY}) IF(MSVC) - SET_TARGET_PROPERTIES(zone PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") - TARGET_LINK_LIBRARIES(zone "Ws2_32.lib") + SET_TARGET_PROPERTIES(zone PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF") + TARGET_LINK_LIBRARIES(zone "Ws2_32.lib") ENDIF(MSVC) IF(MINGW) - TARGET_LINK_LIBRARIES(zone "WS2_32") + TARGET_LINK_LIBRARIES(zone "WS2_32") ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(zone "dl") - TARGET_LINK_LIBRARIES(zone "z") - TARGET_LINK_LIBRARIES(zone "m") - TARGET_LINK_LIBRARIES(zone "rt") - TARGET_LINK_LIBRARIES(zone "pthread") - ADD_DEFINITIONS(-fPIC) + TARGET_LINK_LIBRARIES(zone "dl") + TARGET_LINK_LIBRARIES(zone "z") + TARGET_LINK_LIBRARIES(zone "m") + TARGET_LINK_LIBRARIES(zone "rt") + TARGET_LINK_LIBRARIES(zone "pthread") + ADD_DEFINITIONS(-fPIC) ENDIF(UNIX) INCLUDE_DIRECTORIES(${VLD_INCLUDE_DIR}) diff --git a/zone/Map.cpp b/zone/Map.cpp index cbe17bdba..8e959586d 100644 --- a/zone/Map.cpp +++ b/zone/Map.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/MiscFunctions.h" @@ -294,7 +294,7 @@ if(_node->node4 != nullptr) { tmp = SeekNode( _node->nodes[1], x, y ); } } else { - if(y < midy) { //quad 4 + if(y < midy) { //quad 4 if(_node->nodes[2] != NODE_NONE && _node->nodes[3] != node_r) tmp = SeekNode( _node->nodes[3], x, y ); } else { //quad 1 @@ -304,16 +304,16 @@ if(_node->node4 != nullptr) { } if( tmp != NODE_NONE ) return tmp; #else - if(_node->nodes[0] == node_r) return(NODE_NONE); //prevent infinite recursion + if(_node->nodes[0] == node_r) return(NODE_NONE); //prevent infinite recursion tmp = SeekNode( _node->nodes[0], x, y ); if( tmp != NODE_NONE ) return tmp; - if(_node->nodes[1] == node_r) return(NODE_NONE); //prevent infinite recursion + if(_node->nodes[1] == node_r) return(NODE_NONE); //prevent infinite recursion tmp = SeekNode( _node->nodes[1], x, y ); if( tmp != NODE_NONE ) return tmp; - if(_node->nodes[2] == node_r) return(NODE_NONE); //prevent infinite recursion + if(_node->nodes[2] == node_r) return(NODE_NONE); //prevent infinite recursion tmp = SeekNode( _node->nodes[2], x, y ); if( tmp != NODE_NONE ) return tmp; - if(_node->nodes[3] == node_r) return(NODE_NONE); //prevent infinite recursion + if(_node->nodes[3] == node_r) return(NODE_NONE); //prevent infinite recursion tmp = SeekNode( _node->nodes[3], x, y ); if( tmp != NODE_NONE ) return tmp; #endif @@ -326,13 +326,13 @@ printf(" No node found.\n"); } // maybe precalc edges. -int* Map::SeekFace( NodeRef node_r, float x, float y ) { +int* Map::SeekFace( NodeRef node_r, float x, float y ) { if( node_r == NODE_NONE || node_r >= m_Nodes) { return(nullptr); } const PNODE _node = &mNodes[node_r]; if(!(_node->flags & nodeFinal)) { - return(nullptr); //not a final node... could find the proper node... + return(nullptr); //not a final node... could find the proper node... } @@ -348,15 +348,15 @@ int* Map::SeekFace( NodeRef node_r, float x, float y ) { const VERTEX &v3 = cf.c; dx = v2.x - v1.x; dy = v2.y - v1.y; - nx = x - v1.x; ny = y - v1.y; + nx = x - v1.x; ny = y - v1.y; if( dx*ny - dy*nx >0.0f ) continue; dx = v3.x - v2.x; dy = v3.y - v2.y; - nx = x - v2.x; ny = y - v2.y; + nx = x - v2.x; ny = y - v2.y; if( dx*ny - dy*nx >0.0f ) continue; dx = v1.x - v3.x; dy = v1.y - v3.y; - nx = x - v3.x; ny = y - v3.y; + nx = x - v3.x; ny = y - v3.y; if( dx*ny - dy*nx >0.0f ) continue; *face++ = mFaceLists[_node->faces.offset + i]; @@ -396,14 +396,14 @@ bool Map::LineIntersectsZone(VERTEX start, VERTEX end, float step_mag, VERTEX *r if((stepx == 0) && (stepy == 0) && (stepz == 0)) return false; - float factor = sqrt(stepx*stepx + stepy*stepy + stepz*stepz); + float factor = sqrt(stepx*stepx + stepy*stepy + stepz*stepz); stepx = (stepx/factor)*step_mag; stepy = (stepy/factor)*step_mag; stepz = (stepz/factor)*step_mag; NodeRef cnode, lnode, finalnode; - lnode = NODE_NONE; //last node visited + lnode = NODE_NONE; //last node visited cnode = SeekNode(GetRoot(), start.x, start.y); finalnode = SeekNode(GetRoot(), end.x, end.y); @@ -416,22 +416,22 @@ bool Map::LineIntersectsZone(VERTEX start, VERTEX end, float step_mag, VERTEX *r stepy = (float)end.y - cury; stepz = (float)end.z - curz; - factor = sqrt(stepx*stepx + stepy*stepy + stepz*stepz); + factor = sqrt(stepx*stepx + stepy*stepy + stepz*stepz); stepx = (stepx/factor)*step_mag; stepy = (stepy/factor)*step_mag; stepz = (stepz/factor)*step_mag; - cnode = SeekNode(GetRoot(), curx, cury); + cnode = SeekNode(GetRoot(), curx, cury); if(cnode != lnode) { - lnode = cnode; + lnode = cnode; if(cnode == NODE_NONE) return false; if(LineIntersectsNode(cnode, start, end, result, on)) - return(true); + return(true); if(cnode == finalnode) return false; @@ -466,11 +466,11 @@ bool Map::LocWithinNode( NodeRef node_r, float x, float y ) const { bool Map::LineIntersectsNode( NodeRef node_r, VERTEX p1, VERTEX p2, VERTEX *result, FACE **on) const { _ZP(Map_LineIntersectsNode); if( node_r == NODE_NONE || node_r >= m_Nodes) { - return(true); //can see through empty nodes, just allow LOS on error... + return(true); //can see through empty nodes, just allow LOS on error... } const PNODE _node = &mNodes[node_r]; if(!(_node->flags & nodeFinal)) { - return(true); //not a final node... not sure best action + return(true); //not a final node... not sure best action } unsigned long i; @@ -512,7 +512,7 @@ float Map::FindBestZ( NodeRef node_r, VERTEX p1, VERTEX *result, FACE **on) cons } const PNODE _node = &mNodes[node_r]; if(!(_node->flags & nodeFinal)) { - return(BEST_Z_INVALID); //not a final node... could find the proper node... + return(BEST_Z_INVALID); //not a final node... could find the proper node... } VERTEX tmp_result; //dummy placeholder if they do not ask for a result. @@ -541,7 +541,7 @@ printf("Start finding best Z...\n"); #endif for(i = 0; i < _node->faces.count; i++) { if(*cfl > m_Faces) - continue; //watch for invalid lists, they seem to happen, e.g. in eastwastes.map + continue; //watch for invalid lists, they seem to happen, e.g. in eastwastes.map cur = &mFinalFaces[ *cfl ]; //printf("Intersecting with face %lu\n", *cfl); @@ -564,7 +564,7 @@ printf("Start finding best Z...\n"); if(best_z != BEST_Z_INVALID) return best_z; - p1.z = p1.z + 10 ; // If we can't find a best Z, the NPC is probably just under the world. Try again from 10 units higher up. + p1.z = p1.z + 10 ; // If we can't find a best Z, the NPC is probably just under the world. Try again from 10 units higher up. } #ifdef DEBUG_BEST_Z @@ -577,7 +577,7 @@ printf("Best Z found: %.2f\n", best_z); bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) const { if( cface == nullptr ) { - return(false); //cant intersect a face we dont have... i guess + return(false); //cant intersect a face we dont have... i guess } const VERTEX &pa = cface->a; @@ -608,7 +608,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) return(false); //begin attempt 2 -//#define RTOD 57.2957795 //radians to degrees constant. +//#define RTOD 57.2957795 //radians to degrees constant. float d; float denom,mu; @@ -645,11 +645,11 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) // Calculate the position on the line that intersects the plane denom = n.x * (p2.x - p1.x) + n.y * (p2.y - p1.y) + n.z * (p2.z - p1.z); - if (ABS(denom) < EPS) // Line and plane don't intersect - return(false); + if (ABS(denom) < EPS) // Line and plane don't intersect + return(false); mu = - (d + n.x * p1.x + n.y * p1.y + n.z * p1.z) / denom; - if (mu < 0 || mu > 1) // Intersection not along line segment - return(false); + if (mu < 0 || mu > 1) // Intersection not along line segment + return(false); p->x = p1.x + mu * (p2.x - p1.x); p->y = p1.y + mu * (p2.y - p1.y); p->z = p1.z + mu * (p2.z - p1.z); @@ -682,7 +682,7 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) // if (ABS(total - 2*M_PI) > EPS) total = (acos(a1) + acos(a2) + acos(a3)) * 57.2957795; if (ABS(total - 360) > EPS) - return(false); + return(false); return(true); */ @@ -737,13 +737,13 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) // Determine whether or not the intersection point is bounded by pa,pb,pc #define Sign(p1, p2, p3) \ ((p1->x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1->y - p3.y)) - bool b1, b2, b3; + bool b1, b2, b3; - b1 = Sign(p, pa2, pb2) < 0.0f; - b2 = Sign(p, pb2, pc2) < 0.0f; - b3 = Sign(p, pc2, pa2) < 0.0f; + b1 = Sign(p, pa2, pb2) < 0.0f; + b2 = Sign(p, pb2, pc2) < 0.0f; + b3 = Sign(p, pc2, pa2) < 0.0f; - return ((b1 == b2) && (b2 == b3)); + return ((b1 == b2) && (b2 == b3)); */ /* //not working well, seems to block LOS a lot @@ -805,16 +805,16 @@ bool Map::LineIntersectsFace( PFACE cface, VERTEX p1, VERTEX p2, VERTEX *result) /* Yet another method adapted from this code: - Vec3 pa1 = pa - p; - Vec3 pa2 = pb - p; - float d = pa1.cross(pa2).dot(n); - if (d < 0) return false; - Vec3 pa3 = pb - p; - d = pa2.cross(pa3).dot(n); - if (d < 0) return false; - d = pa3.cross(pa1).dot(n); - if (d < 0) return false; - return true; + Vec3 pa1 = pa - p; + Vec3 pa2 = pb - p; + float d = pa1.cross(pa2).dot(n); + if (d < 0) return false; + Vec3 pa3 = pb - p; + d = pa2.cross(pa3).dot(n); + if (d < 0) return false; + d = pa3.cross(pa1).dot(n); + if (d < 0) return false; + return true; */ //in practice, this seems to actually take longer diff --git a/zone/MobAI.cpp b/zone/MobAI.cpp index 8634cb79a..e954e5dbe 100644 --- a/zone/MobAI.cpp +++ b/zone/MobAI.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -68,9 +68,10 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { float dist2; if (iSpellTypes & SpellType_Escape) { - dist2 = 0; //DistNoRoot(*this); //WTF was up with this... - } else - dist2 = DistNoRoot(*tar); + dist2 = 0; //DistNoRoot(*this); //WTF was up with this... + } + else + dist2 = DistNoRoot(*tar); bool checked_los = false; //we do not check LOS until we are absolutely sure we need to, and we only do it once. @@ -93,8 +94,8 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { (( (spells[AIspells[i].spellid].targettype==ST_AECaster || spells[AIspells[i].spellid].targettype==ST_AEBard) && dist2 <= spells[AIspells[i].spellid].aoerange*spells[AIspells[i].spellid].aoerange - ) || - dist2 <= spells[AIspells[i].spellid].range*spells[AIspells[i].spellid].range + ) || + dist2 <= spells[AIspells[i].spellid].range*spells[AIspells[i].spellid].range ) && (mana_cost <= GetMana() || GetMana() == GetMaxMana()) && (AIspells[i].time_cancast+(MakeRandomInt(0, 4))) <= Timer::GetCurrentTime() //break up the spelling casting over a period of time. @@ -102,11 +103,11 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { #if MobAI_DEBUG_Spells >= 21 cout << "Mob::AICastSpell: Casting: spellid=" << AIspells[i].spellid - << ", tar=" << tar->GetName() - << ", dist2[" << dist2 << "]<=" << spells[AIspells[i].spellid].range *spells[AIspells[i].spellid].range - << ", mana_cost[" << mana_cost << "]<=" << GetMana() - << ", cancast[" << AIspells[i].time_cancast << "]<=" << Timer::GetCurrentTime() - << ", type=" << AIspells[i].type << endl; + << ", tar=" << tar->GetName() + << ", dist2[" << dist2 << "]<=" << spells[AIspells[i].spellid].range *spells[AIspells[i].spellid].range + << ", mana_cost[" << mana_cost << "]<=" << GetMana() + << ", cancast[" << AIspells[i].time_cancast << "]<=" << Timer::GetCurrentTime() + << ", type=" << AIspells[i].type << endl; #endif switch (AIspells[i].type) { @@ -155,12 +156,12 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { && tar->CanBuffStack(AIspells[i].spellid, GetLevel(), true) >= 0 && !(tar->IsPet() && tar->GetOwner()->IsClient() && this != tar) //no buffing PC's pets, but they can buff themself ) - { - if(!checked_los) { - if(!CheckLosFN(tar)) - return(false); - checked_los = true; - } + { + if(!checked_los) { + if(!CheckLosFN(tar)) + return(false); + checked_los = true; + } uint32 tempTime = 0; AIDoSpellCast(i, tar, mana_cost, &tempTime); tar->SetDontBuffMeBefore(tempTime); @@ -172,22 +173,22 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { case SpellType_InCombatBuff: { if(MakeRandomInt(0,100) < 50) { - AIDoSpellCast(i, tar, mana_cost); + AIDoSpellCast(i, tar, mana_cost); return true; } break; } case SpellType_Escape: { - if (GetHPRatio() <= 5 ) - { - AIDoSpellCast(i, tar, mana_cost); + if (GetHPRatio() <= 5 ) + { + AIDoSpellCast(i, tar, mana_cost); return true; } break; } - case SpellType_Slow: - case SpellType_Debuff: + case SpellType_Slow: + case SpellType_Debuff: case SpellType_Nuke: { if ( manaR >= 10 && MakeRandomInt(0, 99) < 70 @@ -249,7 +250,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { } case SpellType_Pet: { - //keep mobs from recasting pets when they have them. + //keep mobs from recasting pets when they have them. if (!IsPet() && !GetPetID() && MakeRandomInt(0, 99) < 25) { AIDoSpellCast(i, tar, mana_cost); return true; @@ -257,7 +258,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { break; } case SpellType_Lifetap: { - if ( GetHPRatio() <= 95 + if (GetHPRatio() <= 95 && MakeRandomInt(0, 99) < 50 && tar->CanBuffStack(AIspells[i].spellid, GetLevel(), true) >= 0 ) { @@ -273,7 +274,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { } case SpellType_Snare: { if ( - !tar->IsRooted() + !tar->IsRooted() && MakeRandomInt(0, 99) < 50 && tar->DontSnareMeBefore() < Timer::GetCurrentTime() && tar->CanBuffStack(AIspells[i].spellid, GetLevel(), true) >= 0 @@ -359,8 +360,8 @@ bool EntityList::AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float if(caster->AI_HasSpells() == false) return false; - if(caster->SpecAttacks[NPC_NO_BUFFHEAL_FRIENDS]) - return false; + if(caster->SpecAttacks[NPC_NO_BUFFHEAL_FRIENDS]) + return false; if (iChance < 100) { uint8 tmp = MakeRandomInt(0, 99); @@ -376,8 +377,8 @@ bool EntityList::AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float //Only iterate through NPCs - LinkedListIterator iterator(npc_list); - for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { + LinkedListIterator iterator(npc_list); + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) { NPC* mob = iterator.GetData(); //Since >90% of mobs will always be out of range, try to @@ -393,7 +394,7 @@ bool EntityList::AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float t2 = 0 - t2; if(t3 < 0) t3 = 0 - t3; - if ( t1 > iRange + if (t1 > iRange || t2 > iRange || t3 > iRange || mob->DistNoRoot(*caster) > iRange2 @@ -761,7 +762,7 @@ void Client::AI_Process() bool WaypointChanged, NodeReached; VERTEX Goal = UpdatePath(fear_walkto_x, fear_walkto_y, fear_walkto_z, - GetFearSpeed(), WaypointChanged, NodeReached); + GetFearSpeed(), WaypointChanged, NodeReached); if(WaypointChanged) tar_ndx = 20; @@ -1004,7 +1005,7 @@ void Mob::AI_Process() { return; bool engaged = IsEngaged(); - bool doranged = false; + bool doranged = false; // Begin: Additions for Wiz Fear Code // @@ -1037,7 +1038,7 @@ void Mob::AI_Process() { bool WaypointChanged, NodeReached; VERTEX Goal = UpdatePath(fear_walkto_x, fear_walkto_y, fear_walkto_z, - GetFearSpeed(), WaypointChanged, NodeReached); + GetFearSpeed(), WaypointChanged, NodeReached); if(WaypointChanged) tar_ndx = 20; @@ -1086,11 +1087,11 @@ void Mob::AI_Process() { #ifdef BOTS if (IsPet() && GetOwner()->IsBot() && target == GetOwner()) - { - // this blocks all pet attacks against owner..bot pet test (copied above check) - RemoveFromHateList(this); - return; - } + { + // this blocks all pet attacks against owner..bot pet test (copied above check) + RemoveFromHateList(this); + return; + } #endif //BOTS if(DivineAura()) @@ -1112,15 +1113,15 @@ void Mob::AI_Process() { (!RuleB(NPC, LiveLikeEnrage) || (RuleB(NPC, LiveLikeEnrage) && ((IsPet() && !IsCharmed() && GetOwner() && GetOwner()->IsClient()) || - (CastToNPC()->GetSwarmOwner() && entity_list.GetMob(CastToNPC()->GetSwarmOwner())->IsClient()))))) + (CastToNPC()->GetSwarmOwner() && entity_list.GetMob(CastToNPC()->GetSwarmOwner())->IsClient()))))) { StartEnrage(); } bool is_combat_range = CombatRange(target); - if (is_combat_range) - { + if (is_combat_range) + { if (AImovement_timer->Check()) { SetRunAnimSpeed(0); @@ -1142,18 +1143,18 @@ void Mob::AI_Process() { //try main hand first if(attack_timer.Check()) { - if(IsNPC()) { - int16 n_atk = CastToNPC()->GetNumberOfAttacks(); - if(n_atk <= 1) { - Attack(target, 13); - } else { - for(int i = 0; i < n_atk; ++i) { - Attack(target, 13); - } - } - } else { - Attack(target, 13); - } + if(IsNPC()) { + int16 n_atk = CastToNPC()->GetNumberOfAttacks(); + if(n_atk <= 1) { + Attack(target, 13); + } else { + for(int i = 0; i < n_atk; ++i) { + Attack(target, 13); + } + } + } else { + Attack(target, 13); + } if (target) { @@ -1191,7 +1192,7 @@ void Mob::AI_Process() { if (GetFlurryChance()) npc_flurry = GetFlurryChance(); - if (MakeRandomInt(0, 99) < npc_flurry) + if (MakeRandomInt(0, 99) < npc_flurry) Flurry(); } @@ -1209,8 +1210,8 @@ void Mob::AI_Process() { if (SpecAttacks[SPECATK_RAMPAGE]) { - //simply based off dex for now, probably a better calc - if(MakeRandomInt(0, 100) < ((int)(GetDEX() / ((GetLevel() * 0.760) + 10.0)) + 5)) + //simply based off dex for now, probably a better calc + if(MakeRandomInt(0, 100) < ((int)(GetDEX() / ((GetLevel() * 0.760) + 10.0)) + 5)) Rampage(); } @@ -1218,7 +1219,7 @@ void Mob::AI_Process() { { //simply based off dex for now, probably a better calc - if(MakeRandomInt(0, 100) < ((int)(GetDEX() / ((GetLevel() * 0.760) + 10.0)) + 5)) + if(MakeRandomInt(0, 100) < ((int)(GetDEX() / ((GetLevel() * 0.760) + 10.0)) + 5)) AreaRampage(); } } @@ -1253,30 +1254,30 @@ void Mob::AI_Process() { } //end is within combat range else { //we cannot reach our target... - //underwater stuff only works with water maps in the zone! - if(IsNPC() && CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { - if(!zone->watermap->InLiquid(target->GetX(), target->GetY(), target->GetZ())) { - Mob *tar = hate_list.GetTop(this); - if(tar == target) { - WipeHateList(); - Heal(); - BuffFadeAll(); - AIwalking_timer->Start(100); - pLastFightingDelayMoving = Timer::GetCurrentTime(); - return; - } else if(tar != nullptr) { - SetTarget(tar); - return; - } - } - } + //underwater stuff only works with water maps in the zone! + if(IsNPC() && CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { + if(!zone->watermap->InLiquid(target->GetX(), target->GetY(), target->GetZ())) { + Mob *tar = hate_list.GetTop(this); + if(tar == target) { + WipeHateList(); + Heal(); + BuffFadeAll(); + AIwalking_timer->Start(100); + pLastFightingDelayMoving = Timer::GetCurrentTime(); + return; + } else if(tar != nullptr) { + SetTarget(tar); + return; + } + } + } // See if we can summon the mob to us if (!HateSummon()) { //could not summon them, check ranged... if(SpecAttacks[SPECATK_RANGED_ATK]) - doranged = true; + doranged = true; // Now pursue // TODO: Check here for another person on hate list with close hate value @@ -1351,13 +1352,13 @@ void Mob::AI_Process() { else if (AIscanarea_timer->Check()) { /* - * This is where NPCs look around to see if they want to attack anybody. - * - * if REVERSE_AGGRO is enabled, then this timer is disabled unless they - * have the npc_aggro flag on them, and aggro against clients is checked - * by the clients. - * - */ + * This is where NPCs look around to see if they want to attack anybody. + * + * if REVERSE_AGGRO is enabled, then this timer is disabled unless they + * have the npc_aggro flag on them, and aggro against clients is checked + * by the clients. + * + */ _ZP(Mob_AI_Process_scanarea); Mob* tmptar = entity_list.AICheckCloseAggro(this, GetAggroRange(), GetAssistRange()); @@ -1484,15 +1485,15 @@ void Mob::AI_Process() { } } - } - } // else if (AImovement_timer->Check()) - } + } + } // else if (AImovement_timer->Check()) + } - //Do Ranged attack here - if(doranged) - { - RangedAttack(target); - } + //Do Ranged attack here + if(doranged) + { + RangedAttack(target); + } } void NPC::AI_DoMovement() { @@ -1550,13 +1551,13 @@ void NPC::AI_DoMovement() { int16 gridno = CastToNPC()->GetGrid(); - if (gridno > 0 || cur_wp==-2) { - if (movetimercompleted==true) { // time to pause at wp is over + if (gridno > 0 || cur_wp==-2) { + if (movetimercompleted==true) { // time to pause at wp is over if (wandertype == 4 && cur_wp == CastToNPC()->GetMaxWp()) { - CastToNPC()->Depop(true); //depop and resart spawn timer + CastToNPC()->Depop(true); //depop and resart spawn timer } else if (wandertype == 6 && cur_wp == CastToNPC()->GetMaxWp()) { - CastToNPC()->Depop(false);//depop without spawn timer + CastToNPC()->Depop(false);//depop without spawn timer } else { movetimercompleted=false; @@ -1579,7 +1580,7 @@ void NPC::AI_DoMovement() { //kick off event_waypoint depart char temp[16]; sprintf(temp, "%d", cur_wp); - parse->EventNPC(EVENT_WAYPOINT_DEPART, CastToNPC(), nullptr, temp, 0); + parse->EventNPC(EVENT_WAYPOINT_DEPART, CastToNPC(), nullptr, temp, 0); //setup our next waypoint, if we are still on our normal grid //remember that the quest event above could have done anything it wanted with our grid @@ -1590,8 +1591,8 @@ void NPC::AI_DoMovement() { else { DistractedFromGrid = false; } - } - } // endif (movetimercompleted==true) + } + } // endif (movetimercompleted==true) else if (!(AIwalking_timer->Enabled())) { // currently moving if (cur_wp_x == GetX() && cur_wp_y == GetY()) @@ -1651,50 +1652,50 @@ void NPC::AI_DoMovement() { } } - } - else if (IsGuarding()) - { - _ZP(Mob_AI_Process_guard); - - bool CP2Moved; - if(!RuleB(Pathing, Guard) || !zone->pathing) - CP2Moved = CalculateNewPosition2(guard_x, guard_y, guard_z, walksp); - else - { - if(!((x_pos == guard_x) && (y_pos == guard_y) && (z_pos == guard_z))) - { - bool WaypointChanged, NodeReached; - VERTEX Goal = UpdatePath(guard_x, guard_y, guard_z, walksp, WaypointChanged, NodeReached); - if(WaypointChanged) - tar_ndx = 20; - - if(NodeReached) - entity_list.OpenDoorsNear(CastToNPC()); - - CP2Moved = CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp); - } - else - CP2Moved = false; - } - if (!CP2Moved) + else if (IsGuarding()) { - if(moved) { - mlog(AI__WAYPOINTS, "Reached guard point (%.3f,%.3f,%.3f)", guard_x, guard_y, guard_z); - ClearFeignMemory(); - moved=false; - SetMoving(false); - if (GetTarget() == nullptr || DistNoRoot(*GetTarget()) >= 5*5 ) + _ZP(Mob_AI_Process_guard); + + bool CP2Moved; + if(!RuleB(Pathing, Guard) || !zone->pathing) + CP2Moved = CalculateNewPosition2(guard_x, guard_y, guard_z, walksp); + else + { + if(!((x_pos == guard_x) && (y_pos == guard_y) && (z_pos == guard_z))) { - SetHeading(guard_heading); - } else { - FaceTarget(GetTarget()); + bool WaypointChanged, NodeReached; + VERTEX Goal = UpdatePath(guard_x, guard_y, guard_z, walksp, WaypointChanged, NodeReached); + if(WaypointChanged) + tar_ndx = 20; + + if(NodeReached) + entity_list.OpenDoorsNear(CastToNPC()); + + CP2Moved = CalculateNewPosition2(Goal.x, Goal.y, Goal.z, walksp); } - SendPosition(); - SetAppearance(GetGuardPointAnim()); + else + CP2Moved = false; + } - } - } + if (!CP2Moved) + { + if(moved) { + mlog(AI__WAYPOINTS, "Reached guard point (%.3f,%.3f,%.3f)", guard_x, guard_y, guard_z); + ClearFeignMemory(); + moved=false; + SetMoving(false); + if (GetTarget() == nullptr || DistNoRoot(*GetTarget()) >= 5*5 ) + { + SetHeading(guard_heading); + } else { + FaceTarget(GetTarget()); + } + SendPosition(); + SetAppearance(GetGuardPointAnim()); + } + } + } } // Note: Mob that caused this may not get added to the hate list until after this function call completes @@ -1703,9 +1704,9 @@ void Mob::AI_Event_Engaged(Mob* attacker, bool iYellForHelp) { return; if(GetAppearance() != eaStanding) - { - SetAppearance(eaStanding); - } + { + SetAppearance(eaStanding); + } if (iYellForHelp) { if(IsPet()) { @@ -1729,7 +1730,7 @@ void Mob::AI_Event_Engaged(Mob* attacker, bool iYellForHelp) { { if(!CastToNPC()->GetCombatEvent() && GetHP() > 0) { - parse->EventNPC(EVENT_COMBAT, CastToNPC(), attacker, "1", 0); + parse->EventNPC(EVENT_COMBAT, CastToNPC(), attacker, "1", 0); uint16 emoteid = GetEmoteID(); if(emoteid != 0) CastToNPC()->DoNPCEmote(ENTERCOMBAT,emoteid); @@ -1766,7 +1767,7 @@ void Mob::AI_Event_NoLongerEngaged() { if(entity_list.GetNPCByID(this->GetID())) { uint16 emoteid = CastToNPC()->GetEmoteID(); - parse->EventNPC(EVENT_COMBAT, CastToNPC(), nullptr, "0", 0); + parse->EventNPC(EVENT_COMBAT, CastToNPC(), nullptr, "0", 0); if(emoteid != 0) CastToNPC()->DoNPCEmote(LEAVECOMBAT,emoteid); CastToNPC()->SetCombatEvent(false); @@ -1861,28 +1862,28 @@ bool NPC::AI_IdleCastCheck() { void Mob::StartEnrage() { - // dont continue if already enraged - if (bEnraged) - return; - if (SpecAttackTimers[SPECATK_ENRAGE] && !SpecAttackTimers[SPECATK_ENRAGE]->Check()) - return; - // see if NPC has possibility to enrage - if (!SpecAttacks[SPECATK_ENRAGE]) - return; - // check if timer exists (should be true at all times) - if (SpecAttackTimers[SPECATK_ENRAGE]) - { + // dont continue if already enraged + if (bEnraged) + return; + if (SpecAttackTimers[SPECATK_ENRAGE] && !SpecAttackTimers[SPECATK_ENRAGE]->Check()) + return; + // see if NPC has possibility to enrage + if (!SpecAttacks[SPECATK_ENRAGE]) + return; + // check if timer exists (should be true at all times) + if (SpecAttackTimers[SPECATK_ENRAGE]) + { safe_delete(SpecAttackTimers[SPECATK_ENRAGE]); - SpecAttackTimers[SPECATK_ENRAGE] = nullptr; - } + SpecAttackTimers[SPECATK_ENRAGE] = nullptr; + } - if (!SpecAttackTimers[SPECATK_ENRAGE]) - { - SpecAttackTimers[SPECATK_ENRAGE] = new Timer(EnragedDurationTimer); - } - // start the timer. need to call IsEnraged frequently since we dont have callback timers :-/ - SpecAttackTimers[SPECATK_ENRAGE]->Start(); - bEnraged = true; + if (!SpecAttackTimers[SPECATK_ENRAGE]) + { + SpecAttackTimers[SPECATK_ENRAGE] = new Timer(EnragedDurationTimer); + } + // start the timer. need to call IsEnraged frequently since we dont have callback timers :-/ + SpecAttackTimers[SPECATK_ENRAGE]->Start(); + bEnraged = true; entity_list.MessageClose_StringID(this, true, 200, MT_NPCEnrage, NPC_ENRAGE_START, GetCleanName()); } @@ -1898,13 +1899,13 @@ void Mob::ProcessEnrage(){ bool Mob::IsEnraged() { - return bEnraged; + return bEnraged; } bool Mob::Flurry() { - // this is wrong, flurry is extra attacks on the current target - Mob *target = GetTarget(); + // this is wrong, flurry is extra attacks on the current target + Mob *target = GetTarget(); if (target) { if (!IsPet()) { entity_list.MessageClose_StringID(this, true, 200, MT_NPCFlurry, NPC_FLURRY, GetCleanName(), target->GetCleanName()); @@ -1914,7 +1915,7 @@ bool Mob::Flurry() for (int i = 0; i < RuleI(Combat, MaxFlurryHits); i++) Attack(target); } - return true; + return true; } bool Mob::AddRampage(Mob *mob) @@ -1922,18 +1923,18 @@ bool Mob::AddRampage(Mob *mob) if(!mob) return false; - if (!SpecAttacks[SPECATK_RAMPAGE]) - return false; + if (!SpecAttacks[SPECATK_RAMPAGE]) + return false; - for (int i = 0; i < RampageArray.size(); i++) - { - // if name is already on the list dont add it again - if (strcasecmp(mob->GetName(), RampageArray[i].c_str()) == 0) - return false; + for (int i = 0; i < RampageArray.size(); i++) + { + // if name is already on the list dont add it again + if (strcasecmp(mob->GetName(), RampageArray[i].c_str()) == 0) + return false; } std::string r_name = mob->GetName(); RampageArray.push_back(r_name); - return true; + return true; } void Mob::ClearRampage(){ @@ -1948,26 +1949,26 @@ bool Mob::Rampage() } else { entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, NPC_RAMPAGE, GetCleanName()); } - for (int i = 0; i < RampageArray.size(); i++) - { + for (int i = 0; i < RampageArray.size(); i++) + { if(index_hit >= RuleI(Combat, MaxRampageTargets)) break; - // range is important + // range is important Mob *m_target = entity_list.GetMob(RampageArray[i].c_str()); - if(m_target) - { + if(m_target) + { if(m_target == GetTarget()) continue; - if (CombatRange(m_target)) + if (CombatRange(m_target)) { - Attack(m_target); + Attack(m_target); index_hit++; } - } - } + } + } if(index_hit < RuleI(Combat, MaxRampageTargets)) Attack(GetTarget()); - return true; + return true; } void Mob::AreaRampage() @@ -1985,166 +1986,166 @@ void Mob::AreaRampage() } uint32 Mob::GetLevelCon(uint8 mylevel, uint8 iOtherLevel) { - int16 diff = iOtherLevel - mylevel; + int16 diff = iOtherLevel - mylevel; uint32 conlevel=0; - if (diff == 0) - return CON_WHITE; - else if (diff >= 1 && diff <= 2) - return CON_YELLOW; - else if (diff >= 3) - return CON_RED; + if (diff == 0) + return CON_WHITE; + else if (diff >= 1 && diff <= 2) + return CON_YELLOW; + else if (diff >= 3) + return CON_RED; - if (mylevel <= 8) - { - if (diff <= -4) - conlevel = CON_GREEN; - else - conlevel = CON_BLUE; - } - else if (mylevel <= 9) + if (mylevel <= 8) { - if (diff <= -6) - conlevel = CON_GREEN; - else if (diff <= -4) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -4) + conlevel = CON_GREEN; + else + conlevel = CON_BLUE; } - else if (mylevel <= 13) + else if (mylevel <= 9) { - if (diff <= -7) - conlevel = CON_GREEN; - else if (diff <= -5) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -6) + conlevel = CON_GREEN; + else if (diff <= -4) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; + } + else if (mylevel <= 13) + { + if (diff <= -7) + conlevel = CON_GREEN; + else if (diff <= -5) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 15) { - if (diff <= -7) - conlevel = CON_GREEN; - else if (diff <= -5) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -7) + conlevel = CON_GREEN; + else if (diff <= -5) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 17) { - if (diff <= -8) - conlevel = CON_GREEN; - else if (diff <= -6) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -8) + conlevel = CON_GREEN; + else if (diff <= -6) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 21) { - if (diff <= -9) - conlevel = CON_GREEN; - else if (diff <= -7) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -9) + conlevel = CON_GREEN; + else if (diff <= -7) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 25) { - if (diff <= -10) - conlevel = CON_GREEN; - else if (diff <= -8) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -10) + conlevel = CON_GREEN; + else if (diff <= -8) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 29) { - if (diff <= -11) - conlevel = CON_GREEN; - else if (diff <= -9) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -11) + conlevel = CON_GREEN; + else if (diff <= -9) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 31) { - if (diff <= -12) - conlevel = CON_GREEN; - else if (diff <= -9) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -12) + conlevel = CON_GREEN; + else if (diff <= -9) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 33) { - if (diff <= -13) - conlevel = CON_GREEN; - else if (diff <= -10) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -13) + conlevel = CON_GREEN; + else if (diff <= -10) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 37) { - if (diff <= -14) - conlevel = CON_GREEN; - else if (diff <= -11) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -14) + conlevel = CON_GREEN; + else if (diff <= -11) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 41) { - if (diff <= -16) - conlevel = CON_GREEN; - else if (diff <= -12) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -16) + conlevel = CON_GREEN; + else if (diff <= -12) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 45) { - if (diff <= -17) - conlevel = CON_GREEN; - else if (diff <= -13) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -17) + conlevel = CON_GREEN; + else if (diff <= -13) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 49) { - if (diff <= -18) - conlevel = CON_GREEN; - else if (diff <= -14) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -18) + conlevel = CON_GREEN; + else if (diff <= -14) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 53) { - if (diff <= -19) - conlevel = CON_GREEN; - else if (diff <= -15) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -19) + conlevel = CON_GREEN; + else if (diff <= -15) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else if (mylevel <= 55) { - if (diff <= -20) - conlevel = CON_GREEN; - else if (diff <= -15) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -20) + conlevel = CON_GREEN; + else if (diff <= -15) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } else { - if (diff <= -21) - conlevel = CON_GREEN; - else if (diff <= -16) - conlevel = CON_LIGHTBLUE; - else - conlevel = CON_BLUE; + if (diff <= -21) + conlevel = CON_GREEN; + else if (diff <= -16) + conlevel = CON_LIGHTBLUE; + else + conlevel = CON_BLUE; } return conlevel; } @@ -2400,9 +2401,9 @@ DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) { uint32 ZoneDatabase::GetMaxNPCSpellsID() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT max(id) from npc_spells"), errbuf, &result)) { safe_delete_array(query); diff --git a/zone/NpcAI.h b/zone/NpcAI.h index 2f08d633a..21d5cbc4e 100644 --- a/zone/NpcAI.h +++ b/zone/NpcAI.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef NPCAI_H @@ -34,7 +34,7 @@ Seems more like a bitwise comparison client side.. */ #define DEFAULT_AGGRORADIUS 70 #define DEFAULT_FRENYRADIUS 70 -#define MAX_SHIELDRADIUS 20 +#define MAX_SHIELDRADIUS 20 uint32 GetLevelCon(uint8 PlayerLevel, uint8 NPCLevel); diff --git a/zone/Object.cpp b/zone/Object.cpp index 2e33959a4..25123a62b 100644 --- a/zone/Object.cpp +++ b/zone/Object.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -345,7 +345,7 @@ void Object::Close() { { last_user = user; // put any remaining items from the world container back into the player's inventory to avoid item loss - // if they close the container without removing all items + // if they close the container without removing all items ItemInst* container = this->m_inst; if(container != nullptr) { @@ -447,7 +447,7 @@ void Object::RandomSpawn(bool send_packet) { bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) { if(m_ground_spawn){//This is a Cool Groundspawn - respawn_timer.Start(); + respawn_timer.Start(); } if (m_type == OT_DROPPEDITEM) { bool cursordelete = false; @@ -456,7 +456,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) // the client updates itself and takes care of sending "duplicate lore item" messages if(sender->CheckLoreConflict(m_inst->GetItem())) { int16 loreslot = sender->GetInv().HasItem(m_inst->GetItem()->ID, 0, invWhereBank); - if(loreslot != SLOT_INVALID) // if the duplicate is in the bank, delete it. + if(loreslot != SLOT_INVALID) // if the duplicate is in the bank, delete it. sender->DeleteItemInInventory(loreslot); else cursordelete = true; // otherwise, we delete the new one @@ -465,13 +465,13 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) char buf[10]; snprintf(buf, 9, "%u", m_inst->GetItem()->ID); buf[9] = '\0'; - parse->EventPlayer(EVENT_PLAYER_PICKUP, sender, buf, 0); + parse->EventPlayer(EVENT_PLAYER_PICKUP, sender, buf, 0); // Transfer item to client sender->PutItemInInventory(SLOT_CURSOR, *m_inst, false); sender->SendItemPacket(SLOT_CURSOR, m_inst, ItemPacketTrade); - if(cursordelete) // delete the item if it's a duplicate lore. We have to do this because the client expects the item packet + if(cursordelete) // delete the item if it's a duplicate lore. We have to do this because the client expects the item packet sender->DeleteItemInInventory(SLOT_CURSOR); if(!m_ground_spawn) @@ -491,7 +491,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) // Remove object database.DeleteObject(m_id); if(!m_ground_spawn) - entity_list.RemoveEntity(this->GetID()); + entity_list.RemoveEntity(this->GetID()); } else { // Tradeskill item EQApplicationPacket* outapp = new EQApplicationPacket(OP_ClickObjectAction, sizeof(ClickObjectAction_Struct)); @@ -559,7 +559,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& object, const ItemInst* inst) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; uint32 database_id = 0; uint32 item_id = 0; @@ -602,7 +602,7 @@ uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& ob void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Object_Struct& object, const ItemInst* inst) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; uint32 item_id = 0; int16 charges = 0; @@ -640,9 +640,9 @@ void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Objec } Ground_Spawns* ZoneDatabase::LoadGroundSpawns(uint32 zone_id, int16 version, Ground_Spawns* gs){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT max_x,max_y,max_z,min_x,min_y,heading,name,item,max_allowed,respawn_timer from ground_spawns where zoneid=%i and (version=%u OR version=-1) limit 50", zone_id, version), errbuf, &result)) { @@ -672,7 +672,7 @@ Ground_Spawns* ZoneDatabase::LoadGroundSpawns(uint32 zone_id, int16 version, Gro void ZoneDatabase::DeleteObject(uint32 id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; // Construct query uint32 len_query = MakeAnyLenString(&query, diff --git a/zone/PlayerCorpse.cpp b/zone/PlayerCorpse.cpp index 8fd0b9c20..6a2fdfe63 100644 --- a/zone/PlayerCorpse.cpp +++ b/zone/PlayerCorpse.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* New class for handeling corpses and everything associated with them. @@ -33,7 +33,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif #include "masterentity.h" @@ -194,14 +194,14 @@ Corpse* Corpse::LoadFromDBData(uint32 in_dbid, uint32 in_charid, char* in_charna // Mongrel: added see_invis and see_invis_undead Corpse::Corpse(NPC* in_npc, ItemList* in_itemlist, uint32 in_npctypeid, const NPCType** in_npctypedata, uint32 in_decaytime) // vesuvias - appearence fix - : Mob("Unnamed_Corpse","",0,0,in_npc->GetGender(),in_npc->GetRace(),in_npc->GetClass(),BT_Humanoid//bodytype added - ,in_npc->GetDeity(),in_npc->GetLevel(),in_npc->GetNPCTypeID(),in_npc->GetSize(),0, - in_npc->GetHeading(),in_npc->GetX(),in_npc->GetY(),in_npc->GetZ(),0, - in_npc->GetTexture(),in_npc->GetHelmTexture(), - 0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0xff,0,0,0,0,0,0,0,0,0), - corpse_decay_timer(in_decaytime), - corpse_res_timer(0), +: Mob("Unnamed_Corpse","",0,0,in_npc->GetGender(),in_npc->GetRace(),in_npc->GetClass(),BT_Humanoid,//bodytype added + in_npc->GetDeity(),in_npc->GetLevel(),in_npc->GetNPCTypeID(),in_npc->GetSize(),0, + in_npc->GetHeading(),in_npc->GetX(),in_npc->GetY(),in_npc->GetZ(),0, + in_npc->GetTexture(),in_npc->GetHelmTexture(), + 0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0xff,0,0,0,0,0,0,0,0,0), + corpse_decay_timer(in_decaytime), + corpse_res_timer(0), corpse_delay_timer(RuleI(NPC, CorpseUnlockTimer)), corpse_graveyard_timer(0), loot_cooldown_timer(10) @@ -347,15 +347,15 @@ Corpse::Corpse(Client* client, int32 in_rezexp) if(!RuleB(Character, LeaveNakedCorpses) || RuleB(Character, LeaveCorpses) && GetLevel() >= RuleI(Character, DeathItemLossLevel)) { // cash - // Let's not move the cash when 'RespawnFromHover = true' && 'client->GetClientVersion() < EQClientSoF' since the client doesn't. - // (change to first client that supports 'death hover' mode, if not SoF.) - if (!RuleB(Character, RespawnFromHover) || client->GetClientVersion() < EQClientSoF) { - SetCash(pp->copper, pp->silver, pp->gold, pp->platinum); - pp->copper = 0; - pp->silver = 0; - pp->gold = 0; - pp->platinum = 0; - } + // Let's not move the cash when 'RespawnFromHover = true' && 'client->GetClientVersion() < EQClientSoF' since the client doesn't. + // (change to first client that supports 'death hover' mode, if not SoF.) + if (!RuleB(Character, RespawnFromHover) || client->GetClientVersion() < EQClientSoF) { + SetCash(pp->copper, pp->silver, pp->gold, pp->platinum); + pp->copper = 0; + pp->silver = 0; + pp->gold = 0; + pp->platinum = 0; + } // get their tints memcpy(item_tint, &client->GetPP().item_tint, sizeof(item_tint)); @@ -384,52 +384,52 @@ Corpse::Corpse(Client* client, int32 in_rezexp) } } - // cursor queue // (change to first client that supports 'death hover' mode, if not SoF.) - if (!RuleB(Character, RespawnFromHover) || client->GetClientVersion() < EQClientSoF) { + // cursor queue // (change to first client that supports 'death hover' mode, if not SoF.) + if (!RuleB(Character, RespawnFromHover) || client->GetClientVersion() < EQClientSoF) { - // bumped starting assignment to 8001 because any in-memory 'slot 8000' item was moved above as 'slot 30' - // this was mainly for client profile state reflection..should match db player inventory entries now. + // bumped starting assignment to 8001 because any in-memory 'slot 8000' item was moved above as 'slot 30' + // this was mainly for client profile state reflection..should match db player inventory entries now. - iter_queue it; - for(it=client->GetInv().cursor_begin(),i=8001; it!=client->GetInv().cursor_end(); it++,i++) { - item = *it; - if((item && (!client->IsBecomeNPC())) || (item && client->IsBecomeNPC() && !item->GetItem()->NoRent)) - { - std::list slot_list = MoveItemToCorpse(client, item, i); - removed_list.merge(slot_list); - cursor = true; - } + iter_queue it; + for(it=client->GetInv().cursor_begin(),i=8001; it!=client->GetInv().cursor_end(); it++,i++) { + item = *it; + if((item && (!client->IsBecomeNPC())) || (item && client->IsBecomeNPC() && !item->GetItem()->NoRent)) + { + std::list slot_list = MoveItemToCorpse(client, item, i); + removed_list.merge(slot_list); + cursor = true; + } } } - if(removed_list.size() != 0) { - std::stringstream ss(""); - ss << "DELETE FROM inventory WHERE charid=" << client->CharacterID(); - ss << " AND ("; - std::list::const_iterator iter = removed_list.begin(); - bool first = true; - while(iter != removed_list.end()) { - if(first) { - first = false; - } else { - ss << " OR "; - } - ss << "slotid=" << (*iter); - iter++; - } - ss << ")"; - database.RunQuery(ss.str().c_str(), ss.str().length()); - } + if(removed_list.size() != 0) { + std::stringstream ss(""); + ss << "DELETE FROM inventory WHERE charid=" << client->CharacterID(); + ss << " AND ("; + std::list::const_iterator iter = removed_list.begin(); + bool first = true; + while(iter != removed_list.end()) { + if(first) { + first = false; + } else { + ss << " OR "; + } + ss << "slotid=" << (*iter); + iter++; + } + ss << ")"; + database.RunQuery(ss.str().c_str(), ss.str().length()); + } - if(cursor) { // all cursor items should be on corpse (client < SoF or RespawnFromHover = false) - while(!client->GetInv().CursorEmpty()) - client->DeleteItemInInventory(SLOT_CURSOR, 0, false, false); - } - else { // only visible cursor made it to corpse (client >= Sof and RespawnFromHover = true) - std::list::const_iterator start = client->GetInv().cursor_begin(); - std::list::const_iterator finish = client->GetInv().cursor_end(); - database.SaveCursor(client->CharacterID(), start, finish); - } + if(cursor) { // all cursor items should be on corpse (client < SoF or RespawnFromHover = false) + while(!client->GetInv().CursorEmpty()) + client->DeleteItemInInventory(SLOT_CURSOR, 0, false, false); + } + else { // only visible cursor made it to corpse (client >= Sof and RespawnFromHover = true) + std::list::const_iterator start = client->GetInv().cursor_begin(); + std::list::const_iterator finish = client->GetInv().cursor_end(); + database.SaveCursor(client->CharacterID(), start, finish); + } client->CalcBonuses(); // will only affect offline profile viewing of dead characters..unneeded overhead client->Save(); @@ -445,17 +445,17 @@ std::list Corpse::MoveItemToCorpse(Client *client, ItemInst *item, int16 int bagindex; int16 interior_slot; ItemInst *interior_item; - std::list returnlist; + std::list returnlist; AddItem(item->GetItem()->ID, item->GetCharges(), equipslot, item->GetAugmentItemID(0), item->GetAugmentItemID(1), item->GetAugmentItemID(2), item->GetAugmentItemID(3), item->GetAugmentItemID(4)); - returnlist.push_back(equipslot); + returnlist.push_back(equipslot); - // Qualified bag slot iterations. processing bag slots that don't exist is probably not a good idea. - if(item->IsType(ItemClassContainer) && ((equipslot >= 22 && equipslot <=30))) // Limit the bag check to inventory and cursor slots. + // Qualified bag slot iterations. processing bag slots that don't exist is probably not a good idea. + if(item->IsType(ItemClassContainer) && ((equipslot >= 22 && equipslot <=30))) // Limit the bag check to inventory and cursor slots. { for(bagindex = 0; bagindex <= 9; bagindex++) { - // For empty bags in cursor queue, slot was previously being resolved as SLOT_INVALID (-1) + // For empty bags in cursor queue, slot was previously being resolved as SLOT_INVALID (-1) interior_slot = Inventory::CalcSlotId(equipslot, bagindex); interior_item = client->GetInv().GetItem(interior_slot); @@ -468,16 +468,16 @@ std::list Corpse::MoveItemToCorpse(Client *client, ItemInst *item, int16 } } client->DeleteItemInInventory(equipslot, 0, true, false); - return returnlist; + return returnlist; } // To be called from LoadFromDBData // Mongrel: added see_invis and see_invis_undead Corpse::Corpse(uint32 in_dbid, uint32 in_charid, char* in_charname, ItemList* in_itemlist, uint32 in_copper, uint32 in_silver, uint32 in_gold, uint32 in_plat, float in_x, float in_y, float in_z, float in_heading, float in_size, uint8 in_gender, uint16 in_race, uint8 in_class, uint8 in_deity, uint8 in_level, uint8 in_texture, uint8 in_helmtexture,uint32 in_rezexp, bool wasAtGraveyard) : Mob("Unnamed_Corpse","",0,0,in_gender, in_race, in_class, BT_Humanoid, in_deity, in_level,0, in_size, 0, in_heading, in_x, in_y, in_z,0,in_texture,in_helmtexture, - 0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0xff, - 0,0,0,0,0,0,0,0,0), + 0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0xff, + 0,0,0,0,0,0,0,0,0), corpse_decay_timer(RuleI(Character, CorpseDecayTimeMS)), corpse_res_timer(RuleI(Character, CorpseResTimeMS)), corpse_delay_timer(RuleI(NPC, CorpseUnlockTimer)), @@ -880,7 +880,7 @@ void Corpse::AllowMobLoot(Mob *them, uint8 slot) // @merth: this function needs some work void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* app) { - // Added 12/08. Started compressing loot struct on live. + // Added 12/08. Started compressing loot struct on live. char tmp[10]; if(p_depop) { SendLootReqErrorPacket(client, 0); @@ -909,7 +909,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a } uint8 tCanLoot = 1; - bool lootcoin = false; + bool lootcoin = false; if(database.GetVariable("LootCoin", tmp, 9)) { lootcoin = (atoi(tmp) == 1); } if(this->BeingLootedBy != 0xFFFFFFFF && this->BeingLootedBy != client->GetID()) { @@ -1169,7 +1169,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) strcpy(corpse_name, orgname); snprintf(buf, 87, "%d %d %s", inst->GetItem()->ID, inst->GetCharges(), EntityList::RemoveNumbers(corpse_name)); buf[87] = '\0'; - parse->EventPlayer(EVENT_LOOT, client, buf, 0); + parse->EventPlayer(EVENT_LOOT, client, buf, 0); if ((RuleB(Character, EnableDiscoveredItems))) { @@ -1255,7 +1255,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) //now send messages to all interested parties //creates a link for the item - char *link = 0, *link2 = 0; //just like a db query :-) + char *link = 0, *link2 = 0; //just like a db query :-) client->MakeItemLink(link2, inst); MakeAnyLenString(&link, "%c" "%s" "%s" "%c", 0x12, @@ -1338,43 +1338,43 @@ void Corpse::QueryLoot(Client* to) { for(; cur != end; cur++) { ServerLootItem_Struct* sitem = *cur; - if (IsPlayerCorpse()) { - if (sitem->equipSlot >= 251 && sitem->equipSlot <= 340) - sitem->lootslot = 0xFFFF; - else - x < corpselootlimit ? sitem->lootslot = x : sitem->lootslot = 0xFFFF; + if (IsPlayerCorpse()) { + if (sitem->equipSlot >= 251 && sitem->equipSlot <= 340) + sitem->lootslot = 0xFFFF; + else + x < corpselootlimit ? sitem->lootslot = x : sitem->lootslot = 0xFFFF; - const Item_Struct* item = database.GetItem(sitem->item_id); + const Item_Struct* item = database.GetItem(sitem->item_id); - if (item) - to->Message((sitem->lootslot == 0xFFFF), "LootSlot: %i (EquipSlot: %i) Item: %s (%d), Count: %i", static_cast(sitem->lootslot), sitem->equipSlot, item->Name, item->ID, sitem->charges); - else - to->Message((sitem->lootslot == 0xFFFF), "Error: 0x%04x", sitem->item_id); + if (item) + to->Message((sitem->lootslot == 0xFFFF), "LootSlot: %i (EquipSlot: %i) Item: %s (%d), Count: %i", static_cast(sitem->lootslot), sitem->equipSlot, item->Name, item->ID, sitem->charges); + else + to->Message((sitem->lootslot == 0xFFFF), "Error: 0x%04x", sitem->item_id); - if (sitem->lootslot != 0xFFFF) - x++; + if (sitem->lootslot != 0xFFFF) + x++; - y++; - } - else { - sitem->lootslot=y; - const Item_Struct* item = database.GetItem(sitem->item_id); + y++; + } + else { + sitem->lootslot=y; + const Item_Struct* item = database.GetItem(sitem->item_id); - if (item) - to->Message(0, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges); - else - to->Message(0, "Error: 0x%04x", sitem->item_id); + if (item) + to->Message(0, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges); + else + to->Message(0, "Error: 0x%04x", sitem->item_id); - y++; - } + y++; + } } - if (IsPlayerCorpse()) { - to->Message(0, "%i visible %s (%i total) on %s (DBID: %i).", x, x==1?"item":"items", y, this->GetName(), this->GetDBID()); - } - else { - to->Message(0, "%i %s on %s.", y, y==1?"item":"items", this->GetName()); - } + if (IsPlayerCorpse()) { + to->Message(0, "%i visible %s (%i total) on %s (DBID: %i).", x, x==1?"item":"items", y, this->GetName(), this->GetDBID()); + } + else { + to->Message(0, "%i %s on %s.", y, y==1?"item":"items", this->GetName()); + } } bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) @@ -1448,7 +1448,7 @@ void Corpse::Spawn() { bool ZoneDatabase::DeleteGraveyard(uint32 zone_id, uint32 graveyard_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256]; + char* query = new char[256]; uint32 query_length = 0; uint32 affected_rows = 0; @@ -1456,12 +1456,12 @@ bool ZoneDatabase::DeleteGraveyard(uint32 zone_id, uint32 graveyard_id) { if (!RunQuery(query, query_length, errbuf, 0, &affected_rows)) { safe_delete_array(query); - cerr << "Error1 in DeleteGraveyard query " << errbuf << endl; + cerr << "Error1 in DeleteGraveyard query " << errbuf << endl; return false; - } + } if (affected_rows == 0) { - cerr << "Error2 in DeleteGraveyard query: affected_rows = 0" << endl; + cerr << "Error2 in DeleteGraveyard query: affected_rows = 0" << endl; return false; } @@ -1469,13 +1469,13 @@ bool ZoneDatabase::DeleteGraveyard(uint32 zone_id, uint32 graveyard_id) { if (!RunQuery(query, query_length, errbuf, 0, &affected_rows)) { safe_delete_array(query); - cerr << "Error3 in DeleteGraveyard query " << errbuf << endl; + cerr << "Error3 in DeleteGraveyard query " << errbuf << endl; return false; - } + } safe_delete_array(query); if (affected_rows == 0) { - cerr << "Error4 in DeleteGraveyard query: affected_rows = 0" << endl; + cerr << "Error4 in DeleteGraveyard query: affected_rows = 0" << endl; return false; } @@ -1483,7 +1483,7 @@ bool ZoneDatabase::DeleteGraveyard(uint32 zone_id, uint32 graveyard_id) { } uint32 ZoneDatabase::AddGraveyardIDToZone(uint32 zone_id, uint32 graveyard_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256]; + char* query = new char[256]; char* end = query; uint32 affected_rows = 0; @@ -1491,13 +1491,13 @@ uint32 ZoneDatabase::AddGraveyardIDToZone(uint32 zone_id, uint32 graveyard_id) { if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { safe_delete_array(query); - cerr << "Error1 in AddGraveyardIDToZone query " << errbuf << endl; + cerr << "Error1 in AddGraveyardIDToZone query " << errbuf << endl; return 0; - } + } safe_delete_array(query); if (affected_rows == 0) { - cerr << "Error2 in AddGraveyardIDToZone query: affected_rows = 0" << endl; + cerr << "Error2 in AddGraveyardIDToZone query: affected_rows = 0" << endl; return 0; } @@ -1505,7 +1505,7 @@ uint32 ZoneDatabase::AddGraveyardIDToZone(uint32 zone_id, uint32 graveyard_id) { } uint32 ZoneDatabase::NewGraveyardRecord(uint32 graveyard_zoneid, float graveyard_x, float graveyard_y, float graveyard_z, float graveyard_heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256]; + char* query = new char[256]; char* end = query; uint32 affected_rows = 0; uint32 new_graveyard_id = 0; @@ -1514,13 +1514,13 @@ uint32 ZoneDatabase::NewGraveyardRecord(uint32 graveyard_zoneid, float graveyard if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows, &new_graveyard_id)) { safe_delete_array(query); - cerr << "Error1 in NewGraveyardRecord query " << errbuf << endl; + cerr << "Error1 in NewGraveyardRecord query " << errbuf << endl; return 0; - } + } safe_delete_array(query); if (affected_rows == 0) { - cerr << "Error2 in NewGraveyardRecord query: affected_rows = 0" << endl; + cerr << "Error2 in NewGraveyardRecord query: affected_rows = 0" << endl; return 0; } @@ -1533,7 +1533,7 @@ uint32 ZoneDatabase::NewGraveyardRecord(uint32 graveyard_zoneid, float graveyard } uint32 ZoneDatabase::GraveyardPlayerCorpse(uint32 dbid, uint32 zoneid, uint16 instanceid, float x, float y, float z, float heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256]; + char* query = new char[256]; char* end = query; uint32 affected_rows = 0; @@ -1542,20 +1542,20 @@ uint32 ZoneDatabase::GraveyardPlayerCorpse(uint32 dbid, uint32 zoneid, uint16 in if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { safe_delete_array(query); - cerr << "Error1 in GraveyardPlayerCorpse query " << errbuf << endl; + cerr << "Error1 in GraveyardPlayerCorpse query " << errbuf << endl; return 0; - } + } safe_delete_array(query); if (affected_rows == 0) { - cerr << "Error2 in GraveyardPlayerCorpse query: affected_rows = 0" << endl; + cerr << "Error2 in GraveyardPlayerCorpse query: affected_rows = 0" << endl; return 0; } return dbid; } uint32 ZoneDatabase::UpdatePlayerCorpse(uint32 dbid, uint32 charid, const char* charname, uint32 zoneid, uint16 instanceid, uchar* data, uint32 datasize, float x, float y, float z, float heading, bool rezzed) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256+(datasize*2)]; + char* query = new char[256+(datasize*2)]; char* end = query; uint32 affected_rows = 0; @@ -1567,13 +1567,13 @@ uint32 ZoneDatabase::UpdatePlayerCorpse(uint32 dbid, uint32 charid, const char* if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { safe_delete_array(query); - cerr << "Error1 in UpdatePlayerCorpse query " << errbuf << endl; + cerr << "Error1 in UpdatePlayerCorpse query " << errbuf << endl; return 0; - } + } safe_delete_array(query); if (affected_rows == 0) { - cerr << "Error2 in UpdatePlayerCorpse query: affected_rows = 0" << endl; + cerr << "Error2 in UpdatePlayerCorpse query: affected_rows = 0" << endl; return 0; } if(rezzed){ @@ -1599,10 +1599,10 @@ void ZoneDatabase::MarkCorpseAsRezzed(uint32 dbid) uint32 ZoneDatabase::CreatePlayerCorpse(uint32 charid, const char* charname, uint32 zoneid, uint16 instanceid, uchar* data, uint32 datasize, float x, float y, float z, float heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256+(datasize*2)]; + char* query = new char[256+(datasize*2)]; char* end = query; - //MYSQL_RES *result; - //MYSQL_ROW row; + //MYSQL_RES *result; + //MYSQL_ROW row; uint32 affected_rows = 0; uint32 last_insert_id = 0; @@ -1612,20 +1612,20 @@ uint32 ZoneDatabase::CreatePlayerCorpse(uint32 charid, const char* charname, uin *end++ = '\''; end += sprintf(end,", charname='%s', zoneid=%u, instanceid=%u, charid=%d, x=%1.1f, y=%1.1f, z=%1.1f, heading=%1.1f, timeofdeath=Now(), IsBurried=0", charname, zoneid, instanceid, charid, x, y, z, heading); - if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows, &last_insert_id)) { + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows, &last_insert_id)) { safe_delete_array(query); - cerr << "Error1 in CreatePlayerCorpse query " << errbuf << endl; + cerr << "Error1 in CreatePlayerCorpse query " << errbuf << endl; return 0; - } + } safe_delete_array(query); if (affected_rows == 0) { - cerr << "Error2 in CreatePlayerCorpse query: affected_rows = 0" << endl; + cerr << "Error2 in CreatePlayerCorpse query: affected_rows = 0" << endl; return 0; } if (last_insert_id == 0) { - cerr << "Error3 in CreatePlayerCorpse query: last_insert_id = 0" << endl; + cerr << "Error3 in CreatePlayerCorpse query: last_insert_id = 0" << endl; return 0; } @@ -1634,7 +1634,7 @@ uint32 ZoneDatabase::CreatePlayerCorpse(uint32 charid, const char* charname, uin bool ZoneDatabase::CreatePlayerCorpseBackup(uint32 dbid, uint32 charid, const char* charname, uint32 zoneid, uint16 instanceid, uchar* data, uint32 datasize, float x, float y, float z, float heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256+(datasize*2)]; + char* query = new char[256+(datasize*2)]; char* end = query; uint32 affected_rows = 0; uint32 last_insert_id = 0; @@ -1668,9 +1668,9 @@ bool ZoneDatabase::CreatePlayerCorpseBackup(uint32 dbid, uint32 charid, const ch uint32 ZoneDatabase::GetPlayerBurriedCorpseCount(uint32 char_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 CorpseCount = 0; if (RunQuery(query, MakeAnyLenString(&query, "select count(*) from player_corpses where charid = '%u' and IsBurried = 1", char_id), errbuf, &result)) { @@ -1689,9 +1689,9 @@ uint32 ZoneDatabase::GetPlayerBurriedCorpseCount(uint32 char_id) { uint32 ZoneDatabase::GetPlayerCorpseCount(uint32 char_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 CorpseCount = 0; if (RunQuery(query, MakeAnyLenString(&query, "select count(*) from player_corpses where charid = '%u'", char_id), errbuf, &result)) { @@ -1710,9 +1710,9 @@ uint32 ZoneDatabase::GetPlayerCorpseCount(uint32 char_id) { uint32 ZoneDatabase::GetPlayerCorpseID(uint32 char_id, uint8 corpse) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 id = 0; if (RunQuery(query, MakeAnyLenString(&query, "select id from player_corpses where charid = '%u'", char_id), errbuf, &result)) { @@ -1744,9 +1744,9 @@ uint32 ZoneDatabase::GetPlayerCorpseItemAt(uint32 corpse_id, uint16 slotid) { Corpse* ZoneDatabase::SummonBurriedPlayerCorpse(uint32 char_id, uint32 dest_zoneid, uint16 dest_instanceid, float dest_x, float dest_y, float dest_z, float dest_heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; Corpse* NewCorpse = 0; unsigned long* lengths; @@ -1778,7 +1778,7 @@ Corpse* ZoneDatabase::SummonBurriedPlayerCorpse(uint32 char_id, uint32 dest_zone } bool ZoneDatabase::SummonAllPlayerCorpses(uint32 char_id, uint32 dest_zoneid, uint16 dest_instanceid, - float dest_x, float dest_y, float dest_z, float dest_heading) + float dest_x, float dest_y, float dest_z, float dest_heading) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; @@ -1789,20 +1789,20 @@ bool ZoneDatabase::SummonAllPlayerCorpses(uint32 char_id, uint32 dest_zoneid, ui unsigned long* lengths; if(!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET zoneid = %i, instanceid = %i, x = %f, y = %f, z = %f, " - "heading = %f, IsBurried = 0, WasAtGraveyard = 0 WHERE charid = %i", - dest_zoneid, dest_instanceid, dest_x, dest_y, dest_z, dest_heading, char_id), errbuf)) + "heading = %f, IsBurried = 0, WasAtGraveyard = 0 WHERE charid = %i", + dest_zoneid, dest_instanceid, dest_x, dest_y, dest_z, dest_heading, char_id), errbuf)) LogFile->write(EQEMuLog::Error, "Error moving corpses, Query = %s, Error = %s\n", query, errbuf); safe_delete_array(query); if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, charname, data, timeofdeath, rezzed FROM player_corpses WHERE charid='%u'" - "ORDER BY timeofdeath", char_id), errbuf, &result)) + "ORDER BY timeofdeath", char_id), errbuf, &result)) { while((row = mysql_fetch_row(result))) { lengths = mysql_fetch_lengths(result); NewCorpse = Corpse::LoadFromDBData(atoi(row[0]), char_id, row[1], (uchar*) row[2], lengths[2], dest_x, dest_y, - dest_z, dest_heading, row[3],atoi(row[4])==1, false); + dest_z, dest_heading, row[3],atoi(row[4])==1, false); if(NewCorpse) { entity_list.AddCorpse(NewCorpse); NewCorpse->SetDecayTimer(RuleI(Character, CorpseDecayTimeMS)); @@ -1825,7 +1825,7 @@ bool ZoneDatabase::SummonAllPlayerCorpses(uint32 char_id, uint32 dest_zoneid, ui bool ZoneDatabase::UnburyPlayerCorpse(uint32 dbid, uint32 new_zoneid, uint16 new_instanceid, float new_x, float new_y, float new_z, float new_heading) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = new char[256]; + char* query = new char[256]; char* end = query; uint32 affected_rows = 0; bool Result = false; @@ -1833,11 +1833,11 @@ bool ZoneDatabase::UnburyPlayerCorpse(uint32 dbid, uint32 new_zoneid, uint16 new end += sprintf(end, "UPDATE player_corpses SET IsBurried=0, zoneid=%u, instanceid=%u, x=%f, y=%f, z=%f, heading=%f, timeofdeath=Now(), WasAtGraveyard=0 WHERE id=%u", new_zoneid, new_instanceid, new_x, new_y, new_z, new_heading, dbid); if (RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { - if (affected_rows == 1) + if (affected_rows == 1) Result = true; else cerr << "Error2 in UnburyPlayerCorpse query: affected_rows NOT EQUAL to 1, as expected." << endl; - } + } else cerr << "Error1 in UnburyPlayerCorpse query " << errbuf << endl; @@ -1848,9 +1848,9 @@ bool ZoneDatabase::UnburyPlayerCorpse(uint32 dbid, uint32 new_zoneid, uint16 new Corpse* ZoneDatabase::LoadPlayerCorpse(uint32 player_corpse_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; Corpse* NewCorpse = 0; unsigned long* lengths; @@ -1876,9 +1876,9 @@ Corpse* ZoneDatabase::LoadPlayerCorpse(uint32 player_corpse_id) { bool ZoneDatabase::LoadPlayerCorpses(uint32 iZoneID, uint16 iInstanceID) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 query_length = 0; unsigned long* lengths; @@ -1908,9 +1908,9 @@ bool ZoneDatabase::LoadPlayerCorpses(uint32 iZoneID, uint16 iInstanceID) { uint32 ZoneDatabase::GetFirstCorpseID(uint32 char_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 CorpseID = 0; MakeAnyLenString(&query, "SELECT id FROM player_corpses WHERE charid='%u' AND IsBurried=0 ORDER BY timeofdeath LIMIT 1", char_id); @@ -1933,7 +1933,7 @@ uint32 ZoneDatabase::GetFirstCorpseID(uint32 char_id) { bool ZoneDatabase::BuryPlayerCorpse(uint32 dbid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried = 1 WHERE id=%d", dbid), errbuf)) { cerr << "Error in BuryPlayerCorpse query '" << query << "' " << errbuf << endl; @@ -1947,7 +1947,7 @@ bool ZoneDatabase::BuryPlayerCorpse(uint32 dbid) { bool ZoneDatabase::BuryAllPlayerCorpses(uint32 charid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE player_corpses SET IsBurried = 1 WHERE charid=%d", charid), errbuf)) { cerr << "Error in BuryPlayerCorpse query '" << query << "' " << errbuf << endl; @@ -1961,7 +1961,7 @@ bool ZoneDatabase::BuryAllPlayerCorpses(uint32 charid) { bool ZoneDatabase::DeletePlayerCorpse(uint32 dbid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "Delete from player_corpses where id=%d", dbid), errbuf)) { cerr << "Error in DeletePlayerCorpse query '" << query << "' " << errbuf << endl; @@ -2024,9 +2024,9 @@ void Corpse::LoadPlayerCorpseDecayTime(uint32 dbid){ if(!dbid) return; char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(timeofdeath)) FROM player_corpses WHERE id=%d and not timeofdeath=0", dbid), errbuf, &result)) { safe_delete_array(query); while ((row = mysql_fetch_row(result))) { diff --git a/zone/PlayerCorpse.h b/zone/PlayerCorpse.h index e5fbfc7c4..0cb767d7f 100644 --- a/zone/PlayerCorpse.h +++ b/zone/PlayerCorpse.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef CORPSE_H @@ -82,7 +82,7 @@ public: void Delete(); void Bury(); virtual void Depop(); - virtual void DepopCorpse(); + virtual void DepopCorpse(); uint32 GetCopper() { return copper; } uint32 GetSilver() { return silver; } diff --git a/zone/Quest.cpp b/zone/Quest.cpp index 5efd868ba..9a98902ab 100644 --- a/zone/Quest.cpp +++ b/zone/Quest.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -94,7 +94,7 @@ return false; pquest_entry Quest::Test( int NpcId, int QuestObject ) { for( int i=0;iGetIdentifier()] = qi; - _extensions[qi->GetIdentifier()] = ext; - _load_precedence.push_back(qi); + _interfaces[qi->GetIdentifier()] = qi; + _extensions[qi->GetIdentifier()] = ext; + _load_precedence.push_back(qi); } void QuestParserCollection::AddVar(std::string name, std::string val) { - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - (*iter)->AddVar(name, val); - iter++; - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + (*iter)->AddVar(name, val); + iter++; + } } void QuestParserCollection::ReloadQuests(bool reset_timers) { - _npc_quest_status.clear(); - _player_quest_status = QuestUnloaded; - _global_player_quest_status = QuestUnloaded; + _npc_quest_status.clear(); + _player_quest_status = QuestUnloaded; + _global_player_quest_status = QuestUnloaded; _global_npc_quest_status = QuestUnloaded; - _spell_quest_status.clear(); - _item_quest_status.clear(); - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - (*iter)->ReloadQuests(reset_timers); - iter++; - } + _spell_quest_status.clear(); + _item_quest_status.clear(); + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + (*iter)->ReloadQuests(reset_timers); + iter++; + } } bool QuestParserCollection::HasQuestSub(uint32 npcid, const char *subname) { - std::map::iterator iter = _npc_quest_status.find(npcid); + std::map::iterator iter = _npc_quest_status.find(npcid); - if(iter != _npc_quest_status.end()) { - //loaded or failed to load - if(iter->second != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(iter->second); - if(qiter->second->HasQuestSub(npcid, subname)) { - return true; - } - } - } else { - QuestInterface *qi = GetQIByNPCQuest(npcid); - if(qi) { - _npc_quest_status[npcid] = qi->GetIdentifier(); - if(qi->HasQuestSub(npcid, subname)) { - return true; - } - } else { - _npc_quest_status[npcid] = QuestFailedToLoad; - } - } - - if(_global_npc_quest_status == QuestUnloaded){ - QuestInterface *qi = GetQIByGlobalNPCQuest(); - if(qi) { - _global_npc_quest_status = qi->GetIdentifier(); - if(qi->HasGlobalQuestSub(subname)) { - return true; - } - } + if(iter != _npc_quest_status.end()) { + //loaded or failed to load + if(iter->second != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(iter->second); + if(qiter->second->HasQuestSub(npcid, subname)) { + return true; + } + } } else { - if(_global_npc_quest_status != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(_global_npc_quest_status); - if(qiter->second->HasGlobalQuestSub(subname)) { - return true; - } - } - } - return false; + QuestInterface *qi = GetQIByNPCQuest(npcid); + if(qi) { + _npc_quest_status[npcid] = qi->GetIdentifier(); + if(qi->HasQuestSub(npcid, subname)) { + return true; + } + } else { + _npc_quest_status[npcid] = QuestFailedToLoad; + } + } + + if(_global_npc_quest_status == QuestUnloaded){ + QuestInterface *qi = GetQIByGlobalNPCQuest(); + if(qi) { + _global_npc_quest_status = qi->GetIdentifier(); + if(qi->HasGlobalQuestSub(subname)) { + return true; + } + } + } else { + if(_global_npc_quest_status != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(_global_npc_quest_status); + if(qiter->second->HasGlobalQuestSub(subname)) { + return true; + } + } + } + return false; } bool QuestParserCollection::PlayerHasQuestSub(const char *subname) { - if(_player_quest_status == QuestUnloaded) { - QuestInterface *qi = GetQIByGlobalPlayerQuest(); - if(qi) { - _global_player_quest_status = qi->GetIdentifier(); - } + if(_player_quest_status == QuestUnloaded) { + QuestInterface *qi = GetQIByGlobalPlayerQuest(); + if(qi) { + _global_player_quest_status = qi->GetIdentifier(); + } - qi = GetQIByPlayerQuest(); - if(qi) { - _player_quest_status = qi->GetIdentifier(); - return qi->PlayerHasQuestSub(subname) || qi->GlobalPlayerHasQuestSub(subname); - } - } else if(_player_quest_status != QuestFailedToLoad) { - std::map::iterator iter = _interfaces.find(_player_quest_status); - return iter->second->PlayerHasQuestSub(subname) || iter->second->GlobalPlayerHasQuestSub(subname); - } - return false; + qi = GetQIByPlayerQuest(); + if(qi) { + _player_quest_status = qi->GetIdentifier(); + return qi->PlayerHasQuestSub(subname) || qi->GlobalPlayerHasQuestSub(subname); + } + } else if(_player_quest_status != QuestFailedToLoad) { + std::map::iterator iter = _interfaces.find(_player_quest_status); + return iter->second->PlayerHasQuestSub(subname) || iter->second->GlobalPlayerHasQuestSub(subname); + } + return false; } bool QuestParserCollection::SpellHasQuestSub(uint32 spell_id, const char *subname) { - std::map::iterator iter = _spell_quest_status.find(spell_id); - if(iter != _spell_quest_status.end()) { - //loaded or failed to load - if(iter->second != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(iter->second); - return qiter->second->SpellHasQuestSub(spell_id, subname); - } - } else { - QuestInterface *qi = GetQIBySpellQuest(spell_id); - if(qi) { - _spell_quest_status[spell_id] = qi->GetIdentifier(); - return qi->SpellHasQuestSub(spell_id, subname); - } else { - _spell_quest_status[spell_id] = QuestFailedToLoad; - } - } - return false; + std::map::iterator iter = _spell_quest_status.find(spell_id); + if(iter != _spell_quest_status.end()) { + //loaded or failed to load + if(iter->second != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(iter->second); + return qiter->second->SpellHasQuestSub(spell_id, subname); + } + } else { + QuestInterface *qi = GetQIBySpellQuest(spell_id); + if(qi) { + _spell_quest_status[spell_id] = qi->GetIdentifier(); + return qi->SpellHasQuestSub(spell_id, subname); + } else { + _spell_quest_status[spell_id] = QuestFailedToLoad; + } + } + return false; } bool QuestParserCollection::ItemHasQuestSub(ItemInst *itm, const char *subname) { - std::string item_script; - if(strcmp("EVENT_SCALE_CALC", subname) == 0 || strcmp("EVENT_ITEM_ENTERZONE", subname) == 0) { - item_script = itm->GetItem()->CharmFile; - } else if(strcmp("EVENT_ITEM_CLICK", subname) == 0 || strcmp("EVENT_ITEM_CLICK_CAST", subname) == 0) { - item_script = "script_"; - item_script += itoa(itm->GetItem()->ScriptFileID); - } else { - item_script = itoa(itm->GetItem()->ID); - } + std::string item_script; + if(strcmp("EVENT_SCALE_CALC", subname) == 0 || strcmp("EVENT_ITEM_ENTERZONE", subname) == 0) { + item_script = itm->GetItem()->CharmFile; + } else if(strcmp("EVENT_ITEM_CLICK", subname) == 0 || strcmp("EVENT_ITEM_CLICK_CAST", subname) == 0) { + item_script = "script_"; + item_script += itoa(itm->GetItem()->ScriptFileID); + } else { + item_script = itoa(itm->GetItem()->ID); + } - std::map::iterator iter = _item_quest_status.find(item_script); - if(iter != _item_quest_status.end()) { - //loaded or failed to load - if(iter->second != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(iter->second); - return qiter->second->ItemHasQuestSub(itm, subname); - } - } else { - QuestInterface *qi = GetQIByItemQuest(item_script); - if(qi) { - _item_quest_status[item_script] = qi->GetIdentifier(); - return qi->ItemHasQuestSub(itm, subname); - } else { - _item_quest_status[item_script] = QuestFailedToLoad; - } - } - return false; + std::map::iterator iter = _item_quest_status.find(item_script); + if(iter != _item_quest_status.end()) { + //loaded or failed to load + if(iter->second != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(iter->second); + return qiter->second->ItemHasQuestSub(itm, subname); + } + } else { + QuestInterface *qi = GetQIByItemQuest(item_script); + if(qi) { + _item_quest_status[item_script] = qi->GetIdentifier(); + return qi->ItemHasQuestSub(itm, subname); + } else { + _item_quest_status[item_script] = QuestFailedToLoad; + } + } + return false; } void QuestParserCollection::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data) { - std::map::iterator iter = _npc_quest_status.find(npc->GetNPCTypeID()); - if(iter != _npc_quest_status.end()) { - //loaded or failed to load - if(iter->second != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(iter->second); - qiter->second->EventNPC(evt, npc, init, data, extra_data); - } - } else { - QuestInterface *qi = GetQIByNPCQuest(npc->GetNPCTypeID()); - if(qi) { - _npc_quest_status[npc->GetNPCTypeID()] = qi->GetIdentifier(); - qi->EventNPC(evt, npc, init, data, extra_data); - } else { - _npc_quest_status[npc->GetNPCTypeID()] = QuestFailedToLoad; - } - } + std::map::iterator iter = _npc_quest_status.find(npc->GetNPCTypeID()); + if(iter != _npc_quest_status.end()) { + //loaded or failed to load + if(iter->second != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(iter->second); + qiter->second->EventNPC(evt, npc, init, data, extra_data); + } + } else { + QuestInterface *qi = GetQIByNPCQuest(npc->GetNPCTypeID()); + if(qi) { + _npc_quest_status[npc->GetNPCTypeID()] = qi->GetIdentifier(); + qi->EventNPC(evt, npc, init, data, extra_data); + } else { + _npc_quest_status[npc->GetNPCTypeID()] = QuestFailedToLoad; + } + } // K, lets also parse templates/global_npc.pl - if(_global_npc_quest_status != QuestUnloaded && _global_npc_quest_status != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(_global_npc_quest_status); - qiter->second->EventGlobalNPC(evt, npc, init, data, extra_data); - } else { - QuestInterface *qi = GetQIByGlobalNPCQuest(); - if(qi) { - _global_npc_quest_status = qi->GetIdentifier(); - qi->EventGlobalNPC(evt, npc, init, data, extra_data); - } else { - _global_npc_quest_status = QuestFailedToLoad; - } - } + if(_global_npc_quest_status != QuestUnloaded && _global_npc_quest_status != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(_global_npc_quest_status); + qiter->second->EventGlobalNPC(evt, npc, init, data, extra_data); + } else { + QuestInterface *qi = GetQIByGlobalNPCQuest(); + if(qi) { + _global_npc_quest_status = qi->GetIdentifier(); + qi->EventGlobalNPC(evt, npc, init, data, extra_data); + } else { + _global_npc_quest_status = QuestFailedToLoad; + } + } } void QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) { - if(_player_quest_status == QuestUnloaded) { - QuestInterface *qi = GetQIByGlobalPlayerQuest(); - if(qi) { - _global_player_quest_status = qi->GetIdentifier(); - qi->EventGlobalPlayer(evt, client, data, extra_data); - } + if(_player_quest_status == QuestUnloaded) { + QuestInterface *qi = GetQIByGlobalPlayerQuest(); + if(qi) { + _global_player_quest_status = qi->GetIdentifier(); + qi->EventGlobalPlayer(evt, client, data, extra_data); + } - qi = GetQIByPlayerQuest(); - if(qi) { - _player_quest_status = qi->GetIdentifier(); - qi->EventPlayer(evt, client, data, extra_data); - } + qi = GetQIByPlayerQuest(); + if(qi) { + _player_quest_status = qi->GetIdentifier(); + qi->EventPlayer(evt, client, data, extra_data); + } - } else { - if(_global_player_quest_status != QuestFailedToLoad) { - std::map::iterator iter = _interfaces.find(_global_player_quest_status); + } else { + if(_global_player_quest_status != QuestFailedToLoad) { + std::map::iterator iter = _interfaces.find(_global_player_quest_status); if(iter != _interfaces.end()) - iter->second->EventGlobalPlayer(evt, client, data, extra_data); - } - if(_player_quest_status != QuestFailedToLoad) { - std::map::iterator iter = _interfaces.find(_player_quest_status); - iter->second->EventPlayer(evt, client, data, extra_data); - } - } + iter->second->EventGlobalPlayer(evt, client, data, extra_data); + } + if(_player_quest_status != QuestFailedToLoad) { + std::map::iterator iter = _interfaces.find(_player_quest_status); + iter->second->EventPlayer(evt, client, data, extra_data); + } + } } void QuestParserCollection::EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data) { - std::string item_script; - if(evt == EVENT_SCALE_CALC || evt == EVENT_ITEM_ENTERZONE) { - item_script = item->GetItem()->CharmFile; - } else if(evt == EVENT_ITEM_CLICK || evt == EVENT_ITEM_CLICK_CAST) { - item_script = "script_"; - item_script += itoa(item->GetItem()->ScriptFileID); - } else { - item_script = itoa(item->GetItem()->ID); - } + std::string item_script; + if(evt == EVENT_SCALE_CALC || evt == EVENT_ITEM_ENTERZONE) { + item_script = item->GetItem()->CharmFile; + } else if(evt == EVENT_ITEM_CLICK || evt == EVENT_ITEM_CLICK_CAST) { + item_script = "script_"; + item_script += itoa(item->GetItem()->ScriptFileID); + } else { + item_script = itoa(item->GetItem()->ID); + } - std::map::iterator iter = _item_quest_status.find(item_script); - if(iter != _item_quest_status.end()) { - //loaded or failed to load - if(iter->second != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(iter->second); - qiter->second->EventItem(evt, client, item, objid, extra_data); - } - } else { - QuestInterface *qi = GetQIByItemQuest(item_script); - if(qi) { - _item_quest_status[item_script] = qi->GetIdentifier(); - qi->EventItem(evt, client, item, objid, extra_data); - } else { - _item_quest_status[item_script] = QuestFailedToLoad; - } - } + std::map::iterator iter = _item_quest_status.find(item_script); + if(iter != _item_quest_status.end()) { + //loaded or failed to load + if(iter->second != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(iter->second); + qiter->second->EventItem(evt, client, item, objid, extra_data); + } + } else { + QuestInterface *qi = GetQIByItemQuest(item_script); + if(qi) { + _item_quest_status[item_script] = qi->GetIdentifier(); + qi->EventItem(evt, client, item, objid, extra_data); + } else { + _item_quest_status[item_script] = QuestFailedToLoad; + } + } } void QuestParserCollection::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data) { - std::map::iterator iter = _spell_quest_status.find(spell_id); - if(iter != _spell_quest_status.end()) { - //loaded or failed to load - if(iter->second != QuestFailedToLoad) { - std::map::iterator qiter = _interfaces.find(iter->second); - qiter->second->EventSpell(evt, npc, client, spell_id, extra_data); - } - } else { - QuestInterface *qi = GetQIBySpellQuest(spell_id); - if(qi) { - _spell_quest_status[spell_id] = qi->GetIdentifier(); - qi->EventSpell(evt, npc, client, spell_id, extra_data); - } else { - _spell_quest_status[spell_id] = QuestFailedToLoad; - } - } + std::map::iterator iter = _spell_quest_status.find(spell_id); + if(iter != _spell_quest_status.end()) { + //loaded or failed to load + if(iter->second != QuestFailedToLoad) { + std::map::iterator qiter = _interfaces.find(iter->second); + qiter->second->EventSpell(evt, npc, client, spell_id, extra_data); + } + } else { + QuestInterface *qi = GetQIBySpellQuest(spell_id); + if(qi) { + _spell_quest_status[spell_id] = qi->GetIdentifier(); + qi->EventSpell(evt, npc, client, spell_id, extra_data); + } else { + _spell_quest_status[spell_id] = QuestFailedToLoad; + } + } } QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid) { - //first look for /quests/zone/npcid.ext (precedence) - std::string filename = "quests/"; - filename += zone->GetShortName(); - filename += "/"; - filename += itoa(npcid); - std::string tmp; - FILE *f = nullptr; + //first look for /quests/zone/npcid.ext (precedence) + std::string filename = "quests/"; + filename += zone->GetShortName(); + filename += "/"; + filename += itoa(npcid); + std::string tmp; + FILE *f = nullptr; - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //second look for /quests/zone/npcname.ext (precedence) - const NPCType *npc_type = database.GetNPCType(npcid); - if(!npc_type) { - return nullptr; - } - std::string npc_name = npc_type->name; - int sz = static_cast(npc_name.length()); - for(int i = 0; i < sz; ++i) { - if(npc_name[i] == '`') { - npc_name[i] = '-'; - } - } + //second look for /quests/zone/npcname.ext (precedence) + const NPCType *npc_type = database.GetNPCType(npcid); + if(!npc_type) { + return nullptr; + } + std::string npc_name = npc_type->name; + int sz = static_cast(npc_name.length()); + for(int i = 0; i < sz; ++i) { + if(npc_name[i] == '`') { + npc_name[i] = '-'; + } + } - filename = "quests/"; - filename += zone->GetShortName(); - filename += "/"; - filename += npc_name; + filename = "quests/"; + filename += zone->GetShortName(); + filename += "/"; + filename += npc_name; - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //third look for /quests/zone/default.ext (precedence) - filename = "quests/"; - filename += zone->GetShortName(); - filename += "/"; - filename += "default"; - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + //third look for /quests/zone/default.ext (precedence) + filename = "quests/"; + filename += zone->GetShortName(); + filename += "/"; + filename += "default"; + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //fourth look for /quests/templates/npcid.ext (precedence) - filename = "quests/"; - filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/"; - filename += itoa(npcid); - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + //fourth look for /quests/templates/npcid.ext (precedence) + filename = "quests/"; + filename += QUEST_TEMPLATES_DIRECTORY; + filename += "/"; + filename += itoa(npcid); + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //fifth look for /quests/templates/npcname.ext (precedence) - filename = "quests/"; - filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/"; - filename += npc_name; - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + //fifth look for /quests/templates/npcname.ext (precedence) + filename = "quests/"; + filename += QUEST_TEMPLATES_DIRECTORY; + filename += "/"; + filename += npc_name; + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //fifth look for /quests/templates/default.ext (precedence) - filename = "quests/"; - filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/"; - filename += "default"; - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + //fifth look for /quests/templates/default.ext (precedence) + filename = "quests/"; + filename += QUEST_TEMPLATES_DIRECTORY; + filename += "/"; + filename += "default"; + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - return nullptr; + return nullptr; } QuestInterface *QuestParserCollection::GetQIByPlayerQuest() { @@ -413,174 +413,174 @@ QuestInterface *QuestParserCollection::GetQIByPlayerQuest() { if(!zone) return nullptr; - //first look for /quests/zone/player_v[instance_version].ext (precedence) - std::string filename = "quests/"; - filename += zone->GetShortName(); - filename += "/"; - filename += "player_v"; - filename += itoa(zone->GetInstanceVersion()); - std::string tmp; - FILE *f = nullptr; + //first look for /quests/zone/player_v[instance_version].ext (precedence) + std::string filename = "quests/"; + filename += zone->GetShortName(); + filename += "/"; + filename += "player_v"; + filename += itoa(zone->GetInstanceVersion()); + std::string tmp; + FILE *f = nullptr; - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //second look for /quests/zone/player.ext (precedence) - filename = "quests/"; - filename += zone->GetShortName(); - filename += "/"; - filename += "player"; + //second look for /quests/zone/player.ext (precedence) + filename = "quests/"; + filename += zone->GetShortName(); + filename += "/"; + filename += "player"; - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - //third look for /quests/templates/player.ext (precedence) - filename = "quests/"; - filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/"; - filename += "player"; - iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + //third look for /quests/templates/player.ext (precedence) + filename = "quests/"; + filename += QUEST_TEMPLATES_DIRECTORY; + filename += "/"; + filename += "player"; + iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - return nullptr; + return nullptr; } QuestInterface *QuestParserCollection::GetQIByGlobalNPCQuest(){ - // simply look for templates/global_npc.pl - std::string filename = "quests/"; - filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/"; - filename += "global_npc"; - std::string tmp; - FILE *f = nullptr; + // simply look for templates/global_npc.pl + std::string filename = "quests/"; + filename += QUEST_TEMPLATES_DIRECTORY; + filename += "/"; + filename += "global_npc"; + std::string tmp; + FILE *f = nullptr; - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - return nullptr; + return nullptr; } QuestInterface *QuestParserCollection::GetQIByGlobalPlayerQuest() { - //first look for /quests/templates/player.ext (precedence) - std::string filename = "quests/"; - filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/"; - filename += "global_player"; - std::string tmp; - FILE *f = nullptr; + //first look for /quests/templates/player.ext (precedence) + std::string filename = "quests/"; + filename += QUEST_TEMPLATES_DIRECTORY; + filename += "/"; + filename += "global_player"; + std::string tmp; + FILE *f = nullptr; - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - return nullptr; + return nullptr; } QuestInterface *QuestParserCollection::GetQIBySpellQuest(uint32 spell_id) { - //first look for /quests/spells/spell_id.ext (precedence) - std::string filename = "quests/spells/"; - filename += itoa(spell_id); - std::string tmp; - FILE *f = nullptr; + //first look for /quests/spells/spell_id.ext (precedence) + std::string filename = "quests/spells/"; + filename += itoa(spell_id); + std::string tmp; + FILE *f = nullptr; - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - return nullptr; + return nullptr; } QuestInterface *QuestParserCollection::GetQIByItemQuest(std::string item_script) { - //first look for /quests/items/item_script.ext (precedence) - std::string filename = "quests/items/"; - filename += item_script; - std::string tmp; - FILE *f = nullptr; + //first look for /quests/items/item_script.ext (precedence) + std::string filename = "quests/items/"; + filename += item_script; + std::string tmp; + FILE *f = nullptr; - std::list::iterator iter = _load_precedence.begin(); - while(iter != _load_precedence.end()) { - tmp = filename; - std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); - tmp += "."; - tmp += ext->second; - f = fopen(tmp.c_str(), "r"); - if(f) { - fclose(f); - return (*iter); - } + std::list::iterator iter = _load_precedence.begin(); + while(iter != _load_precedence.end()) { + tmp = filename; + std::map::iterator ext = _extensions.find((*iter)->GetIdentifier()); + tmp += "."; + tmp += ext->second; + f = fopen(tmp.c_str(), "r"); + if(f) { + fclose(f); + return (*iter); + } - iter++; - } + iter++; + } - return nullptr; + return nullptr; } diff --git a/zone/QuestParserCollection.h b/zone/QuestParserCollection.h index 640a1557b..341b62798 100644 --- a/zone/QuestParserCollection.h +++ b/zone/QuestParserCollection.h @@ -16,44 +16,44 @@ class QuestParserCollection { public: - QuestParserCollection(); - ~QuestParserCollection(); + QuestParserCollection(); + ~QuestParserCollection(); - void RegisterQuestInterface(QuestInterface *qi, std::string ext); + void RegisterQuestInterface(QuestInterface *qi, std::string ext); - void AddVar(std::string name, std::string val); - void ReloadQuests(bool reset_timers = true); + void AddVar(std::string name, std::string val); + void ReloadQuests(bool reset_timers = true); - bool HasQuestSub(uint32 npcid, const char *subname); + bool HasQuestSub(uint32 npcid, const char *subname); bool PlayerHasQuestSub(const char *subname); bool SpellHasQuestSub(uint32 spell_id, const char *subname); - bool ItemHasQuestSub(ItemInst *itm, const char *subname); + bool ItemHasQuestSub(ItemInst *itm, const char *subname); - void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data); - void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data); - void EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data); - void EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data); + void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data); + void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data); + void EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data); + void EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data); private: - QuestInterface *GetQIByNPCQuest(uint32 npcid); + QuestInterface *GetQIByNPCQuest(uint32 npcid); QuestInterface *GetQIByGlobalNPCQuest(); - QuestInterface *GetQIByPlayerQuest(); - QuestInterface *GetQIByGlobalPlayerQuest(); - QuestInterface *GetQIBySpellQuest(uint32 spell_id); - QuestInterface *GetQIByItemQuest(std::string item_script); + QuestInterface *GetQIByPlayerQuest(); + QuestInterface *GetQIByGlobalPlayerQuest(); + QuestInterface *GetQIBySpellQuest(uint32 spell_id); + QuestInterface *GetQIByItemQuest(std::string item_script); - std::map _interfaces; - std::map _extensions; - std::list _load_precedence; + std::map _interfaces; + std::map _extensions; + std::list _load_precedence; - //0x00 = Unloaded - //0xFFFFFFFF = Failed to Load - std::map _npc_quest_status; + //0x00 = Unloaded + //0xFFFFFFFF = Failed to Load + std::map _npc_quest_status; uint32 _global_npc_quest_status; - uint32 _player_quest_status; - uint32 _global_player_quest_status; - std::map _spell_quest_status; - std::map _item_quest_status; + uint32 _player_quest_status; + uint32 _global_player_quest_status; + std::map _spell_quest_status; + std::map _item_quest_status; }; extern QuestParserCollection *parse; diff --git a/zone/StringIDs.h b/zone/StringIDs.h index d54f56c23..af955fe7e 100644 --- a/zone/StringIDs.h +++ b/zone/StringIDs.h @@ -5,13 +5,13 @@ #define GENERIC_9_STRINGS 1 //%1 %2 %3 %4 %5 %6 %7 %8 %9 #define TARGET_OUT_OF_RANGE 100 //Your target is out of range, get closer! #define TARGET_NOT_FOUND 101 //Target player not found. -#define CANNOT_BIND 105 //You cannot form an affinity with this area. Try a city. +#define CANNOT_BIND 105 //You cannot form an affinity with this area. Try a city. #define SPELL_DOES_NOT_WORK_HERE 106 //This spell does not work here. #define SPELL_DOES_NOT_WORK_PLANE 107 //This spell does not work on this plane. #define CANT_SEE_TARGET 108 //You cannot see your target. #define MGB_STRING 113 //The next group buff you cast will hit all targets in range. -#define ABILITY_FAILED 116 //Your ability failed. Timer has been reset. -#define ESCAPE 114 //You escape from combat, hiding yourself from view. +#define ABILITY_FAILED 116 //Your ability failed. Timer has been reset. +#define ESCAPE 114 //You escape from combat, hiding yourself from view. #define TARGET_TOO_FAR 124 //Your target is too far away, get closer! #define PROC_TOOLOW 126 //Your will is not sufficient to command this weapon. #define PROC_PETTOOLOW 127 //Your pet's will is not sufficient to command its weapon. @@ -99,7 +99,7 @@ #define MEND_WORSEN 351 //You have worsened your wounds! #define MEND_FAIL 352 //You have failed to mend your wounds. #define LDON_SENSE_TRAP2 367 //You have not detected any traps. -#define LOOT_LORE_ERROR 371 //You cannot loot this Lore Item. You already have one. +#define LOOT_LORE_ERROR 371 //You cannot loot this Lore Item. You already have one. #define PICK_LORE 379 //You cannot pick up a lore item you already possess. #define CONSENT_DENIED 390 //You do not have consent to summon that corpse. #define DISCIPLINE_RDY 393 //You are ready to use a new discipline now. @@ -126,10 +126,10 @@ #define OTHER_HIT_NONMELEE 434 //%1 was hit by non-melee for %2 points of damage. #define SPELL_WORN_OFF_OF 436 //Your %1 spell has worn off of %2. #define SPELL_WORN_OFF 437 //Your %1 spell has worn off. -#define PET_TAUNTING 438 //Taunting attacker, Master. +#define PET_TAUNTING 438 //Taunting attacker, Master. #define INTERRUPT_SPELL 439 //Your spell is interrupted. #define LOSE_LEVEL 442 //You LOST a level! You are now level %1! -#define GAIN_ABILITY_POINT 446 //You have gained an ability point! You now have %1 ability point%2. +#define GAIN_ABILITY_POINT 446 //You have gained an ability point! You now have %1 ability point%2. #define GAIN_LEVEL 447 //You have gained a level! Welcome to level %1! #define LANG_SKILL_IMPROVED 449 //Your language skills have improved. #define OTHER_LOOTED_MESSAGE 466 //--%1 has looted a %2-- @@ -139,15 +139,15 @@ #define FACTION_BEST 471 //Your faction standing with %1 could not possibly get any better. #define FACTION_BETTER 472 //Your faction standing with %1 got better. #define PET_REPORT_HP 488 //I have %1 percent of my hit points left. -#define PET_NO_TAUNT 489 //No longer taunting attackers, Master. -#define PET_DO_TAUNT 490 //Taunting attackers as normal, Master. +#define PET_NO_TAUNT 489 //No longer taunting attackers, Master. +#define PET_DO_TAUNT 490 //Taunting attackers as normal, Master. #define CORPSE_DECAY1 495 //This corpse will decay in %1 minute(s) %2 seconds. #define DISC_LEVEL_ERROR 503 //You must be a level %1 ... to use this discipline. #define DISCIPLINE_CANUSEIN 504 //You can use a new discipline in %1 minutes %2 seconds. #define PVP_ON 552 //You are now player kill and follow the ways of Discord. #define GENERIC_STRINGID_SAY 554 //%1 says '%T2' #define CANNOT_WAKE 555 //%1 tells you, 'I am unable to wake %2, master.' -#define GUILD_NAME_IN_USE 711 //You cannot create a guild with that name, that guild already exists on this server. +#define GUILD_NAME_IN_USE 711 //You cannot create a guild with that name, that guild already exists on this server. #define GM_GAINXP 1002 //[GM] You have gained %1 AXP and %2 EXP (%3). #define FINISHING_BLOW 1009 //%1 scores a Finishing Blow!! #define ASSASSINATES 1016 //%1 ASSASSINATES their victim!! @@ -169,9 +169,9 @@ #define NPC_FLURRY 1045 //%1 executes a FLURRY of attacks on %2! #define DISCIPLINE_FEARLESS 1076 //%1 becomes fearless. #define DUEL_FINISHED 1088 //dont know text -#define EATING_MESSAGE 1091 //Chomp, chomp, chomp... %1 takes a bite from a %2. -#define DRINKING_MESSAGE 1093 //Glug, glug, glug... %1 takes a drink from a %2. -#define SUCCESSFUL_TAUNT 1095 //I'll teach you to interfere with me %3. +#define EATING_MESSAGE 1091 //Chomp, chomp, chomp... %1 takes a bite from a %2. +#define DRINKING_MESSAGE 1093 //Glug, glug, glug... %1 takes a drink from a %2. +#define SUCCESSFUL_TAUNT 1095 //I'll teach you to interfere with me %3. #define PET_SIT_STRING 1130 //Changing position, Master. #define PET_CALMING 1131 //Sorry, Master..calming down. #define PET_FOLLOWING 1132 //Following you, Master. @@ -180,26 +180,26 @@ #define PET_GETLOST_STRING 1135 //As you wish, oh great one. #define PET_LEADERIS 1136 //My leader is %3. #define I_FOLLOW_NOONE 1137 //I follow no one. -#define PET_ON_HOLD 1138 //Waiting for your order to attack, Master. -#define NOT_LEGAL_TARGET 1139 //I beg forgiveness, Master. That is not a legal target. +#define PET_ON_HOLD 1138 //Waiting for your order to attack, Master. +#define NOT_LEGAL_TARGET 1139 //I beg forgiveness, Master. That is not a legal target. #define MERCHANT_BUSY 1143 //I'm sorry, I am busy right now. #define MERCHANT_GREETING 1144 //Welcome to my shop, %3. #define MERCHANT_HANDY_ITEM1 1145 //Hello there, %3. How about a nice %4? #define MERCHANT_HANDY_ITEM2 1146 //Greetings, %3. You look like you could use a %4. -#define MERCHANT_HANDY_ITEM3 1147 //Hi there %3, just browsing? Have you seen the %4 I just got in? +#define MERCHANT_HANDY_ITEM3 1147 //Hi there %3, just browsing? Have you seen the %4 I just got in? #define MERCHANT_HANDY_ITEM4 1148 //Welcome to my shop, %3. You would probably find a %4 handy. #define AA_POINT 1197 //point #define AA_POINTS 1215 //points #define SPELL_FIZZLE_OTHER 1218 //%1's spell fizzles! #define MISSED_NOTE_OTHER 1219 //A missed note brings %1's song to a close! #define CORPSE_DECAY_NOW 1227 //This corpse is waiting to expire. -#define SURNAME_REJECTED 1374 //Your new surname was rejected. Please try a different name. +#define SURNAME_REJECTED 1374 //Your new surname was rejected. Please try a different name. #define DUEL_DECLINE 1383 //%1 has declined your challenge to duel to the death. #define DUEL_ACCEPTED 1384 //%1 has already accepted a duel with someone else. #define DUEL_CONSIDERING 1385 //%1 is considering a duel with someone else. #define PLAYER_REGAIN 1394 //You have control of yourself again. #define REZZ_ALREADY_PENDING 1379 //You were unable to restore the corpse to life, but you may have success with a later attempt. -#define IN_USE 1406 //Someone else is using that. Try again later. +#define IN_USE 1406 //Someone else is using that. Try again later. #define DUEL_FLED 1408 //%1 has defeated %2 in a duel to the death! %3 has fled like a cowardly dog! #define MEMBER_OF_YOUR_GUILD 1429 #define OFFICER_OF_YOUR_GUILD 1430 @@ -216,7 +216,7 @@ #define SUSPEND_MINION_UNSUSPEND 3267 //%1 tells you, 'I live again...' #define SUSPEND_MINION_SUSPEND 3268 //%1 tells you, 'By your command, master.' #define ONLY_SUMMONED_PETS 3269 //3269 This effect only works with summoned pets. -#define SUSPEND_MINION_FIGHTING 3270 //Your pet must be at peace, first. +#define SUSPEND_MINION_FIGHTING 3270 //Your pet must be at peace, first. #define TRADESKILL_MISSING_ITEM 3455 //You are missing a %1. #define TRADESKILL_MISSING_COMPONENTS 3456 //Sorry, but you don't have everything you need for this recipe in your general inventory. #define TRADESKILL_LEARN_RECIPE 3457 //You have learned the recipe %1! @@ -236,14 +236,14 @@ #define MELEE_SILENCE 5806 //You *CANNOT* use this melee ability, you are suffering from amnesia! #define DISCIPLINE_REUSE_MSG 5807 //You can use the ability %1 again in %2 hour(s) %3 minute(s) %4 seconds. #define DISCIPLINE_REUSE_MSG2 5808 //You can use the ability %1 again in %2 minute(s) %3 seconds. -#define FAILED_TAUNT 5811 //You have failed to taunt your target. +#define FAILED_TAUNT 5811 //You have failed to taunt your target. #define AA_NO_TARGET 5825 //You must first select a target for this ability! -#define FORAGE_MASTERY 6012 //Your forage mastery has enabled you to find something else! -#define GUILD_BANK_CANNOT_DEPOSIT 6097 // Cannot deposit this item. Containers must be empty, and only one of each LORE and no NO TRADE or TEMPORARY items may be deposited. +#define FORAGE_MASTERY 6012 //Your forage mastery has enabled you to find something else! +#define GUILD_BANK_CANNOT_DEPOSIT 6097 // Cannot deposit this item. Containers must be empty, and only one of each LORE and no NO TRADE or TEMPORARY items may be deposited. #define GUILD_BANK_FULL 6098 // There is no more room in the Guild Bank. #define GUILD_BANK_TRANSFERRED 6100 // '%1' transferred to Guild Bank from Deposits. #define GUILD_BANK_EMPTY_HANDS 6108 // You must empty your hands to withdraw from the Guild Bank. -#define GENERIC_STRING 6688 //%1 (used to any basic message) +#define GENERIC_STRING 6688 //%1 (used to any basic message) #define SENTINEL_TRIG_YOU 6724 //You have triggered your sentinel. #define SENTINEL_TRIG_OTHER 6725 //%1 has triggered your sentinel. #define IDENTIFY_SPELL 6765 //Item Lore: %1. @@ -279,11 +279,11 @@ #define SHAKE_OFF_STUN 9077 #define STRIKETHROUGH_STRING 9078 //You strike through your opponent's defenses! #define SPELL_REFLECT 9082 //%1's spell has been reflected by %2. -#define NEW_SPELLS_AVAIL 9149 //You have new spells available to you. Check the merchants near your guild master. -#define PET_NOW_FOCUSING 9254 //Focusing on one target, Master. -#define PET_NOT_FOCUSING 9263 //No longer focusing on one target, Master. -#define PET_NOT_CASTING 9264 //Not casting spells, Master. -#define PET_CASTING 9291 //Casting spells normally, Master. +#define NEW_SPELLS_AVAIL 9149 //You have new spells available to you. Check the merchants near your guild master. +#define PET_NOW_FOCUSING 9254 //Focusing on one target, Master. +#define PET_NOT_FOCUSING 9263 //No longer focusing on one target, Master. +#define PET_NOT_CASTING 9264 //Not casting spells, Master. +#define PET_CASTING 9291 //Casting spells normally, Master. #define AE_RAMPAGE 11015 //%1 goes on a WILD RAMPAGE! #define FACE_ACCEPTED 12028 //Facial features accepted. #define SPELL_LEVEL_TO_LOW 12048 //You will have to achieve level %1 before you can scribe the %2. @@ -329,9 +329,9 @@ #define DIVINE_AURA_NO_ATK 12695 //You can't attack while invulnerable! #define TRY_ATTACKING_SOMEONE 12696 //Try attacking someone other than yourself, it's more productive. #define BACKSTAB_WEAPON 12874 //You need a piercing weapon as your primary weapon in order to backstab -#define MORE_SKILLED_THAN_I 12931 //%1 tells you, 'You are more skilled than I! What could I possibly teach you?' -#define SURNAME_EXISTS 12939 //You already have a surname. Operation failed. -#define SURNAME_LEVEL 12940 //You can only submit a surname upon reaching the 20th level. Operation failed. +#define MORE_SKILLED_THAN_I 12931 //%1 tells you, 'You are more skilled than I! What could I possibly teach you?' +#define SURNAME_EXISTS 12939 //You already have a surname. Operation failed. +#define SURNAME_LEVEL 12940 //You can only submit a surname upon reaching the 20th level. Operation failed. #define SURNAME_TOO_LONG 12942 //Surname must be less than 20 characters in length. #define REPORT_ONCE 12945 //You may only submit a report once per time that you zone. Thank you. #define NOW_INVISIBLE 12950 //%1 is now Invisible. @@ -344,3 +344,4 @@ #define GENERIC_MISS 15041 //%1 missed %2 #endif + diff --git a/zone/ZoneConfig.cpp b/zone/ZoneConfig.cpp index 3c3f4ffdc..65ecefa13 100644 --- a/zone/ZoneConfig.cpp +++ b/zone/ZoneConfig.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "ZoneConfig.h" diff --git a/zone/ZoneConfig.h b/zone/ZoneConfig.h index 41eae1b9c..4fbbf9e59 100644 --- a/zone/ZoneConfig.h +++ b/zone/ZoneConfig.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __ZoneConfig_H #define __ZoneConfig_H diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 347c52264..2d9bbeb12 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -125,48 +125,48 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { t2 = 0 - t2; if(t3 < 0) t3 = 0 - t3; - if( ( t1 > iAggroRange) - || ( t2 > iAggroRange) - || ( t3 > iAggroRange) ) { - towho->Message(0, "...%s is out of range (fast). distances (%.3f,%.3f,%.3f), range %.3f", mob->GetName(), - t1, t2, t3, iAggroRange); - return; + if(( t1 > iAggroRange) + || ( t2 > iAggroRange) + || ( t3 > iAggroRange) ) { + towho->Message(0, "...%s is out of range (fast). distances (%.3f,%.3f,%.3f), range %.3f", mob->GetName(), + t1, t2, t3, iAggroRange); + return; } if(mob->IsInvisible(this)) { - towho->Message(0, "...%s is invisible to me. ", mob->GetName()); - return; + towho->Message(0, "...%s is invisible to me. ", mob->GetName()); + return; } if((mob->IsClient() && - (!mob->CastToClient()->Connected() - || mob->CastToClient()->IsLD() - || mob->CastToClient()->IsBecomeNPC() - || mob->CastToClient()->GetGM() - ) - )) + (!mob->CastToClient()->Connected() + || mob->CastToClient()->IsLD() + || mob->CastToClient()->IsBecomeNPC() + || mob->CastToClient()->GetGM() + ) + )) { - towho->Message(0, "...%s is my owner. ", mob->GetName()); - return; + towho->Message(0, "...%s is my owner. ", mob->GetName()); + return; } if(mob == GetOwner()) { - towho->Message(0, "...%s a GM or is not connected. ", mob->GetName()); - return; + towho->Message(0, "...%s a GM or is not connected. ", mob->GetName()); + return; } - float dist2 = mob->DistNoRoot(*this); + float dist2 = mob->DistNoRoot(*this); float iAggroRange2 = iAggroRange*iAggroRange; if( dist2 > iAggroRange2 ) { - towho->Message(0, "...%s is out of range. %.3f > %.3f ", mob->GetName(), - dist2, iAggroRange2); - return; + towho->Message(0, "...%s is out of range. %.3f > %.3f ", mob->GetName(), + dist2, iAggroRange2); + return; } if(GetINT() > 75 && mob->GetLevelCon(GetLevel()) == CON_GREEN ) { - towho->Message(0, "...%s is red to me (basically)", mob->GetName(), - dist2, iAggroRange2); - return; + towho->Message(0, "...%s is red to me (basically)", mob->GetName(), + dist2, iAggroRange2); + return; } if(verbose) { @@ -224,15 +224,15 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) { || fv == FACTION_THREATENLY )) { - towho->Message(0, "...%s faction not low enough. value='%s'", mob->GetName(), FactionValueToString(fv)); - return; + towho->Message(0, "...%s faction not low enough. value='%s'", mob->GetName(), FactionValueToString(fv)); + return; } if(fv == FACTION_THREATENLY) { - towho->Message(0, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName()); + towho->Message(0, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName()); } if(!CheckLosFN(mob)) { - towho->Message(0, "...%s is out of sight.", mob->GetName()); + towho->Message(0, "...%s is out of sight.", mob->GetName()); } towho->Message(0, "...%s meets all conditions, I should be attacking them.", mob->GetName()); @@ -262,7 +262,7 @@ bool Mob::CheckWillAggro(Mob *mob) { // Check If it's invisible and if we can see invis // Check if it's a client, and that the client is connected and not linkdead, - // and that the client isn't Playing an NPC, with thier gm flag on + // and that the client isn't Playing an NPC, with thier gm flag on // Check if it's not a Interactive NPC // Trumpcard: The 1st 3 checks are low cost calcs to filter out unnessecary distance checks. Leave them at the beginning, they are the most likely occurence. // Image: I moved this up by itself above faction and distance checks because if one of these return true, theres no reason to go through the other information @@ -278,17 +278,17 @@ bool Mob::CheckWillAggro(Mob *mob) { t2 = 0 - t2; if(t3 < 0) t3 = 0 - t3; - if( ( t1 > iAggroRange) - || ( t2 > iAggroRange) - || ( t3 > iAggroRange) - ||(mob->IsInvisible(this)) - || (mob->IsClient() && - (!mob->CastToClient()->Connected() - || mob->CastToClient()->IsLD() - || mob->CastToClient()->IsBecomeNPC() - || mob->CastToClient()->GetGM() - ) - )) + if(( t1 > iAggroRange) + || ( t2 > iAggroRange) + || ( t3 > iAggroRange) + ||(mob->IsInvisible(this)) + || (mob->IsClient() && + (!mob->CastToClient()->Connected() + || mob->CastToClient()->IsLD() + || mob->CastToClient()->IsBecomeNPC() + || mob->CastToClient()->GetGM() + ) + )) { return(false); } @@ -301,7 +301,7 @@ bool Mob::CheckWillAggro(Mob *mob) { return(false); } - float dist2 = mob->DistNoRoot(*this); + float dist2 = mob->DistNoRoot(*this); float iAggroRange2 = iAggroRange*iAggroRange; if( dist2 > iAggroRange2 ) { @@ -354,14 +354,14 @@ bool Mob::CheckWillAggro(Mob *mob) { #endif return(true); } - } + } #if EQDEBUG >= 6 - printf("Is In zone?:%d\n", mob->InZone()); - printf("Dist^2: %f\n", dist2); - printf("Range^2: %f\n", iAggroRange2); - printf("Faction: %d\n", fv); - printf("Int: %d\n", GetINT()); - printf("Con: %d\n", GetLevelCon(mob->GetLevel())); + printf("Is In zone?:%d\n", mob->InZone()); + printf("Dist^2: %f\n", dist2); + printf("Range^2: %f\n", iAggroRange2); + printf("Faction: %d\n", fv); + printf("Int: %d\n", GetINT()); + printf("Con: %d\n", GetLevelCon(mob->GetLevel())); #endif return(false); } @@ -478,7 +478,7 @@ void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) { if(useprimfaction || sender->GetReverseFactionCon(mob) <= FACTION_AMIABLE ) { //attacking someone on same faction, or a friend - //Father Nitwit: make sure we can see them. + //Father Nitwit: make sure we can see them. if(mob->CheckLosFN(sender)) { #if (EQDEBUG>=5) LogFile->write(EQEMuLog::Debug, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f", @@ -495,7 +495,7 @@ void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) { /* solar: returns false if attack should not be allowed I try to list every type of conflict that's possible here, so it's easy -to see how the decision is made. Yea, it could be condensed and made +to see how the decision is made. Yea, it could be condensed and made faster, but I'm doing it this way to make it readable and easy to modify */ @@ -557,7 +557,7 @@ bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack) // solar: the format here is a matrix of mob type vs mob type. // redundant ones are omitted and the reverse is tried if it falls through. - // first figure out if we're pets. we always look at the master's flags. + // first figure out if we're pets. we always look at the master's flags. // no need to compare pets to anything mob1 = our_owner ? our_owner : this; mob2 = target_owner ? target_owner : target; @@ -706,7 +706,7 @@ type', in which case, the answer is yes. // solar: this is to check if non detrimental things are allowed to be done -// to the target. clients cannot affect npcs and vice versa, and clients +// to the target. clients cannot affect npcs and vice versa, and clients // cannot affect other clients that are not of the same pvp flag as them. // also goes for their pets bool Mob::IsBeneficialAllowed(Mob *target) @@ -723,7 +723,7 @@ bool Mob::IsBeneficialAllowed(Mob *target) // solar: see IsAttackAllowed for notes - // first figure out if we're pets. we always look at the master's flags. + // first figure out if we're pets. we always look at the master's flags. // no need to compare pets to anything mob1 = this->GetOwnerID() ? this->GetOwner() : this; mob2 = target->GetOwnerID() ? target->GetOwner() : target; @@ -757,7 +757,7 @@ bool Mob::IsBeneficialAllowed(Mob *target) } else if(_NPC(mob2)) // client to npc { - /* fall through and swap positions */ + /* fall through and swap positions */ } else if(_BECOMENPC(mob2)) // client to becomenpc { @@ -914,17 +914,17 @@ bool Mob::CheckLos(Mob* other) { float dist_z = tmp_z - trg_z; if (dist_z < 0) dist_z *= -1; - if (dist_x < dist_y && dist_z < dist_y) + if (dist_x < dist_y && dist_z < dist_y) { perwalk_x /= (dist_y/dist_x); perwalk_z /= (dist_y/dist_z); } - else if (dist_y < dist_x && dist_z < dist_x) + else if (dist_y < dist_x && dist_z < dist_x) { perwalk_y /= (dist_x/dist_y); perwalk_z /= (dist_x/dist_z); } - else if (dist_x < dist_z && dist_y < dist_z) + else if (dist_x < dist_z && dist_y < dist_z) { perwalk_x /= (dist_z/dist_x); perwalk_y /= (dist_z/dist_y); @@ -1003,7 +1003,7 @@ bool Mob::CheckLos(Mob* other) { iface++; } /* solar: our aggro code isn't using this right now, just spells, so i'm - taking out the +-10 check for now to make it work right on hills + taking out the +-10 check for now to make it work right on hills if (best_z - 10 > trg_z || best_z + 10 < trg_z) { return false; @@ -1074,7 +1074,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { } } #if LOSDEBUG>=5 - else { + else { LogFile->write(EQEMuLog::Debug, "WTF, I have no node, what am I standing on??? (%.2f, %.2f).", myloc.x, myloc.y); } #endif @@ -1096,7 +1096,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) { } } #if LOSDEBUG>=5 - else if(onode == NODE_NONE) { + else if(onode == NODE_NONE) { LogFile->write(EQEMuLog::Debug, "WTF, They have no node, what are they standing on??? (%.2f, %.2f).", myloc.x, myloc.y); } #endif @@ -1365,8 +1365,8 @@ int32 Mob::CheckHealAggroAmount(uint16 spellid, uint32 heal_possible) { break; } default:{ - break; - } + break; + } } } if (IsBardSong(spell_id)) @@ -1413,7 +1413,7 @@ void Mob::AddFeignMemory(Client* attacker) { void Mob::RemoveFromFeignMemory(Client* attacker) { feign_memory_list.erase(attacker->CharacterID()); if(feign_memory_list.empty() && AIfeignremember_timer != nullptr) - AIfeignremember_timer->Disable(); + AIfeignremember_timer->Disable(); if(feign_memory_list.empty()) { minLastFightingDelayMoving = RuleI(NPC, LastFightingDelayMovingMin); @@ -1424,14 +1424,14 @@ void Mob::RemoveFromFeignMemory(Client* attacker) { } void Mob::ClearFeignMemory() { - std::set::iterator RememberedCharID = feign_memory_list.begin(); - while (RememberedCharID != feign_memory_list.end()) - { - Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID); - if(remember_client != nullptr) //Still in zone - remember_client->RemoveXTarget(this, false); - ++RememberedCharID; - } + std::set::iterator RememberedCharID = feign_memory_list.begin(); + while (RememberedCharID != feign_memory_list.end()) + { + Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID); + if(remember_client != nullptr) //Still in zone + remember_client->RemoveXTarget(this, false); + ++RememberedCharID; + } feign_memory_list.clear(); minLastFightingDelayMoving = RuleI(NPC, LastFightingDelayMovingMin); @@ -1487,5 +1487,3 @@ bool Mob::PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id) { return false; } - - diff --git a/zone/attack.cpp b/zone/attack.cpp index 9ced16fd8..c08382838 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #if EQDEBUG >= 5 @@ -48,7 +48,7 @@ extern WorldServer worldserver; #ifdef _WINDOWS #define snprintf _snprintf #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif extern EntityList entity_list; @@ -171,11 +171,11 @@ bool Mob::AttackAnimation(SkillType &skillinuse, int Hand, const ItemInst* weapo type = animDualWield; DoAnim(type); - return true; + return true; } // called when a mob is attacked, does the checks to see if it's a hit -// and does other mitigation checks. 'this' is the mob being attacked. +// and does other mitigation checks. 'this' is the mob being attacked. bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chance_mod) { /*/ @@ -306,10 +306,10 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc //Accuracy = Spell Effect , HitChance = 'Accuracy' from Item Effect //Only AA derived accuracy can be skill limited. ie (Precision of the Pathfinder, Dead Aim) hitBonus += (attacker->itembonuses.Accuracy[HIGHEST_SKILL+1] + - attacker->spellbonuses.Accuracy[HIGHEST_SKILL+1] + - attacker->aabonuses.Accuracy[HIGHEST_SKILL+1] + - attacker->aabonuses.Accuracy[skillinuse] + - attacker->itembonuses.HitChance) / 15.0f; + attacker->spellbonuses.Accuracy[HIGHEST_SKILL+1] + + attacker->aabonuses.Accuracy[HIGHEST_SKILL+1] + + attacker->aabonuses.Accuracy[skillinuse] + + attacker->itembonuses.HitChance) / 15.0f; hitBonus += chance_mod; //Modifier applied from casted/disc skill attacks. @@ -354,13 +354,13 @@ bool Mob::CheckHitChance(Mob* other, SkillType skillinuse, int Hand, int16 chanc bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) { /* solar: called when a mob is attacked, does the checks to see if it's a hit - * and does other mitigation checks. 'this' is the mob being attacked. + * and does other mitigation checks. 'this' is the mob being attacked. * * special return values: - * -1 - block - * -2 - parry - * -3 - riposte - * -4 - dodge + * -1 - block + * -2 - parry + * -3 - riposte + * -4 - dodge * */ float skill; @@ -390,7 +390,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (CanRiposte && damage > 0 && CanThisClassRiposte() && !other->BehindMob(this, other->GetX(), other->GetY())) { riposte_chance = (100.0f + (float)defender->aabonuses.RiposteChance + (float)defender->spellbonuses.RiposteChance + (float)defender->itembonuses.RiposteChance) / 100.0f; - skill = GetSkill(RIPOSTE); + skill = GetSkill(RIPOSTE); if (IsClient()) { CastToClient()->CheckIncreaseSkill(RIPOSTE, other, -10); } @@ -504,7 +504,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (damage > 0 && CanThisClassDodge() && !other->BehindMob(this, other->GetX(), other->GetY())) { dodge_chance = (100.0f + (float)defender->spellbonuses.DodgeChance + (float)defender->itembonuses.DodgeChance) / 100.0f; - skill = CastToClient()->GetSkill(DODGE); + skill = CastToClient()->GetSkill(DODGE); if (IsClient()) { CastToClient()->CheckIncreaseSkill(DODGE, other, -10); } @@ -674,7 +674,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) { thac0 = thac0cap; } - d -= 10.0 * (a_diff / thac0); + d -= 10.0 * (a_diff / thac0); } else if(mit_roll > atk_roll) { @@ -688,7 +688,7 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) } - d += 10 * (m_diff / thac20); + d += 10 * (m_diff / thac20); } if(d < 0.0) @@ -936,7 +936,7 @@ int Mob::GetWeaponDamage(Mob *against, const ItemInst *weapon_item, uint32 *hate if (hate) *hate += dmg; } else if(GetOwner() && GetLevel() >= RuleI(Combat, PetAttackMagicLevel)){ //pets wouldn't actually use this but... - dmg = 1; //it gives us an idea if we can hit + dmg = 1; //it gives us an idea if we can hit } else if(SpecAttacks[SPECATK_MAGICAL]){ dmg = 1; @@ -1111,7 +1111,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b //SetAttackTimer(); if ( - (IsCasting() && GetClass() != BARD && !IsFromSpell) + (IsCasting() && GetClass() != BARD && !IsFromSpell) || other == nullptr || ((IsClient() && CastToClient()->dead) || (other->IsClient() && other->CastToClient()->dead)) || (GetHP() < 0) @@ -1261,7 +1261,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b //riposte bool slippery_attack = false; // Part of hack to allow riposte to become a miss, but still allow a Strikethrough chance (like on Live) - if (damage == -3) { + if (damage == -3) { if (bRiposte) return false; else { if (Hand == 14) {// Do we even have it & was attack with mainhand? If not, don't bother with other calculations @@ -1305,7 +1305,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b other->AddToHateList(this, hate); /////////////////////////////////////////////////////////// - ////// Send Attack Damage + ////// Send Attack Damage /////////////////////////////////////////////////////////// other->Damage(this, damage, SPELL_UNKNOWN, skillinuse); @@ -1472,7 +1472,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ GetMerc()->Suspend(); } - parse->EventPlayer(EVENT_DEATH, this, "", 0); + parse->EventPlayer(EVENT_DEATH, this, "", 0); if (killerMob != nullptr) { @@ -1721,7 +1721,7 @@ void Client::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ } } -bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool IsFromSpell) // Kaiyodo - base function has changed prototype, need to update overloaded version +bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool IsFromSpell) // Kaiyodo - base function has changed prototype, need to update overloaded version { _ZP(NPC_Attack); int damage = 0; @@ -1741,10 +1741,10 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool //Check that we can attack before we calc heading and face our target if (!IsAttackAllowed(other)) { if (this->GetOwnerID()) - this->Say_StringID(NOT_LEGAL_TARGET); + this->Say_StringID(NOT_LEGAL_TARGET); if(other) { - if (other->IsClient()) - other->CastToClient()->RemoveXTarget(this, false); + if (other->IsClient()) + other->CastToClient()->RemoveXTarget(this, false); RemoveFromHateList(other); mlog(COMBAT__ATTACKS, "I am not allowed to attack %s", other->GetName()); } @@ -1766,9 +1766,9 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool //figure out what weapon they are using, if any const Item_Struct* weapon = nullptr; if (Hand == 13 && equipment[SLOT_PRIMARY] > 0) - weapon = database.GetItem(equipment[SLOT_PRIMARY]); + weapon = database.GetItem(equipment[SLOT_PRIMARY]); else if (equipment[SLOT_SECONDARY]) - weapon = database.GetItem(equipment[SLOT_SECONDARY]); + weapon = database.GetItem(equipment[SLOT_SECONDARY]); //We dont factor much from the weapon into the attack. //Just the skill type so it doesn't look silly using punching animations and stuff while wielding weapons @@ -1864,11 +1864,11 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool //check if we're hitting above our max or below it. if((min_dmg+eleBane) != 0 && damage < (min_dmg+eleBane)) { mlog(COMBAT__DAMAGE, "Damage (%d) is below min (%d). Setting to min.", damage, (min_dmg+eleBane)); - damage = (min_dmg+eleBane); + damage = (min_dmg+eleBane); } if((max_dmg+eleBane) != 0 && damage > (max_dmg+eleBane)) { mlog(COMBAT__DAMAGE, "Damage (%d) is above max (%d). Setting to max.", damage, (max_dmg+eleBane)); - damage = (max_dmg+eleBane); + damage = (max_dmg+eleBane); } damage = mod_npc_damage(damage, skillinuse, Hand, &weapon_inst, other); @@ -1930,7 +1930,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool if(GetHP() > 0 && other->GetHP() >= DeathHP) { other->Damage(this, damage, SPELL_UNKNOWN, skillinuse, false); // Not avoidable client already had thier chance to Avoid - } else + } else return false; if (HasDied()) //killed by damage shield ect @@ -1986,10 +1986,10 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool } if (damage > 0) - return true; + return true; else - return false; + return false; } void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic) { @@ -2000,7 +2000,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, SkillType attack_ski if(attacked_timer.Check()) { mlog(COMBAT__HITS, "Triggering EVENT_ATTACK due to attack by %s", other->GetName()); - parse->EventNPC(EVENT_ATTACK, this, other, "", 0); + parse->EventNPC(EVENT_ATTACK, this, other, "", 0); } attacked_timer.Start(CombatEventTimer_expire); @@ -2164,7 +2164,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski killerMob->TrySpellOnKill(killed_level,spell); } /* Send the EVENT_KILLED_MERIT event and update kill tasks - * for all group members */ + * for all group members */ for (int i = 0; i < MAX_GROUP_MEMBERS; i++) { if (kg->members[i] != nullptr && kg->members[i]->IsClient()) { // If Group Member is Client Client *c = kg->members[i]->CastToClient(); @@ -2357,7 +2357,7 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski this->DoNPCEmote(ONDEATH,emoteid); if(oos->IsNPC()) { - parse->EventNPC(EVENT_NPC_SLAY, oos->CastToNPC(), this, "", 0); + parse->EventNPC(EVENT_NPC_SLAY, oos->CastToNPC(), this, "", 0); uint16 emoteid = oos->GetEmoteID(); if(emoteid != 0) oos->CastToNPC()->DoNPCEmote(KILLEDNPC,emoteid); @@ -2374,13 +2374,13 @@ void NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_ski } void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, bool bFrenzy, bool iBuffTic) { - assert(other != nullptr); - if (other == this) - return; + assert(other != nullptr); + if (other == this) + return; - if(damage < 0){ - hate = 1; - } + if(damage < 0){ + hate = 1; + } bool wasengaged = IsEngaged(); Mob* owner = other->GetOwner(); @@ -2417,18 +2417,18 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, if(other->SpecAttacks[IMMUNE_AGGRO_ON]) return; - if(SpecAttacks[NPC_TUNNELVISION]) { - Mob *top = GetTarget(); - if(top && top != other) { - hate *= RuleR(Aggro, TunnelVisionAggroMod); - } - } + if(SpecAttacks[NPC_TUNNELVISION]) { + Mob *top = GetTarget(); + if(top && top != other) { + hate *= RuleR(Aggro, TunnelVisionAggroMod); + } + } - if(IsNPC() && CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { - if(!zone->watermap->InLiquid(other->GetX(), other->GetY(), other->GetZ())) { - return; - } - } + if(IsNPC() && CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { + if(!zone->watermap->InLiquid(other->GetX(), other->GetY(), other->GetZ())) { + return; + } + } // first add self // The damage on the hate list is used to award XP to the killer. This check is to prevent Killstealing. @@ -2496,7 +2496,7 @@ void Mob::AddToHateList(Mob* other, int32 hate, int32 damage, bool iYellForHelp, } if (!wasengaged) { if(IsNPC() && other->IsClient() && other->CastToClient()) - parse->EventNPC(EVENT_AGGRO, this->CastToNPC(), other, "", 0); + parse->EventNPC(EVENT_AGGRO, this->CastToNPC(), other, "", 0); AI_Event_Engaged(other, iYellForHelp); adverrorinfo = 8293; } @@ -2550,8 +2550,8 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) { //value for spells that effect pets. Unclear as to why. For now will convert all positive to be consistent. if (attacker->IsOffHandAtk()){ int16 mitigation = attacker->itembonuses.DSMitigationOffHand + - attacker->spellbonuses.DSMitigationOffHand + - attacker->aabonuses.DSMitigationOffHand; + attacker->spellbonuses.DSMitigationOffHand + + attacker->aabonuses.DSMitigationOffHand; DS -= DS*mitigation/100; } DS -= DS * attacker->itembonuses.DSMitigation / 100; @@ -2607,13 +2607,13 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) // Assert: This function should only be called for hits by the mainhand, as damage bonuses apply only to the - // weapon in the primary slot. Be sure to check that Hand == 13 before calling. + // weapon in the primary slot. Be sure to check that Hand == 13 before calling. // Assert: The caller should ensure that Weapon is actually a weapon before calling this function. - // The ItemInst::IsWeapon() method can be used to quickly determine this. + // The ItemInst::IsWeapon() method can be used to quickly determine this. // Assert: This function should not be called if the player's level is below 28, as damage bonuses do not begin - // to apply until level 28. + // to apply until level 28. // Assert: This function should not be called unless the player is a melee class, as casters do not receive a damage bonus. @@ -2679,9 +2679,9 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) if( ucPlayerLevel == 65 && Weapon->Delay <= 59 ) { // Consider these two facts: - // * Level 65 is the maximum level on many EQ Emu servers. - // * If you listed the levels of all characters logged on to a server, odds are that the number you'll - // see most frequently is level 65. That is, there are more level 65 toons than any other single level. + // * Level 65 is the maximum level on many EQ Emu servers. + // * If you listed the levels of all characters logged on to a server, odds are that the number you'll + // see most frequently is level 65. That is, there are more level 65 toons than any other single level. // // Therefore, if we can optimize this function for level 65 toons, we're speeding up the server! // @@ -2907,7 +2907,7 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) } else { - static const uint8 ucDelay46Levels28to52[] = {6, 6, 7, 8, 8, 8, 9, 10, 10, 11, 11, 11, 13, 13, 13, 14, 14, 15, 16, 16, 16, 17, 18, 20, 22}; + static const uint8 ucDelay46Levels28to52[] = {6, 6, 7, 8, 8, 8, 9, 10, 10, 11, 11, 11, 13, 13, 13, 14, 14, 15, 16, 16, 16, 17, 18, 20, 22}; return ucDelay46Levels28to52[ucPlayerLevel-28] + ((Weapon->Delay-46) / 3); } @@ -3019,11 +3019,11 @@ int Mob::GetMonkHandToHandDamage(void) // Kaiyodo - Determine a monk's fist damage. Table data from www.monkly-business.com // saved as static array - this should speed this function up considerably static int damage[66] = { - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 99, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11, - 12,12,12,12,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14, - 14,14,15,15,15,15 }; + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + 99, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, + 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11, + 12,12,12,12,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14, + 14,14,15,15,15,15 }; // Have a look to see if we have epic fists on @@ -3032,10 +3032,10 @@ int Mob::GetMonkHandToHandDamage(void) else { int Level = GetLevel(); - if (Level > 65) - return(19); - else - return damage[Level]; + if (Level > 65) + return(19); + else + return damage[Level]; } } @@ -3045,16 +3045,16 @@ int Mob::GetMonkHandToHandDelay(void) // saved as static array - this should speed this function up considerably static int delayshuman[66] = { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 99,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36, - 36,36,36,36,36,35,35,35,35,35,34,34,34,34,34,33,33,33,33,33, - 32,32,32,32,32,31,31,31,31,31,30,30,30,29,29,29,28,28,28,27, - 26,24,22,20,20,20 }; + 99,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36, + 36,36,36,36,36,35,35,35,35,35,34,34,34,34,34,33,33,33,33,33, + 32,32,32,32,32,31,31,31,31,31,30,30,30,29,29,29,28,28,28,27, + 26,24,22,20,20,20 }; static int delaysiksar[66] = { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 99,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36, - 36,36,36,36,36,36,36,36,36,36,35,35,35,35,35,34,34,34,34,34, - 33,33,33,33,33,32,32,32,32,32,31,31,31,30,30,30,29,29,29,28, - 27,24,22,20,20,20 }; + 99,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36, + 36,36,36,36,36,36,36,36,36,36,35,35,35,35,35,34,34,34,34,34, + 33,33,33,33,33,32,32,32,32,32,31,31,31,30,30,30,29,29,29,28, + 27,24,22,20,20,20 }; // Have a look to see if we have epic fists on if (IsClient() && CastToClient()->GetItemIDAt(12) == 10652) @@ -3064,17 +3064,17 @@ int Mob::GetMonkHandToHandDelay(void) int Level = GetLevel(); if (GetRace() == HUMAN) { - if (Level > 65) - return(24); - else - return delayshuman[Level]; + if (Level > 65) + return(24); + else + return delayshuman[Level]; } else //heko: iksar table { - if (Level > 65) - return(25); - else - return delaysiksar[Level]; + if (Level > 65) + return(25); + else + return delaysiksar[Level]; } } } @@ -3218,34 +3218,34 @@ int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTi bool Mob::HasProcs() const { - for (int i = 0; i < MAX_PROCS; i++) - if (PermaProcs[i].spellID != SPELL_UNKNOWN || SpellProcs[i].spellID != SPELL_UNKNOWN) - return true; - return false; + for (int i = 0; i < MAX_PROCS; i++) + if (PermaProcs[i].spellID != SPELL_UNKNOWN || SpellProcs[i].spellID != SPELL_UNKNOWN) + return true; + return false; } bool Mob::HasDefensiveProcs() const { for (int i = 0; i < MAX_PROCS; i++) - if (DefensiveProcs[i].spellID != SPELL_UNKNOWN) - return true; - return false; + if (DefensiveProcs[i].spellID != SPELL_UNKNOWN) + return true; + return false; } bool Mob::HasSkillProcs() const { for (int i = 0; i < MAX_PROCS; i++) - if (SkillProcs[i].spellID != SPELL_UNKNOWN) - return true; - return false; + if (SkillProcs[i].spellID != SPELL_UNKNOWN) + return true; + return false; } bool Mob::HasRangedProcs() const { for (int i = 0; i < MAX_PROCS; i++) - if (RangedProcs[i].spellID != SPELL_UNKNOWN) - return true; - return false; + if (RangedProcs[i].spellID != SPELL_UNKNOWN) + return true; + return false; } bool Client::CheckDoubleAttack(bool tripleAttack) { @@ -3300,8 +3300,8 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons if( spell_id != SPELL_UNKNOWN || attacker == nullptr ) avoidable = false; - // only apply DS if physical damage (no spell damage) - // damage shield calls this function with spell_id set, so its unavoidable + // only apply DS if physical damage (no spell damage) + // damage shield calls this function with spell_id set, so its unavoidable if (attacker && damage > 0 && spell_id == SPELL_UNKNOWN && skill_used != ARCHERY && skill_used != THROWING) { DamageShield(attacker); @@ -3372,7 +3372,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons if(attacker->CastToClient()->GetFilter(FilterDamageShields) != FilterHide) attacker->Message(15, "The Spellshield absorbed %d of %d points of damage", origdmg - damage, origdmg); } - if (damage == 0 && attacker && origdmg != damage && IsClient()) { + if (damage == 0 && attacker && origdmg != damage && IsClient()) { //Kayen: Probably need to add a filter for this - Not sure if this msg is correct but there should be a message for spell negate/runes. Message(263, "%s tries to cast on you, but YOUR magical skin absorbs the spell.",attacker->GetCleanName()); } @@ -3433,13 +3433,13 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons TryDeathSave(); } - //fade mez if we are mezzed + //fade mez if we are mezzed if (IsMezzed()) { mlog(COMBAT__HITS, "Breaking mez due to attack."); BuffFadeByEffect(SE_Mez); } - //check stun chances if bashing + //check stun chances if bashing if (damage > 0 && ((skill_used == BASH || skill_used == KICK) && attacker)) { // NPCs can stun with their bash/kick as soon as they recieve it. @@ -3485,8 +3485,8 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons //see if root will break if (IsRooted() && !FromDamageShield) { // neotoyko: only spells cancel root - /*Dev Quote 2010: http://forums.station.sony.com/eq/posts/list.m?topic_id=161443 - The Viscid Roots AA does the following: Reduces the chance for root to break by X percent. + /*Dev Quote 2010: http://forums.station.sony.com/eq/posts/list.m?topic_id=161443 + The Viscid Roots AA does the following: Reduces the chance for root to break by X percent. There is no distinction of any kind between the caster inflicted damage, or anyone else's damage. There is also no distinction between Direct and DOT damage in the root code. There is however, a provision that if the damage inflicted is greater than 500 per hit, the @@ -3521,8 +3521,8 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons SendHPUpdate(); } //end `if damage was done` - //send damage packet... - if(!iBuffTic) { //buff ticks do not send damage, instead they just call SendHPUpdate(), which is done below + //send damage packet... + if(!iBuffTic) { //buff ticks do not send damage, instead they just call SendHPUpdate(), which is done below EQApplicationPacket* outapp = new EQApplicationPacket(OP_Damage, sizeof(CombatDamage_Struct)); CombatDamage_Struct* a = (CombatDamage_Struct*)outapp->pBuffer; a->target = GetID(); @@ -3551,8 +3551,8 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons //special crap for spell damage, looks hackish to me char val1[20]={0}; owner->Message_StringID(MT_NonMelee,OTHER_HIT_NONMELEE,GetCleanName(),ConvertArray(damage,val1)); - } else { - if(damage > 0) { + } else { + if(damage > 0) { if(spell_id != SPELL_UNKNOWN) filter = iBuffTic ? FilterDOT : FilterSpellDamage; else @@ -3583,9 +3583,9 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons } } else - entity_list.MessageClose_StringID(this, true, 100, MT_NonMelee,HIT_NON_MELEE,attacker->GetCleanName(),GetCleanName(),ConvertArray(damage,val1)); - } else { - if(damage > 0) { + entity_list.MessageClose_StringID(this, true, 100, MT_NonMelee,HIT_NON_MELEE,attacker->GetCleanName(),GetCleanName(),ConvertArray(damage,val1)); + } else { + if(damage > 0) { if(spell_id != SPELL_UNKNOWN) filter = iBuffTic ? FilterDOT : FilterSpellDamage; else @@ -3628,7 +3628,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons safe_delete(outapp); } else { - //else, it is a buff tic... + //else, it is a buff tic... // Everhood - So we can see our dot dmg like live shows it. if(spell_id != SPELL_UNKNOWN && damage > 0 && attacker && attacker != this && attacker->IsClient()) { //might filter on (attack_skill>200 && attack_skill<250), but I dont think we need it @@ -3833,7 +3833,7 @@ void Mob::TryWeaponProc(const ItemInst* weapon_g, Mob *on, uint16 hand) { _ZP(Mob_TryWeaponProcA); if(!on) { SetTarget(nullptr); - LogFile->write(EQEMuLog::Error, "A null Mob object was passed to Mob::TryWeaponProc for evaluation!"); + LogFile->write(EQEMuLog::Error, "A null Mob object was passed to Mob::TryWeaponProc for evaluation!"); return; } @@ -4037,7 +4037,7 @@ void Mob::TryPetCriticalHit(Mob *defender, uint16 skill, int32 &damage) { critMod += GetCritDmgMob(skill) * 2; // To account for base crit mod being 200 not 100 damage = (damage * critMod) / 100; - entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, CRITICAL_HIT, GetCleanName(), itoa(damage)); + entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, CRITICAL_HIT, GetCleanName(), itoa(damage)); } } } @@ -4190,7 +4190,7 @@ bool Mob::TryFinishingBlow(Mob *defender, SkillType skillinuse) } else { - mlog(COMBAT__ATTACKS, "FAILED a finishing blow: levelreq at %d, other level %d", levelreq , defender->GetLevel()); + mlog(COMBAT__ATTACKS, "FAILED a finishing blow: levelreq at %d, other level %d", levelreq , defender->GetLevel()); return false; } } @@ -4207,8 +4207,8 @@ void Mob::DoRiposte(Mob* defender) { if (HasDied()) return; int16 DoubleRipChance = defender->aabonuses.GiveDoubleRiposte[0] + - defender->spellbonuses.GiveDoubleRiposte[0] + - defender->itembonuses.GiveDoubleRiposte[0]; + defender->spellbonuses.GiveDoubleRiposte[0] + + defender->itembonuses.GiveDoubleRiposte[0]; //Live AA - Double Riposte if(DoubleRipChance && (DoubleRipChance >= MakeRandomInt(0, 100))) { @@ -4383,3 +4383,4 @@ int32 Mob::RuneAbsorb(int32 damage, uint16 type) return damage; } } + diff --git a/zone/basic_functions.h b/zone/basic_functions.h index 5f8e30d6c..3fa8ba523 100644 --- a/zone/basic_functions.h +++ b/zone/basic_functions.h @@ -25,7 +25,7 @@ char com_list[512]; int calc(char * stuff) { int result = 0; int i = 0; - int a = 0; + int a = 0; static char temp[100]; int op = 0; memset(temp,0x0,100); @@ -105,15 +105,15 @@ int GetArgs(char * string) char temp[255]; char c_name[255]; int params = 0; - //char *buffer = new char[512]; // this is never deleted, causes zone to crash - char *buffer = com_list; - memset(temp,0x0,255); - //memset(buffer,0x0,512); - //#ifdef WIN32 - //strcpy(buffer,com_list); - //#else - //strncpy(buffer,com_list,sizeof(buffer)-1); - //#endif + //char *buffer = new char[512]; // this is never deleted, causes zone to crash + char *buffer = com_list; + memset(temp,0x0,255); + //memset(buffer,0x0,512); + //#ifdef WIN32 + //strcpy(buffer,com_list); + //#else + //strncpy(buffer,com_list,sizeof(buffer)-1); + //#endif int i=0; while (*buffer) { @@ -136,39 +136,39 @@ int GetArgs(char * string) } return 0; #else - if (strstr(string,"if")) { return 0; } - if (strstr(string,"sfollow")) { return 0; } - if (strstr(string,"save")) { return 0; } - if (strstr(string,"while")) { return 0; } - if (strstr(string,"break")) { return 1; } - if (strstr(string,"follow")) { return 1; } - if (strstr(string,"setallskill")) { return 1; } - if (strstr(string,"me")) { return 1; } - if (strstr(string,"flagcheck")) { return 1; } - if (strstr(string,"echo")) { return 1; } - if (strstr(string,"summonitem")) { return 1; } - if (strstr(string,"say")) { return 1; } - if (strstr(string,"emote")) { return 1; } - if (strstr(string,"shout")) { return 1; } - if (strstr(string,"depop")) { return 1; } - if (strstr(string,"cumflag")) { return 1; } - if (strstr(string,"exp")) { return 1; } - if (strstr(string,"level")) { return 1; } - if (strstr(string,"safemove")) { return 1; } - if (strstr(string,"rain")) { return 1; } - if (strstr(string,"snow")) { return 1; } - if (strstr(string,"pvp")) { return 1; } - if (strstr(string,"doanim")) { return 1; } - if (strstr(string,"dbspawnadd")) { return 2; } - if (strstr(string,"castspell")) { return 2; } - if (strstr(string,"flagcheck")) { return 2; } - if (strstr(string,"addskill")) { return 2; } - if (strstr(string,"write")) { return 2; } - if (strstr(string,"settarget")) { return 2; } - if (strstr(string,"givecash")) { return 4; } - if (strstr(string,"movepc")) { return 4; } - if (strstr(string,"spawn")) { return 6; } - return 0; + if (strstr(string,"if")) { return 0; } + if (strstr(string,"sfollow")) { return 0; } + if (strstr(string,"save")) { return 0; } + if (strstr(string,"while")) { return 0; } + if (strstr(string,"break")) { return 1; } + if (strstr(string,"follow")) { return 1; } + if (strstr(string,"setallskill")) { return 1; } + if (strstr(string,"me")) { return 1; } + if (strstr(string,"flagcheck")) { return 1; } + if (strstr(string,"echo")) { return 1; } + if (strstr(string,"summonitem")) { return 1; } + if (strstr(string,"say")) { return 1; } + if (strstr(string,"emote")) { return 1; } + if (strstr(string,"shout")) { return 1; } + if (strstr(string,"depop")) { return 1; } + if (strstr(string,"cumflag")) { return 1; } + if (strstr(string,"exp")) { return 1; } + if (strstr(string,"level")) { return 1; } + if (strstr(string,"safemove")) { return 1; } + if (strstr(string,"rain")) { return 1; } + if (strstr(string,"snow")) { return 1; } + if (strstr(string,"pvp")) { return 1; } + if (strstr(string,"doanim")) { return 1; } + if (strstr(string,"dbspawnadd")) { return 2; } + if (strstr(string,"castspell")) { return 2; } + if (strstr(string,"flagcheck")) { return 2; } + if (strstr(string,"addskill")) { return 2; } + if (strstr(string,"write")) { return 2; } + if (strstr(string,"settarget")) { return 2; } + if (strstr(string,"givecash")) { return 4; } + if (strstr(string,"movepc")) { return 4; } + if (strstr(string,"spawn")) { return 6; } + return 0; #endif // 0 } diff --git a/zone/beacon.cpp b/zone/beacon.cpp index 433f99627..2d2d9a942 100644 --- a/zone/beacon.cpp +++ b/zone/beacon.cpp @@ -1,24 +1,24 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* -solar: Beacon class, extends Mob. Used for AE rain spells to have a mob +solar: Beacon class, extends Mob. Used for AE rain spells to have a mob target to center around. */ @@ -30,7 +30,7 @@ target to center around. #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif #include "masterentity.h" diff --git a/zone/beacon.h b/zone/beacon.h index d7ef43fd6..3d4f0ae23 100644 --- a/zone/beacon.h +++ b/zone/beacon.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef BEACON_H diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index c72fae7e9..ae8bf3c53 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/spdat.h" @@ -532,10 +532,10 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu void Client::CalcEdibleBonuses(StatBonuses* newbon) { #if EQDEBUG >= 11 - cout<<"Client::CalcEdibleBonuses(StatBonuses* newbon)"<ConsumeProjectile += base1; break; - case SE_ForageAdditionalItems: - newbon->ForageAdditionalItems += base1; - break; - case SE_Salvage: - newbon->SalvageChance += base1; - break; + case SE_ForageAdditionalItems: + newbon->ForageAdditionalItems += base1; + break; + case SE_Salvage: + newbon->SalvageChance += base1; + break; case SE_ArcheryDamageModifier: newbon->ArcheryDamageModifier += base1; break; @@ -952,7 +952,7 @@ void Client::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) { if(!newbon->SpellOnKill[i] || ((newbon->SpellOnKill[i] == base2) && (newbon->SpellOnKill[i+1] < base1))) { - //base1 = chance, base2 = SpellID to be triggered, base3 = min npc level + //base1 = chance, base2 = SpellID to be triggered, base3 = min npc level newbon->SpellOnKill[i] = base2; newbon->SpellOnKill[i+1] = base1; @@ -1275,7 +1275,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne break; } - case SE_AttackSpeed2: + case SE_AttackSpeed2: { if ((effect_value - 100) > 0) { // Haste V2 - Stacks with V1 but does not Overcap if ((effect_value - 100) > newbon->hastetype2) { @@ -1283,17 +1283,17 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne } } break; - } + } - case SE_AttackSpeed3: - { + case SE_AttackSpeed3: + { if (effect_value > 0) { // Haste V3 - Stacks and Overcaps if (effect_value > newbon->hastetype3) { newbon->hastetype3 = effect_value; } } break; - } + } case SE_AttackSpeed4: { @@ -1598,10 +1598,10 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->AvoidMeleeChance += effect_value; - else if((effect_value < 0) && (newbon->AvoidMeleeChance > effect_value)) + else if((effect_value < 0) && (newbon->AvoidMeleeChance > effect_value)) newbon->AvoidMeleeChance = effect_value; - else if(newbon->AvoidMeleeChance < effect_value) + else if(newbon->AvoidMeleeChance < effect_value) newbon->AvoidMeleeChance = effect_value; break; } @@ -1625,7 +1625,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DodgeChance += effect_value; else if((effect_value < 0) && (newbon->DodgeChance > effect_value)) - newbon->DodgeChance = effect_value; + newbon->DodgeChance = effect_value; if(newbon->DodgeChance < effect_value) newbon->DodgeChance = effect_value; @@ -1638,7 +1638,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->ParryChance += effect_value; else if((effect_value < 0) && (newbon->ParryChance > effect_value)) - newbon->ParryChance = effect_value; + newbon->ParryChance = effect_value; if(newbon->ParryChance < effect_value) newbon->ParryChance = effect_value; @@ -1651,7 +1651,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DualWieldChance += effect_value; else if((effect_value < 0) && (newbon->DualWieldChance > effect_value)) - newbon->DualWieldChance = effect_value; + newbon->DualWieldChance = effect_value; if(newbon->DualWieldChance < effect_value) newbon->DualWieldChance = effect_value; @@ -1665,7 +1665,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->DoubleAttackChance += effect_value; else if((effect_value < 0) && (newbon->DoubleAttackChance > effect_value)) - newbon->DoubleAttackChance = effect_value; + newbon->DoubleAttackChance = effect_value; if(newbon->DoubleAttackChance < effect_value) newbon->DoubleAttackChance = effect_value; @@ -1676,9 +1676,9 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne { if (RuleB(Spells, AdditiveBonusValues) && item_bonus) - newbon->TripleAttackChance += effect_value; + newbon->TripleAttackChance += effect_value; - else if((effect_value < 0) && (newbon->TripleAttackChance > effect_value)) + else if((effect_value < 0) && (newbon->TripleAttackChance > effect_value)) newbon->TripleAttackChance = effect_value; if(newbon->TripleAttackChance < effect_value) @@ -1691,7 +1691,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->MeleeLifetap += spells[spell_id].base[i]; - else if((effect_value < 0) && (newbon->MeleeLifetap > effect_value)) + else if((effect_value < 0) && (newbon->MeleeLifetap > effect_value)) newbon->MeleeLifetap = spells[spell_id].base[i]; if(newbon->MeleeLifetap < spells[spell_id].base[i]) @@ -1731,8 +1731,8 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->Fearless = true; break; - case SE_HundredHands: - { + case SE_HundredHands: + { if (RuleB(Spells, AdditiveBonusValues) && item_bonus) newbon->HundredHands += spells[spell_id].base[i]; @@ -1741,7 +1741,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne else if (effect_value < 0 && effect_value < newbon->HundredHands) newbon->HundredHands = effect_value; //Decrease Weapon Delay break; - } + } case SE_MeleeSkillCheck: { @@ -1820,7 +1820,7 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->ProcChance += effect_value; else if((effect_value < 0) && (newbon->DoubleAttackChance > effect_value)) - newbon->ProcChance = effect_value; + newbon->ProcChance = effect_value; if(newbon->ProcChance < effect_value) newbon->ProcChance = effect_value; @@ -2198,13 +2198,13 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* ne newbon->ConsumeProjectile += effect_value; break; - case SE_ForageAdditionalItems: - newbon->ForageAdditionalItems += effect_value; - break; + case SE_ForageAdditionalItems: + newbon->ForageAdditionalItems += effect_value; + break; - case SE_Salvage: - newbon->SalvageChance += effect_value; - break; + case SE_Salvage: + newbon->SalvageChance += effect_value; + break; case SE_ArcheryDamageModifier: newbon->ArcheryDamageModifier += effect_value; @@ -2443,9 +2443,9 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y, bool login) uint16 oldexp = e_inst->GetExp(); if(login) { - parse->EventItem(EVENT_ITEM_ENTERZONE, this, e_inst, e_inst->GetID(), 0); - } - parse->EventItem(EVENT_SCALE_CALC, this, e_inst, e_inst->GetID(), 0); + parse->EventItem(EVENT_ITEM_ENTERZONE, this, e_inst, e_inst->GetID(), 0); + } + parse->EventItem(EVENT_SCALE_CALC, this, e_inst, e_inst->GetID(), 0); if (e_inst->GetExp() != oldexp) { // if the scaling factor changed, rescale the item and update the client e_inst->ScaleItem(); @@ -2466,10 +2466,10 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y, bool login) EvoItemInst* e_inst = (EvoItemInst*)a_inst; uint16 oldexp = e_inst->GetExp(); - if(login) { - parse->EventItem(EVENT_ITEM_ENTERZONE, this, e_inst, e_inst->GetID(), 0); - } - parse->EventItem(EVENT_SCALE_CALC, this, e_inst, e_inst->GetID(), 0); + if(login) { + parse->EventItem(EVENT_ITEM_ENTERZONE, this, e_inst, e_inst->GetID(), 0); + } + parse->EventItem(EVENT_SCALE_CALC, this, e_inst, e_inst->GetID(), 0); if (e_inst->GetExp() != oldexp) { @@ -3345,17 +3345,17 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) itembonuses.ConsumeProjectile = effect_value; break; - case SE_ForageAdditionalItems: - spellbonuses.ForageAdditionalItems = effect_value; - aabonuses.ForageAdditionalItems = effect_value; - itembonuses.ForageAdditionalItems = effect_value; - break; + case SE_ForageAdditionalItems: + spellbonuses.ForageAdditionalItems = effect_value; + aabonuses.ForageAdditionalItems = effect_value; + itembonuses.ForageAdditionalItems = effect_value; + break; - case SE_Salvage: - spellbonuses.SalvageChance = effect_value; - aabonuses.SalvageChance = effect_value; - itembonuses.SalvageChance = effect_value; - break; + case SE_Salvage: + spellbonuses.SalvageChance = effect_value; + aabonuses.SalvageChance = effect_value; + itembonuses.SalvageChance = effect_value; + break; case SE_ArcheryDamageModifier: spellbonuses.ArcheryDamageModifier = effect_value; @@ -3500,3 +3500,4 @@ void Mob::NegateSpellsBonuses(uint16 spell_id) } } } + diff --git a/zone/bot.cpp b/zone/bot.cpp index a2ffd5850..0717536cd 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -1288,7 +1288,7 @@ void Bot::GenerateArmorClass() uint16 Bot::GetPrimarySkillValue() { - SkillType skill = HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill + SkillType skill = HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill bool equiped = m_inv.GetItem(SLOT_PRIMARY); if(!equiped) @@ -1297,7 +1297,7 @@ uint16 Bot::GetPrimarySkillValue() } else { - uint8 type = m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType; //is this the best way to do this? + uint8 type = m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType; //is this the best way to do this? switch(type) { case ItemType1HS: // 1H Slashing @@ -1471,7 +1471,7 @@ void Bot::LoadAAs() { MYSQL_RES* DatasetResult; MYSQL_ROW DataRow; - int maxAAExpansion = RuleI(Bots, BotAAExpansion); //get expansion to get AAs up to + int maxAAExpansion = RuleI(Bots, BotAAExpansion); //get expansion to get AAs up to botAAs.clear(); //start fresh if(GetClass() == BERSERKER) @@ -1502,7 +1502,7 @@ void Bot::LoadAAs() { //Get level required for AA if(RequiredLevel != AARequiredLevelAndCost.end()) - req_level = RequiredLevel->second.Level; + req_level = RequiredLevel->second.Level; else req_level = (sendAA->class_type + i * sendAA->level_inc); @@ -1903,7 +1903,7 @@ void Bot::ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon) { if(!newbon->SpellOnKill[i] || ((newbon->SpellOnKill[i] == base2) && (newbon->SpellOnKill[i+1] < base1))) { - //base1 = chance, base2 = SpellID to be triggered, base3 = min npc level + //base1 = chance, base2 = SpellID to be triggered, base3 = min npc level newbon->SpellOnKill[i] = base2; newbon->SpellOnKill[i+1] = base1; @@ -2473,17 +2473,17 @@ void Bot::SaveBuffs() { IsPersistent = 0; if(!database.RunQuery(Query, MakeAnyLenString(&Query, "INSERT INTO botbuffs (BotId, SpellId, CasterLevel, DurationFormula, " - "TicsRemaining, PoisonCounters, DiseaseCounters, CurseCounters, CorruptionCounters, HitCount, MeleeRune, MagicRune, " - "DeathSaveSuccessChance, CasterAARank, Persistent) VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u);", - GetBotID(), buffs[BuffCount].spellid, buffs[BuffCount].casterlevel, spells[buffs[BuffCount].spellid].buffdurationformula, - buffs[BuffCount].ticsremaining, - CalculatePoisonCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - CalculateCurseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - buffs[BuffCount].numhits, buffs[BuffCount].melee_rune, buffs[BuffCount].magic_rune, - buffs[BuffCount].deathSaveSuccessChance, - buffs[BuffCount].deathsaveCasterAARank, IsPersistent), TempErrorMessageBuffer)) { + "TicsRemaining, PoisonCounters, DiseaseCounters, CurseCounters, CorruptionCounters, HitCount, MeleeRune, MagicRune, " + "DeathSaveSuccessChance, CasterAARank, Persistent) VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u);", + GetBotID(), buffs[BuffCount].spellid, buffs[BuffCount].casterlevel, spells[buffs[BuffCount].spellid].buffdurationformula, + buffs[BuffCount].ticsremaining, + CalculatePoisonCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + CalculateCurseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + buffs[BuffCount].numhits, buffs[BuffCount].melee_rune, buffs[BuffCount].magic_rune, + buffs[BuffCount].deathSaveSuccessChance, + buffs[BuffCount].deathsaveCasterAARank, IsPersistent), TempErrorMessageBuffer)) { errorMessage = std::string(TempErrorMessageBuffer); safe_delete(Query); Query = 0; @@ -2527,15 +2527,15 @@ void Bot::LoadBuffs() { buffs[BuffCount].casterlevel = atoi(DataRow[1]); buffs[BuffCount].ticsremaining = atoi(DataRow[3]); - if(CalculatePoisonCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[4]); - } else if(CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[5]); - } else if(CalculateCurseCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[6]); - } else if(CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[7]); - } + if(CalculatePoisonCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[4]); + } else if(CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[5]); + } else if(CalculateCurseCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[6]); + } else if(CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[7]); + } buffs[BuffCount].numhits = atoi(DataRow[8]); buffs[BuffCount].melee_rune = atoi(DataRow[9]); buffs[BuffCount].magic_rune = atoi(DataRow[10]); @@ -3340,7 +3340,7 @@ void Bot::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skil } } - if (damage == -3) { + if (damage == -3) { DoRiposte(other); if (HasDied()) return; @@ -3591,7 +3591,7 @@ void Bot::AI_Process() { for(int counter = 0; counter < g->GroupCount(); counter++) { if(g->members[counter]) { Mob* tar = g->members[counter]->GetTarget(); - if(tar && tar->IsNPC() && tar->GetHateAmount(g->members[counter]) && IsAttackAllowed(g->members[counter]->GetTarget())) { + if(tar && tar->IsNPC() && tar->GetHateAmount(g->members[counter]) && IsAttackAllowed(g->members[counter]->GetTarget())) { AddToHateList(tar, 1); if(HasPet()) @@ -6185,7 +6185,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli item2 = database.GetItem(items[y]); if(item2) { if(botCanWear[y]) { - Say("Thank you for the %s, %s.", item2->Name, client->GetName()); + Say("Thank you for the %s, %s.", item2->Name, client->GetName()); } else { Say("I can't use this %s!", item2->Name); @@ -6565,7 +6565,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b //riposte bool slippery_attack = false; // Part of hack to allow riposte to become a miss, but still allow a Strikethrough chance (like on Live) - if (damage == -3) { + if (damage == -3) { if (FromRiposte) return false; else { if (Hand == SLOT_SECONDARY) {// Do we even have it & was attack with mainhand? If not, don't bother with other calculations @@ -6609,7 +6609,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b } /////////////////////////////////////////////////////////// - ////// Send Attack Damage + ////// Send Attack Damage /////////////////////////////////////////////////////////// other->Damage(this, damage, SPELL_UNKNOWN, skillinuse); @@ -7218,8 +7218,8 @@ int16 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) { int buff_tracker = -1; int buff_slot = 0; - uint16 focusspellid = 0; - uint16 focusspell_tracker = 0; + uint16 focusspellid = 0; + uint16 focusspell_tracker = 0; uint32 buff_max = GetMaxTotalSlots(); for (buff_slot = 0; buff_slot < buff_max; buff_slot++) { focusspellid = buffs[buff_slot].spellid; @@ -7419,7 +7419,7 @@ int16 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel return 0; break; default: - LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); + LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); } break; @@ -7751,7 +7751,7 @@ int16 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel //this spits up a lot of garbage when calculating spell focuses //since they have all kinds of extra effects on them. default: - LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); + LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); #endif } } @@ -7811,13 +7811,13 @@ float Bot::GetProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_spe bool Bot::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) { /* solar: called when a mob is attacked, does the checks to see if it's a hit - * and does other mitigation checks. 'this' is the mob being attacked. + * and does other mitigation checks. 'this' is the mob being attacked. * * special return values: - * -1 - block - * -2 - parry - * -3 - riposte - * -4 - dodge + * -1 - block + * -2 - parry + * -3 - riposte + * -4 - dodge * */ if(GetAppearance() == eaDead) @@ -7850,7 +7850,7 @@ bool Bot::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (CanRiposte && damage > 0 && CanThisClassRiposte() && !other->BehindMob(this, other->GetX(), other->GetY())) { riposte_chance = (100.0f + (float)defender->GetAABonuses().RiposteChance + (float)defender->GetSpellBonuses().RiposteChance + (float)defender->GetItemBonuses().RiposteChance) / 100.0f; - skill = GetSkill(RIPOSTE); + skill = GetSkill(RIPOSTE); if (!ghit) { //if they are not using a garunteed hit discipline bonus = 2.0 + skill/60.0 + (GetDEX()/200); @@ -7953,7 +7953,7 @@ bool Bot::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if (damage > 0 && CanThisClassDodge() && !other->BehindMob(this, other->GetX(), other->GetY())) { dodge_chance = (100.0f + (float)defender->GetSpellBonuses().DodgeChance + (float)defender->GetItemBonuses().DodgeChance) / 100.0f; - skill = GetSkill(DODGE); + skill = GetSkill(DODGE); if (!ghit) { //if they are not using a garunteed hit discipline bonus = 2.0 + skill/60.0 + (GetAGI()/200); @@ -7994,7 +7994,7 @@ int Bot::GetMonkHandToHandDamage(void) // Kaiyodo - Determine a monk's fist damage. Table data from www.monkly-business.com // saved as static array - this should speed this function up considerably static int damage[66] = { - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 99, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,10,10,10,10,10,11,11,11,11,11, 12,12,12,12,12,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14, @@ -8153,7 +8153,7 @@ bool Bot::TryFinishingBlow(Mob *defender, SkillType skillinuse) } else { - mlog(COMBAT__ATTACKS, "FAILED a finishing blow: levelreq at %d, other level %d", levelreq , defender->GetLevel()); + mlog(COMBAT__ATTACKS, "FAILED a finishing blow: levelreq at %d, other level %d", levelreq , defender->GetLevel()); return false; } } @@ -8170,8 +8170,8 @@ void Bot::DoRiposte(Mob* defender) { //double riposte int16 DoubleRipChance = defender->GetAABonuses().GiveDoubleRiposte[0] + - defender->GetSpellBonuses().GiveDoubleRiposte[0] + - defender->GetItemBonuses().GiveDoubleRiposte[0]; + defender->GetSpellBonuses().GiveDoubleRiposte[0] + + defender->GetItemBonuses().GiveDoubleRiposte[0]; if(DoubleRipChance && (DoubleRipChance >= MakeRandomInt(0, 100))) { mlog(COMBAT__ATTACKS, "Preforming a double riposte (%d percent chance)", DoubleRipChance); @@ -8306,7 +8306,7 @@ void Bot::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) { thac0 = thac0cap; } - d -= 10.0 * (a_diff / thac0); + d -= 10.0 * (a_diff / thac0); } else if(mit_roll > atk_roll) { @@ -8317,7 +8317,7 @@ void Bot::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit) { thac20 = thac20cap; } - d += 10 * (m_diff / thac20); + d += 10 * (m_diff / thac20); } if(d < 0.0) @@ -8576,7 +8576,7 @@ void Bot::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) if(primaryweapondamage > 0){ if(level > 25){ - max_hit = (((2*backstab_dmg) * GetDamageTable(BACKSTAB) / 100) * 10 * GetSkill(BACKSTAB) / 355) + ((level-25)/3) + 1; + max_hit = (((2*backstab_dmg) * GetDamageTable(BACKSTAB) / 100) * 10 * GetSkill(BACKSTAB) / 355) + ((level-25)/3) + 1; hate = 20 * backstab_dmg * GetSkill(BACKSTAB) / 355; } else{ @@ -8591,7 +8591,7 @@ void Bot::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) } else { - // Trumpcard: Replaced switch statement with formula calc. This will give minhit increases all the way to 65. + // Trumpcard: Replaced switch statement with formula calc. This will give minhit increases all the way to 65. min_hit = (level * ( level*5 - 105)) / 100; } @@ -8715,11 +8715,11 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { if(level >= RuleI(Combat, NPCBashKickLevel)){ bool canBash = false; if((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) // Racial Slam - || (m_inv.GetItem(SLOT_SECONDARY) && m_inv.GetItem(SLOT_SECONDARY)->GetItem()->ItemType == ItemTypeShield) //Using Shield + || (m_inv.GetItem(SLOT_SECONDARY) && m_inv.GetItem(SLOT_SECONDARY)->GetItem()->ItemType == ItemTypeShield) //Using Shield || (m_inv.GetItem(SLOT_PRIMARY) && (m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType == ItemType2HS || m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType == ItemType2HB || m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType == ItemType2HPierce) - && GetAA(aa2HandBash) >= 1)) { //Using 2 hand weapon, but has AA 2 Hand Bash + && GetAA(aa2HandBash) >= 1)) { //Using 2 hand weapon, but has AA 2 Hand Bash canBash = true; } @@ -8742,11 +8742,11 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { case PALADIN: if(level >= RuleI(Combat, NPCBashKickLevel)){ if((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) // Racial Slam - || (m_inv.GetItem(SLOT_SECONDARY) && m_inv.GetItem(SLOT_SECONDARY)->GetItem()->ItemType == ItemTypeShield) //Using Shield + || (m_inv.GetItem(SLOT_SECONDARY) && m_inv.GetItem(SLOT_SECONDARY)->GetItem()->ItemType == ItemTypeShield) //Using Shield || (m_inv.GetItem(SLOT_PRIMARY) && (m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType == ItemType2HS || m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType == ItemType2HB || m_inv.GetItem(SLOT_PRIMARY)->GetItem()->ItemType == ItemType2HPierce) - && GetAA(aa2HandBash) >= 1)) { //Using 2 hand weapon, but has AA 2 Hand Bash + && GetAA(aa2HandBash) >= 1)) { //Using 2 hand weapon, but has AA 2 Hand Bash skill_to_use = BASH; } } @@ -8828,10 +8828,10 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) { int AtkRounds = 3; int skillmod = 0; - if(MaxSkill(FRENZY) > 0) - skillmod = 100*GetSkill(FRENZY)/MaxSkill(FRENZY); + if(MaxSkill(FRENZY) > 0) + skillmod = 100*GetSkill(FRENZY)/MaxSkill(FRENZY); - int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); + int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); int32 min_dmg = 0; DoAnim(anim2HSlashing); @@ -9415,7 +9415,7 @@ void Bot::SetAttackTimer() { int speed = (int)((36 *(100+DelayMod)/100)*(100.0f+attack_speed)*PermaHaste); //if(speed < RuleI(Combat, MinHastedDelay) && IsClient()) //lower bound // speed = RuleI(Combat, MinHastedDelay); - TimerToUse->SetAtTrigger(speed, true); // Hand to hand, non-monk 2/36 + TimerToUse->SetAtTrigger(speed, true); // Hand to hand, non-monk 2/36 } } else { //we have a weapon, use its delay @@ -9462,8 +9462,8 @@ void Bot::SetAttackTimer() { int32 Bot::Additional_SpellDmg(uint16 spell_id, bool bufftick) { int32 spell_dmg = 0; - spell_dmg += GetBotFocusEffect(BotfocusFF_Damage_Amount, spell_id); - spell_dmg += GetBotFocusEffect(BotfocusSpellDamage, spell_id); + spell_dmg += GetBotFocusEffect(BotfocusFF_Damage_Amount, spell_id); + spell_dmg += GetBotFocusEffect(BotfocusSpellDamage, spell_id); //For DOTs you need to apply the damage over the duration of the dot to each tick (this is how live did it) if (bufftick){ @@ -9495,8 +9495,8 @@ int32 Bot::GetActSpellDamage(uint16 spell_id, int32 value) { if (tt == ST_UndeadAE || tt == ST_Undead || tt == ST_Summoned) { //undead/summoned spells modifier += GetBotFocusEffect(BotfocusImprovedUndeadDamage, spell_id); - } else { - //damage spells. + } else { + //damage spells. modifier += GetBotFocusEffect(BotfocusImprovedDamage, spell_id); modifier += GetBotFocusEffect(BotfocusSpellEffectiveness, spell_id); modifier += GetBotFocusEffect(BotfocusImprovedDamage2, spell_id); @@ -9509,7 +9509,7 @@ int32 Bot::GetActSpellDamage(uint16 spell_id, int32 value) { } //This adds the extra damage from the AA Unholy Touch, 450 per level to the AA Improved Harm TOuch. - if (spell_id == SPELL_IMP_HARM_TOUCH) { //Improved Harm Touch + if (spell_id == SPELL_IMP_HARM_TOUCH) { //Improved Harm Touch value -= GetAA(aaUnholyTouch) * 450; //Unholy Touch } @@ -9544,7 +9544,7 @@ int32 Bot::GetActSpellDamage(uint16 spell_id, int32 value) { ratio += RuleI(Spells, WizCritRatio); } if(aabonuses.SpellCritDmgIncrease > 0) // wizards get an additional bonus - ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% + ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% } //Improved Harm Touch is a guaranteed crit if you have at least one level of SCF. @@ -9598,8 +9598,8 @@ int32 Bot::Additional_Heal(uint16 spell_id) { int32 heal_amt = 0; - heal_amt += GetBotFocusEffect(BotfocusAdditionalHeal, spell_id); - heal_amt += GetBotFocusEffect(BotfocusAdditionalHeal2, spell_id); + heal_amt += GetBotFocusEffect(BotfocusAdditionalHeal, spell_id); + heal_amt += GetBotFocusEffect(BotfocusAdditionalHeal2, spell_id); if (heal_amt){ int duration = CalcBuffDuration(this, this, spell_id); @@ -9901,7 +9901,7 @@ bool Bot::SpellEffect(Mob* caster, uint16 spell_id, float partial) { Result = Mob::SpellEffect(caster, spell_id, partial); - // Franck-add: If healed/doted, a bot must show its new HP to its leader + // Franck-add: If healed/doted, a bot must show its new HP to its leader if(IsGrouped()) { Group *g = GetGroup(); if(g) { @@ -11300,7 +11300,7 @@ bool Bot::IsGroupPrimaryHealer() { case RANGER: case BEASTLORD: { - result = GroupHasPriestClass(g) ? false : true; + result = GroupHasPriestClass(g) ? false : true; break; } default: @@ -11335,7 +11335,7 @@ bool Bot::IsGroupPrimarySlower() { } case BEASTLORD: { - result = (GroupHasShamanClass(g) || GroupHasEnchanterClass(g)) ? false : true; + result = (GroupHasShamanClass(g) || GroupHasEnchanterClass(g)) ? false : true; break; } default: @@ -11972,7 +11972,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { c->Message(0, "#bot taunt [on|off] - Turns taunt on/off for targeted bot"); c->Message(0, "#bot stance [name] [stance (id)|list] - Sets/lists stance for named bot (Passive = 0, Balanced = 1, Efficient = 2, Reactive = 3, Aggressive = 4, Burn = 5, BurnAE = 6)"); c->Message(0, "#bot groupmessages [on|off] [bot name|all] - Turns group messages on/off for named bot/all bots."); - c->Message(0, "#bot defensive [bot name] - Causes warrior or knight bot to use defensive discipline / buff."); + c->Message(0, "#bot defensive [bot name] - Causes warrior or knight bot to use defensive discipline / buff."); c->Message(0, "#bot healrotation help - Displays the commands available to manage BOT heal rotations."); // TODO: // c->Message(0, "#bot illusion - Enchanter Bot cast an illusion buff spell on you or your target."); @@ -12068,9 +12068,9 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { MYSQL_ROW DataRow; c->Message(0, "-----------------#bot armorcolor help-----------------------------"); - c->Message(0, "Armor: 17(Chest/Robe), 7(Arms), 9(Bracer), 12(Hands), 18(Legs), 19(Boots), 2(Helm)"); + c->Message(0, "Armor: 17(Chest/Robe), 7(Arms), 9(Bracer), 12(Hands), 18(Legs), 19(Boots), 2(Helm)"); c->Message(0, "------------------------------------------------------------------"); - c->Message(0, "Color: [red] [green] [blue] (enter a number from 0-255 for each"); + c->Message(0, "Color: [red] [green] [blue] (enter a number from 0-255 for each"); c->Message(0, "------------------------------------------------------------------"); c->Message(0, "Example: #bot armorcolor 17 0 255 0 - this would make the chest bright green"); return; @@ -12191,7 +12191,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } if(!strcasecmp(sep->arg[1], "help") && !strcasecmp(sep->arg[2], "create") ){ - c->Message(0, "Classes: 1(Warrior), 2(Cleric), 3(Paladin), 4(Ranger), 5(Sk), 6(Druid), 7(Monk), 8(Bard), 9(Rogue), 10(Shaman), 11(Necro), 12(Wiz), 13(Mag), 14(Ench), 15(Beast), 16(Bersek)"); + c->Message(0, "Classes: 1(Warrior), 2(Cleric), 3(Paladin), 4(Ranger), 5(Sk), 6(Druid), 7(Monk), 8(Bard), 9(Rogue), 10(Shaman), 11(Necro), 12(Wiz), 13(Mag), 14(Ench), 15(Beast), 16(Bersek)"); c->Message(0, "------------------------------------------------------------------"); c->Message(0, "Races: 1(Human), 2(Barb), 3(Erudit), 4(Wood elf), 5(High elf), 6(Dark elf), 7(Half elf), 8(Dwarf), 9(Troll), 10(Ogre), 11(Halfling), 12(Gnome), 128(Iksar), 130(Vah shir), 330(Froglok), 522(Drakkin)"); c->Message(0, "------------------------------------------------------------------"); @@ -12281,7 +12281,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { if(bot && !listAll) { // Specific bot only - if(bot->GetClass() != WARRIOR && bot->GetClass() != MONK && bot->GetClass() != BARD && bot->GetClass() != BERSERKER && bot->GetClass() != ROGUE) + if(bot->GetClass() != WARRIOR && bot->GetClass() != MONK && bot->GetClass() != BARD && bot->GetClass() != BERSERKER && bot->GetClass() != ROGUE) c->Message(0, "Name: %s -- Class: %s -- Mana: %3.1f%%", bot->GetCleanName(), ClassIdToString(bot->GetClass()).c_str(), bot->GetManaRatio()); } else { @@ -12292,7 +12292,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { for(std::list::iterator botsListItr = spawnedBots.begin(); botsListItr != spawnedBots.end(); botsListItr++) { Bot* tempBot = *botsListItr; if(tempBot) { - if(tempBot->GetClass() != WARRIOR && tempBot->GetClass() != MONK && tempBot->GetClass() != BARD && tempBot->GetClass() != BERSERKER && tempBot->GetClass() != ROGUE) + if(tempBot->GetClass() != WARRIOR && tempBot->GetClass() != MONK && tempBot->GetClass() != BARD && tempBot->GetClass() != BERSERKER && tempBot->GetClass() != ROGUE) c->Message(0, "Name: %s -- Class: %s -- Mana: %3.1f%%", tempBot->GetCleanName(), ClassIdToString(tempBot->GetClass()).c_str(), tempBot->GetManaRatio()); } } @@ -12835,7 +12835,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } } if(hasruneer) { - if (c->GetLevel() <= 12) { + if (c->GetLevel() <= 12) { runeer->Say("I need to be level 13 or higher for this..."); } else if ((c->GetLevel() >= 13) && (c->GetLevel() <= 21)) { @@ -12976,7 +12976,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(CurerClass) { case CLERIC: - if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 1)) { + if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 1)) { Curer->Say("Trying to cure us of %s.", sep->arg[2]); Curer->CastToBot()->Bot_Command_Cure(1, Curer->GetLevel()); } @@ -13004,7 +13004,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { break; case SHAMAN: - if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 2)) { + if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 2)) { Curer->Say("Trying to cure us of %s.", sep->arg[2]); Curer->CastToBot()->Bot_Command_Cure(1, Curer->GetLevel()); } @@ -13580,11 +13580,11 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } } } - if((hasevac) && (c->GetLevel() >= 18)) { + if((hasevac) && (c->GetLevel() >= 18)) { evac->Say("Attempting to Evac you %s.", c->GetName()); evac->CastToClient()->CastSpell(2183, c->GetID(), 1, -1, -1); } - else if((hasevac) && (c->GetLevel() <= 17)) { + else if((hasevac) && (c->GetLevel() <= 17)) { evac->Say("I'm not level 18 yet.", c->GetName()); } return; @@ -13628,11 +13628,11 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(SowerClass) { case DRUID: - if ((!strcasecmp(sep->arg[2], "regular")) && (zone->CanCastOutdoor()) && (c->GetLevel() >= 10) ) { + if ((!strcasecmp(sep->arg[2], "regular")) && (zone->CanCastOutdoor()) && (c->GetLevel() >= 10) ) { Sower->Say("Casting sow..."); Sower->CastSpell(278, c->GetID(), 1, -1, -1); } - else if ((!strcasecmp(sep->arg[2], "regular")) && (zone->CanCastOutdoor()) && (c->GetLevel() <= 10) ) { + else if ((!strcasecmp(sep->arg[2], "regular")) && (zone->CanCastOutdoor()) && (c->GetLevel() <= 10) ) { Sower->Say("I'm not level 10 yet."); } else if ((!strcasecmp(sep->arg[2], "wolf")) && zone->CanCastOutdoor() && (c->GetLevel() >= 20)) { @@ -13715,7 +13715,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { default: - c->Message(15, "You must have a Druid, Shaman, Ranger, or Beastlord in your group."); + c->Message(15, "You must have a Druid, Shaman, Ranger, or Beastlord in your group."); break; } } @@ -13806,7 +13806,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(GaterClass) { case DRUID: - if ((!strcasecmp(sep->arg[2], "karana")) && (c->GetLevel() >= 25) ) { + if ((!strcasecmp(sep->arg[2], "karana")) && (c->GetLevel() >= 25) ) { Gater->Say("Casting Circle of Karana..."); Gater->CastSpell(550, c->GetID(), 1, -1, -1); } @@ -13940,7 +13940,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { case WIZARD: - if ((!strcasecmp(sep->arg[2], "commons")) && (c->GetLevel() >= 35) ) { + if ((!strcasecmp(sep->arg[2], "commons")) && (c->GetLevel() >= 35) ) { Gater->Say("Casting Common Portal..."); Gater->CastSpell(566, c->GetID(), 1, -1, -1); } @@ -14117,7 +14117,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(EndurerClass) { case DRUID: - if (c->GetLevel() < 6) { + if (c->GetLevel() < 6) { Endurer->Say("I'm not level 6 yet."); } else { @@ -14127,7 +14127,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case SHAMAN: - if (c->GetLevel() < 12) { + if (c->GetLevel() < 12) { Endurer->Say("I'm not level 12 yet."); } else { @@ -14136,7 +14136,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case RANGER: - if (c->GetLevel() < 20) { + if (c->GetLevel() < 20) { Endurer->Say("I'm not level 20 yet."); } else { @@ -14145,7 +14145,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case ENCHANTER: - if (c->GetLevel() < 12) { + if (c->GetLevel() < 12) { Endurer->Say("I'm not level 12 yet."); } else { @@ -14154,14 +14154,14 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case BEASTLORD: - if (c->GetLevel() < 25) { + if (c->GetLevel() < 25) { Endurer->Say("I'm not level 25 yet."); - } + } else { Endurer->Say("Casting Enduring Breath..."); Endurer->CastSpell(86, c->GetID(), 1, -1, -1); } - break; + break; default: c->Message(15, "You must have a Druid, Shaman, Ranger, Enchanter, or Beastlord in your group."); break; @@ -14214,21 +14214,21 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(InviserClass) { case ENCHANTER: - if ((c->GetLevel() <= 14) && (!strcasecmp(sep->arg[2], "undead"))) { + if ((c->GetLevel() <= 14) && (!strcasecmp(sep->arg[2], "undead"))) { Inviser->Say("I'm not level 14 yet."); } else if ((!c->IsInvisible(c)) && (!c->invisible_undead) && (c->GetLevel() >= 14) && (!strcasecmp(sep->arg[2], "undead"))) { Inviser->Say("Casting invis undead..."); Inviser->CastSpell(235, c->GetID(), 1, -1, -1); } - else if ((c->GetLevel() <= 4) && (!strcasecmp(sep->arg[2], "live"))) { + else if ((c->GetLevel() <= 4) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("I'm not level 4 yet."); } else if ((!c->IsInvisible(c))&& (!c->invisible_undead) && (c->GetLevel() >= 4) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("Casting invisibilty..."); Inviser->CastSpell(42, c->GetID(), 1, -1, -1); } - else if ((c->GetLevel() <= 6) && (!strcasecmp(sep->arg[2], "see"))) { + else if ((c->GetLevel() <= 6) && (!strcasecmp(sep->arg[2], "see"))) { Inviser->Say("I'm not level 6 yet."); } else if ((c->GetLevel() >= 6) && (!strcasecmp(sep->arg[2], "see"))) { @@ -14243,17 +14243,17 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case MAGICIAN: - if (!strcasecmp(sep->arg[2], "undead")) { + if (!strcasecmp(sep->arg[2], "undead")) { Inviser->Say("I don't have that spell."); } - else if ((c->GetLevel() <= 8) && (!strcasecmp(sep->arg[2], "live"))) { + else if ((c->GetLevel() <= 8) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("I'm not level 8 yet."); } else if ((!c->IsInvisible(c))&& (!c->invisible_undead) && (c->GetLevel() >= 8) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("Casting invisibilty..."); Inviser->CastSpell(42, c->GetID(), 1, -1, -1); } - else if ((c->GetLevel() <= 16) && (!strcasecmp(sep->arg[2], "see"))) { + else if ((c->GetLevel() <= 16) && (!strcasecmp(sep->arg[2], "see"))) { Inviser->Say("I'm not level 16 yet."); } else if ((c->GetLevel() >= 16) && (!strcasecmp(sep->arg[2], "see"))) { @@ -14268,21 +14268,21 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case WIZARD: - if ((c->GetLevel() <= 39) && (!strcasecmp(sep->arg[2], "undead"))) { + if ((c->GetLevel() <= 39) && (!strcasecmp(sep->arg[2], "undead"))) { Inviser->Say("I'm not level 39 yet."); } else if ((!c->IsInvisible(c))&& (!c->invisible_undead) && (c->GetLevel() >= 39) && (!strcasecmp(sep->arg[2], "undead"))) { Inviser->Say("Casting invis undead..."); Inviser->CastSpell(235, c->GetID(), 1, -1, -1); } - else if ((c->GetLevel() <= 16) && (!strcasecmp(sep->arg[2], "live"))) { + else if ((c->GetLevel() <= 16) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("I'm not level 16 yet."); } else if ((!c->IsInvisible(c))&& (!c->invisible_undead) && (c->GetLevel() >= 16) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("Casting invisibilty..."); Inviser->CastSpell(42, c->GetID(), 1, -1, -1); } - else if ((c->GetLevel() <= 4) && (!strcasecmp(sep->arg[2], "see"))) { + else if ((c->GetLevel() <= 4) && (!strcasecmp(sep->arg[2], "see"))) { Inviser->Say("I'm not level 6 yet."); } else if ((c->GetLevel() >= 4) && (!strcasecmp(sep->arg[2], "see"))) { @@ -14315,10 +14315,10 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } break; case DRUID: - if (!strcasecmp(sep->arg[2], "undead")) { + if (!strcasecmp(sep->arg[2], "undead")) { Inviser->Say("I don't have that spell..."); } - else if ((c->GetLevel() <= 4) && (!strcasecmp(sep->arg[2], "live"))) { + else if ((c->GetLevel() <= 4) && (!strcasecmp(sep->arg[2], "live"))) { Inviser->Say("I'm not level 4 yet."); } else if ((!c->IsInvisible(c))&& (!c->invisible_undead) && (c->GetLevel() >= 18) && (!strcasecmp(sep->arg[2], "live"))) { @@ -14332,7 +14332,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { else if ((c->GetLevel() >= 4) && (!strcasecmp(sep->arg[2], "live")) && (!zone->CanCastOutdoor())) { Inviser->Say("I can't cast this spell indoors..."); } - else if ((c->GetLevel() <= 13) && (!strcasecmp(sep->arg[2], "see"))) { + else if ((c->GetLevel() <= 13) && (!strcasecmp(sep->arg[2], "see"))) { Inviser->Say("I'm not level 13 yet."); } else if ((c->GetLevel() >= 13) && (!strcasecmp(sep->arg[2], "see"))) { @@ -14391,7 +14391,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(LeverClass) { case DRUID: - if (c->GetLevel() <= 14) { + if (c->GetLevel() <= 14) { Lever->Say("I'm not level 14 yet."); } else if (zone->CanCastOutdoor()) { @@ -14486,7 +14486,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } switch(ResisterClass) { case CLERIC: - if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 6)) { + if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 6)) { Resister->Say("Casting poison protection...", sep->arg[2]); Resister->CastToBot()->Bot_Command_Resist(1, Resister->GetLevel()); } @@ -14519,7 +14519,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { break; case SHAMAN: - if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 20)) { + if (!strcasecmp(sep->arg[2], "poison") && (c->GetLevel() >= 20)) { Resister->Say("Casting poison protection...", sep->arg[2]); Resister->CastToBot()->Bot_Command_Resist(12, Resister->GetLevel()); } @@ -15015,7 +15015,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { return; } - if(!strcasecmp(sep->arg[1], "botgroup") && !strcasecmp(sep->arg[2], "load")) { + if(!strcasecmp(sep->arg[1], "botgroup") && !strcasecmp(sep->arg[2], "load")) { // If client is grouped, check for aggro on each group member. Group *g = c->GetGroup(); @@ -15027,7 +15027,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { // Fail if current group member is client and has aggro // OR has a popuplated hate list (assume bot). if((g->members[i]->IsClient() && g->members[i]->CastToClient()->GetAggroCount()) - || g->members[i]->IsEngaged()) { + || g->members[i]->IsEngaged()) { c->Message(0, "You can't spawn bots while your group is engaged."); return; } @@ -15238,7 +15238,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { if(!strcasecmp(sep->arg[1], "haircolor") || !strcasecmp(sep->arg[1], "hair") || !strcasecmp(sep->arg[1], "beard") || !strcasecmp(sep->arg[1], "beardcolor") || !strcasecmp(sep->arg[1], "face") || !strcasecmp(sep->arg[1], "eyes") || !strcasecmp(sep->arg[1], "heritage") || !strcasecmp(sep->arg[1], "tattoo") || !strcasecmp(sep->arg[1], "details")) { if(c->GetTarget() && c->GetTarget()->IsBot()) { - if (sep->IsNumber(2)) { + if (sep->IsNumber(2)) { if (c->GetTarget()->CastToBot()->GetBotOwnerCharacterID() == c->CharacterID()) { Bot *target = c->GetTarget()->CastToBot(); uint16 Race = target->GetRace(); @@ -15402,7 +15402,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { int stance = atoi(sep->arg[3]); if(stance >= MaxStances || stance < 0){ - c->Message(0, "Usage #bot stance [name] [stance (id)] (Passive = 0, Balanced = 1, Efficient = 2, Reactive = 3, Aggressive = 4, Burn = 5, BurnAE = 6)"); + c->Message(0, "Usage #bot stance [name] [stance (id)] (Passive = 0, Balanced = 1, Efficient = 2, Reactive = 3, Aggressive = 4, Burn = 5, BurnAE = 6)"); return; } else { @@ -15456,7 +15456,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { } } else { - c->Message(0, "Usage #bot stance [name] [stance (id)] (Passive = 0, Balanced = 1, Efficient = 2, Reactive = 3, Aggressive = 4, Burn = 5, BurnAE = 6)"); + c->Message(0, "Usage #bot stance [name] [stance (id)] (Passive = 0, Balanced = 1, Efficient = 2, Reactive = 3, Aggressive = 4, Burn = 5, BurnAE = 6)"); } return; } @@ -16074,7 +16074,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { Bot* tempBot = *botListItr; if(tempBot->GetInHealRotation() && tempBot->GetHealRotationLeader() == tempBot) { //list leaders and number of bots per rotation - c->Message(0, "Bot Heal Rotation- Leader: %s, Number of Members: %i, Timer: %1.1f", tempBot->GetCleanName(), tempBot->GetNumHealRotationMembers(), (float)(tempBot->GetHealRotationTimer()/1000)); + c->Message(0, "Bot Heal Rotation- Leader: %s, Number of Members: %i, Timer: %1.1f", tempBot->GetCleanName(), tempBot->GetNumHealRotationMembers(), (float)(tempBot->GetHealRotationTimer()/1000)); } } } @@ -16099,7 +16099,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { //list leader and number of members c->Message(0, "Bot Heal Rotation- Leader: %s", leaderBot->GetCleanName()); - c->Message(0, "Bot Heal Rotation- Timer: %1.1f", ((float)leaderBot->GetHealRotationTimer()/1000.0f)); + c->Message(0, "Bot Heal Rotation- Timer: %1.1f", ((float)leaderBot->GetHealRotationTimer()/1000.0f)); for(list::iterator botListItr = botList.begin(); botListItr != botList.end(); botListItr++) { Bot* tempBot = *botListItr; @@ -16315,11 +16315,11 @@ bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, fl if(caster->AICastSpell(g->members[i], 100, SpellType_Heal)) return true; } - else if((g->members[i]->GetClass() == WARRIOR || g->members[i]->GetClass() == PALADIN || g->members[i]->GetClass() == SHADOWKNIGHT) && g->members[i]->GetHPRatio() < 95) { + else if((g->members[i]->GetClass() == WARRIOR || g->members[i]->GetClass() == PALADIN || g->members[i]->GetClass() == SHADOWKNIGHT) && g->members[i]->GetHPRatio() < 95) { if(caster->AICastSpell(g->members[i], 100, SpellType_Heal)) return true; } - else if(g->members[i]->GetClass() == ENCHANTER && g->members[i]->GetHPRatio() < 80) { + else if(g->members[i]->GetClass() == ENCHANTER && g->members[i]->GetHPRatio() < 80) { if(caster->AICastSpell(g->members[i], 100, SpellType_Heal)) return true; } @@ -16379,11 +16379,11 @@ bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, fl if(caster->AICastSpell(g->members[i], 100, SpellType_Heal)) return true; } - else if((g->members[i]->GetClass() == WARRIOR || g->members[i]->GetClass() == PALADIN || g->members[i]->GetClass() == SHADOWKNIGHT) && g->members[i]->GetHPRatio() < hpRatioToHeal) { + else if((g->members[i]->GetClass() == WARRIOR || g->members[i]->GetClass() == PALADIN || g->members[i]->GetClass() == SHADOWKNIGHT) && g->members[i]->GetHPRatio() < hpRatioToHeal) { if(caster->AICastSpell(g->members[i], 100, SpellType_Heal)) return true; } - else if(g->members[i]->GetClass() == ENCHANTER && g->members[i]->GetHPRatio() < hpRatioToHeal) { + else if(g->members[i]->GetClass() == ENCHANTER && g->members[i]->GetHPRatio() < hpRatioToHeal) { if(caster->AICastSpell(g->members[i], 100, SpellType_Heal)) return true; } @@ -16543,7 +16543,7 @@ void EntityList::AddBot(Bot *newBot, bool SendSpawnPacket, bool dontqueue) { safe_delete(ns); } - parse->EventNPC(EVENT_SPAWN, newBot, nullptr, "", 0); + parse->EventNPC(EVENT_SPAWN, newBot, nullptr, "", 0); } bot_list.push_back(newBot); @@ -16653,7 +16653,7 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) { { if(iterator.GetData()->IsTrackable()) { Mob* cur_entity = iterator.GetData(); - int Extras = (cur_entity->IsBot() || cur_entity->IsPet() || cur_entity->IsFamiliar() || cur_entity->IsClient()); + int Extras = (cur_entity->IsBot() || cur_entity->IsPet() || cur_entity->IsFamiliar() || cur_entity->IsClient()); const char *const MyArray[] = { "a_","an_","Innkeep_","Barkeep_", "Guard_","Merchant_","Lieutenant_", @@ -16686,20 +16686,20 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) { "stone_","lava_","_","" }; unsigned int MyArraySize; - for ( MyArraySize = 0; true; MyArraySize++) { //Find empty string & get size - if (!(*(MyArray[MyArraySize]))) break; //Checks for null char in 1st pos + for ( MyArraySize = 0; true; MyArraySize++) { //Find empty string & get size + if (!(*(MyArray[MyArraySize]))) break; //Checks for null char in 1st pos }; if (NamedOnly) { - bool ContinueFlag = false; - const char *CurEntityName = cur_entity->GetName(); //Call function once - for (int Index = 0; Index < MyArraySize; Index++) { - if (!strncasecmp(CurEntityName, MyArray[Index], strlen(MyArray[Index])) || (Extras)) { - iterator.Advance(); - ContinueFlag = true; - break; //From Index for - }; - }; - if (ContinueFlag) continue; //Moved here or would apply to Index for + bool ContinueFlag = false; + const char *CurEntityName = cur_entity->GetName(); //Call function once + for (int Index = 0; Index < MyArraySize; Index++) { + if (!strncasecmp(CurEntityName, MyArray[Index], strlen(MyArray[Index])) || (Extras)) { + iterator.Advance(); + ContinueFlag = true; + break; //From Index for + }; + }; + if (ContinueFlag) continue; //Moved here or would apply to Index for }; CurrentCon = client->GetLevelCon(cur_entity->GetLevel()); @@ -16992,12 +16992,12 @@ bool Bot::HasOrMayGetAggro() { Mob *topHate = GetTarget()->GetHateTop(); if(topHate == this) - mayGetAggro = true; //I currently have aggro + mayGetAggro = true; //I currently have aggro else { uint32 myHateAmt = GetTarget()->GetHateAmount(this); uint32 topHateAmt = GetTarget()->GetHateAmount(topHate); - if(myHateAmt > 0 && topHateAmt > 0 && (uint8)((myHateAmt/topHateAmt)*100) > 90) //I have 90% as much hate as top, next action may give me aggro + if(myHateAmt > 0 && topHateAmt > 0 && (uint8)((myHateAmt/topHateAmt)*100) > 90) //I have 90% as much hate as top, next action may give me aggro mayGetAggro = true; } } @@ -17086,7 +17086,7 @@ bool Bot::UseDiscipline(uint32 spell_id, uint32 target) { //make sure we can use it.. if(!IsValidSpell(spell_id)) { - Say("Not a valid spell"); + Say("Not a valid spell"); return(false); } @@ -17155,7 +17155,7 @@ bool Bot::AddHealRotationMember( Bot* healer ) { for(int i=0; i<3; i++){ healer->ClearHealRotationMembers(); healer->ClearHealRotationTargets(); - healer->AddHealRotationTarget(entity_list.GetMob(_healRotationTargets[i])); // add all targets.. + healer->AddHealRotationTarget(entity_list.GetMob(_healRotationTargets[i])); // add all targets.. } healer->SetHealRotationTimer(tempBot->GetHealRotationTimer()); healer->SetHealRotationLeader(this); @@ -17189,10 +17189,10 @@ bool Bot::AddHealRotationMember( Bot* healer ) { } bool Bot::RemoveHealRotationMember( Bot* healer ) { - if(healer && GetNumHealRotationMembers() > 0) { + if(healer && GetNumHealRotationMembers() > 0) { Bot* leader = healer->GetHealRotationLeader(); - Bot* prevBot = healer->GetPrevHealRotationMember(); - Bot* nextBot = healer->GetNextHealRotationMember(); + Bot* prevBot = healer->GetPrevHealRotationMember(); + Bot* nextBot = healer->GetNextHealRotationMember(); if(healer == this) { if(nextBot != this) { @@ -17202,21 +17202,21 @@ bool Bot::RemoveHealRotationMember( Bot* healer ) { } //remove healer from list - healer->SetHealRotationTimer(0); - healer->ClearHealRotationMembers(); + healer->SetHealRotationTimer(0); + healer->ClearHealRotationMembers(); healer->ClearHealRotationTargets(); healer->ClearHealRotationLeader(); healer->SetHasHealedThisCycle(false); healer->SetHealRotationActive(false); - healer->SetInHealRotation(false); + healer->SetInHealRotation(false); - if(prevBot && nextBot && GetNumHealRotationMembers() > 1) { - //set previous rotation member's next member to new member - prevBot->SetNextHealRotationMember(nextBot); + if(prevBot && nextBot && GetNumHealRotationMembers() > 1) { + //set previous rotation member's next member to new member + prevBot->SetNextHealRotationMember(nextBot); - //set previous rotation member's next member to new member - nextBot->SetPrevHealRotationMember(prevBot); - } + //set previous rotation member's next member to new member + nextBot->SetPrevHealRotationMember(prevBot); + } //update rotation data list botList = GetBotsInHealRotation(leader); @@ -17325,7 +17325,7 @@ bool Bot::AddHealRotationTarget( Mob *target, int index ) { bool Bot::RemoveHealRotationTarget( Mob* target ) { int index = 0; bool removed = false; - if(target) { + if(target) { //notify all heal rotation members to remove target for(int i=0; iGetID()) { @@ -17366,17 +17366,17 @@ bool Bot::RemoveHealRotationTarget( int index ) { void Bot::ClearHealRotationMembers() { _healRotationMemberPrev = 0; // No previous member - _healRotationMemberNext = 0; // No next member + _healRotationMemberNext = 0; // No next member } void Bot::ClearHealRotationTargets() { - for(int i=0; i 0) { //get target at specified index target = entity_list.GetMob(_healRotationTargets[index]); } - return target; + return target; } list Bot::GetBotsInHealRotation(Bot* rotationLeader) { diff --git a/zone/bot.h b/zone/bot.h index 2d86cd8db..47a1516b2 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -139,7 +139,7 @@ public: virtual void Death(Mob* killerMob, int32 damage, uint16 spell_id, SkillType attack_skill); virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false); virtual bool Attack(Mob* other, int Hand = 13, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false); - virtual bool HasRaid() { return (GetRaid() ? true : false); } + virtual bool HasRaid() { return (GetRaid() ? true : false); } virtual bool HasGroup() { return (GetGroup() ? true : false); } virtual Raid* GetRaid() { return entity_list.GetRaidByMob(this); } virtual Group* GetGroup() { return entity_list.GetGroupByMob(this); } @@ -166,7 +166,7 @@ public: void CalcBotStats(bool showtext = true); uint16 BotGetSpells(int spellslot) { return AIspells[spellslot].spellid; } uint16 BotGetSpellType(int spellslot) { return AIspells[spellslot].type; } - uint16 BotGetSpellPriority(int spellslot) { return AIspells[spellslot].priority; } + uint16 BotGetSpellPriority(int spellslot) { return AIspells[spellslot].priority; } virtual float GetProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_speed, uint16 hand); virtual bool AvoidDamage(Mob* other, int32 &damage, bool CanRiposte); virtual int GetMonkHandToHandDamage(void); @@ -240,45 +240,45 @@ public: void ClearHealRotationLeader() { _healRotationLeader = 0; } void ClearHealRotationMembers(); void ClearHealRotationTargets(); - inline virtual int16 GetMaxStat(); - inline virtual int16 GetMaxResist(); - inline virtual int16 GetMaxSTR(); - inline virtual int16 GetMaxSTA(); - inline virtual int16 GetMaxDEX(); - inline virtual int16 GetMaxAGI(); - inline virtual int16 GetMaxINT(); - inline virtual int16 GetMaxWIS(); - inline virtual int16 GetMaxCHA(); - inline virtual int16 GetMaxMR(); - inline virtual int16 GetMaxPR(); - inline virtual int16 GetMaxDR(); - inline virtual int16 GetMaxCR(); - inline virtual int16 GetMaxFR(); - inline virtual int16 GetMaxCorrup(); - int16 CalcATK(); - int16 CalcSTR(); - int16 CalcSTA(); - int16 CalcDEX(); - int16 CalcAGI(); - int16 CalcINT(); - int16 CalcWIS(); - int16 CalcCHA(); + inline virtual int16 GetMaxStat(); + inline virtual int16 GetMaxResist(); + inline virtual int16 GetMaxSTR(); + inline virtual int16 GetMaxSTA(); + inline virtual int16 GetMaxDEX(); + inline virtual int16 GetMaxAGI(); + inline virtual int16 GetMaxINT(); + inline virtual int16 GetMaxWIS(); + inline virtual int16 GetMaxCHA(); + inline virtual int16 GetMaxMR(); + inline virtual int16 GetMaxPR(); + inline virtual int16 GetMaxDR(); + inline virtual int16 GetMaxCR(); + inline virtual int16 GetMaxFR(); + inline virtual int16 GetMaxCorrup(); + int16 CalcATK(); + int16 CalcSTR(); + int16 CalcSTA(); + int16 CalcDEX(); + int16 CalcAGI(); + int16 CalcINT(); + int16 CalcWIS(); + int16 CalcCHA(); int16 CalcMR(); int16 CalcFR(); int16 CalcDR(); int16 CalcPR(); int16 CalcCR(); int16 CalcCorrup(); - int32 CalcHPRegenCap(); - int32 CalcManaRegenCap(); + int32 CalcHPRegenCap(); + int32 CalcManaRegenCap(); int32 LevelRegen(); int32 CalcHPRegen(); int32 CalcManaRegen(); uint32 CalcCurrentWeight(); - int GroupLeadershipAAHealthEnhancement(); - int GroupLeadershipAAManaEnhancement(); + int GroupLeadershipAAHealthEnhancement(); + int GroupLeadershipAAManaEnhancement(); int GroupLeadershipAAHealthRegeneration(); - int GroupLeadershipAAOffenseEnhancement(); + int GroupLeadershipAAOffenseEnhancement(); void CalcRestState(); int32 CalcMaxEndurance(); //This calculates the maximum endurance we can have int32 CalcBaseEndurance(); //Calculates Base End @@ -519,7 +519,7 @@ public: inline virtual int16 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath; } - inline InspectMessage_Struct& GetInspectMessage() { return _botInspectMessage; } + inline InspectMessage_Struct& GetInspectMessage() { return _botInspectMessage; } inline const InspectMessage_Struct& GetInspectMessage() const { return _botInspectMessage; } // "SET" Class Methods diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp index 36662e38b..dd560b6cb 100644 --- a/zone/botspellsai.cpp +++ b/zone/botspellsai.cpp @@ -340,7 +340,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { case ARCHETYPE_CASTER: //TODO: probably more caster specific spell effects in here if(IsEffectInSpell(selectedBotSpell.SpellId, SE_AttackSpeed) || IsEffectInSpell(selectedBotSpell.SpellId, SE_ATK) || - IsEffectInSpell(selectedBotSpell.SpellId, SE_STR) || IsEffectInSpell(selectedBotSpell.SpellId, SE_ReverseDS)) + IsEffectInSpell(selectedBotSpell.SpellId, SE_STR) || IsEffectInSpell(selectedBotSpell.SpellId, SE_ReverseDS)) { continue; } @@ -412,7 +412,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { if (hpr <= 5 || (IsNPC() && CastToNPC()->IsInteractive() && tar != this) ) #else if(hpr > 15 && ((botClass == WIZARD) || (botClass == ENCHANTER) || (botClass == RANGER))) - mayGetAggro = HasOrMayGetAggro(); //classes have hate reducing spells + mayGetAggro = HasOrMayGetAggro(); //classes have hate reducing spells if (hpr <= 15 || mayGetAggro) #endif @@ -423,7 +423,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { break; if(IsInvulnerabilitySpell(botSpell.SpellId)) - tar = this; //target self for invul type spells + tar = this; //target self for invul type spells castedSpell = AIDoSpellCast(botSpell.SpellIndex, tar, botSpell.ManaCost); } @@ -572,7 +572,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 iSpellTypes) { //short duration buffs or other buffs only to be cast during combat. if (IsSelfConversionSpell(selectedBotSpell.SpellId)) { if(GetManaRatio() > 90.0f || GetHPRatio() < 50.0f || GetHPRatio() < (GetManaRatio() + 10.0f)) - break; //don't cast if low hp, lots of mana, or if mana is higher than hps + break; //don't cast if low hp, lots of mana, or if mana is higher than hps } castedSpell = AIDoSpellCast(selectedBotSpell.SpellIndex, tar, selectedBotSpell.ManaCost); @@ -836,7 +836,7 @@ bool Bot::AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain SetMana(hasMana); extraMana = false; } - else { //handle spell recast and recast timers + else { //handle spell recast and recast timers if(GetClass() == BARD && IsGroupSpell(AIspells[i].spellid)) { AIspells[i].time_cancast = (spells[AIspells[i].spellid].recast_time > (spells[AIspells[i].spellid].buffduration * 6000)) ? Timer::GetCurrentTime() + spells[AIspells[i].spellid].recast_time : Timer::GetCurrentTime() + spells[AIspells[i].spellid].buffduration * 6000; //spellend_timer.Start(spells[AIspells[i].spellid].cast_time); @@ -912,7 +912,7 @@ bool Bot::AI_IdleCastCheck() { result = true; } // Pets class will first cast their pet, then buffs - else if(botClass == DRUID || botClass == MAGICIAN || botClass == SHADOWKNIGHT || botClass == SHAMAN || botClass == NECROMANCER || botClass == ENCHANTER || botClass == BEASTLORD || botClass == WIZARD) { + else if(botClass == DRUID || botClass == MAGICIAN || botClass == SHADOWKNIGHT || botClass == SHAMAN || botClass == NECROMANCER || botClass == ENCHANTER || botClass == BEASTLORD || botClass == WIZARD) { if(!entity_list.Bot_AICheckCloseBeneficialSpells(this, 100, BotAISpellRange, SpellType_Cure)) { if (!AICastSpell(this, 100, SpellType_Pet)) { if (!AICastSpell(this, 100, SpellType_Heal)) { @@ -1492,88 +1492,88 @@ BotSpell Bot::GetFirstBotSpellForSingleTargetHeal(Bot* botCaster) { } BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* botCaster) { - BotSpell result; + BotSpell result; - result.SpellId = 0; - result.SpellIndex = 0; - result.ManaCost = 0; + result.SpellId = 0; + result.SpellIndex = 0; + result.ManaCost = 0; - if(botCaster) { - std::list botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CurrentHP); + if(botCaster) { + std::list botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CurrentHP); - for(std::list::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) { - // Assuming all the spells have been loaded into this list by level and in descending order - if(IsRegularGroupHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) { - result.SpellId = botSpellListItr->SpellId; - result.SpellIndex = botSpellListItr->SpellIndex; - result.ManaCost = botSpellListItr->ManaCost; + for(std::list::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) { + // Assuming all the spells have been loaded into this list by level and in descending order + if(IsRegularGroupHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) { + result.SpellId = botSpellListItr->SpellId; + result.SpellIndex = botSpellListItr->SpellIndex; + result.ManaCost = botSpellListItr->ManaCost; - break; - } - } - } + break; + } + } + } - return result; + return result; } BotSpell Bot::GetBestBotSpellForGroupHealOverTime(Bot* botCaster) { - BotSpell result; + BotSpell result; - result.SpellId = 0; - result.SpellIndex = 0; - result.ManaCost = 0; + result.SpellId = 0; + result.SpellIndex = 0; + result.ManaCost = 0; - if(botCaster) { - std::list botHoTSpellList = GetBotSpellsForSpellEffect(botCaster, SE_HealOverTime); - std::vector botSpellList = botCaster->GetBotSpells(); + if(botCaster) { + std::list botHoTSpellList = GetBotSpellsForSpellEffect(botCaster, SE_HealOverTime); + std::vector botSpellList = botCaster->GetBotSpells(); - for(std::list::iterator botSpellListItr = botHoTSpellList.begin(); botSpellListItr != botHoTSpellList.end(); botSpellListItr++) { - // Assuming all the spells have been loaded into this list by level and in descending order - if(IsGroupHealOverTimeSpell(botSpellListItr->SpellId)) { + for(std::list::iterator botSpellListItr = botHoTSpellList.begin(); botSpellListItr != botHoTSpellList.end(); botSpellListItr++) { + // Assuming all the spells have been loaded into this list by level and in descending order + if(IsGroupHealOverTimeSpell(botSpellListItr->SpellId)) { - for (int i = botSpellList.size() - 1; i >= 0; i--) { - if (botSpellList[i].spellid <= 0 || botSpellList[i].spellid >= SPDAT_RECORDS) { - // this is both to quit early to save cpu and to avoid casting bad spells - // Bad info from database can trigger this incorrectly, but that should be fixed in DB, not here - continue; - } - - if(botSpellList[i].spellid == botSpellListItr->SpellId && (botSpellList[i].type & SpellType_Heal) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) { - result.SpellId = botSpellListItr->SpellId; - result.SpellIndex = botSpellListItr->SpellIndex; - result.ManaCost = botSpellListItr->ManaCost; - } - } - - break; + for (int i = botSpellList.size() - 1; i >= 0; i--) { + if (botSpellList[i].spellid <= 0 || botSpellList[i].spellid >= SPDAT_RECORDS) { + // this is both to quit early to save cpu and to avoid casting bad spells + // Bad info from database can trigger this incorrectly, but that should be fixed in DB, not here + continue; } - } - } - return result; -} - -BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* botCaster) { - BotSpell result; - - result.SpellId = 0; - result.SpellIndex = 0; - result.ManaCost = 0; - - if(botCaster) { - std::list botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CompleteHeal); - - for(std::list::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) { - // Assuming all the spells have been loaded into this list by level and in descending order - if(IsGroupCompleteHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) { + if(botSpellList[i].spellid == botSpellListItr->SpellId && (botSpellList[i].type & SpellType_Heal) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) { result.SpellId = botSpellListItr->SpellId; result.SpellIndex = botSpellListItr->SpellIndex; result.ManaCost = botSpellListItr->ManaCost; - - break; } } - } + + break; + } + } + } + + return result; +} + +BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* botCaster) { + BotSpell result; + + result.SpellId = 0; + result.SpellIndex = 0; + result.ManaCost = 0; + + if(botCaster) { + std::list botSpellList = GetBotSpellsForSpellEffect(botCaster, SE_CompleteHeal); + + for(std::list::iterator botSpellListItr = botSpellList.begin(); botSpellListItr != botSpellList.end(); botSpellListItr++) { + // Assuming all the spells have been loaded into this list by level and in descending order + if(IsGroupCompleteHealSpell(botSpellListItr->SpellId) && CheckSpellRecastTimers(botCaster, botSpellListItr->SpellIndex)) { + result.SpellId = botSpellListItr->SpellId; + result.SpellIndex = botSpellListItr->SpellIndex; + result.ManaCost = botSpellListItr->ManaCost; + + break; + } + } + } return result; } @@ -2142,9 +2142,9 @@ int32 Bot::GetSpellRecastTimer(Bot *caster, int timer_index) { bool Bot::CheckSpellRecastTimers(Bot *caster, int SpellIndex) { if(caster) { - if(caster->AIspells[SpellIndex].time_cancast < Timer::GetCurrentTime()) { //checks spell recast - if(GetSpellRecastTimer(caster, spells[caster->AIspells[SpellIndex].spellid].EndurTimerIndex) < Timer::GetCurrentTime()) { //checks for spells on the same timer - return true; //can cast spell + if(caster->AIspells[SpellIndex].time_cancast < Timer::GetCurrentTime()) { //checks spell recast + if(GetSpellRecastTimer(caster, spells[caster->AIspells[SpellIndex].spellid].EndurTimerIndex) < Timer::GetCurrentTime()) { //checks for spells on the same timer + return true; //can cast spell } } } @@ -2180,8 +2180,8 @@ uint32 Bot::GetDisciplineRemainingTime(Bot *caster, int timer_index) { bool Bot::CheckDisciplineRecastTimers(Bot *caster, int timer_index) { if(caster) { - if(GetDisciplineRecastTimer(caster, timer_index) < Timer::GetCurrentTime()) { //checks for spells on the same timer - return true; //can cast spell + if(GetDisciplineRecastTimer(caster, timer_index) < Timer::GetCurrentTime()) { //checks for spells on the same timer + return true; //can cast spell } } return false; diff --git a/zone/client.cpp b/zone/client.cpp index 27554cdde..8f16956aa 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -34,7 +34,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #else #include #include @@ -476,7 +476,7 @@ void Client::ReportConnectingState() { LogFile->write(EQEMuLog::Debug, "We received client ready notification, but never finished Client::CompleteConnect"); break; case ClientConnectFinished: //client finally moved to finished state, were done here - LogFile->write(EQEMuLog::Debug, " Client is successfully connected."); + LogFile->write(EQEMuLog::Debug, "Client is successfully connected."); break; }; } @@ -484,12 +484,12 @@ void Client::ReportConnectingState() { bool Client::Save(uint8 iCommitNow) { #if 0 // Orig. Offset: 344 / 0x00000000 -// Length: 36 / 0x00000024 - unsigned char rawData[36] = +// Length: 36 / 0x00000024 + unsigned char rawData[36] = { - 0x0D, 0x30, 0xE1, 0x30, 0x1E, 0x10, 0x22, 0x10, 0x20, 0x10, 0x21, 0x10, 0x1C, 0x20, 0x1F, 0x10, - 0x7C, 0x10, 0x68, 0x10, 0x51, 0x10, 0x78, 0x10, 0xBD, 0x10, 0xD2, 0x10, 0xCD, 0x10, 0xD1, 0x10, - 0x01, 0x10, 0x6D, 0x10 + 0x0D, 0x30, 0xE1, 0x30, 0x1E, 0x10, 0x22, 0x10, 0x20, 0x10, 0x21, 0x10, 0x1C, 0x20, 0x1F, 0x10, + 0x7C, 0x10, 0x68, 0x10, 0x51, 0x10, 0x78, 0x10, 0xBD, 0x10, 0xD2, 0x10, 0xCD, 0x10, 0xD1, 0x10, + 0x01, 0x10, 0x6D, 0x10 } ; for (int tmp = 0;tmp <=35;tmp++){ m_pp.unknown0256[89+tmp] = rawData[tmp]; @@ -536,7 +536,7 @@ bool Client::Save(uint8 iCommitNow) { if(RequiredLevel != AARequiredLevelAndCost.end()) { - spentpoints += RequiredLevel->second.Cost; + spentpoints += RequiredLevel->second.Cost; } else spentpoints += (curAA->cost + (curAA->cost_inc * rank)); @@ -646,13 +646,13 @@ void Client::SaveBackup() { CLIENTPACKET::CLIENTPACKET() { - app = nullptr; - ack_req = false; + app = nullptr; + ack_req = false; } CLIENTPACKET::~CLIENTPACKET() { - safe_delete(app); + safe_delete(app); } //this assumes we do not own pApp, and clones it. @@ -663,13 +663,13 @@ bool Client::AddPacket(const EQApplicationPacket *pApp, bool bAckreq) { //drop the packet because it will never get sent. return(false); } - CLIENTPACKET *c = new CLIENTPACKET; + CLIENTPACKET *c = new CLIENTPACKET; - c->ack_req = bAckreq; - c->app = pApp->Copy(); + c->ack_req = bAckreq; + c->app = pApp->Copy(); - clientpackets.Append(c); - return true; + clientpackets.Append(c); + return true; } //this assumes that it owns the object pointed to by *pApp @@ -680,14 +680,14 @@ bool Client::AddPacket(EQApplicationPacket** pApp, bool bAckreq) { //drop the packet because it will never get sent. return(false); } - CLIENTPACKET *c = new CLIENTPACKET; + CLIENTPACKET *c = new CLIENTPACKET; - c->ack_req = bAckreq; - c->app = *pApp; + c->ack_req = bAckreq; + c->app = *pApp; *pApp = 0; - clientpackets.Append(c); - return true; + clientpackets.Append(c); + return true; } bool Client::SendAllPackets() { @@ -729,15 +729,15 @@ void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req, CLIENT_CO } // if the program doesnt care about the status or if the status isnt what we requested - if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) - { - // todo: save packets for later use - AddPacket(app, ack_req); -// LogFile->write(EQEMuLog::Normal, "Adding Packet to list (%d) (%d)", app->GetOpcode(), (int)required_state); - } - else - if(eqs) - eqs->QueuePacket(app, ack_req); + if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) + { + // todo: save packets for later use + AddPacket(app, ack_req); +// LogFile->write(EQEMuLog::Normal, "Adding Packet to list (%d) (%d)", app->GetOpcode(), (int)required_state); + } + else + if(eqs) + eqs->QueuePacket(app, ack_req); } void Client::FastQueuePacket(EQApplicationPacket** app, bool ack_req, CLIENT_CONN_STATUS required_state) { @@ -745,15 +745,15 @@ void Client::FastQueuePacket(EQApplicationPacket** app, bool ack_req, CLIENT_CON //cout << "Sending: 0x" << hex << setw(4) << setfill('0') << (*app)->GetOpcode() << dec << ", size=" << (*app)->size << endl; // if the program doesnt care about the status or if the status isnt what we requested - if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) { - // todo: save packets for later use - AddPacket(app, ack_req); -// LogFile->write(EQEMuLog::Normal, "Adding Packet to list (%d) (%d)", (*app)->GetOpcode(), (int)required_state); + if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) { + // todo: save packets for later use + AddPacket(app, ack_req); +// LogFile->write(EQEMuLog::Normal, "Adding Packet to list (%d) (%d)", (*app)->GetOpcode(), (int)required_state); return; - } - else { - if(eqs) - eqs->FastQueuePacket((EQApplicationPacket **)app, ack_req); + } + else { + if(eqs) + eqs->FastQueuePacket((EQApplicationPacket **)app, ack_req); else if (app && (*app)) delete *app; *app = 0; @@ -890,10 +890,10 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s sender = GetPet(); entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); - break; - } + break; + } case 4: { // Auction - if(RuleB(Chat, ServerWideAuction)) + if(RuleB(Chat, ServerWideAuction)) { if(!global_channel_timer.Check()) { @@ -905,7 +905,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if(GetRevoked()) { - Message(0, "You have been revoked. You may not talk on Auction."); + Message(0, "You have been revoked. You may not talk on Auction."); return; } @@ -918,13 +918,13 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } } - if (!worldserver.SendChannelMessage(this, 0, 4, 0, language, message)) + if (!worldserver.SendChannelMessage(this, 0, 4, 0, language, message)) Message(0, "Error: World server disconnected"); } else if(!RuleB(Chat, ServerWideAuction)) { Mob *sender = this; - if (GetPet() && GetPet()->FindType(SE_VoiceGraft)) + if (GetPet() && GetPet()->FindType(SE_VoiceGraft)) sender = GetPet(); entity_list.ChannelMessage(sender, chan_num, language, message); @@ -943,13 +943,13 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } if(worldserver.IsOOCMuted() && admin < 100) { - Message(0,"OOC has been muted. Try again later."); + Message(0,"OOC has been muted. Try again later."); return; } if(GetRevoked()) { - Message(0, "You have been revoked. You may not talk on OOC."); + Message(0, "You have been revoked. You may not talk on OOC."); return; } @@ -997,7 +997,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if(GetRevoked()) { - Message(0, "You have been revoked. You may not send tells."); + Message(0, "You have been revoked. You may not send tells."); return; } @@ -1035,7 +1035,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s break; } case 8: { // /say - if(message[0] == COMMAND_CHAR) { + if(message[0] == COMMAND_CHAR) { if(command_dispatch(this, message) == -2) { if(RuleB(Chat, FlowCommandstoPerl_EVENT_SAY)) { if(parse->PlayerHasQuestSub("EVENT_SAY")) { @@ -1053,10 +1053,10 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s printf("Message: %s\n",message); entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); - if(parse->PlayerHasQuestSub("EVENT_SAY")) - { - parse->EventPlayer(EVENT_SAY, this, message, language); - } + if(parse->PlayerHasQuestSub("EVENT_SAY")) + { + parse->EventPlayer(EVENT_SAY, this, message, language); + } if (sender != this) break; @@ -1073,7 +1073,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if (DistNoRootNoZ(*GetTarget()) <= 200) { if(GetTarget()->CastToNPC()->IsMoving() && !GetTarget()->CastToNPC()->IsOnHatelist(GetTarget())) GetTarget()->CastToNPC()->PauseWandering(RuleI(NPC, SayPauseTimeInSec)); - parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, message, language); + parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, message, language); } } @@ -1093,7 +1093,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s else { if(parse->HasQuestSub(GetTarget()->GetNPCTypeID(), "EVENT_AGGRO_SAY")) { if (DistNoRootNoZ(*GetTarget()) <= 200) { - parse->EventNPC(EVENT_AGGRO_SAY, GetTarget()->CastToNPC(), this, message, language); + parse->EventNPC(EVENT_AGGRO_SAY, GetTarget()->CastToNPC(), this, message, language); } } } @@ -1205,8 +1205,8 @@ void Client::Message(uint32 type, const char* message, ...) { if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits) return; - va_list argptr; - char *buffer = new char[4096]; + va_list argptr; + char *buffer = new char[4096]; va_start(argptr, message); vsnprintf(buffer, 4096, message, argptr); va_end(argptr); @@ -1234,42 +1234,42 @@ void Client::Message(uint32 type, const char* message, ...) { void Client::QuestJournalledMessage(const char *npcname, const char* message) { - // npcnames longer than 60 characters crash the client when they log back in - const int MaxNPCNameLength = 60; - // I assume there is an upper safe limit on the message length. Don't know what it is, but 4000 doesn't crash - // the client. - const int MaxMessageLength = 4000; + // npcnames longer than 60 characters crash the client when they log back in + const int MaxNPCNameLength = 60; + // I assume there is an upper safe limit on the message length. Don't know what it is, but 4000 doesn't crash + // the client. + const int MaxMessageLength = 4000; - char OutNPCName[MaxNPCNameLength+1]; - char OutMessage[MaxMessageLength+1]; + char OutNPCName[MaxNPCNameLength+1]; + char OutMessage[MaxMessageLength+1]; - // Apparently Visual C++ snprintf is not C99 compliant and doesn't put the null terminator - // in if the formatted string >= the maximum length, so we put it in. - // - snprintf(OutNPCName, MaxNPCNameLength, "%s", npcname); OutNPCName[MaxNPCNameLength]='\0'; - snprintf(OutMessage, MaxMessageLength, "%s", message); OutMessage[MaxMessageLength]='\0'; + // Apparently Visual C++ snprintf is not C99 compliant and doesn't put the null terminator + // in if the formatted string >= the maximum length, so we put it in. + // + snprintf(OutNPCName, MaxNPCNameLength, "%s", npcname); OutNPCName[MaxNPCNameLength]='\0'; + snprintf(OutMessage, MaxMessageLength, "%s", message); OutMessage[MaxMessageLength]='\0'; - uint32 len_packet = sizeof(SpecialMesg_Struct) + strlen(OutNPCName) + strlen(OutMessage); - EQApplicationPacket* app = new EQApplicationPacket(OP_SpecialMesg, len_packet); - SpecialMesg_Struct* sm=(SpecialMesg_Struct*)app->pBuffer; + uint32 len_packet = sizeof(SpecialMesg_Struct) + strlen(OutNPCName) + strlen(OutMessage); + EQApplicationPacket* app = new EQApplicationPacket(OP_SpecialMesg, len_packet); + SpecialMesg_Struct* sm=(SpecialMesg_Struct*)app->pBuffer; - sm->header[0] = 0; - sm->header[1] = 2; - sm->header[2] = 0; - sm->msg_type = 0x0a; - sm->target_spawn_id = GetID(); + sm->header[0] = 0; + sm->header[1] = 2; + sm->header[2] = 0; + sm->msg_type = 0x0a; + sm->target_spawn_id = GetID(); - char *dest = &sm->sayer[0]; + char *dest = &sm->sayer[0]; - memcpy(dest, OutNPCName, strlen(OutNPCName) + 1); + memcpy(dest, OutNPCName, strlen(OutNPCName) + 1); - dest = dest + strlen(OutNPCName) + 13; + dest = dest + strlen(OutNPCName) + 13; - memcpy(dest, OutMessage, strlen(OutMessage) + 1); + memcpy(dest, OutMessage, strlen(OutMessage) + 1); - QueuePacket(app); + QueuePacket(app); - safe_delete(app); + safe_delete(app); } void Client::SetMaxHP() { @@ -1473,13 +1473,13 @@ void Client::SendSound(){//Makes a sound. memset(&x[12],0x4A01,sizeof(uint16)); x[16]=0x05; x[28]=0x00;//change this value to give gold to the client - memset(&x[40],0xFFFFFFFF,sizeof(uint32)); - memset(&x[44],0xFFFFFFFF,sizeof(uint32)); - memset(&x[48],0xFFFFFFFF,sizeof(uint32)); - memset(&x[52],0xFFFFFFFF,sizeof(uint32)); - memset(&x[56],0xFFFFFFFF,sizeof(uint32)); - memset(&x[60],0xFFFFFFFF,sizeof(uint32)); - memset(&x[64],0xffffffff,sizeof(uint32)); + memset(&x[40],0xFFFFFFFF,sizeof(uint32)); + memset(&x[44],0xFFFFFFFF,sizeof(uint32)); + memset(&x[48],0xFFFFFFFF,sizeof(uint32)); + memset(&x[52],0xFFFFFFFF,sizeof(uint32)); + memset(&x[56],0xFFFFFFFF,sizeof(uint32)); + memset(&x[60],0xFFFFFFFF,sizeof(uint32)); + memset(&x[64],0xffffffff,sizeof(uint32)); memcpy(outapp->pBuffer,x,outapp->size); QueuePacket(outapp); safe_delete(outapp); @@ -2191,52 +2191,52 @@ void Client::AddMoneyToPP(uint64 copper, bool updateclient){ // Add Amount of Platinum tmp2 = tmp/1000; - int32 new_val = m_pp.platinum + tmp2; - if(new_val < 0) { - m_pp.platinum = 0; - } else { - m_pp.platinum = m_pp.platinum + tmp2; - } + int32 new_val = m_pp.platinum + tmp2; + if(new_val < 0) { + m_pp.platinum = 0; + } else { + m_pp.platinum = m_pp.platinum + tmp2; + } tmp-=tmp2*1000; - //if (updateclient) + //if (updateclient) // SendClientMoneyUpdate(3,tmp2); // Add Amount of Gold tmp2 = tmp/100; - new_val = m_pp.gold + tmp2; - if(new_val < 0) { - m_pp.gold = 0; - } else { - m_pp.gold = m_pp.gold + tmp2; - } + new_val = m_pp.gold + tmp2; + if(new_val < 0) { + m_pp.gold = 0; + } else { + m_pp.gold = m_pp.gold + tmp2; + } tmp-=tmp2*100; //if (updateclient) - // SendClientMoneyUpdate(2,tmp2); + // SendClientMoneyUpdate(2,tmp2); // Add Amount of Silver tmp2 = tmp/10; - new_val = m_pp.silver + tmp2; - if(new_val < 0) { - m_pp.silver = 0; - } else { - m_pp.silver = m_pp.silver + tmp2; - } - tmp-=tmp2*10; - //if (updateclient) + new_val = m_pp.silver + tmp2; + if(new_val < 0) { + m_pp.silver = 0; + } else { + m_pp.silver = m_pp.silver + tmp2; + } + tmp-=tmp2*10; + //if (updateclient) // SendClientMoneyUpdate(1,tmp2); // Add Copper //tmp = tmp - (tmp2* 10); - //if (updateclient) + //if (updateclient) // SendClientMoneyUpdate(0,tmp); tmp2 = tmp; - new_val = m_pp.copper + tmp2; - if(new_val < 0) { - m_pp.copper = 0; - } else { - m_pp.copper = m_pp.copper + tmp2; - } + new_val = m_pp.copper + tmp2; + if(new_val < 0) { + m_pp.copper = 0; + } else { + m_pp.copper = m_pp.copper + tmp2; + } //send them all at once, since the above code stopped working. @@ -2247,26 +2247,26 @@ void Client::AddMoneyToPP(uint64 copper, bool updateclient){ Save(); - LogFile->write(EQEMuLog::Debug, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); + LogFile->write(EQEMuLog::Debug, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); } void Client::AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold, uint32 platinum, bool updateclient){ - int32 new_value = m_pp.platinum + platinum; - if(new_value >= 0 && new_value > m_pp.platinum) - m_pp.platinum += platinum; + int32 new_value = m_pp.platinum + platinum; + if(new_value >= 0 && new_value > m_pp.platinum) + m_pp.platinum += platinum; - new_value = m_pp.gold + gold; - if(new_value >= 0 && new_value > m_pp.gold) - m_pp.gold += gold; + new_value = m_pp.gold + gold; + if(new_value >= 0 && new_value > m_pp.gold) + m_pp.gold += gold; - new_value = m_pp.silver + silver; - if(new_value >= 0 && new_value > m_pp.silver) - m_pp.silver += silver; + new_value = m_pp.silver + silver; + if(new_value >= 0 && new_value > m_pp.silver) + m_pp.silver += silver; - new_value = m_pp.copper + copper; - if(new_value >= 0 && new_value > m_pp.copper) - m_pp.copper += copper; + new_value = m_pp.copper + copper; + if(new_value >= 0 && new_value > m_pp.copper) + m_pp.copper += copper; if(updateclient) SendMoneyUpdate(); @@ -2275,7 +2275,7 @@ void Client::AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold, uint32 plat Save(); #if (EQDEBUG>=5) - LogFile->write(EQEMuLog::Debug, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", + LogFile->write(EQEMuLog::Debug, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper); #endif } @@ -2294,10 +2294,10 @@ void Client::SendMoneyUpdate() { bool Client::HasMoney(uint64 Copper) { - if((static_cast(m_pp.copper) + - (static_cast(m_pp.silver) * 10) + - (static_cast(m_pp.gold) * 100) + - (static_cast(m_pp.platinum) * 1000)) >= Copper) + if ((static_cast(m_pp.copper) + + (static_cast(m_pp.silver) * 10) + + (static_cast(m_pp.gold) * 100) + + (static_cast(m_pp.platinum) * 1000)) >= Copper) return true; return false; @@ -2306,27 +2306,27 @@ bool Client::HasMoney(uint64 Copper) { uint64 Client::GetCarriedMoney() { return ((static_cast(m_pp.copper) + - (static_cast(m_pp.silver) * 10) + - (static_cast(m_pp.gold) * 100) + - (static_cast(m_pp.platinum) * 1000))); + (static_cast(m_pp.silver) * 10) + + (static_cast(m_pp.gold) * 100) + + (static_cast(m_pp.platinum) * 1000))); } uint64 Client::GetAllMoney() { return ( - (static_cast(m_pp.copper) + - (static_cast(m_pp.silver) * 10) + - (static_cast(m_pp.gold) * 100) + - (static_cast(m_pp.platinum) * 1000) + - (static_cast(m_pp.copper_bank) + - (static_cast(m_pp.silver_bank) * 10) + - (static_cast(m_pp.gold_bank) * 100) + - (static_cast(m_pp.platinum_bank) * 1000) + - (static_cast(m_pp.copper_cursor) + - (static_cast(m_pp.silver_cursor) * 10) + - (static_cast(m_pp.gold_cursor) * 100) + - (static_cast(m_pp.platinum_cursor) * 1000) + - (static_cast(m_pp.platinum_shared) * 1000))))); + (static_cast(m_pp.copper) + + (static_cast(m_pp.silver) * 10) + + (static_cast(m_pp.gold) * 100) + + (static_cast(m_pp.platinum) * 1000) + + (static_cast(m_pp.copper_bank) + + (static_cast(m_pp.silver_bank) * 10) + + (static_cast(m_pp.gold_bank) * 100) + + (static_cast(m_pp.platinum_bank) * 1000) + + (static_cast(m_pp.copper_cursor) + + (static_cast(m_pp.silver_cursor) * 10) + + (static_cast(m_pp.gold_cursor) * 100) + + (static_cast(m_pp.platinum_cursor) * 1000) + + (static_cast(m_pp.platinum_shared) * 1000))))); } bool Client::CheckIncreaseSkill(SkillType skillid, Mob *against_who, int chancemodi) { @@ -2479,7 +2479,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(SkillType skillid, uint16 max else { Message(13, "Your spell casting specializations skills have been reset. " - "Only %i primary specialization skill is allowed.", MaxSpecializations); + "Only %i primary specialization skill is allowed.", MaxSpecializations); for(int i = SPECIALIZE_ABJURE; i <= SPECIALIZE_EVOCATION; ++i) SetSkill((SkillType)i, 1); @@ -2487,7 +2487,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(SkillType skillid, uint16 max Save(); LogFile->write(EQEMuLog::Normal, "Reset %s's caster specialization skills to 1. " - "Too many specializations skills were above 50.", GetCleanName()); + "Too many specializations skills were above 50.", GetCleanName()); } } @@ -2930,7 +2930,7 @@ void Client::Message_StringID(uint32 type, uint32 string_id, uint32 distance) // to load the eqstr file and count them in the string. // This hack sucks but it's gonna work for now. // -void Client::Message_StringID(uint32 type, uint32 string_id, const char* message1, +void Client::Message_StringID(uint32 type, uint32 string_id, const char* message1, const char* message2,const char* message3,const char* message4, const char* message5,const char* message6,const char* message7, const char* message8,const char* message9, uint32 distance) @@ -3142,10 +3142,10 @@ uint8 Client::SlotConvert2(uint8 slot){ void Client::Escape() { - entity_list.RemoveFromTargets(this, true); - SetInvisible(1); + entity_list.RemoveFromTargets(this, true); + SetInvisible(1); - Message_StringID(MT_Skills, ESCAPE); + Message_StringID(MT_Skills, ESCAPE); } float Client::CalcPriceMod(Mob* other, bool reverse) @@ -3706,7 +3706,7 @@ void Client::SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID) { strcpy(ts->Caster, Caster->GetName()); ts->SpellID = SpellID; - if((SpellID == 1422) || (SpellID == 1334) || (SpellID == 3243)) { + if((SpellID == 1422) || (SpellID == 1334) || (SpellID == 3243)) { ts->ZoneID = m_pp.binds[0].zoneId; ts->x = m_pp.binds[0].x; ts->y = m_pp.binds[0].y; @@ -3766,7 +3766,7 @@ void Client::SendPopupToClient(const char *Title, const char *Text, uint32 Popup OnLevelMessage_Struct *olms = (OnLevelMessage_Struct *) outapp->pBuffer; if((strlen(Title) > (sizeof(olms->Title)-1)) || - (strlen(Text) > (sizeof(olms->Text)-1))) return; + (strlen(Text) > (sizeof(olms->Text)-1))) return; strcpy(olms->Title, Title); strcpy(olms->Text, Text); @@ -4010,7 +4010,7 @@ void Client::UpdateLFP() { uint16 Client::GetPrimarySkillValue() { - SkillType skill = HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill + SkillType skill = HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill bool equiped = m_inv.GetItem(13); if (!equiped) @@ -4018,7 +4018,7 @@ uint16 Client::GetPrimarySkillValue() else { - uint8 type = m_inv.GetItem(13)->GetItem()->ItemType; //is this the best way to do this? + uint8 type = m_inv.GetItem(13)->GetItem()->ItemType; //is this the best way to do this? switch (type) { @@ -4137,7 +4137,7 @@ void Client::VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber) { void Client::ClearGroupAAs() { - for(unsigned int i = 0; i < MAX_GROUP_LEADERSHIP_AA_ARRAY; i++) + for(unsigned int i = 0; i < MAX_GROUP_LEADERSHIP_AA_ARRAY; i++) m_pp.leader_abilities.ranks[i] = 0; m_pp.group_leadership_points = 0; @@ -4448,10 +4448,10 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type) { case -1: case 0: - Message_StringID(MT_Skills, LDON_DONT_KNOW_TRAPPED, target->GetCleanName()); + Message_StringID(MT_Skills, LDON_DONT_KNOW_TRAPPED, target->GetCleanName()); break; case 1: - Message_StringID(MT_Skills, LDON_CERTAIN_TRAP, target->GetCleanName()); + Message_StringID(MT_Skills, LDON_CERTAIN_TRAP, target->GetCleanName()); target->SetLDoNTrapDetected(true); break; default: @@ -4610,7 +4610,7 @@ void Client::SummonAndRezzAllCorpses() entity_list.RemoveAllCorpsesByCharID(CharacterID()); int CorpseCount = database.SummonAllPlayerCorpses(CharacterID(), zone->GetZoneID(), zone->GetInstanceID(), - GetX(), GetY(), GetZ(), GetHeading()); + GetX(), GetY(), GetZ(), GetHeading()); if(CorpseCount <= 0) { Message(clientMessageYellow, "You have no corpses to summnon."); @@ -4648,7 +4648,7 @@ void Client::SummonAllCorpses(float dest_x, float dest_y, float dest_z, float de entity_list.RemoveAllCorpsesByCharID(CharacterID()); int CorpseCount = database.SummonAllPlayerCorpses(CharacterID(), zone->GetZoneID(), zone->GetInstanceID(), - dest_x, dest_y, dest_z, dest_heading); + dest_x, dest_y, dest_z, dest_heading); if(CorpseCount <= 0) { return; @@ -4709,7 +4709,7 @@ void Client::SetStartZone(uint32 zoneid, float x, float y, float z) // setting city to zero allows the player to use /setstartcity to set the city themselves if(zoneid == 0) { m_pp.binds[4].zoneId = 0; - this->Message(15,"Your starting city has been reset. Use /setstartcity to choose a new one"); + this->Message(15,"Your starting city has been reset. Use /setstartcity to choose a new one"); return; } @@ -4948,7 +4948,7 @@ void Client::Signal(uint32 data) char buf[32]; snprintf(buf, 31, "%d", data); buf[31] = '\0'; - parse->EventPlayer(EVENT_SIGNAL, this, buf, 0); + parse->EventPlayer(EVENT_SIGNAL, this, buf, 0); } const bool Client::IsMQExemptedArea(uint32 zoneID, float x, float y, float z) const @@ -5429,7 +5429,7 @@ void Client::UpdateLDoNLosses(uint32 t, int32 n) void Client::SuspendMinion() { - NPC *CurrentPet = GetPet()->CastToNPC(); + NPC *CurrentPet = GetPet()->CastToNPC(); int AALevel = GetAA(aaSuspendedMinion); @@ -5603,7 +5603,7 @@ void Client::ProcessInspectRequest(Client* requestee, Client* requester) { if(requestee->IsClient() && (requestee != requester)) { requestee->Message(0, "%s is looking at your equipment...", requester->GetName()); } requester->QueuePacket(outapp); // Send answer to requester - safe_delete(outapp); + safe_delete(outapp); } } @@ -6149,8 +6149,8 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid if(summon_count > MAX_SWARM_PETS) summon_count = MAX_SWARM_PETS; - static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, 10, -10, 10, -10, 8, -8, 8, -8 }; - static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, 10, 10, -10, -10, 8, 8, -8, -8 }; + static const float swarm_pet_x[MAX_SWARM_PETS] = { 5, -5, 5, -5, 10, -10, 10, -10, 8, -8, 8, -8 }; + static const float swarm_pet_y[MAX_SWARM_PETS] = { 5, 5, -5, -5, 10, 10, -10, -10, 8, 8, -8, -8 }; TempPets(true); while(summon_count > 0) { @@ -6207,9 +6207,9 @@ void Client::SendStatsWindow(Client* client, bool use_window) std::string color_red = ""; std::string color_blue = ""; - std::string color_green = ""; - std::string bright_green = ""; - std::string bright_red = ""; + std::string color_green = ""; + std::string bright_green = ""; + std::string bright_red = ""; std::string heroic_color = " +"; // Set Class @@ -6240,21 +6240,21 @@ void Client::SendStatsWindow(Client* client, bool use_window) case 522: race_Name = "Drakkin"; break; default: break; } - /*########################################################## + /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - H/M/E String + H/M/E String ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string HME_row = ""; - //Loop Variables - /*===========================*/ - std::string cur_field = ""; - std::string total_field = ""; - std::string cur_name = ""; + //Loop Variables + /*===========================*/ + std::string cur_field = ""; + std::string total_field = ""; + std::string cur_name = ""; std::string cur_spacing = ""; std::string cur_color = ""; - int hme_rows = 3; // Rows in display + int hme_rows = 3; // Rows in display int max_HME_value_len = 9; // 9 digits in the displayed value for(int hme_row_counter = 0; hme_row_counter < hme_rows; hme_row_counter++) @@ -6292,28 +6292,28 @@ void Client::SendStatsWindow(Client* client, bool use_window) HME_row += indM + cur_name + cur_spacing + cur_color + cur_field + " / " + total_field + "
"; } - /*########################################################## + /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Regen String + Regen String ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string regen_string; - //Loop Variables - /*===========================*/ + //Loop Variables + /*===========================*/ std::string regen_row_header = ""; std::string regen_row_color = ""; - std::string base_regen_field = ""; - std::string base_regen_spacing = ""; - std::string item_regen_field = ""; - std::string item_regen_spacing = ""; - std::string cap_regen_field = ""; - std::string cap_regen_spacing = ""; - std::string spell_regen_field = ""; - std::string spell_regen_spacing = ""; - std::string aa_regen_field = ""; + std::string base_regen_field = ""; + std::string base_regen_spacing = ""; + std::string item_regen_field = ""; + std::string item_regen_spacing = ""; + std::string cap_regen_field = ""; + std::string cap_regen_spacing = ""; + std::string spell_regen_field = ""; + std::string spell_regen_spacing = ""; + std::string aa_regen_field = ""; std::string aa_regen_spacing = ""; - std::string total_regen_field = ""; - int regen_rows = 3; // Number of rows + std::string total_regen_field = ""; + int regen_rows = 3; // Number of rows int max_regen_value_len = 5; // 5 digits in the displayed value(larger values will not get cut off, this is just a baseline) for(int regen_row_counter = 0; regen_row_counter < regen_rows; regen_row_counter++) @@ -6379,29 +6379,29 @@ void Client::SendStatsWindow(Client* client, bool use_window) regen_string += ") " + cap_regen_spacing + div + spell_regen_spacing + spell_regen_field; regen_string += div + aa_regen_spacing + aa_regen_field + div + total_regen_field + "
"; } - /*########################################################## + /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Stat String + Stat String ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string stat_field = ""; - //Loop Variables - /*===========================*/ - //first field(stat) + //Loop Variables + /*===========================*/ + //first field(stat) std::string a_stat = "";; - std::string a_stat_name = ""; - std::string a_stat_spacing = ""; - //second field(heroic stat) - std::string h_stat = ""; - std::string h_stat_spacing = ""; - //third field(resist) - std::string a_resist = ""; - std::string a_resist_name = ""; - std::string a_resist_spacing = ""; - //fourth field(heroic resist) - std::string h_resist_field = ""; + std::string a_stat_name = ""; + std::string a_stat_spacing = ""; + //second field(heroic stat) + std::string h_stat = ""; + std::string h_stat_spacing = ""; + //third field(resist) + std::string a_resist = ""; + std::string a_resist_name = ""; + std::string a_resist_spacing = ""; + //fourth field(heroic resist) + std::string h_resist_field = ""; - int stat_rows = 7; // Number of rows + int stat_rows = 7; // Number of rows int max_stat_value_len = 3; // 3 digits in the displayed value for(int stat_row_counter = 0; stat_row_counter < stat_rows; stat_row_counter++) @@ -6483,27 +6483,27 @@ void Client::SendStatsWindow(Client* client, bool use_window) stat_field += h_stat_spacing + a_resist_name + a_resist_spacing + a_resist + heroic_color + h_resist_field + "
"; } } - /*########################################################## + /*########################################################## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Mod2 String + Mod2 String ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ##########################################################*/ std::string mod2_field = ""; - //Loop Variables - /*===========================*/ + //Loop Variables + /*===========================*/ std::string mod2a = ""; - std::string mod2a_name = ""; - std::string mod2a_spacing = ""; + std::string mod2a_name = ""; + std::string mod2a_spacing = ""; std::string mod2a_cap = ""; std::string mod_row_spacing = ""; std::string mod2b = ""; - std::string mod2b_name = ""; - std::string mod2b_spacing = ""; + std::string mod2b_name = ""; + std::string mod2b_spacing = ""; std::string mod2b_cap = ""; int mod2a_space_count; int mod2b_space_count; - int mod2_rows = 4; + int mod2_rows = 4; int max_mod2_value_len = 3; // 3 digits in the displayed value for(int mod2_row_counter = 0; mod2_row_counter < mod2_rows; mod2_row_counter++) @@ -6703,104 +6703,104 @@ void Client::SendStatsWindow(Client* client, bool use_window) } void Client::SendAltCurrencies() { - if(GetClientVersion() >= EQClientSoF) { - uint32 count = zone->AlternateCurrencies.size(); - if(count == 0) { - return; - } + if(GetClientVersion() >= EQClientSoF) { + uint32 count = zone->AlternateCurrencies.size(); + if(count == 0) { + return; + } - EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, - sizeof(AltCurrencyPopulate_Struct) + sizeof(AltCurrencyPopulateEntry_Struct) * count); - AltCurrencyPopulate_Struct *altc = (AltCurrencyPopulate_Struct*)outapp->pBuffer; - altc->opcode = ALT_CURRENCY_OP_POPULATE; - altc->count = count; + EQApplicationPacket *outapp = new EQApplicationPacket(OP_AltCurrency, + sizeof(AltCurrencyPopulate_Struct) + sizeof(AltCurrencyPopulateEntry_Struct) * count); + AltCurrencyPopulate_Struct *altc = (AltCurrencyPopulate_Struct*)outapp->pBuffer; + altc->opcode = ALT_CURRENCY_OP_POPULATE; + altc->count = count; - uint32 i = 0; - list::iterator iter = zone->AlternateCurrencies.begin(); - while(iter != zone->AlternateCurrencies.end()) { - const Item_Struct* item = database.GetItem((*iter).item_id); - altc->entries[i].currency_number = (*iter).id; - altc->entries[i].unknown00 = 1; - altc->entries[i].currency_number2 = (*iter).id; - altc->entries[i].item_id = (*iter).item_id; - if(item) { - altc->entries[i].item_icon = item->Icon; - altc->entries[i].stack_size = item->StackSize; - } else { - altc->entries[i].item_icon = 1000; - altc->entries[i].stack_size = 1000; - } - i++; - iter++; - } + uint32 i = 0; + list::iterator iter = zone->AlternateCurrencies.begin(); + while(iter != zone->AlternateCurrencies.end()) { + const Item_Struct* item = database.GetItem((*iter).item_id); + altc->entries[i].currency_number = (*iter).id; + altc->entries[i].unknown00 = 1; + altc->entries[i].currency_number2 = (*iter).id; + altc->entries[i].item_id = (*iter).item_id; + if(item) { + altc->entries[i].item_icon = item->Icon; + altc->entries[i].stack_size = item->StackSize; + } else { + altc->entries[i].item_icon = 1000; + altc->entries[i].stack_size = 1000; + } + i++; + iter++; + } - FastQueuePacket(&outapp); - } + FastQueuePacket(&outapp); + } } void Client::SetAlternateCurrencyValue(uint32 currency_id, uint32 new_amount) { - alternate_currency[currency_id] = new_amount; - database.UpdateAltCurrencyValue(CharacterID(), currency_id, new_amount); - SendAlternateCurrencyValue(currency_id); + alternate_currency[currency_id] = new_amount; + database.UpdateAltCurrencyValue(CharacterID(), currency_id, new_amount); + SendAlternateCurrencyValue(currency_id); } void Client::AddAlternateCurrencyValue(uint32 currency_id, int32 amount) { - if(amount == 0) { - return; - } + if(amount == 0) { + return; + } - int new_value = 0; - std::map::iterator iter = alternate_currency.find(currency_id); - if(iter == alternate_currency.end()) { - new_value = amount; - } else { - new_value = (*iter).second + amount; - } + int new_value = 0; + std::map::iterator iter = alternate_currency.find(currency_id); + if(iter == alternate_currency.end()) { + new_value = amount; + } else { + new_value = (*iter).second + amount; + } - if(new_value < 0) { - alternate_currency[currency_id] = 0; - database.UpdateAltCurrencyValue(CharacterID(), currency_id, 0); - } else { - alternate_currency[currency_id] = new_value; - database.UpdateAltCurrencyValue(CharacterID(), currency_id, new_value); - } - SendAlternateCurrencyValue(currency_id); + if(new_value < 0) { + alternate_currency[currency_id] = 0; + database.UpdateAltCurrencyValue(CharacterID(), currency_id, 0); + } else { + alternate_currency[currency_id] = new_value; + database.UpdateAltCurrencyValue(CharacterID(), currency_id, new_value); + } + SendAlternateCurrencyValue(currency_id); } void Client::SendAlternateCurrencyValues() { - list::iterator iter = zone->AlternateCurrencies.begin(); - while(iter != zone->AlternateCurrencies.end()) { - SendAlternateCurrencyValue((*iter).id, false); - iter++; - } + list::iterator iter = zone->AlternateCurrencies.begin(); + while(iter != zone->AlternateCurrencies.end()) { + SendAlternateCurrencyValue((*iter).id, false); + iter++; + } } void Client::SendAlternateCurrencyValue(uint32 currency_id, bool send_if_null) { - uint32 value = GetAlternateCurrencyValue(currency_id); - if(value > 0 || (value == 0 && send_if_null)) { - EQApplicationPacket* outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(AltCurrencyUpdate_Struct)); - AltCurrencyUpdate_Struct *update = (AltCurrencyUpdate_Struct*)outapp->pBuffer; - update->opcode = 7; - strcpy(update->name, GetName()); - update->currency_number = currency_id; - update->amount = value; - update->unknown072 = 1; - FastQueuePacket(&outapp); - } + uint32 value = GetAlternateCurrencyValue(currency_id); + if(value > 0 || (value == 0 && send_if_null)) { + EQApplicationPacket* outapp = new EQApplicationPacket(OP_AltCurrency, sizeof(AltCurrencyUpdate_Struct)); + AltCurrencyUpdate_Struct *update = (AltCurrencyUpdate_Struct*)outapp->pBuffer; + update->opcode = 7; + strcpy(update->name, GetName()); + update->currency_number = currency_id; + update->amount = value; + update->unknown072 = 1; + FastQueuePacket(&outapp); + } } uint32 Client::GetAlternateCurrencyValue(uint32 currency_id) const { - std::map::const_iterator iter = alternate_currency.find(currency_id); - if(iter == alternate_currency.end()) { - return 0; - } else { - return (*iter).second; - } + std::map::const_iterator iter = alternate_currency.find(currency_id); + if(iter == alternate_currency.end()) { + return 0; + } else { + return (*iter).second; + } } void Client::OpenLFGuildWindow() @@ -6959,13 +6959,13 @@ void Client::SendXTargetPacket(uint32 Slot, Mob *m) } else { - if(strlen(XTargets[Slot].Name) && ((XTargets[Slot].Type == CurrentTargetPC) || - (XTargets[Slot].Type == GroupTank) || - (XTargets[Slot].Type == GroupAssist) || - (XTargets[Slot].Type == Puller) || - (XTargets[Slot].Type == RaidAssist1) || - (XTargets[Slot].Type == RaidAssist2) || - (XTargets[Slot].Type == RaidAssist3))) + if (strlen(XTargets[Slot].Name) && ((XTargets[Slot].Type == CurrentTargetPC) || + (XTargets[Slot].Type == GroupTank) || + (XTargets[Slot].Type == GroupAssist) || + (XTargets[Slot].Type == Puller) || + (XTargets[Slot].Type == RaidAssist1) || + (XTargets[Slot].Type == RaidAssist2) || + (XTargets[Slot].Type == RaidAssist3))) { outapp->WriteUInt8(2); } @@ -6986,15 +6986,15 @@ void Client::RemoveGroupXTargets() for(int i = 0; i < GetMaxXTargets(); ++i) { - if((XTargets[i].Type == GroupTank) || - (XTargets[i].Type == GroupAssist) || - (XTargets[i].Type == Puller) || - (XTargets[i].Type == RaidAssist1) || - (XTargets[i].Type == RaidAssist2) || - (XTargets[i].Type == RaidAssist3) || - (XTargets[i].Type == GroupMarkTarget1) || - (XTargets[i].Type == GroupMarkTarget2) || - (XTargets[i].Type == GroupMarkTarget3)) + if ((XTargets[i].Type == GroupTank) || + (XTargets[i].Type == GroupAssist) || + (XTargets[i].Type == Puller) || + (XTargets[i].Type == RaidAssist1) || + (XTargets[i].Type == RaidAssist2) || + (XTargets[i].Type == RaidAssist3) || + (XTargets[i].Type == GroupMarkTarget1) || + (XTargets[i].Type == GroupMarkTarget2) || + (XTargets[i].Type == GroupMarkTarget3)) { XTargets[i].ID = 0; XTargets[i].Name[0] = 0; @@ -7361,9 +7361,8 @@ FACTION_VALUE Client::GetReverseFactionCon(Mob* iOther) { //o-------------------------------------------------------------- //| Name: GetFactionLevel; rembrant, Dec. 16, 2001 //o-------------------------------------------------------------- -//| Notes: Gets the characters faction standing with the -//| specified NPC. -//| Will return Indifferent on failure. +//| Notes: Gets the characters faction standing with the specified NPC. +//| Will return Indifferent on failure. //o-------------------------------------------------------------- FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction, Mob* tnpc) { @@ -7372,24 +7371,24 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra if (pFaction < 0) return GetSpecialFactionCon(tnpc); FACTION_VALUE fac = FACTION_INDIFFERENT; - //int32 pFacValue; -Trumpcard: commenting. Not currently used. + //int32 pFacValue; -Trumpcard: commenting. Not currently used. int32 tmpFactionValue; FactionMods fmods; - // neotokyo: few optimizations - if (GetFeigned()) + // neotokyo: few optimizations + if (GetFeigned()) return FACTION_INDIFFERENT; - if (invisible_undead && tnpc && !tnpc->SeeInvisibleUndead()) - return FACTION_INDIFFERENT; - if (IsInvisible(tnpc)) + if (invisible_undead && tnpc && !tnpc->SeeInvisibleUndead()) return FACTION_INDIFFERENT; - if (tnpc && tnpc->GetOwnerID() != 0) // pets con amiably to owner and indiff to rest + if (IsInvisible(tnpc)) + return FACTION_INDIFFERENT; + if (tnpc && tnpc->GetOwnerID() != 0) // pets con amiably to owner and indiff to rest if (char_id == tnpc->GetOwner()->CastToClient()->CharacterID()) return FACTION_AMIABLE; else return FACTION_INDIFFERENT; - //First get the NPC's Primary faction + //First get the NPC's Primary faction if(pFaction > 0) { //Get the faction data from the database @@ -7405,13 +7404,13 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra } } else - { - return(FACTION_INDIFFERENT); - } + { + return(FACTION_INDIFFERENT); + } - // merchant fix - if (tnpc && tnpc->IsNPC() && tnpc->CastToNPC()->MerchantType && (fac == FACTION_THREATENLY || fac == FACTION_SCOWLS)) - fac = FACTION_DUBIOUS; + // merchant fix + if (tnpc && tnpc->IsNPC() && tnpc->CastToNPC()->MerchantType && (fac == FACTION_THREATENLY || fac == FACTION_SCOWLS)) + fac = FACTION_DUBIOUS; if (tnpc != 0 && fac != FACTION_SCOWLS && tnpc->CastToNPC()->CheckAggro(this)) fac = FACTION_THREATENLY; @@ -7422,10 +7421,9 @@ FACTION_VALUE Client::GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_ra //o-------------------------------------------------------------- //| Name: SetFactionLevel; rembrant, Dec. 20, 2001 //o-------------------------------------------------------------- -//| Notes: Sets the characters faction standing with the -//| specified NPC. +//| Notes: Sets the characters faction standing with the specified NPC. //o-------------------------------------------------------------- -void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, uint8 char_race, uint8 char_deity) +void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, uint8 char_race, uint8 char_deity) { _ZP(Client_SetFactionLevel); int32 faction_id[MAX_NPC_FACTIONS]={ 0,0,0,0,0,0,0,0,0,0 }; @@ -7469,56 +7467,56 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, u mod = MIN_FACTION; // Calculate the faction - if(npc_value[i] != 0) { - tmpValue = current_value + mod + npc_value[i]; + if(npc_value[i] != 0) { + tmpValue = current_value + mod + npc_value[i]; - // Make sure faction hits don't go to GMs... - if (m_pp.gm==1 && (tmpValue < current_value)) { - tmpValue = current_value; - } + // Make sure faction hits don't go to GMs... + if (m_pp.gm==1 && (tmpValue < current_value)) { + tmpValue = current_value; + } - // Make sure we dont go over the min/max faction limits - if(tmpValue >= MAX_FACTION) - { - t = MAX_FACTION - mod; - if(current_value == t) { - //do nothing, it is already maxed out - } else if(!(database.SetCharacterFactionLevel(char_id, faction_id[i], t, temp[i], factionvalues))) - { - return; - } - } - else if(tmpValue <= MIN_FACTION) - { - t = MIN_FACTION - mod; - if(current_value == t) { - //do nothing, it is already maxed out - } else if(!(database.SetCharacterFactionLevel(char_id, faction_id[i], t, temp[i], factionvalues))) - { - return; - } - } - else - { - if(!(database.SetCharacterFactionLevel(char_id, faction_id[i], current_value + npc_value[i], temp[i], factionvalues))) - { - return; - } - } - if(tmpValue <= MIN_FACTION) - tmpValue = MIN_FACTION; + // Make sure we dont go over the min/max faction limits + if(tmpValue >= MAX_FACTION) + { + t = MAX_FACTION - mod; + if(current_value == t) { + //do nothing, it is already maxed out + } else if(!(database.SetCharacterFactionLevel(char_id, faction_id[i], t, temp[i], factionvalues))) + { + return; + } + } + else if(tmpValue <= MIN_FACTION) + { + t = MIN_FACTION - mod; + if(current_value == t) { + //do nothing, it is already maxed out + } else if(!(database.SetCharacterFactionLevel(char_id, faction_id[i], t, temp[i], factionvalues))) + { + return; + } + } + else + { + if(!(database.SetCharacterFactionLevel(char_id, faction_id[i], current_value + npc_value[i], temp[i], factionvalues))) + { + return; + } + } + if(tmpValue <= MIN_FACTION) + tmpValue = MIN_FACTION; - char* msg = BuildFactionMessage(npc_value[i],faction_id[i],tmpValue,temp[i]); - if (msg != 0) - Message(0, msg); - safe_delete_array(msg); - } - } + char* msg = BuildFactionMessage(npc_value[i],faction_id[i],tmpValue,temp[i]); + if (msg != 0) + Message(0, msg); + safe_delete_array(msg); + } + } } return; } -void Client::SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class, uint8 char_race, uint8 char_deity, int32 value, uint8 temp) +void Client::SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class, uint8 char_race, uint8 char_deity, int32 value, uint8 temp) { _ZP(Client_SetFactionLevel2); int32 current_value; @@ -7570,7 +7568,7 @@ bool Client::HatedByClass(uint32 p_race, uint32 p_class, uint32 p_deity, int32 p int32 tmpFactionValue; FactionMods fmods; - //First get the NPC's Primary faction + //First get the NPC's Primary faction if(pFaction > 0) { //Get the faction data from the database diff --git a/zone/client.h b/zone/client.h index 949a6658d..52d298b61 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef CLIENT_H #define CLIENT_H @@ -61,10 +61,10 @@ extern TaskManager *taskmanager; class CLIENTPACKET { public: - CLIENTPACKET(); - ~CLIENTPACKET(); - EQApplicationPacket *app; - bool ack_req; + CLIENTPACKET(); + ~CLIENTPACKET(); + EQApplicationPacket *app; + bool ack_req; }; enum { //Type arguments to the Message* routines. @@ -189,13 +189,13 @@ public: #include "client_packet.h" Client(EQStreamInterface * ieqs); - ~Client(); + ~Client(); //abstract virtual function implementations requird by base abstract class virtual void Death(Mob* killerMob, int32 damage, uint16 spell_id, SkillType attack_skill); virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false); virtual bool Attack(Mob* other, int Hand = 13, bool FromRiposte = false, bool IsStrikethrough = false, bool IsFromSpell = false); - virtual bool HasRaid() { return (GetRaid() ? true : false); } + virtual bool HasRaid() { return (GetRaid() ? true : false); } virtual bool HasGroup() { return (GetGroup() ? true : false); } virtual Raid* GetRaid() { return entity_list.GetRaidByClient(this); } virtual Group* GetGroup() { return entity_list.GetGroupByClient(this); } @@ -207,14 +207,14 @@ public: void AI_Process(); void AI_SpellCast(); void Trader_ShowItems(); - void Trader_CustomerBrowsing(Client *Customer); + void Trader_CustomerBrowsing(Client *Customer); void Trader_EndTrader(); void Trader_StartTrader(); uint8 WithCustomer(uint16 NewCustomer); void KeyRingLoad(); void KeyRingAdd(uint32 item_id); bool KeyRingCheck(uint32 item_id); - void KeyRingList(); + void KeyRingList(); virtual bool IsClient() const { return true; } virtual void DBAWComplete(uint8 workpt_b1, DBAsyncWork* dbaw); bool FinishConnState2(DBAsyncWork* dbaw); @@ -233,13 +233,13 @@ public: uint16 FindTraderItem(int32 SerialNumber,uint16 Quantity); ItemInst* FindTraderItemBySerialNumber(int32 SerialNumber); void FindAndNukeTraderItem(int32 item_id,uint16 quantity,Client* customer,uint16 traderslot); - void NukeTraderItem(uint16 slot,int16 charges,uint16 quantity,Client* customer,uint16 traderslot, int uniqueid); + void NukeTraderItem(uint16 slot,int16 charges,uint16 quantity,Client* customer,uint16 traderslot, int uniqueid); void ReturnTraderReq(const EQApplicationPacket* app,int16 traderitemcharges); void TradeRequestFailed(const EQApplicationPacket* app); void BuyTraderItem(TraderBuy_Struct* tbs,Client* trader,const EQApplicationPacket* app); void TraderUpdate(uint16 slot_id,uint32 trader_id); void FinishTrade(Mob* with, ServerPacket* qspack = nullptr, bool finalizer = false); - void SendZonePoints(); + void SendZonePoints(); void SendBuyerResults(char *SearchQuery, uint32 SearchID); void ShowBuyLines(const EQApplicationPacket *app); @@ -248,7 +248,7 @@ public: void UpdateBuyLine(const EQApplicationPacket *app); void BuyerItemSearch(const EQApplicationPacket *app); void SetBuyerWelcomeMessage(const char* WelcomeMessage) { BuyerWelcomeMessage = WelcomeMessage; } - const char* GetBuyerWelcomeMessage() { return BuyerWelcomeMessage.c_str(); } + const char* GetBuyerWelcomeMessage() { return BuyerWelcomeMessage.c_str(); } void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); virtual bool Process(); @@ -260,7 +260,7 @@ public: void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message, ...); void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...); void Message(uint32 type, const char* message, ...); - void QuestJournalledMessage(const char *npcname, const char* message); + void QuestJournalledMessage(const char *npcname, const char* message); void VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber); void SendSound(); void LearnRecipe(uint32 recipeID); @@ -289,13 +289,13 @@ public: inline void Disconnect() { eqs->Close(); client_state = DISCONNECTED; } inline bool IsLD() const { return (bool) (client_state == CLIENT_LINKDEAD); } void WorldKick(); - inline uint8 GetAnon() const { return m_pp.anon; } + inline uint8 GetAnon() const { return m_pp.anon; } inline PlayerProfile_Struct& GetPP() { return m_pp; } inline ExtendedProfile_Struct& GetEPP() { return m_epp; } inline Inventory& GetInv() { return m_inv; } inline const Inventory& GetInv() const { return m_inv; } inline PetInfo* GetPetInfo(uint16 pet) { return (pet==1)?&m_suspendedminion:&m_petinfo; } - inline InspectMessage_Struct& GetInspectMessage() { return m_inspect_message; } + inline InspectMessage_Struct& GetInspectMessage() { return m_inspect_message; } inline const InspectMessage_Struct& GetInspectMessage() const { return m_inspect_message; } bool CheckAccess(int16 iDBLevel, int16 iDefaultLevel); @@ -323,7 +323,7 @@ public: inline void SetBaseClass(uint32 i) { m_pp.class_=i; } inline void SetBaseRace(uint32 i) { m_pp.race=i; } inline void SetBaseGender(uint32 i) { m_pp.gender=i; } - inline void SetDeity(uint32 i) {m_pp.deity=i;deity=i;} + inline void SetDeity(uint32 i) {m_pp.deity=i;deity=i;} inline uint8 GetLevel2() const { return m_pp.level2; } inline uint16 GetBaseRace() const { return m_pp.race; } @@ -346,11 +346,11 @@ public: int32 CalcMaxMana(); int32 CalcBaseMana(); const int32& SetMana(int32 amount); - int32 CalcManaRegenCap(); + int32 CalcManaRegenCap(); void ServerFilter(SetServerFilter_Struct* filter); void BulkSendTraderInventory(uint32 char_id); - void SendSingleTraderItem(uint32 char_id, int uniqueid); + void SendSingleTraderItem(uint32 char_id, int uniqueid); void BulkSendMerchantInventory(int merchant_id, int npcid); inline uint8 GetLanguageSkill(uint16 n) const { return m_pp.languages[n]; } @@ -392,19 +392,19 @@ public: int16 GetMaxStat() const; int16 GetMaxResist() const; - int16 GetMaxSTR() const; - int16 GetMaxSTA() const; - int16 GetMaxDEX() const; - int16 GetMaxAGI() const; - int16 GetMaxINT() const; - int16 GetMaxWIS() const; - int16 GetMaxCHA() const; - int16 GetMaxMR() const; - int16 GetMaxPR() const; - int16 GetMaxDR() const; - int16 GetMaxCR() const; - int16 GetMaxFR() const; - int16 GetMaxCorrup() const; + int16 GetMaxSTR() const; + int16 GetMaxSTA() const; + int16 GetMaxDEX() const; + int16 GetMaxAGI() const; + int16 GetMaxINT() const; + int16 GetMaxWIS() const; + int16 GetMaxCHA() const; + int16 GetMaxMR() const; + int16 GetMaxPR() const; + int16 GetMaxDR() const; + int16 GetMaxCR() const; + int16 GetMaxFR() const; + int16 GetMaxCorrup() const; inline uint8 GetBaseSTR() const { return m_pp.STR; } inline uint8 GetBaseSTA() const { return m_pp.STA; } inline uint8 GetBaseCHA() const { return m_pp.CHA; } @@ -502,8 +502,8 @@ public: //This gets the skill value of the item type equiped in the Primary Slot uint16 GetPrimarySkillValue(); - bool Flurry(); - bool Rampage(); + bool Flurry(); + bool Rampage(); void DurationRampage(uint32 duration); inline uint32 GetEXP() const { return m_pp.exp; } @@ -526,17 +526,17 @@ public: void AddLeadershipEXP(uint32 group_exp, uint32 raid_exp); void SendLeadershipEXPUpdate(); bool IsLeadershipEXPOn(); - inline int GetLeadershipAA(int AAID) { return m_pp.leader_abilities.ranks[AAID]; } + inline int GetLeadershipAA(int AAID) { return m_pp.leader_abilities.ranks[AAID]; } int GroupLeadershipAAHealthEnhancement(); int GroupLeadershipAAManaEnhancement(); int GroupLeadershipAAHealthRegeneration(); int GroupLeadershipAAOffenseEnhancement(); void InspectBuffs(Client* Inspector, int Rank); - uint32 GetRaidPoints() { return(m_pp.raid_leadership_points); } - uint32 GetGroupPoints() { return(m_pp.group_leadership_points); } - uint32 GetRaidEXP() { return(m_pp.raid_leadership_exp); } - uint32 GetGroupEXP() { return(m_pp.group_leadership_exp); } - uint32 GetTotalSecondsPlayed() { return(TotalSecondsPlayed); } + uint32 GetRaidPoints() { return(m_pp.raid_leadership_points); } + uint32 GetGroupPoints() { return(m_pp.group_leadership_points); } + uint32 GetRaidEXP() { return(m_pp.raid_leadership_exp); } + uint32 GetGroupEXP() { return(m_pp.group_leadership_exp); } + uint32 GetTotalSecondsPlayed() { return(TotalSecondsPlayed); } virtual void SetLevel(uint8 set_level, bool command = false); void GoToBind(uint8 bindnum = 0); void GoToSafeCoords(uint16 zone_id, uint16 instance_id); @@ -561,14 +561,14 @@ public: inline const int32 GetInstanceID() const { return zone->GetInstanceID(); } FACTION_VALUE GetReverseFactionCon(Mob* iOther); - FACTION_VALUE GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction, Mob* tnpc); + FACTION_VALUE GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction, Mob* tnpc); int32 GetCharacterFactionLevel(int32 faction_id); - int32 GetModCharacterFactionLevel(int32 faction_id); + int32 GetModCharacterFactionLevel(int32 faction_id); bool HatedByClass(uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction); - char* BuildFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalvalue, uint8 temp); + char* BuildFactionMessage(int32 tmpvalue, int32 faction_id, int32 totalvalue, uint8 temp); void SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, uint8 char_race, uint8 char_deity); - void SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class, uint8 char_race, uint8 char_deity, int32 value, uint8 temp); + void SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class, uint8 char_race, uint8 char_deity, int32 value, uint8 temp); int16 GetRawItemAC(); uint16 GetCombinedAC_TEST(); @@ -592,7 +592,7 @@ public: void SendGuildChannel(); void SendGuildSpawnAppearance(); void SendGuildMembers(); - void SendGuildList(); + void SendGuildList(); void SendGuildJoin(GuildJoin_Struct* gj); void RefreshGuildInfo(); @@ -602,7 +602,7 @@ public: void SendEnduranceUpdate(); uint8 GetFace() const { return m_pp.face; } void WhoAll(Who_All_Struct* whom); - void FriendsWho(char *FriendsString); + void FriendsWho(char *FriendsString); void Stun(int duration); void UnStun(); @@ -639,7 +639,7 @@ public: void CheckSongSkillIncrease(uint16 spell_id); bool CheckIncreaseSkill(SkillType skillid, Mob *against_who, int chancemodi = 0); void CheckLanguageSkillIncrease(uint8 langid, uint8 TeacherSkill); - void SetLanguageSkill(int langid, int value); + void SetLanguageSkill(int langid, int value); void SetHoTT(uint32 mobid); void ShowSkillsWindow(); void SendStatsWindow(Client* client, bool use_window); @@ -679,7 +679,7 @@ public: bool LootToStack(uint32 itemid); void SetFeigned(bool in_feigned); /// this cures timing issues cuz dead animation isn't done but server side feigning is? - inline bool GetFeigned() const { return(feigned); } + inline bool GetFeigned() const { return(feigned); } EQStreamInterface* Connection() { return eqs; } #ifdef PACKET_PROFILER void DumpPacketProfile() { if(eqs) eqs->DumpPacketProfile(); } @@ -713,22 +713,22 @@ public: inline PTimerList &GetPTimers() { return(p_timers); } //AA Methods - void SendAAList(); - void ResetAA(); - void SendAA(uint32 id, int seq=1); - void SendPreviousAA(uint32 id, int seq=1); - void BuyAA(AA_Action* action); + void SendAAList(); + void ResetAA(); + void SendAA(uint32 id, int seq=1); + void SendPreviousAA(uint32 id, int seq=1); + void BuyAA(AA_Action* action); //this function is used by some AA stuff void MemorizeSpell(uint32 slot,uint32 spellid,uint32 scribing); void SetAATitle(const char *Title); void SetTitleSuffix(const char *txt); inline uint32 GetMaxAAXP(void) const { return max_AAXP; } - inline uint32 GetAAXP() const { return m_pp.expAA; } + inline uint32 GetAAXP() const { return m_pp.expAA; } void SendAAStats(); void SendAATable(); void SendAATimers(); - int GetAATimerID(aaID activate); - int CalcAAReuseTimer(const AA_DBAction *caa); + int GetAATimerID(aaID activate); + int CalcAAReuseTimer(const AA_DBAction *caa); void ActivateAA(aaID activate); void SendAATimer(uint32 ability, uint32 begin, uint32 end); void EnableAAEffect(aaEffectType type, uint32 duration = 0); @@ -745,7 +745,7 @@ public: // Item methods uint32 NukeItem(uint32 itemnum, uint8 where_to_check = - (invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor)); + (invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor)); void SetTint(int16 slot_id, uint32 color); void SetTint(int16 slot_id, Color_Struct& color); void SetMaterial(int16 slot_id, uint32 item_id); @@ -770,7 +770,7 @@ public: void SendLootItemInPacket(const ItemInst* inst, int16 slot_id); void SendItemPacket(int16 slot_id, const ItemInst* inst, ItemPacketType packet_type); bool IsValidSlot(uint32 slot); - bool IsBankSlot(uint32 slot); + bool IsBankSlot(uint32 slot); inline bool IsTrader() const { return(Trader); } inline bool IsBuyer() const { return(Buyer); } @@ -786,14 +786,14 @@ public: bool CheckTradeLoreConflict(Client* other); void LinkDead(); void Insight(uint32 t_id); - bool CheckDoubleAttack(bool tripleAttack = false); + bool CheckDoubleAttack(bool tripleAttack = false); //remove charges/multiple objects from inventory: //bool DecreaseByType(uint32 type, uint8 amt); bool DecreaseByID(uint32 type, uint8 amt); uint8 SlotConvert2(uint8 slot); //Maybe not needed. void Escape(); //AA Escape - void RemoveNoRent(bool client_update = true); + void RemoveNoRent(bool client_update = true); void RemoveDuplicateLore(bool client_update = true); void MoveSlotNotAllowed(bool client_update = true); virtual void RangedAttack(Mob* other); @@ -819,9 +819,9 @@ public: void SendDisciplineUpdate(); bool UseDiscipline(uint32 spell_id, uint32 target); - bool CheckTitle(int titleset); - void EnableTitle(int titleset); - void RemoveTitle(int titleset); + bool CheckTitle(int titleset); + void EnableTitle(int titleset); + void RemoveTitle(int titleset); #ifdef PACKET_UPDATE_MANAGER inline UpdateManager *GetUpdateManager() { return(&update_manager); } @@ -862,120 +862,87 @@ public: void SendWindow(uint32 PopupID, uint32 NegativeID, uint32 Buttons, const char *ButtonName0, const char *ButtonName1, uint32 Duration, int title_type, Client* target, const char *Title, const char *Text, ...); bool PendingTranslocate; time_t TranslocateTime; - bool PendingSacrifice; - string SacrificeCaster; - struct Translocate_Struct PendingTranslocateData; - void SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID); + bool PendingSacrifice; + string SacrificeCaster; + struct Translocate_Struct PendingTranslocateData; + void SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID); - // Task System Methods + // Task System Methods void LoadClientTaskState(); void RemoveClientTaskState(); - void SendTaskActivityComplete(int TaskID, int ActivityID, int TaskIndex, int TaskIncomplete=1); - void SendTaskFailed(int TaskID, int TaskIndex); - void SendTaskComplete(int TaskIndex); + void SendTaskActivityComplete(int TaskID, int ActivityID, int TaskIndex, int TaskIncomplete=1); + void SendTaskFailed(int TaskID, int TaskIndex); + void SendTaskComplete(int TaskIndex); inline void CancelTask(int TaskIndex) { if(taskstate) taskstate->CancelTask(this, TaskIndex); } - inline bool SaveTaskState() - { return (taskmanager ? taskmanager->SaveClientState(this, taskstate) : false); } + inline bool SaveTaskState() { return (taskmanager ? taskmanager->SaveClientState(this, taskstate) : false); } inline bool IsTaskStateLoaded() { return taskstate != nullptr; } - inline bool IsTaskActive(int TaskID) - { return (taskstate ? taskstate->IsTaskActive(TaskID) : false); } + inline bool IsTaskActive(int TaskID) { return (taskstate ? taskstate->IsTaskActive(TaskID) : false); } - inline bool IsTaskActivityActive(int TaskID, int ActivityID) - { return (taskstate ? taskstate->IsTaskActivityActive(TaskID, ActivityID) : false); } + inline bool IsTaskActivityActive(int TaskID, int ActivityID) { return (taskstate ? taskstate->IsTaskActivityActive(TaskID, ActivityID) : false); } - inline ActivityState GetTaskActivityState(int index, int ActivityID) - { return (taskstate ? taskstate->GetTaskActivityState(index, ActivityID) : ActivityHidden); } + inline ActivityState GetTaskActivityState(int index, int ActivityID) { return (taskstate ? taskstate->GetTaskActivityState(index, ActivityID) : ActivityHidden); } - inline void UpdateTaskActivity(int TaskID, int ActivityID, int Count) - { if(taskstate) taskstate->UpdateTaskActivity(this, TaskID, ActivityID, Count); } + inline void UpdateTaskActivity(int TaskID, int ActivityID, int Count) { if(taskstate) taskstate->UpdateTaskActivity(this, TaskID, ActivityID, Count); } - inline void ResetTaskActivity(int TaskID, int ActivityID) - { if(taskstate) taskstate->ResetTaskActivity(this, TaskID, ActivityID); } + inline void ResetTaskActivity(int TaskID, int ActivityID) { if(taskstate) taskstate->ResetTaskActivity(this, TaskID, ActivityID); } - inline void UpdateTasksOnKill(int NPCTypeID) - { if(taskstate) taskstate->UpdateTasksOnKill(this, NPCTypeID); } + inline void UpdateTasksOnKill(int NPCTypeID) { if(taskstate) taskstate->UpdateTasksOnKill(this, NPCTypeID); } - inline void UpdateTasksForItem(ActivityType Type, int ItemID, int Count=1) - { if(taskstate) taskstate->UpdateTasksForItem(this, Type, ItemID, Count); } + inline void UpdateTasksForItem(ActivityType Type, int ItemID, int Count=1) { if(taskstate) taskstate->UpdateTasksForItem(this, Type, ItemID, Count); } - inline void UpdateTasksOnExplore(int ExploreID) - { if(taskstate) taskstate->UpdateTasksOnExplore(this, ExploreID); } + inline void UpdateTasksOnExplore(int ExploreID) { if(taskstate) taskstate->UpdateTasksOnExplore(this, ExploreID); } - inline bool UpdateTasksOnSpeakWith(int NPCTypeID) - { if(taskstate) return taskstate->UpdateTasksOnSpeakWith(this, NPCTypeID); else return false; } + inline bool UpdateTasksOnSpeakWith(int NPCTypeID) { if(taskstate) return taskstate->UpdateTasksOnSpeakWith(this, NPCTypeID); else return false; } - inline bool UpdateTasksOnDeliver(uint32 *Items, int Cash, int NPCTypeID) - { if(taskstate) return taskstate->UpdateTasksOnDeliver(this, Items, Cash, NPCTypeID); else return false; } + inline bool UpdateTasksOnDeliver(uint32 *Items, int Cash, int NPCTypeID) { if(taskstate) return taskstate->UpdateTasksOnDeliver(this, Items, Cash, NPCTypeID); else return false; } - inline void TaskSetSelector(Mob *mob, int TaskSetID) - { if(taskmanager) taskmanager->TaskSetSelector(this, taskstate, mob, TaskSetID); } + inline void TaskSetSelector(Mob *mob, int TaskSetID) { if(taskmanager) taskmanager->TaskSetSelector(this, taskstate, mob, TaskSetID); } - inline void EnableTask(int TaskCount, int *TaskList) - { if(taskstate) taskstate->EnableTask(CharacterID(), TaskCount, TaskList); } + inline void EnableTask(int TaskCount, int *TaskList) { if(taskstate) taskstate->EnableTask(CharacterID(), TaskCount, TaskList); } - inline void DisableTask(int TaskCount, int *TaskList) - { if(taskstate) taskstate->DisableTask(CharacterID(), TaskCount, TaskList); } + inline void DisableTask(int TaskCount, int *TaskList) { if(taskstate) taskstate->DisableTask(CharacterID(), TaskCount, TaskList); } - inline bool IsTaskEnabled(int TaskID) - { return (taskstate ? taskstate->IsTaskEnabled(TaskID) : false); } + inline bool IsTaskEnabled(int TaskID) { return (taskstate ? taskstate->IsTaskEnabled(TaskID) : false); } - inline void ProcessTaskProximities(float X, float Y, float Z) - { if(taskstate) taskstate->ProcessTaskProximities(this, X, Y, Z); } + inline void ProcessTaskProximities(float X, float Y, float Z) { if(taskstate) taskstate->ProcessTaskProximities(this, X, Y, Z); } - inline void AssignTask(int TaskID, int NPCID) - { if(taskstate) taskstate->AcceptNewTask(this, TaskID, NPCID); } + inline void AssignTask(int TaskID, int NPCID) { if(taskstate) taskstate->AcceptNewTask(this, TaskID, NPCID); } - inline int ActiveSpeakTask(int NPCID) - { if(taskstate) return taskstate->ActiveSpeakTask(NPCID); else return 0; } + inline int ActiveSpeakTask(int NPCID) { if(taskstate) return taskstate->ActiveSpeakTask(NPCID); else return 0; } - inline int ActiveSpeakActivity(int NPCID, int TaskID) - { if(taskstate) return taskstate->ActiveSpeakActivity(NPCID, TaskID); else return 0; } + inline int ActiveSpeakActivity(int NPCID, int TaskID) { if(taskstate) return taskstate->ActiveSpeakActivity(NPCID, TaskID); else return 0; } - inline void FailTask(int TaskID) - { if(taskstate) taskstate->FailTask(this, TaskID); } + inline void FailTask(int TaskID) { if(taskstate) taskstate->FailTask(this, TaskID); } - inline int TaskTimeLeft(int TaskID) - { return (taskstate ? taskstate->TaskTimeLeft(TaskID) : 0); } + inline int TaskTimeLeft(int TaskID) { return (taskstate ? taskstate->TaskTimeLeft(TaskID) : 0); } - inline int EnabledTaskCount(int TaskSetID) - { return (taskstate ? taskstate->EnabledTaskCount(TaskSetID) : -1); } + inline int EnabledTaskCount(int TaskSetID) { return (taskstate ? taskstate->EnabledTaskCount(TaskSetID) : -1); } - inline int IsTaskCompleted(int TaskID) - { return (taskstate ? taskstate->IsTaskCompleted(TaskID) : -1); } + inline int IsTaskCompleted(int TaskID) { return (taskstate ? taskstate->IsTaskCompleted(TaskID) : -1); } - inline void ShowClientTasks() - { if(taskstate) taskstate->ShowClientTasks(this); } + inline void ShowClientTasks() { if(taskstate) taskstate->ShowClientTasks(this); } - inline void CancelAllTasks() - { if(taskstate) taskstate->CancelAllTasks(this); } + inline void CancelAllTasks() { if(taskstate) taskstate->CancelAllTasks(this); } - inline int GetActiveTaskCount() - { return (taskstate ? taskstate->GetActiveTaskCount() : 0); } + inline int GetActiveTaskCount() { return (taskstate ? taskstate->GetActiveTaskCount() : 0); } - inline int GetActiveTaskID(int index) - { return (taskstate ? taskstate->GetActiveTaskID(index) : -1); } + inline int GetActiveTaskID(int index) { return (taskstate ? taskstate->GetActiveTaskID(index) : -1); } - inline int GetTaskStartTime(int index) - { return (taskstate ? taskstate->GetTaskStartTime(index) : -1); } + inline int GetTaskStartTime(int index) { return (taskstate ? taskstate->GetTaskStartTime(index) : -1); } - inline bool IsTaskActivityCompleted(int index, int ActivityID) - { return (taskstate ? taskstate->IsTaskActivityCompleted(index, ActivityID) : false); } + inline bool IsTaskActivityCompleted(int index, int ActivityID) { return (taskstate ? taskstate->IsTaskActivityCompleted(index, ActivityID) : false); } - inline int GetTaskActivityDoneCount(int ClientTaskIndex, int ActivityID) - { return (taskstate ? taskstate->GetTaskActivityDoneCount(ClientTaskIndex, ActivityID) :0); } + inline int GetTaskActivityDoneCount(int ClientTaskIndex, int ActivityID) { return (taskstate ? taskstate->GetTaskActivityDoneCount(ClientTaskIndex, ActivityID) :0); } - inline int GetTaskActivityDoneCountFromTaskID(int TaskID, int ActivityID) - { return (taskstate ? taskstate->GetTaskActivityDoneCountFromTaskID(TaskID, ActivityID) :0); } + inline int GetTaskActivityDoneCountFromTaskID(int TaskID, int ActivityID) { return (taskstate ? taskstate->GetTaskActivityDoneCountFromTaskID(TaskID, ActivityID) :0); } - inline int ActiveTasksInSet(int TaskSet) - { return (taskstate ? taskstate->ActiveTasksInSet(TaskSet) :0); } + inline int ActiveTasksInSet(int TaskSet) { return (taskstate ? taskstate->ActiveTasksInSet(TaskSet) :0); } - inline int CompletedTasksInSet(int TaskSet) - { return (taskstate ? taskstate->CompletedTasksInSet(TaskSet) :0); } + inline int CompletedTasksInSet(int TaskSet) { return (taskstate ? taskstate->CompletedTasksInSet(TaskSet) :0); } inline const EQClientVersion GetClientVersion() const { return ClientVersion; } inline const uint32 GetClientVersionBit() const { return ClientVersionBit; } @@ -1128,7 +1095,7 @@ public: Timer* GetMercTimer() { return &merc_timer; }; const char* GetRacePlural(Client* client); const char* GetClassPlural(Client* client); - void SendWebLink(const char* website); + void SendWebLink(const char* website); bool StoreTurnInItems(Mob* with); void DuplicateLoreMessage(uint32 ItemID); @@ -1167,7 +1134,7 @@ protected: friend class Mob; void CalcItemBonuses(StatBonuses* newbon); void AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAug = false, bool isTribute = false); - int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); + int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); void CalcEdibleBonuses(StatBonuses* newbon); void CalcAABonuses(StatBonuses* newbon); void ApplyAABonuses(uint32 aaid, uint32 slots, StatBonuses* newbon); @@ -1219,22 +1186,22 @@ private: void HandleTraderPriceUpdate(const EQApplicationPacket *app); - int16 CalcAC(); - int16 GetACMit(); - int16 GetACAvoid(); - int16 CalcATK(); - int CalcHaste(); + int16 CalcAC(); + int16 GetACMit(); + int16 GetACAvoid(); + int16 CalcATK(); + int CalcHaste(); - int16 CalcAlcoholPhysicalEffect(); - int16 CalcSTR(); - int16 CalcSTA(); - int16 CalcDEX(); - int16 CalcAGI(); - int16 CalcINT(); - int16 CalcWIS(); - int16 CalcCHA(); + int16 CalcAlcoholPhysicalEffect(); + int16 CalcSTR(); + int16 CalcSTA(); + int16 CalcDEX(); + int16 CalcAGI(); + int16 CalcINT(); + int16 CalcWIS(); + int16 CalcCHA(); - int16 CalcMR(); + int16 CalcMR(); int16 CalcFR(); int16 CalcDR(); int16 CalcPR(); @@ -1253,13 +1220,13 @@ private: uint32 pLastUpdate; uint32 pLastUpdateWZ; - uint8 playeraction; + uint8 playeraction; EQStreamInterface* eqs; uint32 ip; uint16 port; - CLIENT_CONN_STATUS client_state; + CLIENT_CONN_STATUS client_state; uint32 character_id; uint32 WID; uint32 account_id; @@ -1296,15 +1263,15 @@ private: uint16 BoatID; uint16 TrackingID; uint16 CustomerID; - uint32 account_creation; + uint32 account_creation; uint8 firstlogon; - uint32 mercid; // current merc - uint8 mercSlot; // selected merc slot + uint32 mercid; // current merc + uint8 mercSlot; // selected merc slot bool Trader; bool Buyer; string BuyerWelcomeMessage; bool AbilityTimer; - int Haste; //precalced value + int Haste; //precalced value int32 max_end; int32 cur_end; @@ -1323,9 +1290,9 @@ private: bool CanBeInZone(); void SendLogoutPackets(); - bool AddPacket(const EQApplicationPacket *, bool); - bool AddPacket(EQApplicationPacket**, bool); - bool SendAllPackets(); + bool AddPacket(const EQApplicationPacket *, bool); + bool AddPacket(EQApplicationPacket**, bool); + bool SendAllPackets(); LinkedList clientpackets; //Zoning related stuff @@ -1391,7 +1358,7 @@ private: uint32 tribute_master_id; FILE *SQL_log; - uint32 max_AAXP; + uint32 max_AAXP; uint32 staminacount; AA_Array* aa[MAX_PP_AA_ARRAY]; //this list contains pointers into our player profile map aa_points; @@ -1404,7 +1371,7 @@ private: int32 last_reported_mana; int32 last_reported_endur; - unsigned int AggroCount; // How many mobs are aggro on us. + unsigned int AggroCount; // How many mobs are aggro on us. unsigned int RestRegenHP; unsigned int RestRegenMana; @@ -1431,7 +1398,7 @@ private: bool m_KnockBackExemption; bool m_PortExemption; bool m_SenseExemption; - std::map alternate_currency; + std::map alternate_currency; //Connecting debug code. enum { //connecting states, used for debugging only @@ -1472,3 +1439,4 @@ private: #include "parser.h" #endif + diff --git a/zone/client_logs.cpp b/zone/client_logs.cpp index 4b0bd3f89..987a2ad24 100644 --- a/zone/client_logs.cpp +++ b/zone/client_logs.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/features.h" diff --git a/zone/client_logs.h b/zone/client_logs.h index 8cbc3c88b..bff215c42 100644 --- a/zone/client_logs.h +++ b/zone/client_logs.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef CLIENT_LOGS_H @@ -60,5 +60,3 @@ extern ClientLogs client_logs; #endif //CLIENT_LOGS #endif - - diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index 29676ae01..1e81c563e 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -1319,7 +1319,7 @@ int16 Client::CalcINT() { if(m_pp.intoxication) { - int16 AlcINT = INT - (int16)((float)m_pp.intoxication / 200.0f * (float)INT) - 1; + int16 AlcINT = INT - (int16)((float)m_pp.intoxication / 200.0f * (float)INT) - 1; if((AlcINT < (int)(0.2 * INT))) INT = (int)(0.2f * (float)INT); @@ -1348,7 +1348,7 @@ int16 Client::CalcWIS() { if(m_pp.intoxication) { - int16 AlcWIS = WIS - (int16)((float)m_pp.intoxication / 200.0f * (float)WIS) - 1; + int16 AlcWIS = WIS - (int16)((float)m_pp.intoxication / 200.0f * (float)WIS) - 1; if((AlcWIS < (int)(0.2 * WIS))) WIS = (int)(0.2f * (float)WIS); diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 28a3f77bb..84e36f401 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -1,4 +1,4 @@ -/* EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2009 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify @@ -8,11 +8,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -33,7 +33,7 @@ #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #include @@ -407,7 +407,7 @@ int Client::HandlePacket(const EQApplicationPacket *app) EmuOpcode opcode = app->GetOpcode(); if (opcode == OP_AckPacket) { - return true; + return true; } #if EQDEBUG >= 9 @@ -489,7 +489,7 @@ int Client::HandlePacket(const EQApplicationPacket *app) //LogFile->write(EQEMuLog::Error,"Wrong size on OP_SetDatarate. Got: %i, Expected: %i", app->size, sizeof(float)); //return; //} - //LogFile->write(EQEMuLog::Debug, "HandlePacket() OP_SetDataRate request : %f", *(float*) app->pBuffer); + //LogFile->write(EQEMuLog::Debug, "HandlePacket() OP_SetDataRate request : %f", *(float*) app->pBuffer); //float tmpDR = *(float*) app->pBuffer; //if (tmpDR <= 0.0f) { //LogFile->write(EQEMuLog::Error,"HandlePacket() OP_SetDataRate INVALID request : %f <= 0", tmpDR); @@ -555,7 +555,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) //DO NOT FORGET TO EDIT ZoneDatabase::GetCharacterInfoForLogin if you change this dbaw->AddQuery(2, &query, MakeAnyLenString(&query, "SELECT id,profile,zonename,x,y,z,guild_id,rank,extprofile,class,level,lfp,lfg,instanceid,xtargets,firstlogon" - " FROM character_ LEFT JOIN guild_members ON id=char_id WHERE id=%i", + " FROM character_ LEFT JOIN guild_members ON id=char_id WHERE id=%i", character_id)); dbaw->AddQuery(3, &query, MakeAnyLenString(&query, "SELECT faction_id,current_value FROM faction_values WHERE temp = 0 AND char_id = %i", @@ -880,7 +880,7 @@ void Client::Handle_Connect_OP_ClientError(const EQApplicationPacket *app) LogFile->write(EQEMuLog::Error, "Error message: %s", error->message); Message(13, error->message); #if (EQDEBUG>=5) - DumpPacket(app); + DumpPacket(app); #endif return; } @@ -1205,7 +1205,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) rewind_y_diff *= rewind_y_diff; //We only need to store updated values if the player has moved. - //If the player has moved more than units for x or y, then we'll store + //If the player has moved more than units for x or y, then we'll store //his pre-PPU x and y for /rewind, in case he gets stuck. if ((rewind_x_diff > 750) || (rewind_y_diff > 750)) { rewind_x = x_pos; @@ -1214,7 +1214,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) } //If the PPU was a large jump, such as a cross zone gate or Call of Hero, - //just update rewind coords to the new ppu coords. This will prevent exploitation. + //just update rewind coords to the new ppu coords. This will prevent exploitation. if ((rewind_x_diff > 5000) || (rewind_y_diff > 5000)) { rewind_x = ppu->x_pos; @@ -1224,7 +1224,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) if(proximity_timer.Check()) { entity_list.ProcessMove(this, ppu->x_pos, ppu->y_pos, ppu->z_pos); - if(RuleB(TaskSystem, EnableTaskSystem) && RuleB(TaskSystem,EnableTaskProximity)) + if(RuleB(TaskSystem, EnableTaskSystem) && RuleB(TaskSystem,EnableTaskProximity)) ProcessTaskProximities(ppu->x_pos, ppu->y_pos, ppu->z_pos); proximity_x = ppu->x_pos; proximity_y = ppu->y_pos; @@ -1245,7 +1245,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) // Break Hide if moving without sneaking and set rewind timer if moved if(ppu->y_pos != y_pos || ppu->x_pos != x_pos){ - if((hidden || improved_hidden) && !sneaking){ + if((hidden || improved_hidden) && !sneaking){ hidden = false; improved_hidden = false; if(!invisible) { @@ -1285,7 +1285,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) if(zone->watermap) { - if(zone->watermap->InLiquid(x_pos, y_pos, z_pos)) + if(zone->watermap->InLiquid(x_pos, y_pos, z_pos)) { CheckIncreaseSkill(SWIMMING, nullptr, -17); } @@ -1428,9 +1428,9 @@ void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app) if(nt) { SetTarget(nt); - if((nt->IsClient() && !nt->CastToClient()->GetPVP()) || - (nt->IsPet() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP()) || - (nt->IsMerc() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP())) + if ((nt->IsClient() && !nt->CastToClient()->GetPVP()) || + (nt->IsPet() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP()) || + (nt->IsMerc() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP())) nt->SendBuffsToClient(this); } else @@ -2067,7 +2067,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) if(parse->ItemHasQuestSub(p_inst, "EVENT_ITEM_CLICK")) { - parse->EventItem(EVENT_ITEM_CLICK, this, p_inst, p_inst->GetID(), slot_id); + parse->EventItem(EVENT_ITEM_CLICK, this, p_inst, p_inst->GetID(), slot_id); inst = m_inv[slot_id]; if (!inst) { @@ -2288,7 +2288,7 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app) Mob* tmp = entity_list.GetMob(eid->entity_id); if (tmp == 0 || !tmp->IsNPC() || ((tmp->GetClass() != ADVENTUREMERCHANT) && - (tmp->GetClass() != DISCORD_MERCHANT) && (tmp->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (tmp->GetClass() != DARK_REIGN_MERCHANT))) + (tmp->GetClass() != DISCORD_MERCHANT) && (tmp->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (tmp->GetClass() != DARK_REIGN_MERCHANT))) return; //you have to be somewhat close to them to be properly using them @@ -2303,14 +2303,14 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app) std::list::const_iterator itr; for(itr = merlist.begin();itr != merlist.end() && count<255;itr++){ const MerchantList &ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tmp->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tmp->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } item = database.GetItem(ml.item); if(item) @@ -2383,7 +2383,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app) uint32 merchantid = 0; Mob* tmp = entity_list.GetMob(aps->npcid); if (tmp == 0 || !tmp->IsNPC() || ((tmp->GetClass() != ADVENTUREMERCHANT) && - (tmp->GetClass() != DISCORD_MERCHANT) && (tmp->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (tmp->GetClass() != DARK_REIGN_MERCHANT))) + (tmp->GetClass() != DISCORD_MERCHANT) && (tmp->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (tmp->GetClass() != DARK_REIGN_MERCHANT))) return; //you have to be somewhat close to them to be properly using them @@ -2399,18 +2399,18 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app) for(itr = merlist.begin();itr != merlist.end();itr++){ MerchantList ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tmp->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tmp->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } - item = database.GetItem(ml.item); - if(!item) - continue; + item = database.GetItem(ml.item); + if(!item) + continue; if(item->ID == aps->itemid) { //This check to make sure that the item is actually on the NPC, people attempt to inject packets to get items summoned... found = true; break; @@ -2651,15 +2651,15 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app) } } - if(con->faction == FACTION_APPREHENSIVE) { - con->faction = FACTION_SCOWLS; - } else if(con->faction == FACTION_DUBIOUS) { - con->faction = FACTION_THREATENLY; - } else if(con->faction == FACTION_SCOWLS) { - con->faction = FACTION_APPREHENSIVE; - } else if(con->faction == FACTION_THREATENLY) { - con->faction = FACTION_DUBIOUS; - } + if(con->faction == FACTION_APPREHENSIVE) { + con->faction = FACTION_SCOWLS; + } else if(con->faction == FACTION_DUBIOUS) { + con->faction = FACTION_THREATENLY; + } else if(con->faction == FACTION_SCOWLS) { + con->faction = FACTION_APPREHENSIVE; + } else if(con->faction == FACTION_THREATENLY) { + con->faction = FACTION_DUBIOUS; + } mod_consider(tmob, con); @@ -3196,7 +3196,7 @@ void Client::Handle_OP_Death(const EQApplicationPacket *app) void Client::Handle_OP_MoveCoin(const EQApplicationPacket *app) { if(app->size != sizeof(MoveCoin_Struct)){ - LogFile->write(EQEMuLog::Error, "Wrong size on OP_MoveCoin. Got: %i, Expected: %i", app->size, sizeof(MoveCoin_Struct)); + LogFile->write(EQEMuLog::Error, "Wrong size on OP_MoveCoin. Got: %i, Expected: %i", app->size, sizeof(MoveCoin_Struct)); DumpPacket(app); return; } @@ -3207,7 +3207,7 @@ void Client::Handle_OP_MoveCoin(const EQApplicationPacket *app) void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app) { if(app->size != sizeof(ItemViewRequest_Struct)){ - LogFile->write(EQEMuLog::Error, "Wrong size on OP_ItemLinkClick. Got: %i, Expected: %i", app->size, sizeof(ItemViewRequest_Struct)); + LogFile->write(EQEMuLog::Error, "Wrong size on OP_ItemLinkClick. Got: %i, Expected: %i", app->size, sizeof(ItemViewRequest_Struct)); DumpPacket(app); return; } @@ -3264,8 +3264,8 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app) { if(silentsaylink) { - parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, response.c_str(), 0); - parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0); + parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, response.c_str(), 0); + parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0); } else { @@ -3351,7 +3351,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app) casting_spell_id); database.SetMQDetectionFlag(AccountName(), GetName(), detect, zone->GetShortName()); safe_delete_array(detect); - Kick(); // Kick client to prevent client and server from getting out-of-sync inventory slots + Kick(); // Kick client to prevent client and server from getting out-of-sync inventory slots return; } } @@ -3359,25 +3359,25 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app) // Illegal bagslot useage checks. Currently, user only receives a message if this check is triggered. bool mi_hack = false; - if(mi->from_slot >= 251 && mi->from_slot <= 340) { + if(mi->from_slot >= 251 && mi->from_slot <= 340) { if(mi->from_slot > 330) { mi_hack = true; } - else { + else { int16 from_parent = m_inv.CalcSlotId(mi->from_slot); if(!m_inv[from_parent]) { mi_hack = true; } else if(!m_inv[from_parent]->IsType(ItemClassContainer)) { mi_hack = true; } else if(m_inv.CalcBagIdx(mi->from_slot) >= m_inv[from_parent]->GetItem()->BagSlots) { mi_hack = true; } - } - } + } + } - if(mi->to_slot >= 251 && mi->to_slot <= 340) { + if(mi->to_slot >= 251 && mi->to_slot <= 340) { if(mi->to_slot > 330) { mi_hack = true; } else { int16 to_parent = m_inv.CalcSlotId(mi->to_slot); if(!m_inv[to_parent]) { mi_hack = true; } else if(!m_inv[to_parent]->IsType(ItemClassContainer)) { mi_hack = true; } else if(m_inv.CalcBagIdx(mi->to_slot) >= m_inv[to_parent]->GetItem()->BagSlots) { mi_hack = true; } - } - } + } + } if(mi_hack) { Message(15, "Caution: Illegal use of inaccessable bag slots!"); } @@ -3469,7 +3469,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app) void Client::Handle_OP_Sneak(const EQApplicationPacket *app) { - if(!HasSkill(SNEAK) && GetSkill(SNEAK) == 0) { + if(!HasSkill(SNEAK) && GetSkill(SNEAK) == 0) { return; //You cannot sneak if you do not have sneak } @@ -3667,7 +3667,7 @@ void Client::Handle_OP_WhoAllRequest(const EQApplicationPacket *app) void Client::Handle_OP_FriendsWho(const EQApplicationPacket *app) { - char *FriendsString = (char*) app->pBuffer; + char *FriendsString = (char*) app->pBuffer; FriendsWho(FriendsString); return; } @@ -4618,7 +4618,7 @@ LogFile->write(EQEMuLog::Debug, "OP CastSpell: slot=%d, spell=%d, target=%d, inv ItemInst* p_inst = (ItemInst*)inst; if(parse->ItemHasQuestSub(p_inst, "EVENT_ITEM_CLICK_CAST")) { - parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, p_inst->GetID(), castspell->inventoryslot); + parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, p_inst->GetID(), castspell->inventoryslot); SendSpellBarEnable(castspell->spell_id); return; } @@ -4639,7 +4639,7 @@ LogFile->write(EQEMuLog::Debug, "OP CastSpell: slot=%d, spell=%d, target=%d, inv ItemInst* p_inst = (ItemInst*)inst; if(parse->ItemHasQuestSub(p_inst, "EVENT_ITEM_CLICK_CAST")) { - parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, p_inst->GetID(), castspell->inventoryslot); + parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, p_inst->GetID(), castspell->inventoryslot); SendSpellBarEnable(castspell->spell_id); return; } @@ -4828,7 +4828,7 @@ void Client::Handle_OP_RezzAnswer(const EQApplicationPacket *app) const Resurrect_Struct* ra = (const Resurrect_Struct*) app->pBuffer; _log(SPELLS__REZ, "Received OP_RezzAnswer from client. Pendingrezzexp is %i, action is %s", - PendingRezzXP, ra->action ? "ACCEPT" : "DECLINE"); + PendingRezzXP, ra->action ? "ACCEPT" : "DECLINE"); _pkt(SPELLS__REZ, app); @@ -4875,9 +4875,9 @@ void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app) tradee->CastToClient()->QueuePacket(app); } #ifndef BOTS - else if (tradee && tradee->IsNPC()) { + else if (tradee && tradee->IsNPC()) { #else - else if (tradee && (tradee->IsNPC() || tradee->IsBot())) { + else if (tradee && (tradee->IsNPC() || tradee->IsBot())) { #endif //npcs always accept trade->Start(msg->to_mob_id); @@ -5186,7 +5186,7 @@ void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app) return; } if (!usedname) { - Message(13, "%s is already in use. Operation failed!", gmn->newname); + Message(13, "%s is already in use. Operation failed!", gmn->newname); return; } @@ -5414,7 +5414,7 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app) outtcs->Approval = Customer->WithCustomer(GetID()); else { _log(TRADING__CLIENT, "Client::Handle_OP_TraderShop: entity_list.GetClientByID(tcs->traderid)" - " returned a nullptr pointer"); + " returned a nullptr pointer"); return; } @@ -5521,7 +5521,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app) mco->playerid = 0; mco->command = action; // Merchant command 0x01 = open if (RuleB(Merchant, UsePriceMod)){ - mco->rate = 1/((RuleR(Merchant, BuyCostMod))*Client::CalcPriceMod(tmp,true)); // works + mco->rate = 1/((RuleR(Merchant, BuyCostMod))*Client::CalcPriceMod(tmp,true)); // works } else mco->rate = 1/(RuleR(Merchant, BuyCostMod)); @@ -5566,7 +5566,7 @@ void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app) } return; } - else { + else { _log(TRADING__CLIENT, "Malformed BazaarSearch_Struct packe, Action %it received, ignoring..."); LogFile->write(EQEMuLog::Error, "Malformed BazaarSearch_Struct packet received, ignoring...\n"); } @@ -5609,14 +5609,14 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) std::list::const_iterator itr; for(itr = merlist.begin();itr != merlist.end();itr++){ MerchantList ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tmp->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tmp->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } if(mp->itemslot == ml.slot){ item_id = ml.item; @@ -5771,28 +5771,28 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) ServerPacket* qspack = new ServerPacket(ServerOP_QSMerchantLogTransactions, sizeof(QSMerchantLogTransaction_Struct) + sizeof(QSTransactionItems_Struct)); QSMerchantLogTransaction_Struct* qsaudit = (QSMerchantLogTransaction_Struct*)qspack->pBuffer; - qsaudit->zone_id = zone->GetZoneID(); - qsaudit->merchant_id = tmp->CastToNPC()->MerchantType; - qsaudit->merchant_money.platinum = 0; - qsaudit->merchant_money.gold = 0; - qsaudit->merchant_money.silver = 0; - qsaudit->merchant_money.copper = 0; - qsaudit->merchant_count = 1; - qsaudit->char_id = character_id; - qsaudit->char_money.platinum = (mpo->price / 1000); - qsaudit->char_money.gold = (mpo->price / 100) % 10; - qsaudit->char_money.silver = (mpo->price / 10) % 10; - qsaudit->char_money.copper = mpo->price % 10; - qsaudit->char_count = 0; + qsaudit->zone_id = zone->GetZoneID(); + qsaudit->merchant_id = tmp->CastToNPC()->MerchantType; + qsaudit->merchant_money.platinum = 0; + qsaudit->merchant_money.gold = 0; + qsaudit->merchant_money.silver = 0; + qsaudit->merchant_money.copper = 0; + qsaudit->merchant_count = 1; + qsaudit->char_id = character_id; + qsaudit->char_money.platinum = (mpo->price / 1000); + qsaudit->char_money.gold = (mpo->price / 100) % 10; + qsaudit->char_money.silver = (mpo->price / 10) % 10; + qsaudit->char_money.copper = mpo->price % 10; + qsaudit->char_count = 0; - qsaudit->items[0].char_slot = freeslotid; - qsaudit->items[0].item_id = m_inv[freeslotid]->GetID(); - qsaudit->items[0].charges = mpo->quantity; - qsaudit->items[0].aug_1 = m_inv[freeslotid]->GetAugmentItemID(1); - qsaudit->items[0].aug_2 = m_inv[freeslotid]->GetAugmentItemID(2); - qsaudit->items[0].aug_3 = m_inv[freeslotid]->GetAugmentItemID(3); - qsaudit->items[0].aug_4 = m_inv[freeslotid]->GetAugmentItemID(4); - qsaudit->items[0].aug_5 = m_inv[freeslotid]->GetAugmentItemID(5); + qsaudit->items[0].char_slot = freeslotid; + qsaudit->items[0].item_id = m_inv[freeslotid]->GetID(); + qsaudit->items[0].charges = mpo->quantity; + qsaudit->items[0].aug_1 = m_inv[freeslotid]->GetAugmentItemID(1); + qsaudit->items[0].aug_2 = m_inv[freeslotid]->GetAugmentItemID(2); + qsaudit->items[0].aug_3 = m_inv[freeslotid]->GetAugmentItemID(3); + qsaudit->items[0].aug_4 = m_inv[freeslotid]->GetAugmentItemID(4); + qsaudit->items[0].aug_5 = m_inv[freeslotid]->GetAugmentItemID(5); qspack->Deflate(); if(worldserver.Connected()) { worldserver.SendPacket(qspack); } @@ -5908,28 +5908,28 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app) ServerPacket* qspack = new ServerPacket(ServerOP_QSMerchantLogTransactions, sizeof(QSMerchantLogTransaction_Struct) + sizeof(QSTransactionItems_Struct)); QSMerchantLogTransaction_Struct* qsaudit = (QSMerchantLogTransaction_Struct*)qspack->pBuffer; - qsaudit->zone_id = zone->GetZoneID(); - qsaudit->merchant_id = vendor->CastToNPC()->MerchantType; - qsaudit->merchant_money.platinum = (price / 1000); - qsaudit->merchant_money.gold = (price / 100) % 10; - qsaudit->merchant_money.silver = (price / 10) % 10; - qsaudit->merchant_money.copper = price % 10; - qsaudit->merchant_count = 0; - qsaudit->char_id = character_id; - qsaudit->char_money.platinum = 0; - qsaudit->char_money.gold = 0; - qsaudit->char_money.silver = 0; - qsaudit->char_money.copper = 0; - qsaudit->char_count = 1; + qsaudit->zone_id = zone->GetZoneID(); + qsaudit->merchant_id = vendor->CastToNPC()->MerchantType; + qsaudit->merchant_money.platinum = (price / 1000); + qsaudit->merchant_money.gold = (price / 100) % 10; + qsaudit->merchant_money.silver = (price / 10) % 10; + qsaudit->merchant_money.copper = price % 10; + qsaudit->merchant_count = 0; + qsaudit->char_id = character_id; + qsaudit->char_money.platinum = 0; + qsaudit->char_money.gold = 0; + qsaudit->char_money.silver = 0; + qsaudit->char_money.copper = 0; + qsaudit->char_count = 1; - qsaudit->items[0].char_slot = mp->itemslot; - qsaudit->items[0].item_id = itemid; - qsaudit->items[0].charges = charges; - qsaudit->items[0].aug_1 = m_inv[mp->itemslot]->GetAugmentItemID(1); - qsaudit->items[0].aug_2 = m_inv[mp->itemslot]->GetAugmentItemID(2); - qsaudit->items[0].aug_3 = m_inv[mp->itemslot]->GetAugmentItemID(3); - qsaudit->items[0].aug_4 = m_inv[mp->itemslot]->GetAugmentItemID(4); - qsaudit->items[0].aug_5 = m_inv[mp->itemslot]->GetAugmentItemID(5); + qsaudit->items[0].char_slot = mp->itemslot; + qsaudit->items[0].item_id = itemid; + qsaudit->items[0].charges = charges; + qsaudit->items[0].aug_1 = m_inv[mp->itemslot]->GetAugmentItemID(1); + qsaudit->items[0].aug_2 = m_inv[mp->itemslot]->GetAugmentItemID(2); + qsaudit->items[0].aug_3 = m_inv[mp->itemslot]->GetAugmentItemID(3); + qsaudit->items[0].aug_4 = m_inv[mp->itemslot]->GetAugmentItemID(4); + qsaudit->items[0].aug_5 = m_inv[mp->itemslot]->GetAugmentItemID(5); qspack->Deflate(); if(worldserver.Connected()) { worldserver.SendPacket(qspack); } @@ -5951,7 +5951,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app) mco->price=price; QueuePacket(outapp); safe_delete(outapp); - SendMoneyUpdate(); + SendMoneyUpdate(); t1.start(); Save(1); t1.stop(); @@ -5968,7 +5968,7 @@ void Client::Handle_OP_ShopEnd(const EQApplicationPacket *app) //outapp->pBuffer[1] = 0x66; //QueuePacket(outapp); //safe_delete(outapp); - //Save(); + //Save(); return; } @@ -6086,7 +6086,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app) LogFile->write(EQEMuLog::Debug, "Requested Favorites for: %d - %d\n", tsf->object_type, tsf->some_id); // results show that object_type is combiner type - // some_id = 0 if world combiner, item number otherwise + // some_id = 0 if world combiner, item number otherwise // make where clause segment for container(s) char containers[30]; @@ -6099,7 +6099,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app) } char *query = 0; - char buf[5500]; //gotta be big enough for 500 IDs + char buf[5500]; //gotta be big enough for 500 IDs bool first = true; uint16 r; @@ -6129,7 +6129,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app) " LEFT JOIN tradeskill_recipe_entries AS tre ON tr.id=tre.recipe_id " " LEFT JOIN (SELECT recipe_id, madecount FROM char_recipe_list WHERE char_id = %u) AS crl ON tr.id=crl.recipe_id " " WHERE tr.id IN (%s) " - " AND tr.must_learn & 0x20 <> 0x20 AND ((tr.must_learn & 0x3 <> 0 AND crl.madecount IS NOT NULL) OR (tr.must_learn & 0x3 = 0)) " + " AND tr.must_learn & 0x20 <> 0x20 AND ((tr.must_learn & 0x3 <> 0 AND crl.madecount IS NOT NULL) OR (tr.must_learn & 0x3 = 0)) " " GROUP BY tr.id " " HAVING sum(if(tre.item_id %s AND tre.iscontainer > 0,1,0)) > 0 " " LIMIT 100 ", CharacterID(), buf, containers); @@ -6184,7 +6184,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app) " LEFT JOIN tradeskill_recipe_entries AS tre ON tr.id=tre.recipe_id " " LEFT JOIN (SELECT recipe_id, madecount FROM char_recipe_list WHERE char_id = %u) AS crl ON tr.id=crl.recipe_id " " WHERE %s tr.trivial >= %u AND tr.trivial <= %u " - " AND tr.must_learn & 0x20 <> 0x20 AND((tr.must_learn & 0x3 <> 0 AND crl.madecount IS NOT NULL) OR (tr.must_learn & 0x3 = 0)) " + " AND tr.must_learn & 0x20 <> 0x20 AND((tr.must_learn & 0x3 <> 0 AND crl.madecount IS NOT NULL) OR (tr.must_learn & 0x3 = 0)) " " GROUP BY tr.id " " HAVING sum(if(tre.item_id %s AND tre.iscontainer > 0,1,0)) > 0 " " LIMIT 200 " @@ -6294,13 +6294,13 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app) if(!currentdoor) { Message(0,"Unable to find door, please notify a GM (DoorID: %i).",cd->doorid); - return; + return; } char buf[20]; snprintf(buf, 19, "%u %u", cd->doorid, zone->GetInstanceVersion()); buf[19] = '\0'; - parse->EventPlayer(EVENT_CLICKDOOR, this, buf, 0); + parse->EventPlayer(EVENT_CLICKDOOR, this, buf, 0); currentdoor->HandleClick(this,0); return; @@ -6393,7 +6393,7 @@ void Client::Handle_OP_GroupInvite2(const EQApplicationPacket *app) #endif } else - { + { ServerPacket* pack = new ServerPacket(ServerOP_GroupInvite, sizeof(GroupInvite_Struct)); memcpy(pack->pBuffer, gis, sizeof(GroupInvite_Struct)); worldserver.SendPacket(pack); @@ -6418,7 +6418,7 @@ void Client::Handle_OP_GroupCancelInvite(const EQApplicationPacket *app) GroupCancel_Struct* gf = (GroupCancel_Struct*) app->pBuffer; Mob* inviter = entity_list.GetClientByName(gf->name1); - if(inviter != nullptr) + if(inviter != nullptr) { if(inviter->IsClient()) inviter->CastToClient()->QueuePacket(app); @@ -6856,14 +6856,14 @@ void Client::Handle_OP_InspectAnswer(const EQApplicationPacket *app) { } //Fills the app sent from client. - EQApplicationPacket* outapp = app->Copy(); - InspectResponse_Struct* insr = (InspectResponse_Struct*) outapp->pBuffer; - Mob* tmp = entity_list.GetMob(insr->TargetID); - const Item_Struct* item = nullptr; + EQApplicationPacket* outapp = app->Copy(); + InspectResponse_Struct* insr = (InspectResponse_Struct*) outapp->pBuffer; + Mob* tmp = entity_list.GetMob(insr->TargetID); + const Item_Struct* item = nullptr; for (int16 L = 0; L <= 20; L++) { const ItemInst* inst = GetInv().GetItem(L); - item = inst ? inst->GetItem() : nullptr; + item = inst ? inst->GetItem() : nullptr; if(item) { strcpy(insr->itemnames[L], item->Name); @@ -7210,7 +7210,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } case PET_TAUNT: { if((mypet->GetPetType() == petAnimation && GetAA(aaAnimationEmpathy) >= 3) || mypet->GetPetType() != petAnimation) { - Message_StringID(MT_PetResponse, PET_DO_TAUNT); + Message_StringID(MT_PetResponse, PET_DO_TAUNT); mypet->CastToNPC()->SetTaunting(true); } break; @@ -7294,7 +7294,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } break; } - case PET_FOCUS: { + case PET_FOCUS: { if(GetAA(aaAdvancedPetDiscipline) >= 1 && mypet->IsNPC()) { if (mypet->IsFeared()) break; @@ -7308,7 +7308,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } break; } - case PET_FOCUS_ON: { + case PET_FOCUS_ON: { if(GetAA(aaAdvancedPetDiscipline) >= 1 && mypet->IsNPC()) { if (mypet->IsFeared()) break; @@ -7319,7 +7319,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } break; } - case PET_FOCUS_OFF: { + case PET_FOCUS_OFF: { if(GetAA(aaAdvancedPetDiscipline) >= 1 && mypet->IsNPC()) { if (mypet->IsFeared()) break; @@ -7405,7 +7405,7 @@ void Client::Handle_OP_PetitionRefresh(const EQApplicationPacket *app) { // This is When Client Asks for Petition Again and Again... // break is here because it floods the zones and causes lag if it - // Were to actually do something:P We update on our own schedule now. + // Were to actually do something:P We update on our own schedule now. return; } @@ -7456,8 +7456,8 @@ void Client::Handle_OP_Emote(const EQApplicationPacket *app) cptr = outapp->pBuffer + 2; - // not sure if live does this or not. thought it was a nice feature, but would take a lot to - // clean up grammatical and other errors. Maybe with a regex parser... + // not sure if live does this or not. thought it was a nice feature, but would take a lot to + // clean up grammatical and other errors. Maybe with a regex parser... replacestr((char *)cptr, target->GetName(), "you"); replacestr((char *)cptr, " he", " you"); replacestr((char *)cptr, " she", " you"); @@ -7642,14 +7642,14 @@ void Client::Handle_OP_Fishing(const EQApplicationPacket *app) } if (CanFish()) { - parse->EventPlayer(EVENT_FISH_START, this, "", 0); + parse->EventPlayer(EVENT_FISH_START, this, "", 0); //these will trigger GoFish() after a delay if we're able to actually fish, and if not, we won't stop the client from trying again immediately (although we may need to tell it to repop the button) p_timers.Start(pTimerFishing, FishingReuseTime-1); fishing_timer.Start(); } return; -// Changes made based on Bobs work on foraging. Now can set items in the forage database table to +// Changes made based on Bobs work on foraging. Now can set items in the forage database table to // forage for. } @@ -7704,11 +7704,11 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app) Message_StringID(4,MEND_SUCCESS); } else { /* the purpose of the following is to make the chance to worsen wounds much less common, - which is more consistent with the way eq live works. - according to my math, this should result in the following probability: - 0 skill - 25% chance to worsen - 20 skill - 23% chance to worsen - 50 skill - 16% chance to worsen */ + which is more consistent with the way eq live works. + according to my math, this should result in the following probability: + 0 skill - 25% chance to worsen + 20 skill - 23% chance to worsen + 50 skill - 16% chance to worsen */ if ((GetSkill(MEND) <= 75) && (MakeRandomInt(GetSkill(MEND),100) < 75) && (MakeRandomInt(1, 3) == 1)) { SetHP(currenthp > mendhp ? (GetHP() - mendhp) : 1); @@ -7957,10 +7957,10 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app) } for (uint32 i = 0; i < max_items; i++) { - if(database.GetItem(gis->Items[i])) { + if(database.GetItem(gis->Items[i])) { database.SaveTraderItem(this->CharacterID(),gis->Items[i],gis->SerialNumber[i], gis->Charges[i],ints->ItemCost[i],i); - } else { + } else { //return; //sony doesnt memset so assume done on first bad item break; } @@ -7991,7 +7991,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app) } else { _log(TRADING__CLIENT,"Client::Handle_OP_Trader: Unknown TraderStruct code of: %i\n", - ints->Code); + ints->Code); LogFile->write(EQEMuLog::Error, "Unknown TraderStruct code of: %i\n", ints->Code); } @@ -8124,7 +8124,7 @@ void Client::Handle_OP_Bind_Wound(const EQApplicationPacket *app) BindWound_Struct* bind_in = (BindWound_Struct*) app->pBuffer; Mob* bindmob = entity_list.GetMob(bind_in->to); if (!bindmob){ - LogFile->write(EQEMuLog::Error, "Bindwound on non-exsistant mob from %s", this->GetName()); + LogFile->write(EQEMuLog::Error, "Bindwound on non-exsistant mob from %s", this->GetName()); } else { LogFile->write(EQEMuLog::Debug, "BindWound in: to:\'%s\' from=\'%s\'", bindmob->GetName(), GetName()); @@ -8176,7 +8176,7 @@ void Client::Handle_OP_TrackUnknown(const EQApplicationPacket *app) void Client::Handle_0x0193(const EQApplicationPacket *app) { - // Not sure what this opcode does. It started being sent when OP_ClientUpdate was + // Not sure what this opcode does. It started being sent when OP_ClientUpdate was // changed to pump OP_ClientUpdate back out instead of OP_MobUpdate // 2 bytes: 00 00 } @@ -8226,9 +8226,9 @@ void Client::Handle_OP_Split(const EQApplicationPacket *app) } if(!TakeMoneyFromPP(static_cast(split->copper) + - 10 * static_cast(split->silver) + - 100 * static_cast(split->gold) + - 1000 * static_cast(split->platinum))) { + 10 * static_cast(split->silver) + + 100 * static_cast(split->gold) + + 1000 * static_cast(split->platinum))) { Message(13, "You do not have enough money to do that split."); return; } @@ -8362,7 +8362,7 @@ void Client::Handle_OP_OpenTributeMaster(const EQApplicationPacket *app) _pkt(TRIBUTE__IN, app); if(app->size != sizeof(StartTribute_Struct)) - printf("Error in OP_OpenTributeMaster. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); + printf("Error in OP_OpenTributeMaster. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); else { //Opens the tribute master window StartTribute_Struct* st = (StartTribute_Struct*)app->pBuffer; @@ -8387,7 +8387,7 @@ void Client::Handle_OP_OpenGuildTributeMaster(const EQApplicationPacket *app) _pkt(TRIBUTE__IN, app); if(app->size != sizeof(StartTribute_Struct)) - printf("Error in OP_OpenGuildTributeMaster. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); + printf("Error in OP_OpenGuildTributeMaster. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); else { //Opens the guild tribute master window StartTribute_Struct* st = (StartTribute_Struct*)app->pBuffer; @@ -8413,7 +8413,7 @@ void Client::Handle_OP_TributeItem(const EQApplicationPacket *app) //player donates an item... if(app->size != sizeof(TributeItem_Struct)) - printf("Error in OP_TributeItem. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); + printf("Error in OP_TributeItem. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); else { TributeItem_Struct* t = (TributeItem_Struct*)app->pBuffer; @@ -8442,7 +8442,7 @@ void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app) //player donates money if(app->size != sizeof(TributeMoney_Struct)) - printf("Error in OP_TributeMoney. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); + printf("Error in OP_TributeMoney. Expected size of: %lu, but got: %i\n",sizeof(StartTribute_Struct),app->size); else { TributeMoney_Struct* t = (TributeMoney_Struct*)app->pBuffer; @@ -8532,7 +8532,7 @@ void Client::Handle_OP_ControlBoat(const EQApplicationPacket *app) if (boat == 0) return; // do nothing if the boat isn't valid - if(!boat->IsNPC() || (boat->GetRace() != CONTROLLED_BOAT && boat->GetRace() != 502)) + if(!boat->IsNPC() || (boat->GetRace() != CONTROLLED_BOAT && boat->GetRace() != 502)) { char *hacked_string = nullptr; MakeAnyLenString(&hacked_string, "OP_Control Boat was sent against %s which is of race %u", boat->GetName(), boat->GetRace()); @@ -8542,7 +8542,7 @@ void Client::Handle_OP_ControlBoat(const EQApplicationPacket *app) } if (cbs->TakeControl) { - // this uses the boat's target to indicate who has control of it. It has to check hate to make sure the boat isn't actually attacking anyone. + // this uses the boat's target to indicate who has control of it. It has to check hate to make sure the boat isn't actually attacking anyone. if ((boat->GetTarget() == 0) || (boat->GetTarget() == this && boat->GetHateAmount(this) == 0)) { boat->SetTarget(this); } @@ -8590,7 +8590,7 @@ void Client::Handle_OP_Ignore(const EQApplicationPacket *app) void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app) { if(app->size != sizeof(FindPersonRequest_Struct)) - printf("Error in FindPersonRequest_Struct. Expected size of: %lu, but got: %i\n",sizeof(FindPersonRequest_Struct),app->size); + printf("Error in FindPersonRequest_Struct. Expected size of: %lu, but got: %i\n",sizeof(FindPersonRequest_Struct),app->size); else { FindPersonRequest_Struct* t = (FindPersonRequest_Struct*)app->pBuffer; @@ -8607,9 +8607,9 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app) } if(!RuleB(Pathing, Find) && RuleB(Bazaar, EnableWarpToTrader) && target->IsClient() && (target->CastToClient()->Trader || - target->CastToClient()->Buyer)) { + target->CastToClient()->Buyer)) { Message(15, "Moving you to Trader %s", target->GetName()); - MovePC(zone->GetZoneID(), zone->GetInstanceID(), target->GetX(), target->GetY(), target->GetZ() , 0.0f); + MovePC(zone->GetZoneID(), zone->GetInstanceID(), target->GetX(), target->GetY(), target->GetZ() , 0.0f); } else Message(13, "Found NPC '%s'\n", target->GetName()); @@ -8663,9 +8663,9 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app) } // Live appears to send the points in this order: - // Final destination. - // Current Position. - // rest of the points. + // Final destination. + // Current Position. + // rest of the points. FindPerson_Point p; int PointNumber = 0; @@ -9054,30 +9054,30 @@ bool Client::FinishConnState2(DBAsyncWork* dbaw) { UnmemSpell(z, false); } - database.LoadBuffs(this); - uint32 max_slots = GetMaxBuffSlots(); - for(int i = 0; i < max_slots; i++) { - if(buffs[i].spellid != SPELL_UNKNOWN) { - m_pp.buffs[i].spellid = buffs[i].spellid; - m_pp.buffs[i].bard_modifier = 10; - m_pp.buffs[i].slotid = 2; - m_pp.buffs[i].player_id = 0x2211; - m_pp.buffs[i].level = buffs[i].casterlevel; - m_pp.buffs[i].effect = 0; - m_pp.buffs[i].duration = buffs[i].ticsremaining; - m_pp.buffs[i].counters = buffs[i].counters; - } else { - m_pp.buffs[i].spellid = SPELLBOOK_UNKNOWN; - m_pp.buffs[i].bard_modifier = 10; - m_pp.buffs[i].slotid = 0; - m_pp.buffs[i].player_id = 0; - m_pp.buffs[i].level = 0; - m_pp.buffs[i].effect = 0; - m_pp.buffs[i].duration = 0; - m_pp.buffs[i].counters = 0; - } - } - } + database.LoadBuffs(this); + uint32 max_slots = GetMaxBuffSlots(); + for(int i = 0; i < max_slots; i++) { + if(buffs[i].spellid != SPELL_UNKNOWN) { + m_pp.buffs[i].spellid = buffs[i].spellid; + m_pp.buffs[i].bard_modifier = 10; + m_pp.buffs[i].slotid = 2; + m_pp.buffs[i].player_id = 0x2211; + m_pp.buffs[i].level = buffs[i].casterlevel; + m_pp.buffs[i].effect = 0; + m_pp.buffs[i].duration = buffs[i].ticsremaining; + m_pp.buffs[i].counters = buffs[i].counters; + } else { + m_pp.buffs[i].spellid = SPELLBOOK_UNKNOWN; + m_pp.buffs[i].bard_modifier = 10; + m_pp.buffs[i].slotid = 0; + m_pp.buffs[i].player_id = 0; + m_pp.buffs[i].level = 0; + m_pp.buffs[i].effect = 0; + m_pp.buffs[i].duration = 0; + m_pp.buffs[i].counters = 0; + } + } + } KeyRingLoad(); @@ -9442,7 +9442,7 @@ void Client::CompleteConnect() for (int x1=0; x1 < EFFECT_COUNT; x1++) { switch (spell.effectid[x1]) { - case SE_IllusionCopy: + case SE_IllusionCopy: case SE_Illusion: { if (spell.base[x1] == -1) { if (gender == 1) @@ -9523,17 +9523,17 @@ void Client::CompleteConnect() } case SE_Levitate: { - if( !zone->CanLevitate() ) - { - if(!GetGM()) - { - SendAppearancePacket(AT_Levitate, 0); - BuffFadeByEffect(SE_Levitate); - Message(13, "You can't levitate in this zone."); - } - }else{ - SendAppearancePacket(AT_Levitate, 2); - } + if( !zone->CanLevitate() ) + { + if(!GetGM()) + { + SendAppearancePacket(AT_Levitate, 0); + BuffFadeByEffect(SE_Levitate); + Message(13, "You can't levitate in this zone."); + } + }else{ + SendAppearancePacket(AT_Levitate, 2); + } break; } case SE_InvisVsUndead2: @@ -9548,7 +9548,7 @@ void Client::CompleteConnect() break; } case SE_AddMeleeProc: - case SE_WeaponProc: + case SE_WeaponProc: { AddProcToWeapon(GetProcID(buffs[j1].spellid, x1), false, 100+spells[buffs[j1].spellid].base2[x1]); break; @@ -9603,10 +9603,10 @@ void Client::CompleteConnect() if(GetGroup()) database.RefreshGroupFromDB(this); - if(RuleB(TaskSystem, EnableTaskSystem)) - TaskPeriodic_Timer.Start(); - else - TaskPeriodic_Timer.Disable(); + if(RuleB(TaskSystem, EnableTaskSystem)) + TaskPeriodic_Timer.Start(); + else + TaskPeriodic_Timer.Disable(); conn_state = ClientConnectFinished; @@ -9841,28 +9841,28 @@ void Client::Handle_OP_BankerChange(const EQApplicationPacket *app) EQApplicationPacket *outapp=new EQApplicationPacket(OP_BankerChange,nullptr,sizeof(BankerChange_Struct)); BankerChange_Struct *bc=(BankerChange_Struct *)outapp->pBuffer; - if(m_pp.platinum < 0) - m_pp.platinum = 0; - if(m_pp.gold < 0) - m_pp.gold = 0; - if(m_pp.silver < 0) - m_pp.silver = 0; - if(m_pp.copper < 0) - m_pp.copper = 0; + if(m_pp.platinum < 0) + m_pp.platinum = 0; + if(m_pp.gold < 0) + m_pp.gold = 0; + if(m_pp.silver < 0) + m_pp.silver = 0; + if(m_pp.copper < 0) + m_pp.copper = 0; - if(m_pp.platinum_bank < 0) - m_pp.platinum_bank = 0; - if(m_pp.gold_bank < 0) - m_pp.gold_bank = 0; - if(m_pp.silver_bank < 0) - m_pp.silver_bank = 0; - if(m_pp.copper_bank < 0) - m_pp.copper_bank = 0; + if(m_pp.platinum_bank < 0) + m_pp.platinum_bank = 0; + if(m_pp.gold_bank < 0) + m_pp.gold_bank = 0; + if(m_pp.silver_bank < 0) + m_pp.silver_bank = 0; + if(m_pp.copper_bank < 0) + m_pp.copper_bank = 0; uint64 cp = static_cast(m_pp.copper) + - (static_cast(m_pp.silver) * 10) + - (static_cast(m_pp.gold) * 100) + - (static_cast(m_pp.platinum) * 1000); + (static_cast(m_pp.silver) * 10) + + (static_cast(m_pp.gold) * 100) + + (static_cast(m_pp.platinum) * 1000); m_pp.copper=cp%10; cp/=10; @@ -9873,9 +9873,9 @@ void Client::Handle_OP_BankerChange(const EQApplicationPacket *app) m_pp.platinum=cp; cp = static_cast(m_pp.copper_bank) + - (static_cast(m_pp.silver_bank) * 10) + - (static_cast(m_pp.gold_bank) * 100) + - (static_cast(m_pp.platinum_bank) * 1000); + (static_cast(m_pp.silver_bank) * 10) + + (static_cast(m_pp.gold_bank) * 100) + + (static_cast(m_pp.platinum_bank) * 1000); m_pp.copper_bank=cp%10; cp/=10; @@ -10224,7 +10224,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app) } } break; - } + } case RaidCommandDisband: { Raid *r = entity_list.GetRaidByClient(this); if(r){ @@ -10275,7 +10275,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app) //} } break; - } + } case RaidCommandMoveGroup: { Raid *r = entity_list.GetRaidByClient(this); @@ -10490,7 +10490,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app) default: { Message(13, "Raid command (%d) NYI", ri->action); break; - } + } } } @@ -10516,7 +10516,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app) { int SpellID = PendingTranslocateData.SpellID; if(parse->SpellHasQuestSub(SpellID, "EVENT_SPELL_EFFECT_TRANSLOCATE_COMPLETE")) { - parse->EventSpell(EVENT_SPELL_EFFECT_TRANSLOCATE_COMPLETE, nullptr, this, SpellID, 0); + parse->EventSpell(EVENT_SPELL_EFFECT_TRANSLOCATE_COMPLETE, nullptr, this, SpellID, 0); } else { @@ -10524,8 +10524,9 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app) { // is bound in, use the GoToBind method. If we send OP_Translocate in this case, the client moves itself // to the bind coords it has from the PlayerProfile, but with the X and Y reversed. I suspect they are // reversed in the pp, and since spells like Gate are handled serverside, this has not mattered before. - if(((SpellID == 1422) || (SpellID == 1334) || (SpellID == 3243)) && - zone->GetZoneID() == PendingTranslocateData.ZoneID) { + if (((SpellID == 1422) || (SpellID == 1334) || (SpellID == 3243)) && + zone->GetZoneID() == PendingTranslocateData.ZoneID) + { PendingTranslocate = false; GoToBind(); return; @@ -10571,7 +10572,7 @@ void Client::Handle_OP_AcceptNewTask(const EQApplicationPacket *app) { if(app->size != sizeof(AcceptNewTask_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_AcceptNewTask expected %i got %i", - sizeof(AcceptNewTask_Struct), app->size); + sizeof(AcceptNewTask_Struct), app->size); DumpPacket(app); return; } @@ -10585,7 +10586,7 @@ void Client::Handle_OP_CancelTask(const EQApplicationPacket *app) { if(app->size != sizeof(CancelTask_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_CancelTask expected %i got %i", - sizeof(CancelTask_Struct), app->size); + sizeof(CancelTask_Struct), app->size); DumpPacket(app); return; } @@ -10599,7 +10600,7 @@ void Client::Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app) { if(app->size != sizeof(TaskHistoryRequest_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_TaskHistoryRequest expected %i got %i", - sizeof(TaskHistoryRequest_Struct), app->size); + sizeof(TaskHistoryRequest_Struct), app->size); DumpPacket(app); return; } @@ -10615,7 +10616,7 @@ void Client::Handle_OP_Bandolier(const EQApplicationPacket *app) { // if(app->size != sizeof(BandolierCreate_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_Bandolier expected %i got %i", - sizeof(BandolierCreate_Struct), app->size); + sizeof(BandolierCreate_Struct), app->size); DumpPacket(app); return; } @@ -10642,7 +10643,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app) { if(app->size != sizeof(PopupResponse_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_PopupResponse expected %i got %i", - sizeof(PopupResponse_Struct), app->size); + sizeof(PopupResponse_Struct), app->size); DumpPacket(app); return; } @@ -10669,7 +10670,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app) { Mob* Target = GetTarget(); if(Target && Target->IsNPC()) { - parse->EventNPC(EVENT_POPUPRESPONSE, Target->CastToNPC(), this, buf, 0); + parse->EventNPC(EVENT_POPUPRESPONSE, Target->CastToNPC(), this, buf, 0); } safe_delete_array(buf); @@ -10679,7 +10680,7 @@ void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app) { if(app->size != sizeof(MovePotionToBelt_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_PotionBelt expected %i got %i", - sizeof(MovePotionToBelt_Struct), app->size); + sizeof(MovePotionToBelt_Struct), app->size); DumpPacket(app); return; } @@ -10784,7 +10785,7 @@ void Client::Handle_OP_LFPCommand(const EQApplicationPacket *app) { worldserver.UpdateLFP(CharacterID(), lfp->Action, lfp->MatchFilter, lfp->FromLevel, lfp->ToLevel, lfp->Classes, - lfp->Comments, LFPMembers); + lfp->Comments, LFPMembers); } @@ -10979,7 +10980,7 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app) { if(app->size != sizeof(VoiceMacroIn_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_VoiceMacroIn expected %i got %i", - sizeof(VoiceMacroIn_Struct), app->size); + sizeof(VoiceMacroIn_Struct), app->size); DumpPacket(app); @@ -10999,7 +11000,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app) if(app->size != sizeof(DoGroupLeadershipAbility_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_DoGroupLeadershipAbility expected %i got %i", - sizeof(DoGroupLeadershipAbility_Struct), app->size); + sizeof(DoGroupLeadershipAbility_Struct), app->size); DumpPacket(app); @@ -11048,7 +11049,7 @@ void Client::Handle_OP_ClearNPCMarks(const EQApplicationPacket *app) { if(app->size != 0) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_ClearNPCMarks expected 0 got %i", - app->size); + app->size); DumpPacket(app); @@ -11066,7 +11067,7 @@ void Client::Handle_OP_DelegateAbility(const EQApplicationPacket *app) { if(app->size != sizeof(DelegateAbility_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_DelegateAbility expected %i got %i", - sizeof(DelegateAbility_Struct), app->size); + sizeof(DelegateAbility_Struct), app->size); DumpPacket(app); @@ -11123,15 +11124,14 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app) { if(!IsPoison) { mlog(SPELLS__CASTING_ERR, "Item used to cast spell effect from a poison item was missing from inventory slot %d " - "after casting, or is not a poison!", ApplyPoisonData->inventorySlot); + "after casting, or is not a poison!", ApplyPoisonData->inventorySlot); Message(0, "Error: item not found for inventory slot #%i or is not a poison", ApplyPoisonData->inventorySlot); } else if(GetClass() == ROGUE) { - if((PrimaryWeapon && PrimaryWeapon->GetItem()->ItemType == ItemTypePierce) || - (SecondaryWeapon && SecondaryWeapon->GetItem()->ItemType == ItemTypePierce)) - { + if ((PrimaryWeapon && PrimaryWeapon->GetItem()->ItemType == ItemTypePierce) || + (SecondaryWeapon && SecondaryWeapon->GetItem()->ItemType == ItemTypePierce)) { float SuccessChance = (GetSkill(APPLY_POISON) + GetLevel()) / 400.0f; double ChanceRoll = MakeRandomFloat(0, 1); @@ -11170,7 +11170,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app) { if(app->size != sizeof(AugmentInfo_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_AugmentInfo expected %i got %i", - sizeof(AugmentInfo_Struct), app->size); + sizeof(AugmentInfo_Struct), app->size); DumpPacket(app); @@ -11215,7 +11215,7 @@ void Client::Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket *app) if(app->size != sizeof(PVPLeaderBoardRequest_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_PVPLeaderBoardRequest expected %i got %i", - sizeof(PVPLeaderBoardRequest_Struct), app->size); + sizeof(PVPLeaderBoardRequest_Struct), app->size); DumpPacket(app); @@ -11240,7 +11240,7 @@ void Client::Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket *a if(app->size != sizeof(PVPLeaderBoardDetailsRequest_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_PVPLeaderBoardDetailsRequest expected %i got %i", - sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size); + sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size); DumpPacket(app); @@ -11270,7 +11270,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app) Mob* vendor = entity_list.GetMob(ams_in->npcid); if (vendor == 0 || !vendor->IsNPC() || ((vendor->GetClass() != ADVENTUREMERCHANT) && - (vendor->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (vendor->GetClass() != DARK_REIGN_MERCHANT))) + (vendor->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (vendor->GetClass() != DARK_REIGN_MERCHANT))) { Message(13, "Vendor was not found."); return; @@ -11720,8 +11720,8 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app) database.DoEscapeString(EscSearchString, gmscs->Name, strlen(gmscs->Name)); if (database.RunQuery(Query, MakeAnyLenString(&Query, "select charname, zoneid, x, y, z, timeofdeath, rezzed, IsBurried from " - "player_corpses where charname like '%%%s%%' order by charname limit %i", - EscSearchString, MaxResults), errbuf, &Result)) + "player_corpses where charname like '%%%s%%' order by charname limit %i", + EscSearchString, MaxResults), errbuf, &Result)) { int NumberOfRows = mysql_num_rows(Result); @@ -11743,8 +11743,8 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app) char CharName[64], TimeOfDeath[20], Buffer[512]; string PopupText = ""; + "Rezzed"; while ((Row = mysql_fetch_row(Result))) @@ -12091,7 +12091,7 @@ void Client::Handle_OP_GroupRoles(const EQApplicationPacket *app) switch(grs->RoleNumber) { - case 1: //Main Tank + case 1: //Main Tank { if(grs->Toggle) g->DelegateMainTank(grs->Name1, grs->Toggle); @@ -12099,7 +12099,7 @@ void Client::Handle_OP_GroupRoles(const EQApplicationPacket *app) g->UnDelegateMainTank(grs->Name1, grs->Toggle); break; } - case 2: //Main Assist + case 2: //Main Assist { if(grs->Toggle) g->DelegateMainAssist(grs->Name1, grs->Toggle); @@ -12107,7 +12107,7 @@ void Client::Handle_OP_GroupRoles(const EQApplicationPacket *app) g->UnDelegateMainAssist(grs->Name1, grs->Toggle); break; } - case 3: //Puller + case 3: //Puller { if(grs->Toggle) g->DelegatePuller(grs->Name1, grs->Toggle); @@ -12127,7 +12127,7 @@ void Client::Handle_OP_HideCorpse(const EQApplicationPacket *app) if(app->size != sizeof(HideCorpse_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_HideCorpse expected %i got %i", - sizeof(HideCorpse_Struct), app->size); + sizeof(HideCorpse_Struct), app->size); DumpPacket(app); @@ -12139,7 +12139,7 @@ void Client::Handle_OP_HideCorpse(const EQApplicationPacket *app) if(hcs->Action == HideCorpseLooted) return; - if((HideCorpseMode == HideCorpseNone) && (hcs->Action == HideCorpseNone)) + if((HideCorpseMode == HideCorpseNone) && (hcs->Action == HideCorpseNone)) return; entity_list.HideCorpses(this, HideCorpseMode, hcs->Action); @@ -12152,7 +12152,7 @@ void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app) if(app->size != sizeof(GuildUpdateURLAndChannel_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_GuildUpdateURLAndChannel expected %i got %i", - sizeof(GuildUpdateURLAndChannel_Struct), app->size); + sizeof(GuildUpdateURLAndChannel_Struct), app->size); DumpPacket(app); @@ -12182,7 +12182,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app) if(app->size != sizeof(GuildStatus_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_GuildStatus expected %i got %i", - sizeof(GuildStatus_Struct), app->size); + sizeof(GuildStatus_Struct), app->size); DumpPacket(app); @@ -12242,7 +12242,7 @@ void Client::Handle_OP_BlockedBuffs(const EQApplicationPacket *app) if(app->size != sizeof(BlockedBuffs_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_BlockedBuffs expected %i got %i", - sizeof(BlockedBuffs_Struct), app->size); + sizeof(BlockedBuffs_Struct), app->size); DumpPacket(app); @@ -12339,7 +12339,7 @@ void Client::Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app) if(app->size != sizeof(BlockedBuffs_Struct)) { LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_RemoveBlockedBuffs expected %i got %i", - sizeof(BlockedBuffs_Struct), app->size); + sizeof(BlockedBuffs_Struct), app->size); DumpPacket(app); @@ -12536,9 +12536,9 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app) return; } - if((Admin() < RuleI(Guild, PlayerCreationRequiredStatus)) || - (GetLevel() < RuleI(Guild, PlayerCreationRequiredLevel)) || - (database.GetTotalTimeEntitledOnAccount(AccountID()) < (unsigned int)RuleI(Guild, PlayerCreationRequiredTime))) + if ((Admin() < RuleI(Guild, PlayerCreationRequiredStatus)) || + (GetLevel() < RuleI(Guild, PlayerCreationRequiredLevel)) || + (database.GetTotalTimeEntitledOnAccount(AccountID()) < (unsigned int)RuleI(Guild, PlayerCreationRequiredTime))) { Message(clientMessageError, "Your status, level or time playing on this account are insufficient to use this feature."); return; @@ -12604,387 +12604,387 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app) } void Client::Handle_OP_AltCurrencyMerchantRequest(const EQApplicationPacket *app) { - VERIFY_PACKET_LENGTH(OP_AltCurrencyMerchantRequest, app, uint32); + VERIFY_PACKET_LENGTH(OP_AltCurrencyMerchantRequest, app, uint32); - NPC* tar = entity_list.GetNPCByID(*((uint32*)app->pBuffer)); - if(tar) { - if(DistNoRoot(*tar) > USE_NPC_RANGE2) - return; + NPC* tar = entity_list.GetNPCByID(*((uint32*)app->pBuffer)); + if(tar) { + if(DistNoRoot(*tar) > USE_NPC_RANGE2) + return; - if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { - return; - } + if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { + return; + } - uint32 alt_cur_id = tar->GetAltCurrencyType(); - if(alt_cur_id == 0) { - return; - } + uint32 alt_cur_id = tar->GetAltCurrencyType(); + if(alt_cur_id == 0) { + return; + } - list::iterator altc_iter = zone->AlternateCurrencies.begin(); - bool found = false; - while(altc_iter != zone->AlternateCurrencies.end()) { - if((*altc_iter).id == alt_cur_id) { - found = true; - break; - } - altc_iter++; - } + list::iterator altc_iter = zone->AlternateCurrencies.begin(); + bool found = false; + while(altc_iter != zone->AlternateCurrencies.end()) { + if((*altc_iter).id == alt_cur_id) { + found = true; + break; + } + altc_iter++; + } - if(!found) { - return; - } + if(!found) { + return; + } - std::stringstream ss(std::stringstream::in | std::stringstream::out); - std::stringstream item_ss(std::stringstream::in | std::stringstream::out); - ss << alt_cur_id << "|1|" << alt_cur_id; - uint32 count = 0; - uint32 merchant_id = tar->MerchantType; - const Item_Struct *item = nullptr; + std::stringstream ss(std::stringstream::in | std::stringstream::out); + std::stringstream item_ss(std::stringstream::in | std::stringstream::out); + ss << alt_cur_id << "|1|" << alt_cur_id; + uint32 count = 0; + uint32 merchant_id = tar->MerchantType; + const Item_Struct *item = nullptr; - std::list merlist = zone->merchanttable[merchant_id]; - std::list::const_iterator itr; - for(itr = merlist.begin(); itr != merlist.end() && count < 255; itr++){ - const MerchantList &ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + std::list merlist = zone->merchanttable[merchant_id]; + std::list::const_iterator itr; + for(itr = merlist.begin(); itr != merlist.end() && count < 255; itr++){ + const MerchantList &ml = *itr; + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tar->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tar->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } - item = database.GetItem(ml.item); - if(item) - { - item_ss << "^" << item->Name << "|"; - item_ss << item->ID << "|"; - item_ss << ml.alt_currency_cost << "|"; - item_ss << "0|"; - item_ss << "1|"; - item_ss << item->Races << "|"; - item_ss << item->Classes; - count++; - } - } + item = database.GetItem(ml.item); + if(item) + { + item_ss << "^" << item->Name << "|"; + item_ss << item->ID << "|"; + item_ss << ml.alt_currency_cost << "|"; + item_ss << "0|"; + item_ss << "1|"; + item_ss << item->Races << "|"; + item_ss << item->Classes; + count++; + } + } - if(count > 0) { - ss << "|" << count << item_ss.str(); - } else { - ss << "|0"; - } + if(count > 0) { + ss << "|" << count << item_ss.str(); + } else { + ss << "|0"; + } - EQApplicationPacket* outapp = new EQApplicationPacket(OP_AltCurrencyMerchantReply, ss.str().length() + 1); - memcpy(outapp->pBuffer, ss.str().c_str(), ss.str().length()); - FastQueuePacket(&outapp); - } + EQApplicationPacket* outapp = new EQApplicationPacket(OP_AltCurrencyMerchantReply, ss.str().length() + 1); + memcpy(outapp->pBuffer, ss.str().c_str(), ss.str().length()); + FastQueuePacket(&outapp); + } } void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app) { - VERIFY_PACKET_LENGTH(OP_AltCurrencySellSelection, app, AltCurrencySelectItem_Struct); + VERIFY_PACKET_LENGTH(OP_AltCurrencySellSelection, app, AltCurrencySelectItem_Struct); - AltCurrencySelectItem_Struct *select = (AltCurrencySelectItem_Struct*)app->pBuffer; - NPC* tar = entity_list.GetNPCByID(select->merchant_entity_id); - if(tar) { - if(DistNoRoot(*tar) > USE_NPC_RANGE2) - return; + AltCurrencySelectItem_Struct *select = (AltCurrencySelectItem_Struct*)app->pBuffer; + NPC* tar = entity_list.GetNPCByID(select->merchant_entity_id); + if(tar) { + if(DistNoRoot(*tar) > USE_NPC_RANGE2) + return; - if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { - return; - } + if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { + return; + } - uint32 alt_cur_id = tar->GetAltCurrencyType(); - if(alt_cur_id == 0) { - return; - } + uint32 alt_cur_id = tar->GetAltCurrencyType(); + if(alt_cur_id == 0) { + return; + } - ItemInst *inst = m_inv.GetItem(select->slot_id); - if(!inst) { - return; - } + ItemInst *inst = m_inv.GetItem(select->slot_id); + if(!inst) { + return; + } - const Item_Struct* item = nullptr; - uint32 cost = 0; - uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); - uint32 merchant_id = tar->MerchantType; - bool found = false; - std::list merlist = zone->merchanttable[merchant_id]; - std::list::const_iterator itr; - for(itr = merlist.begin(); itr != merlist.end(); itr++) { - MerchantList ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + const Item_Struct* item = nullptr; + uint32 cost = 0; + uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); + uint32 merchant_id = tar->MerchantType; + bool found = false; + std::list merlist = zone->merchanttable[merchant_id]; + std::list::const_iterator itr; + for(itr = merlist.begin(); itr != merlist.end(); itr++) { + MerchantList ml = *itr; + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tar->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tar->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } - item = database.GetItem(ml.item); - if(!item) - continue; + item = database.GetItem(ml.item); + if(!item) + continue; - if(item->ID == inst->GetItem()->ID) { - cost = ml.alt_currency_cost; - found = true; - break; - } - } + if(item->ID == inst->GetItem()->ID) { + cost = ml.alt_currency_cost; + found = true; + break; + } + } - if(!found) { - cost = 0; - } + if(!found) { + cost = 0; + } - EQApplicationPacket* outapp = new EQApplicationPacket(OP_AltCurrencySellSelection, sizeof(AltCurrencySelectItemReply_Struct)); - AltCurrencySelectItemReply_Struct *reply = (AltCurrencySelectItemReply_Struct*)outapp->pBuffer; - reply->unknown004 = 0xFF; - reply->unknown005 = 0xFF; - reply->unknown006 = 0xFF; - reply->unknown007 = 0xFF; - strcpy(reply->item_name, inst->GetItem()->Name); - reply->cost = cost; - FastQueuePacket(&outapp); - } + EQApplicationPacket* outapp = new EQApplicationPacket(OP_AltCurrencySellSelection, sizeof(AltCurrencySelectItemReply_Struct)); + AltCurrencySelectItemReply_Struct *reply = (AltCurrencySelectItemReply_Struct*)outapp->pBuffer; + reply->unknown004 = 0xFF; + reply->unknown005 = 0xFF; + reply->unknown006 = 0xFF; + reply->unknown007 = 0xFF; + strcpy(reply->item_name, inst->GetItem()->Name); + reply->cost = cost; + FastQueuePacket(&outapp); + } } void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app) { - VERIFY_PACKET_LENGTH(OP_AltCurrencyPurchase, app, AltCurrencyPurchaseItem_Struct); - AltCurrencyPurchaseItem_Struct *purchase = (AltCurrencyPurchaseItem_Struct*)app->pBuffer; - NPC* tar = entity_list.GetNPCByID(purchase->merchant_entity_id); - if(tar) { - if(DistNoRoot(*tar) > USE_NPC_RANGE2) - return; + VERIFY_PACKET_LENGTH(OP_AltCurrencyPurchase, app, AltCurrencyPurchaseItem_Struct); + AltCurrencyPurchaseItem_Struct *purchase = (AltCurrencyPurchaseItem_Struct*)app->pBuffer; + NPC* tar = entity_list.GetNPCByID(purchase->merchant_entity_id); + if(tar) { + if(DistNoRoot(*tar) > USE_NPC_RANGE2) + return; - if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { - return; - } + if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { + return; + } - uint32 alt_cur_id = tar->GetAltCurrencyType(); - if(alt_cur_id == 0) { - return; - } + uint32 alt_cur_id = tar->GetAltCurrencyType(); + if(alt_cur_id == 0) { + return; + } - const Item_Struct* item = nullptr; - uint32 cost = 0; - uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); - uint32 merchant_id = tar->MerchantType; - bool found = false; - std::list merlist = zone->merchanttable[merchant_id]; - std::list::const_iterator itr; - for(itr = merlist.begin(); itr != merlist.end(); itr++) { - MerchantList ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + const Item_Struct* item = nullptr; + uint32 cost = 0; + uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); + uint32 merchant_id = tar->MerchantType; + bool found = false; + std::list merlist = zone->merchanttable[merchant_id]; + std::list::const_iterator itr; + for(itr = merlist.begin(); itr != merlist.end(); itr++) { + MerchantList ml = *itr; + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tar->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tar->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } - item = database.GetItem(ml.item); - if(!item) - continue; + item = database.GetItem(ml.item); + if(!item) + continue; - if(item->ID == purchase->item_id) { //This check to make sure that the item is actually on the NPC, people attempt to inject packets to get items summoned... - cost = ml.alt_currency_cost; - found = true; - break; - } - } + if(item->ID == purchase->item_id) { //This check to make sure that the item is actually on the NPC, people attempt to inject packets to get items summoned... + cost = ml.alt_currency_cost; + found = true; + break; + } + } - if (!item || !found) { - Message(13, "Error: The item you purchased does not exist!"); - return; - } + if (!item || !found) { + Message(13, "Error: The item you purchased does not exist!"); + return; + } - if(cost > current_currency) { - Message(13, "You cannot afford that item right now."); - return; - } + if(cost > current_currency) { + Message(13, "You cannot afford that item right now."); + return; + } - if(CheckLoreConflict(item)) - { - Message(15,"You can only have one of a lore item."); - return; - } + if(CheckLoreConflict(item)) + { + Message(15,"You can only have one of a lore item."); + return; + } - AddAlternateCurrencyValue(alt_cur_id, -((int32)cost)); - int16 charges = 1; - if(item->MaxCharges != 0) - charges = item->MaxCharges; + AddAlternateCurrencyValue(alt_cur_id, -((int32)cost)); + int16 charges = 1; + if(item->MaxCharges != 0) + charges = item->MaxCharges; - ItemInst *inst = database.CreateItem(item, charges); - if(!AutoPutLootInInventory(*inst, true, true)) - { - PutLootInInventory(SLOT_CURSOR, *inst); - } + ItemInst *inst = database.CreateItem(item, charges); + if(!AutoPutLootInInventory(*inst, true, true)) + { + PutLootInInventory(SLOT_CURSOR, *inst); + } - Save(1); - } + Save(1); + } } void Client::Handle_OP_AltCurrencyReclaim(const EQApplicationPacket *app) { - VERIFY_PACKET_LENGTH(OP_AltCurrencyReclaim, app, AltCurrencyReclaim_Struct); - AltCurrencyReclaim_Struct *reclaim = (AltCurrencyReclaim_Struct*)app->pBuffer; - uint32 item_id = 0; - list::iterator iter = zone->AlternateCurrencies.begin(); - while(iter != zone->AlternateCurrencies.end()) { - if((*iter).id == reclaim->currency_id) { - item_id = (*iter).item_id; - } - iter++; - } + VERIFY_PACKET_LENGTH(OP_AltCurrencyReclaim, app, AltCurrencyReclaim_Struct); + AltCurrencyReclaim_Struct *reclaim = (AltCurrencyReclaim_Struct*)app->pBuffer; + uint32 item_id = 0; + list::iterator iter = zone->AlternateCurrencies.begin(); + while(iter != zone->AlternateCurrencies.end()) { + if((*iter).id == reclaim->currency_id) { + item_id = (*iter).item_id; + } + iter++; + } - if(item_id == 0) { - return; - } + if(item_id == 0) { + return; + } - if(reclaim->reclaim_flag == 1) { //item -> altcur - uint32 removed = NukeItem(item_id, invWhereWorn | invWherePersonal | invWhereCursor); - if(removed > 0) { - AddAlternateCurrencyValue(reclaim->currency_id, removed); - } - } else { - uint32 max_currency = GetAlternateCurrencyValue(reclaim->currency_id); - if(reclaim->count > max_currency) { - SummonItem(item_id, max_currency); - SetAlternateCurrencyValue(reclaim->currency_id, 0); - } else { - SummonItem(item_id, reclaim->count, 0, 0, 0, 0, 0, false, SLOT_CURSOR); - AddAlternateCurrencyValue(reclaim->currency_id, -((int32)reclaim->count)); - } - } + if(reclaim->reclaim_flag == 1) { //item -> altcur + uint32 removed = NukeItem(item_id, invWhereWorn | invWherePersonal | invWhereCursor); + if(removed > 0) { + AddAlternateCurrencyValue(reclaim->currency_id, removed); + } + } else { + uint32 max_currency = GetAlternateCurrencyValue(reclaim->currency_id); + if(reclaim->count > max_currency) { + SummonItem(item_id, max_currency); + SetAlternateCurrencyValue(reclaim->currency_id, 0); + } else { + SummonItem(item_id, reclaim->count, 0, 0, 0, 0, 0, false, SLOT_CURSOR); + AddAlternateCurrencyValue(reclaim->currency_id, -((int32)reclaim->count)); + } + } } void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app) { - VERIFY_PACKET_LENGTH(OP_AltCurrencySell, app, AltCurrencySellItem_Struct); - EQApplicationPacket *outapp = app->Copy(); - AltCurrencySellItem_Struct *sell = (AltCurrencySellItem_Struct*)outapp->pBuffer; + VERIFY_PACKET_LENGTH(OP_AltCurrencySell, app, AltCurrencySellItem_Struct); + EQApplicationPacket *outapp = app->Copy(); + AltCurrencySellItem_Struct *sell = (AltCurrencySellItem_Struct*)outapp->pBuffer; - NPC* tar = entity_list.GetNPCByID(sell->merchant_entity_id); - if(tar) { - if(DistNoRoot(*tar) > USE_NPC_RANGE2) - return; + NPC* tar = entity_list.GetNPCByID(sell->merchant_entity_id); + if(tar) { + if(DistNoRoot(*tar) > USE_NPC_RANGE2) + return; - if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { - return; - } + if(tar->GetClass() != ALT_CURRENCY_MERCHANT) { + return; + } - uint32 alt_cur_id = tar->GetAltCurrencyType(); - if(alt_cur_id == 0) { - return; - } + uint32 alt_cur_id = tar->GetAltCurrencyType(); + if(alt_cur_id == 0) { + return; + } - ItemInst* inst = GetInv().GetItem(sell->slot_id); - if(!inst) { - return; - } + ItemInst* inst = GetInv().GetItem(sell->slot_id); + if(!inst) { + return; + } - const Item_Struct* item = nullptr; - uint32 cost = 0; - uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); - uint32 merchant_id = tar->MerchantType; - bool found = false; - std::list merlist = zone->merchanttable[merchant_id]; - std::list::const_iterator itr; - for(itr = merlist.begin(); itr != merlist.end(); itr++) { - MerchantList ml = *itr; - if(GetLevel() < ml.level_required) { - continue; - } + const Item_Struct* item = nullptr; + uint32 cost = 0; + uint32 current_currency = GetAlternateCurrencyValue(alt_cur_id); + uint32 merchant_id = tar->MerchantType; + bool found = false; + std::list merlist = zone->merchanttable[merchant_id]; + std::list::const_iterator itr; + for(itr = merlist.begin(); itr != merlist.end(); itr++) { + MerchantList ml = *itr; + if(GetLevel() < ml.level_required) { + continue; + } - int32 fac = tar->GetPrimaryFaction(); - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = tar->GetPrimaryFaction(); + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } - item = database.GetItem(ml.item); - if(!item) - continue; + item = database.GetItem(ml.item); + if(!item) + continue; - if(item->ID == inst->GetItem()->ID) { - cost = ml.alt_currency_cost; - found = true; - break; - } - } + if(item->ID == inst->GetItem()->ID) { + cost = ml.alt_currency_cost; + found = true; + break; + } + } - if(!found) { - return; - } + if(!found) { + return; + } - if(!inst->IsStackable()) - { - DeleteItemInInventory(sell->slot_id, 0, false); - } - else - { - if(inst->GetCharges() < sell->charges) - { - sell->charges = inst->GetCharges(); - } + if(!inst->IsStackable()) + { + DeleteItemInInventory(sell->slot_id, 0, false); + } + else + { + if(inst->GetCharges() < sell->charges) + { + sell->charges = inst->GetCharges(); + } - if(sell->charges == 0) - { - Message(13, "Charge mismatch error."); - return; - } + if(sell->charges == 0) + { + Message(13, "Charge mismatch error."); + return; + } - DeleteItemInInventory(sell->slot_id, sell->charges, false); - cost *= sell->charges; - } + DeleteItemInInventory(sell->slot_id, sell->charges, false); + cost *= sell->charges; + } - sell->cost = cost; + sell->cost = cost; - FastQueuePacket(&outapp); - AddAlternateCurrencyValue(alt_cur_id, cost); - Save(1); - } + FastQueuePacket(&outapp); + AddAlternateCurrencyValue(alt_cur_id, cost); + Save(1); + } } void Client::Handle_OP_CrystalReclaim(const EQApplicationPacket *app) { - uint32 ebon = NukeItem(RuleI(Zone, EbonCrystalItemID), invWhereWorn | invWherePersonal | invWhereCursor); - uint32 radiant = NukeItem(RuleI(Zone, RadiantCrystalItemID), invWhereWorn | invWherePersonal | invWhereCursor); - if((ebon + radiant) > 0) { - AddCrystals(radiant, ebon); - } + uint32 ebon = NukeItem(RuleI(Zone, EbonCrystalItemID), invWhereWorn | invWherePersonal | invWhereCursor); + uint32 radiant = NukeItem(RuleI(Zone, RadiantCrystalItemID), invWhereWorn | invWherePersonal | invWhereCursor); + if((ebon + radiant) > 0) { + AddCrystals(radiant, ebon); + } } void Client::Handle_OP_CrystalCreate(const EQApplicationPacket *app) { - VERIFY_PACKET_LENGTH(OP_CrystalCreate, app, CrystalReclaim_Struct); - CrystalReclaim_Struct *cr = (CrystalReclaim_Struct*)app->pBuffer; + VERIFY_PACKET_LENGTH(OP_CrystalCreate, app, CrystalReclaim_Struct); + CrystalReclaim_Struct *cr = (CrystalReclaim_Struct*)app->pBuffer; - if(cr->type == 5) { - if(cr->amount > GetEbonCrystals()) { - SummonItem(RuleI(Zone, EbonCrystalItemID), GetEbonCrystals()); - m_pp.currentEbonCrystals = 0; - m_pp.careerEbonCrystals = 0; - Save(); - SendCrystalCounts(); - } else { - SummonItem(RuleI(Zone, EbonCrystalItemID), cr->amount); - m_pp.currentEbonCrystals -= cr->amount; - m_pp.careerEbonCrystals -= cr->amount; - Save(); - SendCrystalCounts(); - } - } else if(cr->type == 4) { - if(cr->amount > GetRadiantCrystals()) { - SummonItem(RuleI(Zone, RadiantCrystalItemID), GetRadiantCrystals()); - m_pp.currentRadCrystals = 0; - m_pp.careerRadCrystals = 0; - Save(); - SendCrystalCounts(); - } else { - SummonItem(RuleI(Zone, RadiantCrystalItemID), cr->amount); - m_pp.currentRadCrystals -= cr->amount; - m_pp.careerRadCrystals -= cr->amount; - Save(); - SendCrystalCounts(); - } - } + if(cr->type == 5) { + if(cr->amount > GetEbonCrystals()) { + SummonItem(RuleI(Zone, EbonCrystalItemID), GetEbonCrystals()); + m_pp.currentEbonCrystals = 0; + m_pp.careerEbonCrystals = 0; + Save(); + SendCrystalCounts(); + } else { + SummonItem(RuleI(Zone, EbonCrystalItemID), cr->amount); + m_pp.currentEbonCrystals -= cr->amount; + m_pp.careerEbonCrystals -= cr->amount; + Save(); + SendCrystalCounts(); + } + } else if(cr->type == 4) { + if(cr->amount > GetRadiantCrystals()) { + SummonItem(RuleI(Zone, RadiantCrystalItemID), GetRadiantCrystals()); + m_pp.currentRadCrystals = 0; + m_pp.careerRadCrystals = 0; + Save(); + SendCrystalCounts(); + } else { + SummonItem(RuleI(Zone, RadiantCrystalItemID), cr->amount); + m_pp.currentRadCrystals -= cr->amount; + m_pp.careerRadCrystals -= cr->amount; + Save(); + SendCrystalCounts(); + } + } } void Client::Handle_OP_LFGuild(const EQApplicationPacket *app) @@ -12998,7 +12998,7 @@ void Client::Handle_OP_LFGuild(const EQApplicationPacket *app) { case 0: { - VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_PlayerToggle_Struct); + VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_PlayerToggle_Struct); LFGuild_PlayerToggle_Struct *pts = (LFGuild_PlayerToggle_Struct *)app->pBuffer; if(strnlen(pts->Comment, 256) > 256) @@ -13025,7 +13025,7 @@ void Client::Handle_OP_LFGuild(const EQApplicationPacket *app) } case 1: { - VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_GuildToggle_Struct); + VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_GuildToggle_Struct); LFGuild_GuildToggle_Struct *gts = (LFGuild_GuildToggle_Struct *)app->pBuffer; if(strnlen(gts->Comment, 256) > 256) @@ -13054,7 +13054,7 @@ void Client::Handle_OP_LFGuild(const EQApplicationPacket *app) } case 3: { - VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_SearchPlayer_Struct); + VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_SearchPlayer_Struct); ServerPacket* pack = new ServerPacket(ServerOP_QueryServGeneric, strlen(GetName()) + 37); @@ -13078,7 +13078,7 @@ void Client::Handle_OP_LFGuild(const EQApplicationPacket *app) } case 4: { - VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_SearchGuild_Struct); + VERIFY_PACKET_LENGTH(OP_LFGuild, app, LFGuild_SearchGuild_Struct); ServerPacket* pack = new ServerPacket(ServerOP_QueryServGeneric, strlen(GetName()) + 33); @@ -13109,7 +13109,7 @@ void Client::Handle_OP_XTargetRequest(const EQApplicationPacket *app) { if(app->size < 12) { - LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_XTargetRequest, expected at least 12, got %i", app->size); + LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_XTargetRequest, expected at least 12, got %i", app->size); DumpPacket(app); return; } @@ -13342,7 +13342,7 @@ void Client::Handle_OP_XTargetAutoAddHaters(const EQApplicationPacket *app) { if(app->size != 1) { - LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_XTargetAutoAddHaters, expected 1, got %i", app->size); + LogFile->write(EQEMuLog::Debug, "Size mismatch in OP_XTargetAutoAddHaters, expected 1, got %i", app->size); DumpPacket(app); return; } @@ -13684,12 +13684,12 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app) Mob* merchant = entity_list.GetNPCByID(merchant_id); if(!CheckCanHireMerc(merchant, merc_template_id)) { - return; + return; } if(RuleB(Mercs, ChargeMercPurchaseCost)) { - uint32 cost = Merc::CalcPurchaseCost(merc_template->MercTemplateID, GetLevel()) * 100; // Cost is in gold - TakeMoneyFromPP(cost, true); + uint32 cost = Merc::CalcPurchaseCost(merc_template->MercTemplateID, GetLevel()) * 100; // Cost is in gold + TakeMoneyFromPP(cost, true); } // Set time remaining to max on Hire @@ -13885,8 +13885,8 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app) } } - if(entityID > 0) { - SendMercTimerPacket(entityID, mercState, suspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); + if(entityID > 0) { + SendMercTimerPacket(entityID, mercState, suspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); } } @@ -13905,8 +13905,8 @@ void Client::Handle_OP_OpenContainer(const EQApplicationPacket *app) { // RoF::struct.SlotType = {0 - Equipment, 1 - Bank, 2 - Shared Bank} // not tested beyond listed types // RoF::struct.Unknown2 = 0 // RoF::struct.MainSlot = { } - // RoF::struct.SubSlot = -1 (non-child) - // RoF::struct.AugSlot = -1 (non-child) + // RoF::struct.SubSlot = -1 (non-child) + // RoF::struct.AugSlot = -1 (non-child) // RoF::struct.Unknown1 = 141 (unsure why, but always appears to be this value..combine containers not tested) // SideNote: Watching the slot translations, Unknown1 is showing '141' as well on certain item swaps. diff --git a/zone/client_packet.h b/zone/client_packet.h index 63145391b..22e8f92f4 100644 --- a/zone/client_packet.h +++ b/zone/client_packet.h @@ -223,8 +223,8 @@ void Handle_OP_AutoFire(const EQApplicationPacket *app); void Handle_OP_Rewind(const EQApplicationPacket *app); void Handle_OP_RaidCommand(const EQApplicationPacket *app); - void Handle_OP_Translocate(const EQApplicationPacket *app); - void Handle_OP_Sacrifice(const EQApplicationPacket *app); + void Handle_OP_Translocate(const EQApplicationPacket *app); + void Handle_OP_Sacrifice(const EQApplicationPacket *app); void Handle_OP_AcceptNewTask(const EQApplicationPacket *app); void Handle_OP_CancelTask(const EQApplicationPacket *app); void Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app); diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 1e49c2f30..63d2db72a 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA client_process.cpp: Handles client login sequence and packets sent from client to zone @@ -36,7 +36,7 @@ #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #include @@ -83,7 +83,7 @@ bool Client::Process() { if(Connected() || IsLD()) { - // try to send all packets that weren't sent before + // try to send all packets that weren't sent before if(!IsLD() && zoneinpacket_timer.Check()){ SendAllPackets(); } @@ -258,7 +258,7 @@ bool Client::Process() { AI_Process(); if (bindwound_timer.Check() && bindwound_target != 0) { - BindWound(bindwound_target, false); + BindWound(bindwound_target, false); } if(KarmaUpdateTimer) @@ -409,7 +409,7 @@ bool Client::Process() { { entity_list.AEAttack(this, 30); } else { - Attack(auto_attack_target, 13); // Kaiyodo - added attacking hand to arguments + Attack(auto_attack_target, 13); // Kaiyodo - added attacking hand to arguments } ItemInst *wpn = GetInv().GetItem(SLOT_PRIMARY); TryWeaponProc(wpn, auto_attack_target, 13); @@ -430,7 +430,7 @@ bool Client::Process() { //triple attack: rangers, monks, warriors, berserkers over level 60 if((((GetClass() == MONK || GetClass() == WARRIOR || GetClass() == RANGER || GetClass() == BERSERKER) && GetLevel() >= 60) || SpecAttacks[SPECATK_TRIPLE]) - && CheckDoubleAttack(true)) + && CheckDoubleAttack(true)) { tripleAttackSuccess = true; Attack(auto_attack_target, 13, false); @@ -793,7 +793,7 @@ void Client::OnDisconnect(bool hard_disconnect) { MyRaid->MemberZoned(this); if(this->IsClient()){ - if(parse->PlayerHasQuestSub("EVENT_DISCONNECT")) { + if(parse->PlayerHasQuestSub("EVENT_DISCONNECT")) { parse->EventPlayer(EVENT_DISCONNECT, this, "", 0); } } @@ -968,7 +968,7 @@ void Client::BulkSendInventoryItems() // LINKDEAD TRADE ITEMS // If player went LD during a trade, they have items in the trade inventory - // slots. These items are now being put into their inventory (then queue up on cursor) + // slots. These items are now being put into their inventory (then queue up on cursor) for (int16 trade_slot_id=3000; trade_slot_id<=3007; trade_slot_id++) { const ItemInst* inst = m_inv[slot_id]; if (inst) { @@ -982,7 +982,7 @@ void Client::BulkSendInventoryItems() void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { const Item_Struct* handyitem = nullptr; - uint32 numItemSlots=80; //The max number of items passed in the transaction. + uint32 numItemSlots=80; //The max number of items passed in the transaction. const Item_Struct *item; std::list merlist = zone->merchanttable[merchant_id]; std::list::const_iterator itr; @@ -1000,14 +1000,14 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { uint8 handychance = 0; for(itr = merlist.begin();itr != merlist.end() && iGetPrimaryFaction() : 0; - if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { - continue; - } + int32 fac = merch ? merch->GetPrimaryFaction() : 0; + if(fac != 0 && GetModCharacterFactionLevel(fac) < ml.faction_required) { + continue; + } handychance = MakeRandomInt(0, merlist.size() + tmp_merlist.size() - 1 ); @@ -1099,16 +1099,16 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) { break; default: greet_id=MERCHANT_HANDY_ITEM4; - } + } sprintf(handy_id,"%i",greet_id); if(greet_id!=MERCHANT_GREETING) Message_StringID(10,GENERIC_STRINGID_SAY,merch->GetCleanName(),handy_id,this->GetName(),handyitem->Name); - else + else Message_StringID(10,GENERIC_STRINGID_SAY,merch->GetCleanName(),handy_id,this->GetName()); merch->CastToNPC()->FaceTarget(this->CastToMob()); - } + } // safe_delete_array(cpi); } @@ -1153,8 +1153,8 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I // corpse is in has shutdown since the rez spell was cast. database.MarkCorpseAsRezzed(PendingRezzDBID); _log(SPELLS__REZ, "Player %s got a %i Rezz, spellid %i in zone%i, instance id %i", - this->name, (uint16)spells[SpellID].base[0], - SpellID, ZoneID, InstanceID); + this->name, (uint16)spells[SpellID].base[0], + SpellID, ZoneID, InstanceID); this->BuffFadeAll(); int SpellEffectDescNum = GetSpellEffectDescNum(SpellID); @@ -1171,7 +1171,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I if(spells[SpellID].base[0] < 100 && spells[SpellID].base[0] > 0 && PendingRezzXP > 0) { SetEXP(((int)(GetEXP()+((float)((PendingRezzXP / 100) * spells[SpellID].base[0])))), - GetAAXP(),true); + GetAAXP(),true); } else if (spells[SpellID].base[0] == 100 && PendingRezzXP > 0) { SetEXP((GetEXP() + PendingRezzXP), GetAAXP(), true); @@ -1539,7 +1539,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app) // now we should have a from_bucket, a to_bucket, an amount_to_take // and an amount_to_add - // now we actually take it from the from bucket. if there's an error + // now we actually take it from the from bucket. if there's an error // with the destination slot, they lose their money *from_bucket -= amount_to_take; // why are intentionally inducing a crash here rather than letting the code attempt to stumble on? @@ -1614,8 +1614,8 @@ void Client::OPGMTraining(const EQApplicationPacket *app) if(DistNoRoot(*pTrainer) > USE_NPC_RANGE2) return; - SkillType sk; - for (sk = _1H_BLUNT; sk <= HIGHEST_SKILL; sk = (SkillType)(sk+1)) { + SkillType sk; + for (sk = _1H_BLUNT; sk <= HIGHEST_SKILL; sk = (SkillType)(sk+1)) { if(sk == TINKERING && GetRace() != GNOME) { gmtrain->skills[sk] = 0; //Non gnomes can't tinker! } else { @@ -2083,7 +2083,7 @@ void Client::HandleRespawnFromHover(uint32 Option) if (corpse && corpse->IsCorpse()) { _log(SPELLS__REZ, "Hover Rez in zone %s for corpse %s", - zone->GetShortName(), PendingRezzCorpseName.c_str()); + zone->GetShortName(), PendingRezzCorpseName.c_str()); _log(SPELLS__REZ, "Found corpse. Marking corpse as rezzed."); diff --git a/zone/command.cpp b/zone/command.cpp index 042950477..3c04933db 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -1,34 +1,34 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* To add a new command 3 things must be done: - 1. At the bottom of command.h you must add a prototype for it. - 2. Add the function in this file. - 3. In the command_init function you must add a call to command_add - for your function. If you want an alias for your command, add - a second call to command_add with the descriptin and access args - set to nullptr and 0 respectively since they aren't used when adding - an alias. The function pointers being equal is makes it an alias. - The access level you set with command_add is only a default if - the command isn't listed in the addon.ini file. + 1. At the bottom of command.h you must add a prototype for it. + 2. Add the function in this file. + 3. In the command_init function you must add a call to command_add + for your function. If you want an alias for your command, add + a second call to command_add with the descriptin and access args + set to nullptr and 0 respectively since they aren't used when adding + an alias. The function pointers being equal is makes it an alias. + The access level you set with command_add is only a default if + the command isn't listed in the addon.ini file. */ @@ -96,7 +96,7 @@ LinkedList cleanup_commandlist; * This is the default dispatch function when commands aren't loaded. * * Parameters: - * not used + * not used * */ int command_notavail(Client *c, const char *message) @@ -106,7 +106,7 @@ int command_notavail(Client *c, const char *message) } /*****************************************************************************/ -/* the rest below here could be in a dynamically loaded module eventually */ +/* the rest below here could be in a dynamically loaded module eventually */ /*****************************************************************************/ /* @@ -137,10 +137,10 @@ Access Levels: * initializes the command list, call at startup * * Parameters: - * none + * none * * When adding a command, if it's the first time that function pointer is - * used it is a new command. If that function pointer is used for another + * used it is a new command. If that function pointer is used for another * command, the command is added as an alias; description and access level * are not used and can be nullptr. * @@ -180,7 +180,7 @@ int command_init(void) { command_add("summon","[charname] - Summons your player/npc/corpse target, or charname if specified",80,command_summon) || command_add("zone","[zonename] [x] [y] [z] - Go to specified zone (coords optional)",50,command_zone) || command_add("zoneinstance","[instanceid] [x] [y] [z] - Go to specified instance zone (coords optional)",50,command_zone_instance) || - command_add("peqzone","[zonename] - Go to specified zone, if you have > 75% health",0,command_peqzone) || + command_add("peqzone","[zonename] - Go to specified zone, if you have > 75% health",0,command_peqzone) || command_add("tgczone",nullptr,0,command_peqzone) || command_add("showbuffs","- List buffs active on your target or you if no target",50,command_showbuffs) || command_add("movechar","[charname] [zonename] - Move charname to zonename",50,command_movechar) || @@ -246,8 +246,8 @@ int command_init(void) { command_add("setskillall","[value] - Set all of your target's skills to value",50,command_setskillall) || command_add("setallskill",nullptr,0,command_setskillall) || command_add("setallskills",nullptr,0,command_setskillall) || - command_add("race","[racenum] - Change your or your target's race. Use racenum 0 to return to normal",50,command_race) || - command_add("gender","[0/1/2] - Change your or your target's gender to male/female/neuter",50,command_gender) || + command_add("race","[racenum] - Change your or your target's race. Use racenum 0 to return to normal",50,command_race) || + command_add("gender","[0/1/2] - Change your or your target's gender to male/female/neuter",50,command_gender) || command_add("makepet","[level] [class] [race] [texture] - Make a pet",50,command_makepet) || command_add("level","[level] - Set your or your target's level",10,command_level) || command_add("spawn","[name] [race] [level] [material] [hp] [gender] [class] [priweapon] [secweapon] [merchantid] - Spawn an NPC",10,command_spawn) || @@ -312,7 +312,7 @@ int command_init(void) { command_add("setcrystals","[value] - Set your or your player target's available radiant or ebon crystals",100,command_setcrystals) || command_add("name","[newname] - Rename your player target",150,command_name) || command_add("tempname","[newname] - Temporarily renames your target. Leave name blank to restore the original name.",100,command_tempname) || - command_add("npcspecialattk","[flagchar] [perm] - Set NPC special attack flags. Flags are E(nrage) F(lurry) R(ampage) S(ummon).",80,command_npcspecialattk) || + command_add("npcspecialattk","[flagchar] [perm] - Set NPC special attack flags. Flags are E(nrage) F(lurry) R(ampage) S(ummon).",80,command_npcspecialattk) || command_add("npcspecialattack",nullptr,0,command_npcspecialattk) || command_add("npcspecialatk",nullptr,0,command_npcspecialattk) || command_add("kill","- Kill your target",100,command_kill) || @@ -334,7 +334,7 @@ int command_init(void) { command_add("iteminfo","- Get information about the item on your cursor",10,command_iteminfo) || command_add("uptime","[zone server id] - Get uptime of worldserver, or zone server if argument provided",10,command_uptime) || command_add("flag","[status] [acctname] - Refresh your admin status, or set an account's admin status if arguments provided",0,command_flag) || - command_add("guild","- Guild manipulation commands. Use argument help for more info.",10,command_guild) || + command_add("guild","- Guild manipulation commands. Use argument help for more info.",10,command_guild) || command_add("guilds",nullptr,0,command_guild) || command_add("zonestatus","- Show connected zoneservers, synonymous with /servers",150,command_zonestatus) || command_add("manaburn","- Use AA Wizard class skill manaburn on target",10,command_manaburn) || @@ -356,11 +356,11 @@ int command_init(void) { command_add("unscribespells","- Clear out your or your player target's spell book.",180,command_unscribespells) || command_add("scribespell", "[spellid] - Scribe specified spell in your target's spell book.", 180, command_scribespell) || command_add("unscribespell", "[spellid] - Unscribe specified spell from your target's spell book.", 180, command_unscribespell) || - command_add("interrupt","[message id] [color] - Interrupt your casting. Arguments are optional.",50,command_interrupt) || + command_add("interrupt","[message id] [color] - Interrupt your casting. Arguments are optional.",50,command_interrupt) || command_add("d1","[type] [spell] [damage] - Send an OP_Action packet with the specified values",200,command_d1) || - command_add("summonitem","[itemid] [charges] - Summon an item onto your cursor. Charges are optional.",200,command_summonitem) || + command_add("summonitem","[itemid] [charges] - Summon an item onto your cursor. Charges are optional.",200,command_summonitem) || command_add("si",nullptr,200,command_summonitem) || - command_add("giveitem","[itemid] [charges] - Summon an item onto your target's cursor. Charges are optional.",200,command_giveitem) || + command_add("giveitem","[itemid] [charges] - Summon an item onto your target's cursor. Charges are optional.",200,command_giveitem) || command_add("gi",nullptr,200,command_giveitem) || command_add("givemoney","[pp] [gp] [sp] [cp] - Gives specified amount of money to the target player.",200,command_givemoney) || command_add("itemsearch","[search criteria] - Search for an item",10,command_itemsearch) || @@ -430,7 +430,7 @@ int command_init(void) { command_add("modifynpcstat","- Modifys a NPC's stats",150,command_modifynpcstat) || command_add("undyeme","- Remove dye from all of your armor slots",0,command_undyeme) || command_add("instance","- Modify Instances",200,command_instance) || - command_add("setstartzone","[zoneid] - Set target's starting zone. Set to zero to allow the player to use /setstartcity",80,command_setstartzone) || + command_add("setstartzone","[zoneid] - Set target's starting zone. Set to zero to allow the player to use /setstartcity",80,command_setstartzone) || command_add("netstats","- Gets the network stats for a stream.",200,command_netstats) || command_add("object","List|Add|Edit|Move|Rotate|Copy|Save|Undo|Delete - Manipulate static and tradeskill objects within the zone",100,command_object) || command_add("raidloot","LEADER|GROUPLEADER|SELECTED|ALL - Sets your raid loot settings if you have permission to do so.",0,command_raidloot) || @@ -445,9 +445,9 @@ int command_init(void) { command_add("reloadallrules","Executes a reload of all rules.",80, command_reloadallrules) || command_add("reloadrulesworld","Executes a reload of all rules in world specifically.",80, command_reloadworldrules) || command_add("camerashake", "Shakes the camera on everyone's screen globally.", 80, command_camerashake) || - command_add("disarmtrap", "Analog for ldon disarm trap for the newer clients since we still don't have it working.", 0, command_disarmtrap) || - command_add("sensetrap", "Analog for ldon sense trap for the newer clients since we still don't have it working.", 0, command_sensetrap) || - command_add("picklock", "Analog for ldon pick lock for the newer clients since we still don't have it working.", 0, command_picklock) || + command_add("disarmtrap", "Analog for ldon disarm trap for the newer clients since we still don't have it working.", 0, command_disarmtrap) || + command_add("sensetrap", "Analog for ldon sense trap for the newer clients since we still don't have it working.", 0, command_sensetrap) || + command_add("picklock", "Analog for ldon pick lock for the newer clients since we still don't have it working.", 0, command_picklock) || command_add("mysql", "Mysql CLI, see 'help' for options.", 250, command_mysql) || command_add("xtargets", "Show your targets Extended Targets and optionally set how many xtargets they can have.", 250, command_xtargets) || command_add("printquestitems","Returns available quest items for multiquesting currently on the target npc.",200,command_printquestitems) || @@ -493,7 +493,7 @@ int command_init(void) { * clears the command list, freeing resources * * Parameters: - * none + * none * */ void command_deinit(void) @@ -515,10 +515,10 @@ void command_deinit(void) * adds a command to the command list; used by command_init * * Parameters: - * command_string - the command ex: "spawn" - * desc - text description of command for #help - * access - default access level required to use command - * function - pointer to function that handles command + * command_string - the command ex: "spawn" + * desc - text description of command for #help + * access - default access level required to use command + * function - pointer to function that handles command * */ int command_add(const char *command_string, const char *desc, int access, CmdFuncPtr function) @@ -572,9 +572,9 @@ int command_add(const char *command_string, const char *desc, int access, CmdFun * adds a command to the command list, as a perl function * * Parameters: - * command_string - the command ex: "spawn" - * desc - text description of command for #help - * access - default access level required to use command + * command_string - the command ex: "spawn" + * desc - text description of command for #help + * access - default access level required to use command * */ int command_add_perl(const char *command_string, const char *desc, int access) { @@ -631,8 +631,8 @@ void command_clear_perl() { * command character (#). * * Parameters: - * c - pointer to the calling client object - * message - what the client typed + * c - pointer to the calling client object + * message - what the client typed * */ int command_realdispatch(Client *c, const char *message) @@ -640,7 +640,7 @@ int command_realdispatch(Client *c, const char *message) _ZP(command_realdispatch); - Seperator sep(message, ' ', 10, 100, true); // "three word argument" should be considered 1 arg + Seperator sep(message, ' ', 10, 100, true); // "three word argument" should be considered 1 arg command_logcommand(c, message); @@ -665,7 +665,7 @@ int command_realdispatch(Client *c, const char *message) if(cur->function == nullptr) { #ifdef EMBPERL_COMMANDS //todo reimplement this stuff - //dispatch perl command + //dispatch perl command //PerlembParser *embparse = (PerlembParser *) parse; //embparse->ExecCommand(c, &sep); #else @@ -813,7 +813,7 @@ void command_sendop(Client *c,const Seperator *sep){ */ - /* + /* if(sep->arg[1][0] && sep->arg[2][0]){ EQApplicationPacket* outapp = new EQApplicationPacket((EmuOpcode)atoi(sep->arg[1]),sizeof(GMName_Struct)); GMName_Struct* gms=(GMName_Struct*)outapp->pBuffer; @@ -826,7 +826,7 @@ void command_sendop(Client *c,const Seperator *sep){ c->QueuePacket(outapp); safe_delete(outapp); } - */ + */ /* else{ EQApplicationPacket* outapp = new EQApplicationPacket(121,atoi(sep->arg[2])); @@ -930,7 +930,7 @@ void command_help(Client *c, const Seperator *sep) if(c->Admin() < cur->second->access) continue; - commands_shown++; + commands_shown++; c->Message(0, " %c%s %s", COMMAND_CHAR, cur->first.c_str(), cur->second->desc == nullptr?"":cur->second->desc); } c->Message(0, "%d command%s listed.", commands_shown, commands_shown!=1?"s":""); @@ -1348,7 +1348,7 @@ void command_gm(Client *c, const Seperator *sep) //To whoever wrote the above: And what about /kill, /zone, /zoneserver, etc? //There is a reason for the # commands: so that admins can specifically enable certain -//commands for their users. Some might want users to #summon but not to /kill. Cant do that if they are a GM +//commands for their users. Some might want users to #summon but not to /kill. Cant do that if they are a GM void command_summon(Client *c, const Seperator *sep) { Mob *t; @@ -1423,13 +1423,13 @@ void command_summon(Client *c, const Seperator *sep) void command_zone(Client *c, const Seperator *sep) { - if(c->Admin() < commandZoneToCoords && - (sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) { - c->Message(0, "Your status is not high enough to zone to specific coordinates."); - return; - } + if(c->Admin() < commandZoneToCoords && + (sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) { + c->Message(0, "Your status is not high enough to zone to specific coordinates."); + return; + } - uint16 zoneid = 0; + uint16 zoneid = 0; if (sep->IsNumber(1)) { @@ -1479,11 +1479,11 @@ void command_zone(Client *c, const Seperator *sep) //todo: fix this so it checks if you're in the instance set void command_zone_instance(Client *c, const Seperator *sep) { - if(c->Admin() < commandZoneToCoords && - (sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) { - c->Message(0, "Your status is not high enough to zone to specific coordinates."); - return; - } + if(c->Admin() < commandZoneToCoords && + (sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) { + c->Message(0, "Your status is not high enough to zone to specific coordinates."); + return; + } if (sep->arg[1][0] == 0) { @@ -1492,7 +1492,7 @@ void command_zone_instance(Client *c, const Seperator *sep) return; } - uint16 zoneid = 0; + uint16 zoneid = 0; uint16 instanceid = 0; if(sep->IsNumber(1)) @@ -1542,72 +1542,77 @@ void command_showbuffs(Client *c, const Seperator *sep) void command_peqzone(Client *c, const Seperator *sep) { - uint32 timeleft = c->GetPTimers().GetRemainingTime(pTimerPeqzoneReuse)/60; + uint32 timeleft = c->GetPTimers().GetRemainingTime(pTimerPeqzoneReuse)/60; - if(!c->GetPTimers().Expired(&database, pTimerPeqzoneReuse, false)) { - c->Message(13,"You must wait %i minute(s) before using this ability again.", timeleft); - return; - } - if(c->GetHPRatio() < 75) { - c->Message(0, "You cannot use this command with less than 75 percent health."); - return; - } - //this isnt perfect, but its better... - if( - c->IsInvisible(c) - || c->IsRooted() - || c->IsStunned() - || c->IsMezzed() - || c->AutoAttackEnabled() - || c->GetInvul() - ) { - c->Message(0, "You cannot use this command in your current state. Settle down and wait."); - return; - } - uint16 zoneid = 0; - uint8 destzone = 0; - if (sep->IsNumber(1)) - { - zoneid = atoi(sep->arg[1]); - destzone = database.GetPEQZone(zoneid, 0); - if(destzone == 0){ - c->Message(13, "You cannot use this command to enter that zone!"); - return; - } - if(zoneid == zone->GetZoneID()) { - c->Message(13, "You cannot use this command on the zone you are in!"); - return; - } - } - else if (sep->arg[1][0] == 0 || sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4) || sep->IsNumber(5)) - { - c->Message(0, "Usage: #peqzone [zonename]"); - c->Message(0, "Optional Usage: #peqzone [zoneid]"); - return; - } else { - zoneid = database.GetZoneID(sep->arg[1]); - destzone = database.GetPEQZone(zoneid, 0); - if(zoneid == 0) { - c->Message(0, "Unable to locate zone '%s'", sep->arg[1]); - return; - } - if(destzone == 0){ - c->Message(13, "You cannot use this command to enter that zone!"); - return; - } - if(zoneid == zone->GetZoneID()) { - c->Message(13, "You cannot use this command on the zone you are in!"); - return; - } - } - if(RuleB (Zone, UsePEQZoneDebuffs)){ - c->SpellOnTarget(RuleI(Zone, PEQZoneDebuff1), c); - c->SpellOnTarget(RuleI(Zone, PEQZoneDebuff2), c); - } + if(!c->GetPTimers().Expired(&database, pTimerPeqzoneReuse, false)) { + c->Message(13,"You must wait %i minute(s) before using this ability again.", timeleft); + return; + } - //zone to safe coords - c->GetPTimers().Start(pTimerPeqzoneReuse, RuleI(Zone, PEQZoneReuseTime)); - c->MovePC(zoneid, 0.0f, 0.0f, 0.0f, 0.0f, 0, ZoneToSafeCoords); + if(c->GetHPRatio() < 75) { + c->Message(0, "You cannot use this command with less than 75 percent health."); + return; + } + + //this isnt perfect, but its better... + if( + c->IsInvisible(c) + || c->IsRooted() + || c->IsStunned() + || c->IsMezzed() + || c->AutoAttackEnabled() + || c->GetInvul() + ) { + c->Message(0, "You cannot use this command in your current state. Settle down and wait."); + return; + } + + uint16 zoneid = 0; + uint8 destzone = 0; + if (sep->IsNumber(1)) + { + zoneid = atoi(sep->arg[1]); + destzone = database.GetPEQZone(zoneid, 0); + if(destzone == 0){ + c->Message(13, "You cannot use this command to enter that zone!"); + return; + } + if(zoneid == zone->GetZoneID()) { + c->Message(13, "You cannot use this command on the zone you are in!"); + return; + } + } + else if (sep->arg[1][0] == 0 || sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4) || sep->IsNumber(5)) + { + c->Message(0, "Usage: #peqzone [zonename]"); + c->Message(0, "Optional Usage: #peqzone [zoneid]"); + return; + } + else { + zoneid = database.GetZoneID(sep->arg[1]); + destzone = database.GetPEQZone(zoneid, 0); + if(zoneid == 0) { + c->Message(0, "Unable to locate zone '%s'", sep->arg[1]); + return; + } + if(destzone == 0){ + c->Message(13, "You cannot use this command to enter that zone!"); + return; + } + if(zoneid == zone->GetZoneID()) { + c->Message(13, "You cannot use this command on the zone you are in!"); + return; + } + } + + if(RuleB (Zone, UsePEQZoneDebuffs)){ + c->SpellOnTarget(RuleI(Zone, PEQZoneDebuff1), c); + c->SpellOnTarget(RuleI(Zone, PEQZoneDebuff2), c); + } + + //zone to safe coords + c->GetPTimers().Start(pTimerPeqzoneReuse, RuleI(Zone, PEQZoneReuseTime)); + c->MovePC(zoneid, 0.0f, 0.0f, 0.0f, 0.0f, 0, ZoneToSafeCoords); } void command_movechar(Client *c, const Seperator *sep) @@ -1798,9 +1803,9 @@ void command_invul(Client *c, const Seperator *sep) void command_hideme(Client *c, const Seperator *sep) { - bool state=atobool(sep->arg[1]); + bool state=atobool(sep->arg[1]); - if(sep->arg[1][0]==0) + if(sep->arg[1][0]==0) c->Message(0, "Usage: #hideme [on/off]"); else { @@ -1933,15 +1938,15 @@ void command_zstats(Client *c, const Seperator *sep) void command_permaclass(Client *c, const Seperator *sep) { - Client *t=c; + Client *t=c; - if(c->GetTarget() && c->GetTarget()->IsClient()) - t=c->GetTarget()->CastToClient(); + if(c->GetTarget() && c->GetTarget()->IsClient()) + t=c->GetTarget()->CastToClient(); if(sep->arg[1][0]==0) { c->Message(0,"Usage: #permaclass "); } - else if(!t->IsClient()) + else if(!t->IsClient()) c->Message(0,"Target is not a client."); else { c->Message(0, "Setting %s's class...Sending to char select.", t->GetName()); @@ -1954,16 +1959,16 @@ void command_permaclass(Client *c, const Seperator *sep) void command_permarace(Client *c, const Seperator *sep) { - Client *t=c; + Client *t=c; - if(c->GetTarget() && c->GetTarget()->IsClient()) - t=c->GetTarget()->CastToClient(); + if(c->GetTarget() && c->GetTarget()->IsClient()) + t=c->GetTarget()->CastToClient(); if(sep->arg[1][0]==0) { c->Message(0,"Usage: #permarace "); c->Message(0,"NOTE: Not all models are global. If a model is not global, it will appear as a human on character select and in zones without the model."); } - else if(!t->IsClient()) + else if(!t->IsClient()) c->Message(0,"Target is not a client."); else { c->Message(0, "Setting %s's race - zone to take effect",t->GetName()); @@ -1978,16 +1983,16 @@ void command_permarace(Client *c, const Seperator *sep) void command_permagender(Client *c, const Seperator *sep) { - Client *t=c; + Client *t=c; - if(c->GetTarget() && c->GetTarget()->IsClient()) - t=c->GetTarget()->CastToClient(); + if(c->GetTarget() && c->GetTarget()->IsClient()) + t=c->GetTarget()->CastToClient(); if(sep->arg[1][0]==0) { c->Message(0,"Usage: #permagender "); c->Message(0,"Gender Numbers: 0=Male, 1=Female, 2=Neuter"); } - else if(!t->IsClient()) + else if(!t->IsClient()) c->Message(0,"Target is not a client."); else { c->Message(0, "Setting %s's gender - zone to take effect",t->GetName()); @@ -2512,7 +2517,7 @@ void command_mana(Client *c, const Seperator *sep) void command_flymode(Client *c, const Seperator *sep) { - Client *t=c; + Client *t=c; if (strlen(sep->arg[1]) == 1 && !(sep->arg[1][0] == '0' || sep->arg[1][0] == '1' || sep->arg[1][0] == '2')) c->Message(0, "#flymode [0/1/2]"); @@ -2727,7 +2732,7 @@ void command_setskillall(Client *c, const Seperator *sep) void command_race(Client *c, const Seperator *sep) { - Mob *t=c->CastToMob(); + Mob *t=c->CastToMob(); // Need to figure out max race for LoY/LDoN: going with upper bound of 500 now for testing if (sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 724) { @@ -2736,12 +2741,12 @@ void command_race(Client *c, const Seperator *sep) t->SendIllusionPacket(atoi(sep->arg[1])); } else - c->Message(0, "Usage: #race [0-724] (0 for back to normal)"); + c->Message(0, "Usage: #race [0-724] (0 for back to normal)"); } void command_gender(Client *c, const Seperator *sep) { - Mob *t=c->CastToMob(); + Mob *t=c->CastToMob(); if (sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 500) { if ((c->GetTarget()) && c->Admin() >= commandGenderOthers) @@ -2841,7 +2846,7 @@ void command_texture(Client *c, const Seperator *sep) } } else - c->Message(0, "Usage: #texture [texture] [helmtexture] (0-255, 255 for show equipment)"); + c->Message(0, "Usage: #texture [texture] [helmtexture] (0-255, 255 for show equipment)"); } void command_npctypespawn(Client *c, const Seperator *sep) @@ -3304,67 +3309,67 @@ void command_peekinv(Client *c, const Seperator *sep) void command_findnpctype(Client *c, const Seperator *sep) { - if(sep->arg[1][0] == 0) - c->Message(0, "Usage: #findnpctype [search criteria]"); - else - { - int id; - int count; - const int maxrows = 20; - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query; - MYSQL_RES *result; - MYSQL_ROW row; + if(sep->arg[1][0] == 0) + c->Message(0, "Usage: #findnpctype [search criteria]"); + else + { + int id; + int count; + const int maxrows = 20; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query; + MYSQL_RES *result; + MYSQL_ROW row; - query = new char[256]; + query = new char[256]; - // If id evaluates to 0, then search as if user entered a string. - if ((id = atoi((const char *)sep->arg[1])) == 0) - MakeAnyLenString(&query, - "SELECT id,name" - " FROM npc_types WHERE name LIKE '%%%s%%'", - sep->arg[1]); - // Otherwise, look for just that npc id. - else - MakeAnyLenString(&query, - "SELECT id,name FROM npc_types WHERE id=%i", id); + // If id evaluates to 0, then search as if user entered a string. + if ((id = atoi((const char *)sep->arg[1])) == 0) + MakeAnyLenString(&query, + "SELECT id,name" + " FROM npc_types WHERE name LIKE '%%%s%%'", + sep->arg[1]); + // Otherwise, look for just that npc id. + else + MakeAnyLenString(&query, + "SELECT id,name FROM npc_types WHERE id=%i", id); - // If query runs successfully. - if (database.RunQuery(query, strlen(query), errbuf, &result)) - { - count = 0; + // If query runs successfully. + if (database.RunQuery(query, strlen(query), errbuf, &result)) + { + count = 0; - // Process each row returned. - while((row = mysql_fetch_row(result))) - { - // Limit to returning maxrows rows. - if (++count > maxrows) - { - c->Message (0, - "%i npc types shown. Too many results.", maxrows); - break; - } - c->Message (0, " %s: %s", row[0], row[1]); - } + // Process each row returned. + while((row = mysql_fetch_row(result))) + { + // Limit to returning maxrows rows. + if (++count > maxrows) + { + c->Message (0, + "%i npc types shown. Too many results.", maxrows); + break; + } + c->Message (0, " %s: %s", row[0], row[1]); + } - // If we did not hit the maxrows limit. - if (count <= maxrows) - c->Message (0, "Query complete. %i rows shown.", count); - // No matches found. - else if (count == 0) - c->Message (0, "No matches found for %s.", sep->arg[1]); + // If we did not hit the maxrows limit. + if (count <= maxrows) + c->Message (0, "Query complete. %i rows shown.", count); + // No matches found. + else if (count == 0) + c->Message (0, "No matches found for %s.", sep->arg[1]); - mysql_free_result(result); - } - // If query failed. - else - { - c->Message (0, "Error querying database."); - c->Message (0, query); - } + mysql_free_result(result); + } + // If query failed. + else + { + c->Message (0, "Error querying database."); + c->Message (0, query); + } - safe_delete_array(query); - } + safe_delete_array(query); + } } void command_findzone(Client *c, const Seperator *sep) @@ -3390,7 +3395,7 @@ void command_findzone(Client *c, const Seperator *sep) database.DoEscapeString(EscName, sep->arg[1], strlen(sep->arg[1])); MakeAnyLenString(&query, "SELECT zoneidnumber,short_name,long_name FROM zone WHERE long_name rLIKE '%s' AND version=0", - EscName); + EscName); safe_delete_array(EscName); } // Otherwise, look for just that zoneidnumber. @@ -4362,7 +4367,7 @@ void command_bind(Client *c, const Seperator *sep) c->GetTarget()->CastToClient()->SetBindPoint(); else c->Message(0, "Error: target not a Player"); - } else + } else c->SetBindPoint(); } @@ -4586,7 +4591,7 @@ void command_name(Client *c, const Seperator *sep) target->Kick(); } else - c->Message(13, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.", oldname, sep->arg[2]); + c->Message(13, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.", oldname, sep->arg[2]); free(oldname); } } @@ -4776,7 +4781,7 @@ void command_spawnfix(Client *c, const Seperator *sep) { { c->Message(13, "Update failed! MySQL gave the following error:"); c->Message(13, errbuf); - } + } safe_delete_array(query); } } @@ -4812,7 +4817,7 @@ void command_iteminfo(Client *c, const Seperator *sep) c->Message(0, " Lore: %s ND: %i NS: %i Type: %i", (item->LoreFlag) ? "true":"false", item->NoDrop, item->NoRent, item->ItemClass); c->Message(0, " IDF: %s Size: %i Weight: %i icon_id: %i Price: %i", item->IDFile, item->Size, item->Weight, item->Icon, item->Price); if (c->Admin() >= 200) - c->Message(0, "MinStatus: %i", item->MinStatus); + c->Message(0, "MinStatus: %i", item->MinStatus); if (item->ItemClass==ItemClassBook) c->Message(0, " This item is a Book: %s", item->Filename); else if (item->ItemClass==ItemClassContainer) @@ -4822,7 +4827,7 @@ void command_iteminfo(Client *c, const Seperator *sep) c->Message(0, " Magic: %i SpellID: %i Proc Level: %i DBCharges: %i CurCharges: %i", item->Magic, item->Click.Effect, item->Click.Level, item->MaxCharges, inst->GetCharges()); c->Message(0, " EffectType: 0x%02x CastTime: %.2f", (uint8) item->Click.Type, (double) item->CastTime/1000); c->Message(0, " Material: 0x%02x Color: 0x%08x Skill: %i", item->Material, item->Color, item->ItemType); - c->Message(0, " Required level: %i Required skill: %i Recommended level:%i", item->ReqLevel, item->RecSkill, item->RecLevel); + c->Message(0, " Required level: %i Required skill: %i Recommended level:%i", item->ReqLevel, item->RecSkill, item->RecLevel); c->Message(0, " Skill mod: %i percent: %i", item->SkillModType, item->SkillModValue); c->Message(0, " BaneRace: %i BaneBody: %i BaneDMG: %i", item->BaneDmgRace, item->BaneDmgBody, item->BaneDmgAmt); } @@ -4922,7 +4927,7 @@ void command_guild(Client *c, const Seperator *sep) c->Message(0, " #guild remove [charname]"); c->Message(0, " #guild promote rank [charname]"); c->Message(0, " #guild demote rank [charname]"); - c->Message(0, " /guildmotd [newmotd] (use 'none' to clear)"); + c->Message(0, " /guildmotd [newmotd] (use 'none' to clear)"); c->Message(0, " #guild edit rank title newtitle"); c->Message(0, " #guild edit rank permission 0/1"); c->Message(0, " #guild leader newleader (they must be rank0)"); @@ -6128,10 +6133,10 @@ void command_wpadd(Client *c, const Seperator *sep) if (tmp_grid) t->CastToNPC()->SetGrid(tmp_grid); - t->CastToNPC()->AssignWaypoints(t->CastToNPC()->GetGrid()); + t->CastToNPC()->AssignWaypoints(t->CastToNPC()->GetGrid()); c->Message(0,"Waypoint added. Use #wpinfo to see waypoints for this NPC (may need to #repop first)."); - } - else + } + else c->Message(0,"You must target an NPC to use this."); } @@ -6167,11 +6172,11 @@ void command_summonitem(Client *c, const Seperator *sep) c->Message(0, "Usage: #summonitem [item id] [charges], charges are optional"); else { uint32 itemid = atoi(sep->arg[1]); - int16 item_status = 0; - const Item_Struct* item = database.GetItem(itemid); - if(item) { - item_status = static_cast(item->MinStatus); - } + int16 item_status = 0; + const Item_Struct* item = database.GetItem(itemid); + if(item) { + item_status = static_cast(item->MinStatus); + } if (item_status > c->Admin()) c->Message(13, "Error: Insufficient status to summon this item."); @@ -6204,11 +6209,11 @@ void command_giveitem(Client *c, const Seperator *sep) } else { Client *t = c->GetTarget()->CastToClient(); uint32 itemid = atoi(sep->arg[1]); - int16 item_status = 0; - const Item_Struct* item = database.GetItem(itemid); - if(item) { - item_status = static_cast(item->MinStatus); - } + int16 item_status = 0; + const Item_Struct* item = database.GetItem(itemid); + if(item) { + item_status = static_cast(item->MinStatus); + } if (item_status > c->Admin()) c->Message(13, "Error: Insufficient status to summon this item."); @@ -6234,7 +6239,7 @@ void command_givemoney(Client *c, const Seperator *sep) { if (!sep->IsNumber(1)) { //as long as the first one is a number, we'll just let atoi convert the rest to 0 or a number c->Message(13, "Usage: #Usage: #givemoney [pp] [gp] [sp] [cp]"); - } + } else if(c->GetTarget() == nullptr) { c->Message(13, "You must target a player to give money to."); } @@ -6405,90 +6410,90 @@ void command_stun(Client *c, const Seperator *sep) void command_embperl_plugin(Client *c, const Seperator *sep) { - if(sep->arg[1][0] == 0) - { - c->Message(0, "Usage: #plugin (subname) [arguments]"); - return; - } + if(sep->arg[1][0] == 0) + { + c->Message(0, "Usage: #plugin (subname) [arguments]"); + return; + } - Embperl * perl; - if(!parse || !(perl = ((PerlembParser *)parse)->getperl())) - { - c->Message(0, "Error: Perl module not loaded"); - return; - } + Embperl * perl; + if(!parse || !(perl = ((PerlembParser *)parse)->getperl())) + { + c->Message(0, "Error: Perl module not loaded"); + return; + } - std::string exports = "$plugin::printbuff='';$plugin::ip='"; - struct in_addr ip; ip.s_addr = c->GetIP(); - exports += inet_ntoa(ip); - exports += "';$plugin::name=qq("; - exports += c->GetName(); - exports += ");package plugin;"; - perl->eval(exports.c_str()); + std::string exports = "$plugin::printbuff='';$plugin::ip='"; + struct in_addr ip; ip.s_addr = c->GetIP(); + exports += inet_ntoa(ip); + exports += "';$plugin::name=qq("; + exports += c->GetName(); + exports += ");package plugin;"; + perl->eval(exports.c_str()); - std::string fqsubname("plugin::"); - fqsubname.append(sep->arg[1]); + std::string fqsubname("plugin::"); + fqsubname.append(sep->arg[1]); - //convert args into a vector of strings. - std::vector args; - for(int i = 2; i < sep->argnum; ++i) - { - args.push_back(sep->arg[i]); - } + //convert args into a vector of strings. + std::vector args; + for(int i = 2; i < sep->argnum; ++i) + { + args.push_back(sep->arg[i]); + } - try - { - perl->dosub(fqsubname.c_str(), &args); - std::string output = perl->getstr("$plugin::printbuff"); - if(output.length()) - c->Message(0, "%s", output.c_str()); - } - catch(const char * err) - { - c->Message(0, "Error executing plugin: %s", perl->lasterr().c_str()); - } + try + { + perl->dosub(fqsubname.c_str(), &args); + std::string output = perl->getstr("$plugin::printbuff"); + if(output.length()) + c->Message(0, "%s", output.c_str()); + } + catch(const char * err) + { + c->Message(0, "Error executing plugin: %s", perl->lasterr().c_str()); + } - perl->eval("package main;"); + perl->eval("package main;"); } void command_embperl_eval(Client *c, const Seperator *sep) { - if(sep->arg[1][0] == 0) - { - c->Message(0, "Usage: #peval (expr)"); - return; - } + if(sep->arg[1][0] == 0) + { + c->Message(0, "Usage: #peval (expr)"); + return; + } - Embperl * perl; - if(!parse || !(perl = ((PerlembParser *)parse)->getperl())) - { - c->Message(0, "Error: Perl module not loaded"); - return; - } + Embperl * perl; + if(!parse || !(perl = ((PerlembParser *)parse)->getperl())) + { + c->Message(0, "Error: Perl module not loaded"); + return; + } - std::string exports = "$plugin::printbuff='';$plugin::ip='"; - struct in_addr ip; ip.s_addr = c->GetIP(); - exports += inet_ntoa(ip); - exports += "';$plugin::name=qq("; - exports += c->GetName(); - exports += ");"; - perl->eval(exports.c_str()); + std::string exports = "$plugin::printbuff='';$plugin::ip='"; + struct in_addr ip; ip.s_addr = c->GetIP(); + exports += inet_ntoa(ip); + exports += "';$plugin::name=qq("; + exports += c->GetName(); + exports += ");"; + perl->eval(exports.c_str()); - try - { - std::string cmd = std::string("package plugin;") + std::string(sep->msg + sizeof("peval ")); - perl->eval(cmd.c_str()); - std::string output = perl->getstr("$plugin::printbuff"); - if(output.length()) - c->Message(0, "%s", output.c_str()); - } - catch(const char * err) - { - c->Message(0, "Error: %s", perl->lasterr().c_str()); - } + try + { + std::string cmd = std::string("package plugin;") + std::string(sep->msg + sizeof("peval ")); + perl->eval(cmd.c_str()); + std::string output = perl->getstr("$plugin::printbuff"); + if(output.length()) + c->Message(0, "%s", output.c_str()); + } + catch(const char * err) + { + c->Message(0, "Error: %s", perl->lasterr().c_str()); + } - perl->eval("package main;"); + perl->eval("package main;"); } @@ -6504,7 +6509,7 @@ void command_ban(Client *c, const Seperator *sep) if(sep->arg[1][0] == 0) { - c->Message(0, "Usage: #ban [charname]"); + c->Message(0, "Usage: #ban [charname]"); } else { @@ -6562,7 +6567,7 @@ void command_suspend(Client *c, const Seperator *sep) char *query = nullptr; if((sep->arg[1][0] == 0) || (sep->arg[2][0] == 0)) - c->Message(0, "Usage: #suspend (Specify 0 days to lift the suspension immediately)"); + c->Message(0, "Usage: #suspend (Specify 0 days to lift the suspension immediately)"); else { int Duration = atoi(sep->arg[2]); @@ -6579,11 +6584,11 @@ void command_suspend(Client *c, const Seperator *sep) if((AccountID = database.GetAccountIDByChar(EscName)) > 0) { database.RunQuery(query, MakeAnyLenString(&query, "UPDATE `account` SET `suspendeduntil` = DATE_ADD(NOW(), INTERVAL %i DAY)" - " WHERE `id` = %i", Duration, AccountID), errbuf, 0); + " WHERE `id` = %i", Duration, AccountID), errbuf, 0); if(Duration) c->Message(13,"Account number %i with the character %s has been temporarily suspended for %i day(s).", AccountID, sep->arg[1], - Duration); + Duration); else c->Message(13,"Account number %i with the character %s is no longer suspended.", AccountID, sep->arg[1]); @@ -6618,7 +6623,7 @@ void command_ipban(Client *c, const Seperator *sep) { if(sep->arg[1] == 0) { - c->Message(0, "Usage: #ipban [xxx.xxx.xxx.xxx]"); + c->Message(0, "Usage: #ipban [xxx.xxx.xxx.xxx]"); } else { if(database.AddBannedIP(sep->arg[1], c->GetName())) { c->Message(0, "%s has been successfully added to the Banned_IPs table by %s",sep->arg[1], c->GetName()); @@ -6635,7 +6640,7 @@ void command_revoke(Client *c, const Seperator *sep) if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) { - c->Message(0, "Usage: #revoke [charname] [1/0]"); + c->Message(0, "Usage: #revoke [charname] [1/0]"); } else { @@ -6679,7 +6684,7 @@ void command_revoke(Client *c, const Seperator *sep) void command_oocmute(Client *c, const Seperator *sep) { if(sep->arg[1][0] == 0 || !(sep->arg[1][0] == '1' || sep->arg[1][0] == '0')) - c->Message(0, "Usage: #oocmute [1/0]"); + c->Message(0, "Usage: #oocmute [1/0]"); else { ServerPacket * outapp = new ServerPacket (ServerOP_OOCMute,1); *(outapp->pBuffer)=atoi(sep->arg[1]); @@ -8086,9 +8091,9 @@ void command_bestz(Client *c, const Seperator *sep) { WaterRegionType RegionType; float z; - if(c->GetTarget()) { + if(c->GetTarget()) { z=c->GetTarget()->GetZ(); - RegionType = zone->watermap->BSPReturnRegionType(1, c->GetTarget()->GetX(), c->GetTarget()->GetY(), z); + RegionType = zone->watermap->BSPReturnRegionType(1, c->GetTarget()->GetX(), c->GetTarget()->GetY(), z); c->Message(0,"InWater returns %d", zone->watermap->InWater(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z)); c->Message(0,"InLava returns %d", zone->watermap->InLava(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z)); @@ -8106,7 +8111,7 @@ void command_bestz(Client *c, const Seperator *sep) { case RegionTypeWater: { c->Message(0,"You/your target are in Water."); break; } case RegionTypeLava: { c->Message(0,"You/your target are in Lava."); break; } case RegionTypeVWater: { c->Message(0,"You/your target are in VWater (Icy Water?)."); break; } - default: c->Message(0,"You/your target are in an unknown region type."); + default: c->Message(0,"You/your target are in an unknown region type."); } } @@ -8484,17 +8489,17 @@ void command_rules(Client *c, const Seperator *sep) { //super-command for managing rules settings if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) { c->Message(0, "Syntax: #rules [subcommand]."); - c->Message(0, "-- Rule Set Manipulation --"); + c->Message(0, "-- Rule Set Manipulation --"); c->Message(0, "...listsets - List avaliable rule sets"); c->Message(0, "...current - gives the name of the ruleset currently running in this zone"); c->Message(0, "...reload - Reload the selected ruleset in this zone"); c->Message(0, "...switch (ruleset name) - Change the selected ruleset and load it"); - c->Message(0, "...load (ruleset name) - Load a ruleset in just this zone without changing the selected set"); + c->Message(0, "...load (ruleset name) - Load a ruleset in just this zone without changing the selected set"); //too lazy to write this right now: // c->Message(0, "...wload (ruleset name) - Load a ruleset in all zones without changing the selected set"); - c->Message(0, "...store [ruleset name] - Store the running ruleset as the specified name"); + c->Message(0, "...store [ruleset name] - Store the running ruleset as the specified name"); c->Message(0, "---------------------"); - c->Message(0, "-- Running Rule Manipulation --"); + c->Message(0, "-- Running Rule Manipulation --"); c->Message(0, "...reset - Reset all rules to their default values"); c->Message(0, "...get [rule] - Get the specified rule's local value"); c->Message(0, "...set (rule) (value) - Set the specified rule to the specified value locally only"); @@ -8506,7 +8511,7 @@ void command_rules(Client *c, const Seperator *sep) { if(!strcasecmp(sep->arg[1], "current")) { c->Message(0, "Currently running ruleset '%s' (%d)", RuleManager::Instance()->GetActiveRuleset(), - RuleManager::Instance()->GetActiveRulesetID()); + RuleManager::Instance()->GetActiveRulesetID()); } else if(!strcasecmp(sep->arg[1], "listsets")) { std::map sets; if(!RuleManager::Instance()->ListRulesets(&database, sets)) { @@ -8524,7 +8529,7 @@ void command_rules(Client *c, const Seperator *sep) { } else if(!strcasecmp(sep->arg[1], "reload")) { RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset()); c->Message(0, "The active ruleset (%s (%d)) has been reloaded", RuleManager::Instance()->GetActiveRuleset(), - RuleManager::Instance()->GetActiveRulesetID()); + RuleManager::Instance()->GetActiveRulesetID()); } else if(!strcasecmp(sep->arg[1], "switch")) { //make sure this is a valid rule set.. int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]); @@ -8672,7 +8677,7 @@ void command_task(Client *c, const Seperator *sep) { //super-command for managing tasks if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) { c->Message(0, "Syntax: #task [subcommand]."); - c->Message(0, "-- Task System Commands --"); + c->Message(0, "-- Task System Commands --"); c->Message(0, "...show - List active tasks for a client"); c->Message(0, "...update [Count]"); c->Message(0, "...reloadall - Reload all Task information from the database"); @@ -9052,163 +9057,163 @@ void command_refreshgroup(Client *c, const Seperator *sep) } void command_advnpcspawn(Client *c, const Seperator *sep) - { - Mob *target=c->GetTarget(); - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; +{ + Mob *target=c->GetTarget(); + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; uint32 last_insert_id = 0; - if (strcasecmp(sep->arg[1], "maketype") == 0){ - if(target && target->IsNPC()) - { - database.NPCSpawnDB(6, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC()); - } - else - c->Message(0, "Target Required!"); - } - else if (strcasecmp(sep->arg[1], "makegroup") == 0) { - if(sep->arg[2]) - { - if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawngroup (name,spawn_limit,dist,max_x,min_x,max_y,min_y,delay) VALUES (\"%s\",%i,%f,%f,%f,%f,%f,%i)", sep->arg[2], (sep->arg[3]?atoi(sep->arg[3]):0), (sep->arg[4]?atof(sep->arg[4]):0), (sep->arg[5]?atof(sep->arg[5]):0), (sep->arg[6]?atof(sep->arg[6]):0), (sep->arg[7]?atof(sep->arg[7]):0), (sep->arg[8]?atof(sep->arg[8]):0), (sep->arg[9]?atoi(sep->arg[9]):0)), errbuf, 0, 0, &last_insert_id)) - { - c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); - c->Message(13, errbuf); - } - else - { - c->LogSQL(query); - c->Message(0, "Group ID %i created successfully!", last_insert_id); - } - safe_delete_array(query); - } - else - { - c->Message(0, "Format: #advnpdspawn makegroup [spawn limit] [dist] [max x] [min x] [max y] [min y] [delay]"); - } - } - else if (strcasecmp(sep->arg[1], "addgroupentry") == 0) { - if(atoi(sep->arg[2]) && atoi(sep->arg[3]) && atoi(sep->arg[4])) - { - if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawnentry (spawngroupID,npcID,chance) VALUES (%i,%i,%i)", atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), errbuf, 0, 0, &last_insert_id))) - { - c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); - c->Message(13, errbuf); - } - else - { - c->LogSQL(query); - c->Message(0, "NPC %i added to group %i with %i chance!", atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[4]) ); - } - safe_delete(query); - } - else - { - c->Message(0, "Format: #advnpdspawn addgroupentry "); - } - } - else if (strcasecmp(sep->arg[1], "editgroupbox") == 0) { - if(atof(sep->arg[2]) && atof(sep->arg[3]) && atof(sep->arg[4]) && atof(sep->arg[5]) && atof(sep->arg[6]) && atof(sep->arg[7]) && atof(sep->arg[8])) - { - if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawngroup SET dist='%f',max_x='%f',min_x='%f',max_y='%f',min_y='%f',delay='%i' WHERE id='%i'", atof(sep->arg[3]),atof(sep->arg[4]),atof(sep->arg[5]),atof(sep->arg[6]),atof(sep->arg[7]),atoi(sep->arg[8]),atoi(sep->arg[2]), errbuf, 0, 0, &last_insert_id))) - { - c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); - c->Message(13, errbuf); - } - else - { - c->LogSQL(query); - c->Message(0, "Group ID %i created successfully!", last_insert_id); - } - safe_delete_array(query); - } - else - { - c->Message(0, "Format: #advnpdspawn editgroupbox "); - } - } - else if (strcasecmp(sep->arg[1], "cleargroupbox") == 0) { - if(atoi(sep->arg[2])) - { - if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawngroup SET dist='0',max_x='0',min_x='0',max_y='0',min_y='0',delay='0' WHERE id='%i'",atoi(sep->arg[2])), errbuf, 0, 0, &last_insert_id)) - { - c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); - c->Message(13, errbuf); - } - else - { - c->LogSQL(query); - c->Message(0, "Group ID %i created successfully!", last_insert_id); - } - safe_delete_array(query); - } - else - { - c->Message(0, "Format: #advnpdspawn cleargroupbox "); - } - } - else if (strcasecmp(sep->arg[1], "addgroupspawn") == 0 && atoi(sep->arg[2])!=0) { - database.NPCSpawnDB(5, zone->GetShortName(), zone->GetInstanceVersion(), c, 0, atoi(sep->arg[2])); - c->Message(0, "Mob of group %i added successfully!", atoi(sep->arg[2])); - } - else if (strcasecmp(sep->arg[1], "removegroupspawn") == 0) { - if (!target || !target->IsNPC()) - c->Message(0, "Error: Need an NPC target."); - else { - Spawn2* s2 = target->CastToNPC()->respawn2; + if (strcasecmp(sep->arg[1], "maketype") == 0){ + if(target && target->IsNPC()) + { + database.NPCSpawnDB(6, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC()); + } + else + c->Message(0, "Target Required!"); + } + else if (strcasecmp(sep->arg[1], "makegroup") == 0) { + if(sep->arg[2]) + { + if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawngroup (name,spawn_limit,dist,max_x,min_x,max_y,min_y,delay) VALUES (\"%s\",%i,%f,%f,%f,%f,%f,%i)", sep->arg[2], (sep->arg[3]?atoi(sep->arg[3]):0), (sep->arg[4]?atof(sep->arg[4]):0), (sep->arg[5]?atof(sep->arg[5]):0), (sep->arg[6]?atof(sep->arg[6]):0), (sep->arg[7]?atof(sep->arg[7]):0), (sep->arg[8]?atof(sep->arg[8]):0), (sep->arg[9]?atoi(sep->arg[9]):0)), errbuf, 0, 0, &last_insert_id)) + { + c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); + c->Message(13, errbuf); + } + else + { + c->LogSQL(query); + c->Message(0, "Group ID %i created successfully!", last_insert_id); + } + safe_delete_array(query); + } + else + { + c->Message(0, "Format: #advnpdspawn makegroup [spawn limit] [dist] [max x] [min x] [max y] [min y] [delay]"); + } + } + else if (strcasecmp(sep->arg[1], "addgroupentry") == 0) { + if(atoi(sep->arg[2]) && atoi(sep->arg[3]) && atoi(sep->arg[4])) + { + if (!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawnentry (spawngroupID,npcID,chance) VALUES (%i,%i,%i)", atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), errbuf, 0, 0, &last_insert_id))) + { + c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); + c->Message(13, errbuf); + } + else + { + c->LogSQL(query); + c->Message(0, "NPC %i added to group %i with %i chance!", atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[4]) ); + } + safe_delete(query); + } + else + { + c->Message(0, "Format: #advnpdspawn addgroupentry "); + } + } + else if (strcasecmp(sep->arg[1], "editgroupbox") == 0) { + if(atof(sep->arg[2]) && atof(sep->arg[3]) && atof(sep->arg[4]) && atof(sep->arg[5]) && atof(sep->arg[6]) && atof(sep->arg[7]) && atof(sep->arg[8])) + { + if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawngroup SET dist='%f',max_x='%f',min_x='%f',max_y='%f',min_y='%f',delay='%i' WHERE id='%i'", atof(sep->arg[3]),atof(sep->arg[4]),atof(sep->arg[5]),atof(sep->arg[6]),atof(sep->arg[7]),atoi(sep->arg[8]),atoi(sep->arg[2]), errbuf, 0, 0, &last_insert_id))) + { + c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); + c->Message(13, errbuf); + } + else + { + c->LogSQL(query); + c->Message(0, "Group ID %i created successfully!", last_insert_id); + } + safe_delete_array(query); + } + else + { + c->Message(0, "Format: #advnpdspawn editgroupbox "); + } + } + else if (strcasecmp(sep->arg[1], "cleargroupbox") == 0) { + if(atoi(sep->arg[2])) + { + if (!database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawngroup SET dist='0',max_x='0',min_x='0',max_y='0',min_y='0',delay='0' WHERE id='%i'",atoi(sep->arg[2])), errbuf, 0, 0, &last_insert_id)) + { + c->Message(0, "Invalid Arguments -- MySQL gave the following error:"); + c->Message(13, errbuf); + } + else + { + c->LogSQL(query); + c->Message(0, "Group ID %i created successfully!", last_insert_id); + } + safe_delete_array(query); + } + else + { + c->Message(0, "Format: #advnpdspawn cleargroupbox "); + } + } + else if (strcasecmp(sep->arg[1], "addgroupspawn") == 0 && atoi(sep->arg[2])!=0) { + database.NPCSpawnDB(5, zone->GetShortName(), zone->GetInstanceVersion(), c, 0, atoi(sep->arg[2])); + c->Message(0, "Mob of group %i added successfully!", atoi(sep->arg[2])); + } + else if (strcasecmp(sep->arg[1], "removegroupspawn") == 0) { + if (!target || !target->IsNPC()) + c->Message(0, "Error: Need an NPC target."); + else { + Spawn2* s2 = target->CastToNPC()->respawn2; - if(!s2) { - c->Message(0, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from."); - } - else - { - if(database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawn2 WHERE id='%i'",s2->GetID()), errbuf)) - { - c->LogSQL(query); - c->Message(0, "Spawnpoint Removed successfully."); - target->Depop(false); - } - else - { - c->Message(13, "Update failed! MySQL gave the following error:"); - c->Message(13, errbuf); - } - safe_delete_array(query); - } - } - } - else if (strcasecmp(sep->arg[1], "movespawn") == 0) { - if (!target || !target->IsNPC()) - c->Message(0, "Error: Need an NPC target."); - else { - Spawn2* s2 = target->CastToNPC()->respawn2; + if(!s2) { + c->Message(0, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from."); + } + else + { + if(database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM spawn2 WHERE id='%i'",s2->GetID()), errbuf)) + { + c->LogSQL(query); + c->Message(0, "Spawnpoint Removed successfully."); + target->Depop(false); + } + else + { + c->Message(13, "Update failed! MySQL gave the following error:"); + c->Message(13, errbuf); + } + safe_delete_array(query); + } + } + } + else if (strcasecmp(sep->arg[1], "movespawn") == 0) { + if (!target || !target->IsNPC()) + c->Message(0, "Error: Need an NPC target."); + else { + Spawn2* s2 = target->CastToNPC()->respawn2; - if(!s2) { - c->Message(0, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from."); - } - else - { - if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET x='%f', y='%f', z='%f', heading='%f' WHERE id='%i'",c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(),s2->GetID()), errbuf)) - { - c->LogSQL(query); - c->Message(0, "Updating coordinates successful."); - target->CastToNPC()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading()); - target->CastToNPC()->SaveGuardSpot(true); - target->SendPosition(); - } - else - { - c->Message(13, "Update failed! MySQL gave the following error:"); - c->Message(13, errbuf); - } - safe_delete_array(query); - } - } - } - else if (strcasecmp(sep->arg[1], "editrespawn") == 0) { - if (!target || !target->IsNPC()) - c->Message(0, "Error: Need an NPC target."); - else { - Spawn2* s2 = target->CastToNPC()->respawn2; + if(!s2) { + c->Message(0, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from."); + } + else + { + if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET x='%f', y='%f', z='%f', heading='%f' WHERE id='%i'",c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(),s2->GetID()), errbuf)) + { + c->LogSQL(query); + c->Message(0, "Updating coordinates successful."); + target->CastToNPC()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading()); + target->CastToNPC()->SaveGuardSpot(true); + target->SendPosition(); + } + else + { + c->Message(13, "Update failed! MySQL gave the following error:"); + c->Message(13, errbuf); + } + safe_delete_array(query); + } + } + } + else if (strcasecmp(sep->arg[1], "editrespawn") == 0) { + if (!target || !target->IsNPC()) + c->Message(0, "Error: Need an NPC target."); + else { + Spawn2* s2 = target->CastToNPC()->respawn2; uint32 new_rs = 0; uint32 new_var = s2->GetVariance(); @@ -9227,61 +9232,61 @@ void command_advnpcspawn(Client *c, const Seperator *sep) new_var = atoi(sep->arg[3]); } - if(!s2) { - c->Message(0, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from."); - } - else - { - if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET respawntime=%u, variance=%u WHERE id='%i'", new_rs, new_var, s2->GetID()), errbuf)) - { - c->LogSQL(query); - c->Message(0, "Updating respawn timer successful."); + if(!s2) { + c->Message(0, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from."); + } + else + { + if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET respawntime=%u, variance=%u WHERE id='%i'", new_rs, new_var, s2->GetID()), errbuf)) + { + c->LogSQL(query); + c->Message(0, "Updating respawn timer successful."); s2->SetRespawnTimer(new_rs); s2->SetVariance(new_var); - } - else - { - c->Message(13, "Update failed! MySQL gave the following error:"); - c->Message(13, errbuf); - } - safe_delete_array(query); - } - } - } + } + else + { + c->Message(13, "Update failed! MySQL gave the following error:"); + c->Message(13, errbuf); + } + safe_delete_array(query); + } + } + } else if (strcasecmp(sep->arg[1], "setversion") == 0) { int16 Version = 0; - if (!target || !target->IsNPC()) - c->Message(0, "Error: Need an NPC target."); - else { + if (!target || !target->IsNPC()) + c->Message(0, "Error: Need an NPC target."); + else { if(sep->IsNumber(2)){ Version = atoi(sep->arg[2]); - if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET version=%i WHERE spawngroupID='%i'", Version, c->GetTarget()->CastToNPC()->GetSp2()), errbuf)){ - c->LogSQL(query); - c->Message(0, "Version change to %i was successful from SpawnGroupID %i", Version, c->GetTarget()->CastToNPC()->GetSp2()); + if(database.RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET version=%i WHERE spawngroupID='%i'", Version, c->GetTarget()->CastToNPC()->GetSp2()), errbuf)){ + c->LogSQL(query); + c->Message(0, "Version change to %i was successful from SpawnGroupID %i", Version, c->GetTarget()->CastToNPC()->GetSp2()); c->GetTarget()->Depop(false); - } - else{ - c->Message(13, "Update failed! MySQL gave the following error:"); - c->Message(13, errbuf); - } - safe_delete_array(query); + } + else{ + c->Message(13, "Update failed! MySQL gave the following error:"); + c->Message(13, errbuf); + } + safe_delete_array(query); } else{ c->Message(0, "setversion FAILED -- You must set a version number"); return; } } - } - else if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) { - database.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list); - c->Message(0, "Group %i loaded successfully!", atoi(sep->arg[2])); - } - else { - c->Message(0, "Error: #advnpcspawn: Invalid command."); - c->Message(0, "Usage: #advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn|setversion]"); - c->Message(0, "Usage: #advnpcspawn [removegroupspawn|movespawn|editrespawn|editgroupbox|cleargroupbox]"); - } - } + } + else if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) { + database.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list); + c->Message(0, "Group %i loaded successfully!", atoi(sep->arg[2])); + } + else { + c->Message(0, "Error: #advnpcspawn: Invalid command."); + c->Message(0, "Usage: #advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn|setversion]"); + c->Message(0, "Usage: #advnpcspawn [removegroupspawn|movespawn|editrespawn|editgroupbox|cleargroupbox]"); + } +} void command_aggrozone(Client *c, const Seperator *sep) { if(!c) @@ -9513,7 +9518,7 @@ void command_setstartzone(Client *c, const Seperator *sep) target = c->GetTarget()->CastToClient(); else { c->Message(0, "Usage: (needs PC target) #setstartzone zonename"); - c->Message(0, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. A player can select a starting zone using /setstartcity"); + c->Message(0, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. Player can select a starting zone using /setstartcity"); return; } @@ -9654,8 +9659,8 @@ void command_object(Client *c, const Seperator *sep) " ORDER BY id", zone->GetZoneID(), zone->GetInstanceVersion(), - c->GetX() - radius, // Yes, we're actually using a bounding box instead of a radius. - c->GetX() + radius, // Much less processing power used this way. + c->GetX() - radius, // Yes, we're actually using a bounding box instead of a radius. + c->GetX() + radius, // Much less processing power used this way. c->GetY() - radius, c->GetY() + radius, c->GetZ() - radius, @@ -9856,8 +9861,8 @@ void command_object(Client *c, const Seperator *sep) "AND (posz BETWEEN %.1f AND %.1f)", zone->GetZoneID(), zone->GetInstanceVersion(), - od.x - 0.2f, od.x + 0.2f, // Yes, we're actually using a bounding box instead of a radius. - od.y - 0.2f, od.y + 0.2f, // Much less processing power used this way. + od.x - 0.2f, od.x + 0.2f, // Yes, we're actually using a bounding box instead of a radius. + od.y - 0.2f, od.y + 0.2f, // Much less processing power used this way. od.z - 0.2f, od.z + 0.2f); // It's pretty forgiving, though, allowing for close-proximity objects iObjectsFound = 0; @@ -10271,8 +10276,8 @@ void command_object(Client *c, const Seperator *sep) if ((sep->argnum < 2) || // Not enough arguments ((id = atoi(sep->arg[2])) == 0) || // ID not specified (((sep->arg[3][0] < '0') || (sep->arg[3][0] > '9')) && - ((sep->arg[3][0] & 0xDF) != 'T') && - (sep->arg[3][0] != '-') && (sep->arg[3][0] != '.'))) // Location argument not specified correctly + ((sep->arg[3][0] & 0xDF) != 'T') && + (sep->arg[3][0] != '-') && (sep->arg[3][0] != '.'))) // Location argument not specified correctly { c->Message(0, "Usage: #object Move (ObjectID) ToMe|(x y z [h])"); @@ -11038,7 +11043,7 @@ void command_emoteview(Client *c, const Seperator *sep) while(iterator.MoreElements()) { NPC_Emote_Struct* nes = iterator.GetData(); - if(emoteid == nes->emoteid) + if(emoteid == nes->emoteid) { c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s", nes->emoteid, nes->event_, nes->type, nes->text); count++; @@ -11069,7 +11074,7 @@ void command_emotesearch(Client *c, const Seperator *sep) while(iterator.MoreElements()) { NPC_Emote_Struct* nes = iterator.GetData(); - if(emoteid == nes->emoteid) + if(emoteid == nes->emoteid) { c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s", nes->emoteid, nes->event_, nes->type, nes->text); count++; @@ -11305,7 +11310,7 @@ void command_camerashake(Client *c, const Seperator *sep) { if(c) { - if(sep->arg[1][0] && sep->arg[2][0]) + if(sep->arg[1][0] && sep->arg[2][0]) { ServerPacket *pack = new ServerPacket(ServerOP_CameraShake, sizeof(ServerCameraShake_Struct)); memset(pack->pBuffer, 0, sizeof(pack->pBuffer)); @@ -11439,9 +11444,9 @@ void command_mysql(Client *c, const Seperator *sep) int argnum = 3; bool Options = false, Optionh = false; bool Fail = false; while(sep->arg[argnum] && strlen(sep->arg[argnum]) > 1){ switch(sep->arg[argnum][1]){ - case 's': Options = true; break; - case 'h': Optionh = true; break; - default: c->Message(15, "%s, there is no option '%c'", c->GetName(), sep->arg[argnum][1]); Fail = true; + case 's': Options = true; break; + case 'h': Optionh = true; break; + default: c->Message(15, "%s, there is no option '%c'", c->GetName(), sep->arg[argnum][1]); Fail = true; } ++argnum; } @@ -11485,7 +11490,7 @@ void command_mysql(Client *c, const Seperator *sep) LineVec.push_back(LineText.str()); LineText.str(""); } - LineText << fields[i].name << ":" << "[" << (row[i] ? row[i] : "nullptr") << "] "; + LineText << fields[i].name << ":" << "[" << (row[i] ? row[i] : "nullptr") << "] "; } LineVec.push_back(LineText.str()); @@ -11595,11 +11600,11 @@ void command_zopp(Client *c, const Seperator *sep) return; } - int16 item_status = 0; - const Item_Struct* item = database.GetItem(itemid); - if(item) { - item_status = static_cast(item->MinStatus); - } + int16 item_status = 0; + const Item_Struct* item = database.GetItem(itemid); + if(item) { + item_status = static_cast(item->MinStatus); + } if (item_status > c->Admin()) { c->Message(13, "Error: Insufficient status to use this command."); return; @@ -11631,3 +11636,4 @@ void command_augmentitem(Client *c, const Seperator *sep) Object::HandleAugmentation(c, in_augment, c->GetTradeskillObject()); safe_delete_array(in_augment); } + diff --git a/zone/command.h b/zone/command.h index d9db1439f..fc64dfcc9 100644 --- a/zone/command.h +++ b/zone/command.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -32,12 +32,12 @@ typedef void (*CmdFuncPtr)(Client *,const Seperator *); // this is a command list item /*struct cl_struct { - char *command[CMDALIASES]; // the command(s) - char *desc; // description of command - CmdFuncPtr function; // the function to call - int access; // the required 'status' level + char *command[CMDALIASES]; // the command(s) + char *desc; // description of command + CmdFuncPtr function; // the function to call + int access; // the required 'status' level - struct cl_struct *next; // linked list + struct cl_struct *next; // linked list }; extern struct cl_struct *commandlist; // the head of the list diff --git a/zone/common.h b/zone/common.h index f95351e83..ddc17118f 100644 --- a/zone/common.h +++ b/zone/common.h @@ -156,16 +156,16 @@ struct Buffs_Struct { uint16 spellid; uint8 casterlevel; uint16 casterid; // Maybe change this to a pointer sometime, but gotta make sure it's 0'd when it no longer points to anything - char caster_name[64]; - int32 ticsremaining; - uint32 counters; + char caster_name[64]; + int32 ticsremaining; + uint32 counters; uint32 numhits; //the number of physical hits this buff can take before it fades away, lots of druid armor spells take advantage of this mixed with powerful effects uint32 melee_rune; uint32 magic_rune; uint8 deathSaveSuccessChance; uint8 deathsaveCasterAARank; - bool persistant_buff; - bool client; //True if the caster is a client + bool persistant_buff; + bool client; //True if the caster is a client bool UpdateClient; }; @@ -224,14 +224,14 @@ struct StatBonuses { DmgShieldType DamageShieldType; int SpellDamageShield; int SpellShield; - int ReverseDamageShield; // this is damage done to the mob when it attacks + int ReverseDamageShield; // this is damage done to the mob when it attacks uint16 ReverseDamageShieldSpellID; DmgShieldType ReverseDamageShieldType; int movementspeed; int16 haste; int16 hastetype2; int16 hastetype3; - int16 inhibitmelee; + int16 inhibitmelee; float AggroRange; // when calculate just replace original value with this float AssistRange; int16 skillmod[HIGHEST_SKILL+1]; @@ -245,65 +245,65 @@ struct StatBonuses { int8 hatemod; int32 EnduranceReduction; - int16 StrikeThrough; // PoP: Strike Through % - int16 MeleeMitigation; //i = Shielding - int16 CriticalHitChance[HIGHEST_SKILL+2]; //i - int16 CriticalSpellChance; //i - int16 SpellCritDmgIncrease; //i - int16 DotCritDmgIncrease; //i - int16 CriticalHealChance; //i - int16 CriticalHealOverTime; //i - int16 CriticalDoTChance; //i - int16 CrippBlowChance; // - int16 AvoidMeleeChance; //AvoidMeleeChance/10 == % chance i = Avoidance - int16 RiposteChance; //i - int16 DodgeChance; //i - int16 ParryChance; //i - int16 DualWieldChance; //i - int16 DoubleAttackChance; //i - int16 TripleAttackChance; //i - int16 ResistSpellChance; //i - int16 ResistFearChance; //i - bool Fearless; //i - bool IsFeared; //i - int16 StunResist; //i - int16 MeleeSkillCheck; //i - uint8 MeleeSkillCheckSkill; - int16 HitChance; //HitChance/15 == % increase i = Accuracy (Item: Accuracy) - int16 HitChanceEffect[HIGHEST_SKILL+2]; //Spell effect Chance to Hit, straight percent increase - int16 DamageModifier[HIGHEST_SKILL+2]; //i - int16 MinDamageModifier[HIGHEST_SKILL+2]; //i - int16 ProcChance; // ProcChance/10 == % increase i = CombatEffects - int16 ExtraAttackChance; + int16 StrikeThrough; // PoP: Strike Through % + int16 MeleeMitigation; //i = Shielding + int16 CriticalHitChance[HIGHEST_SKILL+2]; //i + int16 CriticalSpellChance; //i + int16 SpellCritDmgIncrease; //i + int16 DotCritDmgIncrease; //i + int16 CriticalHealChance; //i + int16 CriticalHealOverTime; //i + int16 CriticalDoTChance; //i + int16 CrippBlowChance; // + int16 AvoidMeleeChance; //AvoidMeleeChance/10 == % chance i = Avoidance + int16 RiposteChance; //i + int16 DodgeChance; //i + int16 ParryChance; //i + int16 DualWieldChance; //i + int16 DoubleAttackChance; //i + int16 TripleAttackChance; //i + int16 ResistSpellChance; //i + int16 ResistFearChance; //i + bool Fearless; //i + bool IsFeared; //i + int16 StunResist; //i + int16 MeleeSkillCheck; //i + uint8 MeleeSkillCheckSkill; + int16 HitChance; //HitChance/15 == % increase i = Accuracy (Item: Accuracy) + int16 HitChanceEffect[HIGHEST_SKILL+2]; //Spell effect Chance to Hit, straight percent increase + int16 DamageModifier[HIGHEST_SKILL+2]; //i + int16 MinDamageModifier[HIGHEST_SKILL+2]; //i + int16 ProcChance; // ProcChance/10 == % increase i = CombatEffects + int16 ExtraAttackChance; int16 DoTShielding; - int16 DivineSaveChance[2]; // Second Chance (base1 = chance, base2 = spell on trigger) + int16 DivineSaveChance[2]; // Second Chance (base1 = chance, base2 = spell on trigger) uint16 DeathSave[4]; // Death Pact [0](value = 1 partial 2 = full) [1]=slot [2]=LvLimit [3]=HealAmt - int16 FlurryChance; + int16 FlurryChance; int16 Accuracy[HIGHEST_SKILL+2]; //Accuracy/15 == % increase [Spell Effect: Accuracy) - int16 HundredHands; //extra haste, stacks with all other haste i + int16 HundredHands; //extra haste, stacks with all other haste i int8 MeleeLifetap; //i - int16 HealRate; // Spell effect that influences effectiveness of heals - int16 MaxHPChange; // Spell Effect - int16 SkillDmgTaken[HIGHEST_SKILL+2]; // All Skills + -1 - int32 HealAmt; // Item Effect - int32 SpellDmg; // Item Effect - int32 Clairvoyance; // Item Effect - int16 DSMitigation; // Item Effect - int16 DSMitigationOffHand; // Lowers damage shield from off hand attacks. - uint32 SpellTriggers[MAX_SPELL_TRIGGER]; // Innate/Spell/Item Spells that trigger when you cast - uint32 SpellOnKill[MAX_SPELL_TRIGGER*3]; // Chance to proc after killing a mob - uint32 SpellOnDeath[MAX_SPELL_TRIGGER*2]; // Chance to have effect cast when you die - int16 CritDmgMob[HIGHEST_SKILL+2]; // All Skills + -1 - int16 SkillReuseTime[HIGHEST_SKILL+1]; // Reduces skill timers - int16 SkillDamageAmount[HIGHEST_SKILL+2]; // All Skills + -1 - int16 TwoHandBluntBlock; // chance to block when wielding two hand blunt weapon - uint16 ItemManaRegenCap; // Increases the amount of mana you have can over the cap(aa effect) - int16 GravityEffect; // Indictor of spell effect + int16 HealRate; // Spell effect that influences effectiveness of heals + int16 MaxHPChange; // Spell Effect + int16 SkillDmgTaken[HIGHEST_SKILL+2]; // All Skills + -1 + int32 HealAmt; // Item Effect + int32 SpellDmg; // Item Effect + int32 Clairvoyance; // Item Effect + int16 DSMitigation; // Item Effect + int16 DSMitigationOffHand; // Lowers damage shield from off hand attacks. + uint32 SpellTriggers[MAX_SPELL_TRIGGER]; // Innate/Spell/Item Spells that trigger when you cast + uint32 SpellOnKill[MAX_SPELL_TRIGGER*3]; // Chance to proc after killing a mob + uint32 SpellOnDeath[MAX_SPELL_TRIGGER*2]; // Chance to have effect cast when you die + int16 CritDmgMob[HIGHEST_SKILL+2]; // All Skills + -1 + int16 SkillReuseTime[HIGHEST_SKILL+1]; // Reduces skill timers + int16 SkillDamageAmount[HIGHEST_SKILL+2]; // All Skills + -1 + int16 TwoHandBluntBlock; // chance to block when wielding two hand blunt weapon + uint16 ItemManaRegenCap; // Increases the amount of mana you have can over the cap(aa effect) + int16 GravityEffect; // Indictor of spell effect bool AntiGate; // spell effect that prevents gating bool MagicWeapon; // spell effect that makes weapon magical int16 IncreaseBlockChance; // overall block chance modifier uint16 PersistantCasting; // chance to continue casting through a stun - int XPRateMod; //i + int XPRateMod; //i int HPPercCap; //Spell effect that limits you to being healed/regening beyond a % of your max int ManaPercCap; // ^^ int EndPercCap; // ^^ @@ -311,19 +311,19 @@ struct StatBonuses { //uint16 BlockSpellEffect[EFFECT_COUNT]; // Prevents spells with certain effects from landing on you *no longer used bool ImmuneToFlee; // Bypass the fleeing flag uint16 VoiceGraft; // Stores the ID of the mob with which to talk through - uint16 SpellProcChance; // chance to proc from sympathetic spell effects + uint16 SpellProcChance; // chance to proc from sympathetic spell effects uint16 CharmBreakChance; // chance to break charm - int16 SongRange; // increases range of beneficial bard songs - uint16 HPToManaConvert; // Uses HP to cast spells at specific conversion - uint16 FocusEffects[HIGHEST_FOCUS+1]; // Stores the focus effectid for each focustype you have. + int16 SongRange; // increases range of beneficial bard songs + uint16 HPToManaConvert; // Uses HP to cast spells at specific conversion + uint16 FocusEffects[HIGHEST_FOCUS+1]; // Stores the focus effectid for each focustype you have. bool NegateEffects; // Check if you contain a buff with negate effect. (only spellbonuses) - int16 SkillDamageAmount2[HIGHEST_SKILL+2]; // Adds skill specific damage - uint16 NegateAttacks[2]; // 0 = bool HasEffect 1 = Buff Slot + int16 SkillDamageAmount2[HIGHEST_SKILL+2]; // Adds skill specific damage + uint16 NegateAttacks[2]; // 0 = bool HasEffect 1 = Buff Slot uint16 MitigateMeleeRune[2]; // 0 = Mitigation value 1 = Buff Slot uint16 MitigateSpellRune[2]; // 0 = Mitigation value 1 = Buff Slot uint16 ManaAbsorbPercentDamage[2]; // 0 = Mitigation value 1 = Buff Slot - int16 ShieldBlock; // Chance to Shield Block - int16 BlockBehind; // Chance to Block Behind (with our without shield) + int16 ShieldBlock; // Chance to Shield Block + int16 BlockBehind; // Chance to Block Behind (with our without shield) //bool AbsorbMagicAtt; // Magic Rune *Need to be implemented for NegateEffect //bool MeleeRune; // Melee Rune *Need to be implemented for NegateEffect @@ -336,51 +336,51 @@ struct StatBonuses { int16 DoubleSpecialAttack; // Chance to to perform a double special attack (ie flying kick 2x) int16 SpecialAttackKBProc[2]; // Chance to to do a knockback from special attacks. (0 = chance 1 = Skill) uint8 FrontalStunResist; // Chance to resist a frontal stun - int16 BindWound; // Increase amount of HP by percent. - int16 MaxBindWound; // Increase max amount of HP you can bind wound. - int16 ChannelChanceSpells; // Modify chance to channel a spell. - int16 ChannelChanceItems; // Modify chance to channel a items. + int16 BindWound; // Increase amount of HP by percent. + int16 MaxBindWound; // Increase max amount of HP you can bind wound. + int16 ChannelChanceSpells; // Modify chance to channel a spell. + int16 ChannelChanceItems; // Modify chance to channel a items. uint8 SeeInvis; // See Invs. uint8 TripleBackstab; // Chance to triple backstab bool FrontalBackstabMinDmg; // Allow frontal backstabs for min damage - uint8 FrontalBackstabChance; // Chance to backstab from the front for full damage + uint8 FrontalBackstabChance; // Chance to backstab from the front for full damage uint8 ConsumeProjectile; // Chance to not consume arrow. - uint8 ForageAdditionalItems; // Chance to forage another item. - uint8 SalvageChance; // Chance to salvage a tradeskill components on fail. - uint16 ArcheryDamageModifier; // Increase Archery Damage by percent + uint8 ForageAdditionalItems; // Chance to forage another item. + uint8 SalvageChance; // Chance to salvage a tradeskill components on fail. + uint16 ArcheryDamageModifier; // Increase Archery Damage by percent bool SecondaryDmgInc; // Allow off hand weapon to recieve damage bonus. uint16 GiveDoubleAttack; // Allow classes to double attack with a specified chance. int16 SlayUndead[2]; // Allow classes to do extra damage verse undead.(base1 = rate, base2 = damage mod) - int16 PetCriticalHit; // Allow pets to critical hit with % value. + int16 PetCriticalHit; // Allow pets to critical hit with % value. int16 PetAvoidance; // Pet avoidance chance. - int16 CombatStability; // Melee damage mitigation. - int16 GiveDoubleRiposte[3]; // 0=Regular Chance, 1=Skill Attack Chance, 2=Skill + int16 CombatStability; // Melee damage mitigation. + int16 GiveDoubleRiposte[3]; // 0=Regular Chance, 1=Skill Attack Chance, 2=Skill uint16 RaiseSkillCap[2]; // Raise a specific skill cap (1 = value, 2=skill) - int16 Ambidexterity; // Increase chance to duel wield by adding bonus 'skill'. - int16 PetMaxHP; // Increase the max hp of your pet. - int16 PetFlurry; // Chance for pet to flurry. + int16 Ambidexterity; // Increase chance to duel wield by adding bonus 'skill'. + int16 PetMaxHP; // Increase the max hp of your pet. + int16 PetFlurry; // Chance for pet to flurry. uint8 MasteryofPast; // Can not fizzle spells below this level specified in value. bool GivePetGroupTarget; // All pets to recieve group buffs. (Pet Affinity) int16 RootBreakChance; // Chance root will break; - int16 UnfailingDivinity; // Improves chance that DI will fire + increase partial heal. - int16 ItemHPRegenCap; // Increase item regen cap. - int16 SEResist[MAX_RESISTABLE_EFFECTS*2]; // Resist chance by specific spell effects. - int16 OffhandRiposteFail; // chance for opponent to fail riposte with offhand attack. + int16 UnfailingDivinity; // Improves chance that DI will fire + increase partial heal. + int16 ItemHPRegenCap; // Increase item regen cap. + int16 SEResist[MAX_RESISTABLE_EFFECTS*2]; // Resist chance by specific spell effects. + int16 OffhandRiposteFail; // chance for opponent to fail riposte with offhand attack. int16 ItemATKCap; // Raise item attack cap - int32 FinishingBlow[2]; // Chance to do a finishing blow for specified damage amount. + int32 FinishingBlow[2]; // Chance to do a finishing blow for specified damage amount. uint16 FinishingBlowLvl[2]; // Sets max level an NPC can be affected by FB. (base1 = lv, base2= ???) }; typedef struct { - uint16 spellID; - uint16 chance; - uint16 base_spellID; + uint16 spellID; + uint16 chance; + uint16 base_spellID; } tProc; struct Shielders_Struct { - uint32 shielder_id; - uint16 shielder_bonus; + uint32 shielder_id; + uint16 shielder_bonus; }; //eventually turn this into a typedef and @@ -444,44 +444,44 @@ class Mob; class Trade { public: - Trade(Mob* in_owner); - virtual ~Trade(); + Trade(Mob* in_owner); + virtual ~Trade(); - void Reset(); - void SetTradeCash(uint32 in_pp, uint32 in_gp, uint32 in_sp, uint32 in_cp); + void Reset(); + void SetTradeCash(uint32 in_pp, uint32 in_gp, uint32 in_sp, uint32 in_cp); - // Initiate a trade with another mob - // Also puts other mob into trader mode with this mob - void Start(uint32 mob_id, bool initiate_with=true); + // Initiate a trade with another mob + // Also puts other mob into trader mode with this mob + void Start(uint32 mob_id, bool initiate_with=true); - // Mob the owner is trading with - Mob* With(); + // Mob the owner is trading with + Mob* With(); - // Add item from cursor slot to trade bucket (automatically does bag data too) - void AddEntity(uint16 from_slot_id, uint16 trade_slot_id); + // Add item from cursor slot to trade bucket (automatically does bag data too) + void AddEntity(uint16 from_slot_id, uint16 trade_slot_id); - // Audit trade - void LogTrade(); + // Audit trade + void LogTrade(); - // Debug only method - #if (EQDEBUG >= 9) - void DumpTrade(); - #endif + // Debug only method + #if (EQDEBUG >= 9) + void DumpTrade(); + #endif public: - // Object state - TradeState state; - int32 pp; - int32 gp; - int32 sp; - int32 cp; + // Object state + TradeState state; + int32 pp; + int32 gp; + int32 sp; + int32 cp; private: - // Send item data for trade item to other person involved in trade - void SendItemData(const ItemInst* inst, int16 dest_slot_id); + // Send item data for trade item to other person involved in trade + void SendItemData(const ItemInst* inst, int16 dest_slot_id); - uint32 with_id; - Mob* owner; + uint32 with_id; + Mob* owner; }; #endif diff --git a/zone/doors.cpp b/zone/doors.cpp index 2124a5958..bdb07f062 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -38,7 +38,7 @@ extern EntityList entity_list; extern WorldServer worldserver; Doors::Doors(const Door* door) -: close_timer(5000) +: close_timer(5000) { db_id = door->db_id; door_id = door->door_id; @@ -76,7 +76,7 @@ Doors::Doors(const Door* door) } Doors::Doors(const char *dmodel, float dx, float dy, float dz, float dheading, uint8 dopentype, uint16 dsize) -: close_timer(5000) +: close_timer(5000) { db_id = database.GetDoorsCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion()); door_id = database.GetDoorsDBCountPlusOne(zone->GetShortName(), zone->GetInstanceVersion()); @@ -120,8 +120,8 @@ Doors::~Doors() bool Doors::Process() { - if(close_timer.Enabled() && close_timer.Check() && IsDoorOpen()) - { + if(close_timer.Enabled() && close_timer.Check() && IsDoorOpen()) + { if (opentype == 40 || GetTriggerType() == 1) { EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoveDoor, sizeof(MoveDoor_Struct)); @@ -135,7 +135,7 @@ bool Doors::Process() triggered=false; close_timer.Disable(); SetOpenState(false); - } + } return true; } @@ -146,7 +146,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) _log(DOORS__INFO, " incline %d, opentype %d, lockpick %d, key %d, nokeyring %d, trigger %d type %d, param %d", incline, opentype, lockpick, keyitem, nokeyring, trigger_door, trigger_type, door_param); _log(DOORS__INFO, " size %d, invert %d, dest: %s (%.4f,%.4f,%.4f @%.4f)", size, invert_state, dest_zone, dest_x, dest_y, dest_z, dest_heading); - EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoveDoor, sizeof(MoveDoor_Struct)); + EQApplicationPacket* outapp = new EQApplicationPacket(OP_MoveDoor, sizeof(MoveDoor_Struct)); MoveDoor_Struct* md = (MoveDoor_Struct*)outapp->pBuffer; md->doorid = door_id; ///////////////////////////////////////////////////////////////// @@ -260,7 +260,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) } // a key is required or the door is locked but can be picked or both sender->Message(4, "This is locked..."); // debug spam - should probably go - if(sender->GetGM()) // GM can always open locks - should probably be changed to require a key + if(sender->GetGM()) // GM can always open locks - should probably be changed to require a key { sender->Message_StringID(4,DOORS_GM); if(!IsDoorOpen() || (opentype == 58)) @@ -413,7 +413,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) } } - if(((opentype == 57) || (opentype == 58)) && (strncmp(dest_zone, "NONE", strlen("NONE")) != 0)) + if(((opentype == 57) || (opentype == 58)) && (strncmp(dest_zone, "NONE", strlen("NONE")) != 0)) { // Teleport door! if (( strncmp(dest_zone,zone_name,strlen(zone_name)) == 0) && (!keyneeded)) { @@ -558,23 +558,23 @@ void Doors::ToggleState(Mob *sender) } void Doors::DumpDoor(){ - LogFile->write(EQEMuLog::Debug, - "db_id:%i door_id:%i zone_name:%s door_name:%s pos_x:%f pos_y:%f pos_z:%f heading:%f", - db_id, door_id, zone_name, door_name, pos_x, pos_y, pos_z, heading); - LogFile->write(EQEMuLog::Debug, + LogFile->write(EQEMuLog::Debug, + "db_id:%i door_id:%i zone_name:%s door_name:%s pos_x:%f pos_y:%f pos_z:%f heading:%f", + db_id, door_id, zone_name, door_name, pos_x, pos_y, pos_z, heading); + LogFile->write(EQEMuLog::Debug, "opentype:%i guild_id:%i lockpick:%i keyitem:%i nokeyring:%i trigger_door:%i trigger_type:%i door_param:%i open:%s", - opentype, guild_id, lockpick, keyitem, nokeyring, trigger_door, trigger_type, door_param, (isopen) ? "open":"closed"); - LogFile->write(EQEMuLog::Debug, - "dest_zone:%s dest_x:%f dest_y:%f dest_z:%f dest_heading:%f", - dest_zone, dest_x, dest_y, dest_z, dest_heading); + opentype, guild_id, lockpick, keyitem, nokeyring, trigger_door, trigger_type, door_param, (isopen) ? "open":"closed"); + LogFile->write(EQEMuLog::Debug, + "dest_zone:%s dest_x:%f dest_y:%f dest_z:%f dest_heading:%f", + dest_zone, dest_x, dest_y, dest_z, dest_heading); } int32 ZoneDatabase::GetDoorsCount(uint32* oMaxID, const char *zone_name, int16 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; sprintf(query, "SELECT MAX(id), count(*) FROM doors WHERE zone='%s' AND (version=%u OR version=-1)", zone_name, version); if (RunQuery(query, strlen(query), errbuf, &result)) { @@ -604,11 +604,11 @@ int32 ZoneDatabase::GetDoorsCount(uint32* oMaxID, const char *zone_name, int16 v int32 ZoneDatabase::GetDoorsCountPlusOne(const char *zone_name, int16 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 oMaxID = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; sprintf(query, "SELECT MAX(id) FROM doors WHERE zone='%s' AND version=%u", zone_name, version); if (RunQuery(query, strlen(query), errbuf, &result)) { @@ -635,11 +635,11 @@ int32 ZoneDatabase::GetDoorsCountPlusOne(const char *zone_name, int16 version) { int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 oMaxID = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; sprintf(query, "SELECT MAX(doorid) FROM doors WHERE zone='%s' AND (version=%u OR version=-1)", zone_name, version); if (RunQuery(query, strlen(query), errbuf, &result)) { @@ -667,9 +667,9 @@ int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version) bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) { LogFile->write(EQEMuLog::Status, "Loading Doors from database..."); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; // Door tmpDoor; MakeAnyLenString(&query, "SELECT id,doorid,zone,name,pos_x,pos_y,pos_z,heading," @@ -700,12 +700,12 @@ bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name into[r].nokeyring = atoi(row[12]); into[r].trigger_door = atoi(row[13]); into[r].trigger_type = atoi(row[14]); - strn0cpy(into[r].dest_zone, row[15], 32); + strn0cpy(into[r].dest_zone, row[15], 32); into[r].dest_instance_id = atoi(row[16]); - into[r].dest_x = (float) atof(row[17]); - into[r].dest_y = (float) atof(row[18]); - into[r].dest_z = (float) atof(row[19]); - into[r].dest_heading = (float) atof(row[20]); + into[r].dest_x = (float) atof(row[17]); + into[r].dest_y = (float) atof(row[18]); + into[r].dest_z = (float) atof(row[19]); + into[r].dest_heading = (float) atof(row[20]); into[r].door_param=atoi(row[21]); into[r].invert_state=atoi(row[22]); into[r].incline=atoi(row[23]); @@ -788,3 +788,4 @@ void Doors::CreateDatabaseEntry() } database.InsertDoor(GetDoorDBID(), GetDoorID(), GetDoorName(), GetX(), GetY(), GetZ(), GetHeading(), GetOpenType(), GetGuildID(), GetLockpick(), GetKeyItem(), GetDoorParam(), GetInvertState(), GetIncline(), GetSize()); } + diff --git a/zone/effects.cpp b/zone/effects.cpp index a08c14d39..4f5bdbd6d 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -43,8 +43,8 @@ float Client::GetActSpellRange(uint16 spell_id, float range, bool IsBard) int32 Client::Additional_SpellDmg(uint16 spell_id, bool bufftick) { int32 spell_dmg = 0; - spell_dmg += GetFocusEffect(focusFF_Damage_Amount, spell_id); - spell_dmg += GetFocusEffect(focusSpellDamage, spell_id); + spell_dmg += GetFocusEffect(focusFF_Damage_Amount, spell_id); + spell_dmg += GetFocusEffect(focusSpellDamage, spell_id); //For DOTs you need to apply the damage over the duration of the dot to each tick (this is how live did it) if (bufftick){ @@ -89,8 +89,8 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { if (tt == ST_UndeadAE || tt == ST_Undead || tt == ST_Summoned) { //undead/summoned spells modifier += GetFocusEffect(focusImprovedUndeadDamage, spell_id); - } else { - //damage spells. + } else { + //damage spells. modifier += GetFocusEffect(focusImprovedDamage, spell_id); modifier += GetFocusEffect(focusSpellEffectiveness, spell_id); modifier += GetFocusEffect(focusImprovedDamage2, spell_id); @@ -103,12 +103,12 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { } //This adds the extra damage from the AA Unholy Touch, 450 per level to the AA Improved Harm TOuch. - if (spell_id == SPELL_IMP_HARM_TOUCH) { //Improved Harm Touch + if (spell_id == SPELL_IMP_HARM_TOUCH) { //Improved Harm Touch value -= GetAA(aaUnholyTouch) * 450; //Unholy Touch } // This adds the extra damage for the AA's Consumption of the Soul and Improved Consumption of the Soul, 200 per level to the AA Leech Curse for Shadowknights. - if (spell_id == SPELL_LEECH_TOUCH) { //Leech Touch + if (spell_id == SPELL_LEECH_TOUCH) { //Leech Touch value -= GetAA(aaConsumptionoftheSoul) * 200; //Consumption of the Soul value -= GetAA(aaImprovedConsumptionofSoul) * 200; //Improved Consumption of the Soul } @@ -138,7 +138,7 @@ int32 Client::GetActSpellDamage(uint16 spell_id, int32 value) { ratio += RuleI(Spells, WizCritRatio); } if(aabonuses.SpellCritDmgIncrease > 0) // wizards get an additional bonus - ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% + ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% } //Improved Harm Touch is a guaranteed crit if you have at least one level of SCF. @@ -235,8 +235,8 @@ int32 Client::Additional_Heal(uint16 spell_id) { int32 heal_amt = 0; - heal_amt += GetFocusEffect(focusAdditionalHeal, spell_id); - heal_amt += GetFocusEffect(focusAdditionalHeal2, spell_id); + heal_amt += GetFocusEffect(focusAdditionalHeal, spell_id); + heal_amt += GetFocusEffect(focusAdditionalHeal2, spell_id); if (heal_amt){ int duration = CalcBuffDuration(this, this, spell_id); diff --git a/zone/embparser.cpp b/zone/embparser.cpp index b93b3072d..b27293de4 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ //extends the parser to include perl @@ -72,7 +72,7 @@ const char *QuestEventSubroutines[_LargestEventID] = { "EVENT_PROXIMITY_SAY", "EVENT_CAST", "EVENT_SCALE_CALC", - "EVENT_ITEM_ENTERZONE", + "EVENT_ITEM_ENTERZONE", "EVENT_TARGET_CHANGE", "EVENT_HATE_LIST", "EVENT_SPELL_EFFECT_CLIENT", @@ -105,7 +105,7 @@ PerlembParser::PerlembParser(void) : Parser() { perl = nullptr; eventQueueProcessing = false; - globalPlayerQuestLoaded = pQuestReadyToLoad; + globalPlayerQuestLoaded = pQuestReadyToLoad; globalNPCQuestLoaded = nQuestReadyToLoad; } @@ -244,7 +244,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d } bool isPlayerQuest = false; - bool isGlobalPlayerQuest = false; + bool isGlobalPlayerQuest = false; bool isGlobalNPC = false; bool isItemQuest = false; bool isSpellQuest = false; @@ -260,12 +260,12 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d { if(!npcmob && mob) { if(!iteminst) { - if(global) { - isGlobalPlayerQuest = true; - } else { - isPlayerQuest = true; - } - } + if(global) { + isGlobalPlayerQuest = true; + } else { + isPlayerQuest = true; + } + } else isItemQuest = true; } @@ -324,14 +324,14 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d LoadPlayerScript(zone->GetShortName()); } } - else if(isGlobalPlayerQuest) { - packagename = "global_player"; + else if(isGlobalPlayerQuest) { + packagename = "global_player"; if(!isloaded(packagename.c_str())) { LoadGlobalPlayerScript(); } - } + } else { packagename = "spell_effect_"; @@ -350,16 +350,16 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d } int charid = 0; - if (mob && mob->IsClient()) { // some events like waypoint and spawn don't have a player involved + if (mob && mob->IsClient()) { // some events like waypoint and spawn don't have a player involved charid = mob->CastToClient()->CharacterID(); } else { if(npcmob) { - charid = -npcmob->GetNPCTypeID(); // make char id negative npc id as a fudge + charid = -npcmob->GetNPCTypeID(); // make char id negative npc id as a fudge } else if(mob && mob->IsNPC()) { - charid = -mob->CastToNPC()->GetNPCTypeID(); // make char id negative npc id as a fudge + charid = -mob->CastToNPC()->GetNPCTypeID(); // make char id negative npc id as a fudge } } ExportVar(packagename.c_str(), "charid", charid); @@ -593,7 +593,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d switch (event) { case EVENT_SAY: { if (npcmob && npcmob->GetAppearance() != eaDead) - npcmob->FaceTarget(mob); + npcmob->FaceTarget(mob); ExportVar(packagename.c_str(), "data", objid); ExportVar(packagename.c_str(), "text", data); ExportVar(packagename.c_str(), "langid", extradata); @@ -601,7 +601,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d } case EVENT_ITEM: { if (npcmob->GetAppearance() != eaDead) - npcmob->FaceTarget(mob); + npcmob->FaceTarget(mob); //this is such a hack... why aren't these just set directly.. ExportVar(packagename.c_str(), "item1", GetVar("item1", objid).c_str()); ExportVar(packagename.c_str(), "item2", GetVar("item2", objid).c_str()); @@ -737,7 +737,7 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d break; } case EVENT_SCALE_CALC: - case EVENT_ITEM_ENTERZONE: { + case EVENT_ITEM_ENTERZONE: { ExportVar(packagename.c_str(), "itemid", objid); ExportVar(packagename.c_str(), "itemname", iteminst->GetItem()->Name); break; @@ -842,11 +842,11 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d } else if(isSpellQuest) { - if(mob) { - SendCommands(packagename.c_str(), sub_name, 0, mob, mob, nullptr); - } else { - SendCommands(packagename.c_str(), sub_name, 0, npcmob, mob, nullptr); - } + if(mob) { + SendCommands(packagename.c_str(), sub_name, 0, mob, mob, nullptr); + } else { + SendCommands(packagename.c_str(), sub_name, 0, npcmob, mob, nullptr); + } } else { SendCommands(packagename.c_str(), sub_name, objid, npcmob, mob, nullptr); @@ -857,27 +857,27 @@ void PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * d } void PerlembParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data) { - EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data, true); + EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data, true); } void PerlembParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data) { - EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data); + EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data); } void PerlembParser::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) { - EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data); + EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data); } void PerlembParser::EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) { - EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data, true); + EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data, true); } void PerlembParser::EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data) { - EventCommon(evt, objid, nullptr, nullptr, item, client, extra_data); + EventCommon(evt, objid, nullptr, nullptr, item, client, extra_data); } void PerlembParser::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data) { - EventCommon(evt, 0, itoa(spell_id), npc, nullptr, client, extra_data); + EventCommon(evt, 0, itoa(spell_id), npc, nullptr, client, extra_data); } void PerlembParser::ReloadQuests(bool with_timers) { @@ -915,7 +915,7 @@ void PerlembParser::ReloadQuests(bool with_timers) { hasQuests.clear(); playerQuestLoaded.clear(); globalPlayerQuestLoaded = pQuestReadyToLoad; - globalNPCQuestLoaded = nQuestReadyToLoad; + globalNPCQuestLoaded = nQuestReadyToLoad; itemQuestLoaded.clear(); spellQuestLoaded.clear(); } @@ -1142,8 +1142,8 @@ int PerlembParser::LoadScript(int npcid, const char * zone, Mob* activater) //LogFile->write(EQEMuLog::Debug, " finally settling on '%s'", filename.c_str()); // LogFile->write(EQEMuLog::Status, "Looking for quest file: '%s'", filename.c_str()); - // todo: decide whether or not to delete the package to allow for script refreshes w/o restarting the server - // remember to guard against deleting the default package, on a similar note... consider deleting packages upon zone change + // todo: decide whether or not to delete the package to allow for script refreshes w/o restarting the server + // remember to guard against deleting the default package, on a similar note... consider deleting packages upon zone change // try { perl->eval(std::string("delete_package(\"").append(packagename).append("\");").c_str()); } // catch(...) {/*perl balked at us trynig to delete a non-existant package... no big deal.*/} @@ -1192,7 +1192,7 @@ int PerlembParser::LoadGlobalNPCScript() string filename = "quests/"; filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/global_npc.pl"; + filename += "/global_npc.pl"; string packagename = "global_npc"; try { @@ -1225,8 +1225,8 @@ int PerlembParser::LoadPlayerScript(const char *zone_name) string filename= "quests/"; filename += zone_name; filename += "/player_v"; - filename += itoa(zone->GetInstanceVersion()); - filename += ".pl"; + filename += itoa(zone->GetInstanceVersion()); + filename += ".pl"; string packagename = "player"; packagename += "_"; packagename += zone_name; @@ -1239,11 +1239,11 @@ int PerlembParser::LoadPlayerScript(const char *zone_name) LogFile->write(EQEMuLog::Quest, "WARNING: error compiling quest file %s: %s", filename.c_str(), err); } - if(!isloaded(packagename.c_str())) + if(!isloaded(packagename.c_str())) { filename= "quests/"; - filename += zone_name; - filename += "/player.pl"; + filename += zone_name; + filename += "/player.pl"; try { perl->eval_file(packagename.c_str(), filename.c_str()); } @@ -1253,7 +1253,7 @@ int PerlembParser::LoadPlayerScript(const char *zone_name) } } - //todo: change this to just read eval_file's %cache - duh! + //todo: change this to just read eval_file's %cache - duh! if(!isloaded(packagename.c_str())) { filename = "quests/"; @@ -1296,7 +1296,7 @@ int PerlembParser::LoadGlobalPlayerScript() string filename = "quests/"; filename += QUEST_TEMPLATES_DIRECTORY; - filename += "/global_player.pl"; + filename += "/global_player.pl"; string packagename = "global_player"; try { diff --git a/zone/embparser.h b/zone/embparser.h index 668fdb235..2181f6db0 100644 --- a/zone/embparser.h +++ b/zone/embparser.h @@ -41,13 +41,13 @@ typedef enum { pQuestLoaded = 1, pQuestUnloaded, pQuestEventCast, // player.pl loaded, has an EVENT_CAST sub - pQuestReadyToLoad + pQuestReadyToLoad } playerQuestMode; typedef enum { nQuestLoaded = 1, nQuestUnloaded, - nQuestReadyToLoad + nQuestReadyToLoad } GlobalNPCQuestMode; typedef enum { @@ -77,7 +77,7 @@ protected: //if they do not have a quest or the default. map hasQuests; //npcid -> questMode map playerQuestLoaded; //zone shortname -> playerQuestMode - playerQuestMode globalPlayerQuestLoaded; + playerQuestMode globalPlayerQuestLoaded; GlobalNPCQuestMode globalNPCQuestLoaded; map itemQuestLoaded; // package name - > itemQuestMode map spellQuestLoaded; @@ -99,29 +99,29 @@ public: //todo, consider making the following two methods static (need to check for perl!=null, first, then) bool isloaded(const char *packagename) const; - //interface stuff - virtual void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data); + //interface stuff + virtual void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data); virtual void EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data); - virtual void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data); - virtual void EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data); - virtual void EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data); - virtual void EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data); + virtual void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data); + virtual void EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data); + virtual void EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data); + virtual void EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data); - virtual bool HasQuestSub(uint32 npcid, const char *subname); + virtual bool HasQuestSub(uint32 npcid, const char *subname); virtual bool HasGlobalQuestSub(const char *subname); virtual bool PlayerHasQuestSub(const char *subname); - virtual bool GlobalPlayerHasQuestSub(const char *subname); + virtual bool GlobalPlayerHasQuestSub(const char *subname); virtual bool SpellHasQuestSub(uint32 spell_id, const char *subname); virtual bool ItemHasQuestSub(ItemInst *itm, const char *subname); - virtual void ReloadQuests(bool with_timers = false); - virtual void AddVar(std::string name, std::string val) { Parser::AddVar(name, val); }; - virtual uint32 GetIdentifier() { return 0xf8b05c11; } + virtual void ReloadQuests(bool with_timers = false); + virtual void AddVar(std::string name, std::string val) { Parser::AddVar(name, val); }; + virtual uint32 GetIdentifier() { return 0xf8b05c11; } - int LoadScript(int npcid, const char * zone, Mob* activater=0); + int LoadScript(int npcid, const char * zone, Mob* activater=0); int LoadGlobalNPCScript(); int LoadPlayerScript(const char *zone); - int LoadGlobalPlayerScript(); + int LoadGlobalPlayerScript(); int LoadItemScript(ItemInst* iteminst, string packagename, itemQuestMode Qtype); int LoadSpellScript(uint32 id); diff --git a/zone/embperl.cpp b/zone/embperl.cpp index 8895b500c..5c92520f9 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -18,7 +18,7 @@ Eglin #include "embxs.h" #include "../common/features.h" #ifndef GvCV_set -#define GvCV_set(gv,cv) (GvCV(gv) = (cv)) +#define GvCV_set(gv,cv) (GvCV(gv) = (cv)) #endif #ifdef EMBPERL_XS @@ -166,19 +166,19 @@ void Embperl::DoInit() { eval_pv( "package EQEmuIO; " // "&boot_EQEmuIO;" - "sub TIEHANDLE { my $me = bless {}, $_[0]; $me->PRINT('Creating '.$me); return($me); } " - "sub WRITE { } " - //dunno why I need to shift off fmt here, but it dosent like without it - "sub PRINTF { my $me = shift; my $fmt = shift; $me->PRINT(sprintf($fmt, @_)); } " - "sub CLOSE { my $me = shift; $me->PRINT('Closing '.$me); } " - "sub DESTROY { my $me = shift; $me->PRINT('Destroying '.$me); } " + "sub TIEHANDLE { my $me = bless {}, $_[0]; $me->PRINT('Creating '.$me); return($me); } " + "sub WRITE { } " + //dunno why I need to shift off fmt here, but it dosent like without it + "sub PRINTF { my $me = shift; my $fmt = shift; $me->PRINT(sprintf($fmt, @_)); } " + "sub CLOSE { my $me = shift; $me->PRINT('Closing '.$me); } " + "sub DESTROY { my $me = shift; $me->PRINT('Destroying '.$me); } " //this ties us for all packages, just do it in quest since thats kinda 'our' package - "package quest;" - " if(tied *STDOUT) { untie(*STDOUT); }" - " if(tied *STDERR) { untie(*STDERR); }" - " tie *STDOUT, 'EQEmuIO';" - " tie *STDERR, 'EQEmuIO';" - ,FALSE); + "package quest;" + " if(tied *STDOUT) { untie(*STDOUT); }" + " if(tied *STDERR) { untie(*STDERR); }" + " tie *STDOUT, 'EQEmuIO';" + " tie *STDERR, 'EQEmuIO';" + ,FALSE); #endif //EMBPERL_IO_CAPTURE #ifdef EMBPERL_PLUGIN @@ -310,26 +310,26 @@ void Embperl::dosub(const char * subname, const std::vector * args, #endif in_use = true; bool err = false; - dSP; /* initialize stack pointer */ - ENTER; /* everything created after here */ - SAVETMPS; /* ...is a temporary variable. */ - PUSHMARK(SP); /* remember the stack pointer */ + dSP; /* initialize stack pointer */ + ENTER; /* everything created after here */ + SAVETMPS; /* ...is a temporary variable. */ + PUSHMARK(SP); /* remember the stack pointer */ if(args && args->size()) { for(std::vector::const_iterator i = args->begin(); i != args->end(); ++i) - {/* push the arguments onto the perl stack */ + {/* push the arguments onto the perl stack */ XPUSHs(sv_2mortal(newSVpv(i->c_str(), i->length()))); } } - PUTBACK; /* make local stack pointer global */ + PUTBACK; /* make local stack pointer global */ call_pv(subname, mode); /*eval our code*/ - SPAGAIN; /* refresh stack pointer */ + SPAGAIN; /* refresh stack pointer */ if(SvTRUE(ERRSV)) { err = true; } - FREETMPS; /* free temp values */ - LEAVE; /* ...and the XPUSHed "mortal" args.*/ + FREETMPS; /* free temp values */ + LEAVE; /* ...and the XPUSHed "mortal" args.*/ in_use = false; if(err) diff --git a/zone/embperl.h b/zone/embperl.h index 4dd9c4242..668755c25 100644 --- a/zone/embperl.h +++ b/zone/embperl.h @@ -29,10 +29,10 @@ extern "C" { //the perl headers dont do this for us... }; #endif #ifdef WIN32 -#define snprintf _snprintf +#define snprintf _snprintf #endif -//perl defines these macros and dosent clean them up, lazy bastards. -- I hate them too! +//perl defines these macros and dosent clean them up, lazy bastards. -- I hate them too! #ifdef Copy #undef Copy #endif @@ -81,7 +81,7 @@ protected: void DoInit(); public: - Embperl(void); //This can throw errors! Buyer beware + Embperl(void); //This can throw errors! Buyer beware ~Embperl(void); void Reinit(); @@ -90,7 +90,7 @@ public: std::string lasterr(void) const { return errmsg;}; //evaluate an expression. throws string errors on fail void eval(const char * code); - //execute a subroutine. throws lasterr on failure + //execute a subroutine. throws lasterr on failure void dosub(const char * subname, const std::vector * args = nullptr, int mode = G_SCALAR|G_DISCARD|G_EVAL); //Access to perl variables @@ -130,17 +130,17 @@ public: HV *hv = get_hv(varname, TRUE); hv_clear(hv); - // Iterate through key-value pairs, storing them in hash - for (it = vals.begin(); it != vals.end(); it++) - { - int keylen = static_cast(it->first.length()); + // Iterate through key-value pairs, storing them in hash + for (it = vals.begin(); it != vals.end(); it++) + { + int keylen = static_cast(it->first.length()); - SV *val = newSVpv(it->second.c_str(), it->second.length()); + SV *val = newSVpv(it->second.c_str(), it->second.length()); - // If val was not added to hash, reset reference count - if (hv_store(hv, it->first.c_str(), keylen, val, 0) == nullptr) - val->sv_refcnt = 0; - } + // If val was not added to hash, reset reference count + if (hv_store(hv, it->first.c_str(), keylen, val, 0) == nullptr) + val->sv_refcnt = 0; + } } //loads a file and compiles it into our interpreter (assuming it hasn't already been read in) diff --git a/zone/embxs.cpp b/zone/embxs.cpp index ecdf6a80e..18be2998d 100644 --- a/zone/embxs.cpp +++ b/zone/embxs.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef EMBPERL @@ -28,36 +28,36 @@ const char *getItemName(unsigned itemid) { - const Item_Struct* item = nullptr; - item = database.GetItem(itemid); + const Item_Struct* item = nullptr; + item = database.GetItem(itemid); - if (item) - return item->Name; - else - return nullptr; + if (item) + return item->Name; + else + return nullptr; } XS(XS_qc_getItemName); /* prototype to pass -Wmissing-prototypes */ XS(XS_qc_getItemName) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: quest::getItemName(itemid)"); - { - unsigned itemid = (unsigned)SvUV(ST(0)); - const char * RETVAL; - dXSTARG; - RETVAL = getItemName(itemid); - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; - } - XSRETURN(1); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: quest::getItemName(itemid)"); + { + unsigned itemid = (unsigned)SvUV(ST(0)); + const char * RETVAL; + dXSTARG; + RETVAL = getItemName(itemid); + sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; + } + XSRETURN(1); } EXTERN_C XS(boot_qc); /* prototype to pass -Wmissing-prototypes */ EXTERN_C XS(boot_qc) { - dXSARGS; + dXSARGS; char file[256]; strncpy(file, __FILE__, 256); file[255] = '\0'; @@ -69,11 +69,11 @@ EXTERN_C XS(boot_qc) //add the strcpy stuff to get rid of const warnings.... - XS_VERSION_BOOTCHECK ; + XS_VERSION_BOOTCHECK ; - newXS(strcpy(buf, "quest::getItemName"), XS_qc_getItemName, file); + newXS(strcpy(buf, "quest::getItemName"), XS_qc_getItemName, file); - XSRETURN_YES; + XSRETURN_YES; } #ifdef EMBPERL_IO_CAPTURE @@ -81,10 +81,10 @@ EXTERN_C XS(boot_qc) XS(XS_EQEmuIO_PRINT); /* prototype to pass -Wmissing-prototypes */ XS(XS_EQEmuIO_PRINT) { - dXSARGS; - if (items < 2) - return; -// Perl_croak(aTHX_ "Usage: EQEmuIO::PRINT(@strings)"); + dXSARGS; + if (items < 2) + return; + //Perl_croak(aTHX_ "Usage: EQEmuIO::PRINT(@strings)"); int r; for(r = 1; r < items; r++) { @@ -106,9 +106,9 @@ XS(XS_EQEmuIO_PRINT) if(len > 0) { LogFile->writebuf(EQEMuLog::Quest, str + pos, 1, len); } - } + } - XSRETURN_EMPTY; + XSRETURN_EMPTY; } #endif //EMBPERL_IO_CAPTURE @@ -118,9 +118,9 @@ XS(XS_EQEmuIO_PRINT) XS(XS_command_add); /* prototype to pass -Wmissing-prototypes */ XS(XS_command_add) { - dXSARGS; - if (items != 3) - Perl_croak(aTHX_ "Usage: commands::command_add(name, desc, access)"); + dXSARGS; + if (items != 3) + Perl_croak(aTHX_ "Usage: commands::command_add(name, desc, access)"); char *name = SvPV_nolen(ST(0)); char *desc = SvPV_nolen(ST(1)); @@ -128,7 +128,7 @@ XS(XS_command_add) command_add_perl(name, desc, access); - XSRETURN_EMPTY; + XSRETURN_EMPTY; } #endif //EMBPERL_COMMANDS diff --git a/zone/entity.cpp b/zone/entity.cpp index a4d5889d0..bfe12c17f 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -65,7 +65,7 @@ extern uint32 numclients; extern PetitionList petition_list; extern DBAsync *dbasync; -extern char errorname[32]; +extern char errorname[32]; extern uint16 adverrornum; Entity::Entity() { @@ -300,24 +300,24 @@ EntityList::~EntityList() { } bool EntityList::CanAddHateForMob(Mob *p) { - LinkedListIterator iterator(npc_list); - int count = 0; + LinkedListIterator iterator(npc_list); + int count = 0; - iterator.Reset(); - while( iterator.MoreElements()) - { - NPC *npc=iterator.GetData(); - if (npc->IsOnHatelist(p)) - count++; - // no need to continue if we already hit the limit - if (count > 3) - return false; - iterator.Advance(); - } + iterator.Reset(); + while( iterator.MoreElements()) + { + NPC *npc=iterator.GetData(); + if (npc->IsOnHatelist(p)) + count++; + // no need to continue if we already hit the limit + if (count > 3) + return false; + iterator.Advance(); + } - if (count <= 2) - return true; - return false; + if (count <= 2) + return true; + return false; } void EntityList::AddClient(Client* client) { @@ -619,7 +619,7 @@ void EntityList::AddCorpse(Corpse* corpse, uint32 in_id) { void EntityList::AddNPC(NPC* npc, bool SendSpawnPacket, bool dontqueue) { npc->SetID(GetFreeID()); - parse->EventNPC(EVENT_SPAWN, npc, nullptr, "", 0); + parse->EventNPC(EVENT_SPAWN, npc, nullptr, "", 0); uint16 emoteid = npc->GetEmoteID(); if(emoteid != 0) @@ -671,7 +671,7 @@ void EntityList::AddMerc(Merc* merc, bool SendSpawnPacket, bool dontqueue) { safe_delete(ns); } - //parse->EventMERC(EVENT_SPAWN, merc, nullptr, "", 0); + //parse->EventMERC(EVENT_SPAWN, merc, nullptr, "", 0); } merc_list.Insert(merc); @@ -1469,9 +1469,9 @@ void EntityList::ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget) iterator.Reset(); while(iterator.MoreElements()) { if (iterator.GetData()->IsAIControlled()) { - // replace the old mob with the new one + // replace the old mob with the new one if (iterator.GetData()->RemoveFromHateList(pOldMob)) - iterator.GetData()->AddToHateList(pNewTarget, 1, 0); + iterator.GetData()->AddToHateList(pNewTarget, 1, 0); } iterator.Advance(); } @@ -1587,7 +1587,7 @@ void EntityList::RefreshClientXTargets(Client *c) } void EntityList::QueueClientsByTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender, Mob* SkipThisMob, bool ackreq, bool HoTT, - uint32 ClientVersionBits) + uint32 ClientVersionBits) { LinkedListIterator iterator(client_list); @@ -1678,8 +1678,8 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, if ((!ignore_sender || ent != sender) && (ent != SkipThisMob)) { eqFilterMode filter2 = ent->GetFilter(filter); if(ent->Connected() && - ( filter==FilterNone - || filter2 == FilterShow + (filter==FilterNone + || filter2 == FilterShow || (filter2 == FilterShowGroupOnly && (sender == ent || (ent->GetGroup() && ent->GetGroup()->IsGroupMember(sender)))) || (filter2 == FilterShowSelfOnly && ent==sender)) @@ -1732,13 +1732,13 @@ void EntityList::FilterQueueCloseClients(uint8 filter, uint8 required, Mob* send required=1; if(filterval==required){ if ((!ignore_sender || ent != sender) && (ent != SkipThisMob) - ) { + ) { #ifdef PACKET_UPDATE_MANAGER if(ent->Connected()) { ent->GetUpdateManager()->QueuePacket(tmp_app, ackreq, sender, ent->DistNoRoot(*sender)); } #else - if(ent->Connected() && (ent->DistNoRoot(*sender) <= dist2 || dist == 0)) { + if(ent->Connected() && (ent->DistNoRoot(*sender) <= dist2 || dist == 0)) { ent->QueuePacket(app, ackreq); } #endif @@ -1778,8 +1778,8 @@ void EntityList::QueueCloseClients(Mob* sender, const EQApplicationPacket* app, if(ent->Connected() && (filter==0 || (filter2==1 || (filter2==99 && entity_list.GetGroupByClient(ent)!=0 && - entity_list.GetGroupByClient(ent)->IsGroupMember(sender)) - || (filter2==98 && ent==sender))) + entity_list.GetGroupByClient(ent)->IsGroupMember(sender)) + || (filter2==98 && ent==sender))) #ifdef PACKET_UPDATE_MANAGER ) { ent->GetUpdateManager()->QueuePacket(tmp_app, ackreq, sender, ent->DistNoRoot(*sender)); @@ -3309,7 +3309,7 @@ void EntityList::DoubleAggro(Mob* who) while(iterator.MoreElements()) { if (iterator.GetData()->CheckAggro(who)) - iterator.GetData()->SetHate(who,iterator.GetData()->CastToNPC()->GetHateAmount(who),iterator.GetData()->CastToNPC()->GetHateAmount(who)*2); + iterator.GetData()->SetHate(who,iterator.GetData()->CastToNPC()->GetHateAmount(who),iterator.GetData()->CastToNPC()->GetHateAmount(who)*2); iterator.Advance(); } } @@ -3321,7 +3321,7 @@ void EntityList::HalveAggro(Mob* who) while(iterator.MoreElements()) { if (iterator.GetData()->CastToNPC()->CheckAggro(who)) - iterator.GetData()->CastToNPC()->SetHate(who,iterator.GetData()->CastToNPC()->GetHateAmount(who)/2); + iterator.GetData()->CastToNPC()->SetHate(who,iterator.GetData()->CastToNPC()->GetHateAmount(who)/2); iterator.Advance(); } } @@ -3728,7 +3728,7 @@ void EntityList::ProcessMove(Client *c, float x, float y, float z) { //This is done to address the issue of this code not being reentrant //because perl can call clear_proximity() while we're still iterating through the list - //This causes our list to become invalid but we don't know it. On GCC it's basic heap + //This causes our list to become invalid but we don't know it. On GCC it's basic heap //corruption and it doesn't appear to catch it at all. //MSVC it's a crash with 0xfeeefeee debug address (freed memory off the heap) std::list::iterator iter = skip_ids.begin(); @@ -3752,20 +3752,20 @@ void EntityList::ProcessMove(Client *c, float x, float y, float z) { //cross a boundary, send the event. bool old_in = true; bool new_in = true; - if( last_x < l->min_x || last_x > l->max_x - || last_y < l->min_y || last_y > l->max_y - || last_z < l->min_z || last_z > l->max_z ) { + if(last_x < l->min_x || last_x > l->max_x + || last_y < l->min_y || last_y > l->max_y + || last_z < l->min_z || last_z > l->max_z ) { old_in = false; } - if( x < l->min_x || x > l->max_x - || y < l->min_y || y > l->max_y - || z < l->min_z || z > l->max_z ) { + if(x < l->min_x || x > l->max_x + || y < l->min_y || y > l->max_y + || z < l->min_z || z > l->max_z ) { new_in = false; } if(old_in && !new_in) { //we were in the proximity, we are no longer, send event exit - parse->EventNPC(EVENT_EXIT, d, c, "", 0); + parse->EventNPC(EVENT_EXIT, d, c, "", 0); //Reentrant fix iterator.Reset(); @@ -3795,12 +3795,12 @@ void EntityList::ProcessProximitySay(const char *Message, Client *c, uint8 langu if(l == nullptr || !l->say) continue; - if( c->GetX() < l->min_x || c->GetX() > l->max_x - || c->GetY() < l->min_y || c->GetY() > l->max_y - || c->GetZ() < l->min_z || c->GetZ() > l->max_z ) + if(c->GetX() < l->min_x || c->GetX() > l->max_x + || c->GetY() < l->min_y || c->GetY() > l->max_y + || c->GetZ() < l->min_z || c->GetZ() > l->max_z ) continue; - parse->EventNPC(EVENT_PROXIMITY_SAY, d, c, Message, language); + parse->EventNPC(EVENT_PROXIMITY_SAY, d, c, Message, language); } } @@ -4066,25 +4066,24 @@ bool Entity::CheckCoordLosNoZLeaps(float cur_x, float cur_y, float cur_z, float void EntityList::QuestJournalledSayClose(Mob *sender, Client *QuestInitiator, float dist, const char* mobname, const char* message) { - Client *c; - LinkedListIterator iterator(client_list); - float dist2 = dist * dist; + Client *c; + LinkedListIterator iterator(client_list); + float dist2 = dist * dist; - // Send the message to the quest initiator such that the client will enter it into the NPC Quest Journal - if(QuestInitiator) { - - char *buf = new char[strlen(mobname) + strlen(message) + 10]; - sprintf(buf, "%s says, '%s'", mobname, message); - QuestInitiator->QuestJournalledMessage(mobname, buf); - safe_delete_array(buf); - } - // Use the old method for all other nearby clients - for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) - { - c = iterator.GetData(); - if(c && (c != QuestInitiator) && c->DistNoRoot(*sender) <= dist2) - c->Message_StringID(10, GENERIC_SAY, mobname, message); - } + // Send the message to the quest initiator such that the client will enter it into the NPC Quest Journal + if(QuestInitiator) { + char *buf = new char[strlen(mobname) + strlen(message) + 10]; + sprintf(buf, "%s says, '%s'", mobname, message); + QuestInitiator->QuestJournalledMessage(mobname, buf); + safe_delete_array(buf); + } + // Use the old method for all other nearby clients + for(iterator.Reset(); iterator.MoreElements(); iterator.Advance()) + { + c = iterator.GetData(); + if(c && (c != QuestInitiator) && c->DistNoRoot(*sender) <= dist2) + c->Message_StringID(10, GENERIC_SAY, mobname, message); + } } Corpse* EntityList::GetClosestCorpse(Mob* sender, const char* Name) @@ -4110,7 +4109,7 @@ Corpse* EntityList::GetClosestCorpse(Mob* sender, const char* Name) continue; CurrentDistance = ((CurrentCorpse->GetY() - sender->GetY()) * (CurrentCorpse->GetY() - sender->GetY())) + - ((CurrentCorpse->GetX() - sender->GetX()) * (CurrentCorpse->GetX() - sender->GetX())); + ((CurrentCorpse->GetX() - sender->GetX()) * (CurrentCorpse->GetX() - sender->GetX())); if(CurrentDistance < ClosestDistance) { @@ -4303,7 +4302,7 @@ Mob* EntityList::GetTargetForMez(Mob* caster) if(!caster->CheckLosFN(d)){ //this is wasteful but can't really think of another way to do it iterator.Advance(); //that wont have us trying to los the same target every time - continue; //it's only in combat so it's impact should be minimal.. but stil. + continue; //it's only in combat so it's impact should be minimal.. but stil. } return d; } @@ -4394,8 +4393,8 @@ void EntityList::SendUntargetable(Client *c) continue; } if(!cur->IsTargetable()) { - cur->SendTargetable(false, c); - } + cur->SendTargetable(false, c); + } } iterator.Advance(); } @@ -4415,7 +4414,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { iterator.Reset(); - while(iterator.MoreElements()) { + while(iterator.MoreElements()) { Client *ClientEntry = iterator.GetData(); @@ -4451,7 +4450,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { } if(WhomLength && strncasecmp(Who->whom, ClientEntry->GetName(), WhomLength) && - strncasecmp(guild_mgr.GetGuildName(ClientEntry->GuildID()), Who->whom, WhomLength)) + strncasecmp(guild_mgr.GetGuildName(ClientEntry->GuildID()), Who->whom, WhomLength)) continue; Entries++; @@ -4541,7 +4540,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { } if(WhomLength && strncasecmp(Who->whom, ClientEntry->GetName(), WhomLength) && - strncasecmp(guild_mgr.GetGuildName(ClientEntry->GuildID()), Who->whom, WhomLength)) + strncasecmp(guild_mgr.GetGuildName(ClientEntry->GuildID()), Who->whom, WhomLength)) continue; string GuildName; @@ -4619,7 +4618,7 @@ void EntityList::ZoneWho(Client *c, Who_All_Struct* Who) { WAPP3->Class_ = PlayerClass; - WAPP3->Level = PlayerLevel; + WAPP3->Level = PlayerLevel; WAPP3->Race = PlayerRace; @@ -4668,12 +4667,12 @@ void EntityList::UnMarkNPC(uint16 ID) uint32 EntityList::CheckNPCsClose(Mob *center) { - LinkedListIterator iterator(npc_list); - uint32 count = 0; + LinkedListIterator iterator(npc_list); + uint32 count = 0; - iterator.Reset(); - while(iterator.MoreElements()) - { + iterator.Reset(); + while(iterator.MoreElements()) + { NPC *current = iterator.GetData(); if(!current) { @@ -5011,7 +5010,7 @@ void EntityList::HideCorpses(Client *c, uint8 CurrentMode, uint8 NewMode) if((NewMode == HideCorpseAll) || ((NewMode == HideCorpseNPC) && (b->IsNPCCorpse()))) { EQApplicationPacket outapp; - b->CreateDespawnPacket(&outapp, false); + b->CreateDespawnPacket(&outapp, false); c->QueuePacket(&outapp); } else if(NewMode == HideCorpseAllButGroup) @@ -5019,13 +5018,13 @@ void EntityList::HideCorpses(Client *c, uint8 CurrentMode, uint8 NewMode) if(!g->IsGroupMember(b->GetOwnerName())) { EQApplicationPacket outapp; - b->CreateDespawnPacket(&outapp, false); + b->CreateDespawnPacket(&outapp, false); c->QueuePacket(&outapp); } else if((CurrentMode == HideCorpseAll)) { EQApplicationPacket outapp; - b->CreateSpawnPacket(&outapp); + b->CreateSpawnPacket(&outapp); c->QueuePacket(&outapp); } } @@ -5194,7 +5193,7 @@ Mob* EntityList::GetClosestMobByBodyType(Mob* sender, bodyType BodyType) continue; CurrentDistance = ((CurrentMob->GetY() - sender->GetY()) * (CurrentMob->GetY() - sender->GetY())) + - ((CurrentMob->GetX() - sender->GetX()) * (CurrentMob->GetX() - sender->GetX())); + ((CurrentMob->GetX() - sender->GetX()) * (CurrentMob->GetX() - sender->GetX())); if(CurrentDistance < ClosestDistance) { @@ -5306,3 +5305,4 @@ Mob* EntityList::GetTargetForVirus(Mob* spreader) return TargetsInRange[MakeRandomInt(0, TargetsInRange.size() - 1)]; } + diff --git a/zone/entity.h b/zone/entity.h index be0befbf4..4b26b45d8 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ENTITY_H #define ENTITY_H @@ -81,14 +81,14 @@ public: virtual bool IsTrap() const { return false; } virtual bool IsBeacon() const { return false; } - virtual bool Process() { return false; } + virtual bool Process() { return false; } virtual bool Save() { return true; } virtual void Depop(bool StartSpawnTimer = false) {} Client* CastToClient(); - NPC* CastToNPC(); - Mob* CastToMob(); - Merc* CastToMerc(); + NPC* CastToNPC(); + Mob* CastToMob(); + Merc* CastToMerc(); Corpse* CastToCorpse(); Object* CastToObject(); Doors* CastToDoors(); @@ -96,14 +96,14 @@ public: Beacon* CastToBeacon(); const Client* CastToClient() const; - const NPC* CastToNPC() const; - const Mob* CastToMob() const; - const Merc* CastToMerc() const; + const NPC* CastToNPC() const; + const Mob* CastToMob() const; + const Merc* CastToMerc() const; const Corpse* CastToCorpse() const; - const Object* CastToObject() const; + const Object* CastToObject() const; // const Group* CastToGroup() const; const Doors* CastToDoors() const; - const Trap* CastToTrap() const; + const Trap* CastToTrap() const; const Beacon* CastToBeacon() const; inline const uint16& GetID() const{ return id; } @@ -148,8 +148,8 @@ public: Client* GetRandomClient(float x, float y, float z, float Distance, Client *ExcludeClient = nullptr); Group* GetGroupByMob(Mob* mob); Group* GetGroupByClient(Client* client); - Group* GetGroupByID(uint32 id); - Group* GetGroupByLeaderName(char* leader); + Group* GetGroupByID(uint32 id); + Group* GetGroupByLeaderName(char* leader); Raid* GetRaidByMob(Mob* mob); Raid* GetRaidByClient(Client* client); Raid* GetRaidByID(uint32 id); @@ -173,12 +173,12 @@ public: int RezzAllCorpsesByCharID(uint32 charid); bool IsMobInZone(Mob *who); void ClearClientPetitionQueue(); - bool CanAddHateForMob(Mob *p); - void SendGuildMOTD(uint32 guild_id); - void SendGuildSpawnAppearance(uint32 guild_id); - void SendGuildMembers(uint32 guild_id); - void RefreshAllGuildInfo(uint32 guild_id); - void SendGuildList(); + bool CanAddHateForMob(Mob *p); + void SendGuildMOTD(uint32 guild_id); + void SendGuildSpawnAppearance(uint32 guild_id); + void SendGuildMembers(uint32 guild_id); + void RefreshAllGuildInfo(uint32 guild_id); + void SendGuildList(); // void SendGuildJoin(GuildJoin_Struct* gj); // Check group list for nullptr entries void CheckGroupList (const char *fname, const int fline); @@ -197,17 +197,17 @@ public: Object* FindObject(uint32 object_id); Object* FindNearbyObject(float x, float y, float z, float radius); bool MakeDoorSpawnPacket(EQApplicationPacket* app, Client *client); - bool MakeTrackPacket(Client* client); + bool MakeTrackPacket(Client* client); void SendTraders(Client* client); - void AddClient(Client*); - void AddNPC(NPC*, bool SendSpawnPacket = true, bool dontqueue = false); + void AddClient(Client*); + void AddNPC(NPC*, bool SendSpawnPacket = true, bool dontqueue = false); void AddMerc(Merc*, bool SendSpawnPacket = true, bool dontqueue = false); void AddCorpse(Corpse* pc, uint32 in_id = 0xFFFFFFFF); - void AddObject(Object*, bool SendSpawnPacket = true); - void AddGroup(Group*); - void AddGroup(Group*, uint32 id); + void AddObject(Object*, bool SendSpawnPacket = true); + void AddGroup(Group*); + void AddGroup(Group*, uint32 id); void AddRaid(Raid *raid); - void AddRaid(Raid*, uint32 id); + void AddRaid(Raid*, uint32 id); void AddDoor(Doors* door); void AddTrap(Trap* trap); void AddBeacon(Beacon *beacon); @@ -259,39 +259,39 @@ public: void Message_StringID(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0); void MessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0); void ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message); - void ChannelMessage(Mob* from, uint8 chan_num, uint8 language, const char* message, ...); - void ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...); + void ChannelMessage(Mob* from, uint8 chan_num, uint8 language, const char* message, ...); + void ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...); void ChannelMessageSend(Mob* to, uint8 chan_num, uint8 language, const char* message, ...); - void SendZoneSpawns(Client*); + void SendZoneSpawns(Client*); void SendZonePVPUpdates(Client *); void SendZoneSpawnsBulk(Client* client); - void Save(); - void SendZoneCorpses(Client*); - void SendZoneCorpsesBulk(Client*); - void SendZoneObjects(Client* client); + void Save(); + void SendZoneCorpses(Client*); + void SendZoneCorpsesBulk(Client*); + void SendZoneObjects(Client* client); void SendZoneAppearance(Client *c); void SendNimbusEffects(Client *c); - void SendUntargetable(Client *c); + void SendUntargetable(Client *c); void DuelMessage(Mob* winner, Mob* loser, bool flee); - void QuestJournalledSayClose(Mob *sender, Client *QuestIntiator, float dist, const char* mobname, const char* message); + void QuestJournalledSayClose(Mob *sender, Client *QuestIntiator, float dist, const char* mobname, const char* message); void GroupMessage(uint32 gid, const char *from, const char *message); void ExpeditionWarning(uint32 minutes_left); - void RemoveFromTargets(Mob* mob, bool RemoveFromXTargets = false); - void RemoveFromXTargets(Mob* mob); - void RemoveFromAutoXTargets(Mob* mob); - void ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget); + void RemoveFromTargets(Mob* mob, bool RemoveFromXTargets = false); + void RemoveFromXTargets(Mob* mob); + void RemoveFromAutoXTargets(Mob* mob); + void ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget); void QueueCloseClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, float dist=200, Mob* SkipThisMob = 0, bool ackreq = true,eqFilterType filter=FilterNone); - void QueueClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true); + void QueueClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true); void QueueClientsStatus(Mob* sender, const EQApplicationPacket* app, bool ignore_sender = false, uint8 minstatus = 0, uint8 maxstatus = 0); void QueueClientsGuild(Mob* sender, const EQApplicationPacket* app, bool ignore_sender = false, uint32 guildeqid = 0); void QueueClientsGuildBankItemUpdate(const GuildBankItemUpdate_Struct *gbius, uint32 GuildID); void QueueClientsByTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender = true, Mob* SkipThisMob = 0, bool ackreq = true, - bool HoTT = true, uint32 ClientVersionBits = 0xFFFFFFFF); + bool HoTT = true, uint32 ClientVersionBits = 0xFFFFFFFF); void QueueClientsByXTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender = true); void QueueToGroupsForNPCHealthAA(Mob* sender, const EQApplicationPacket* app); - void QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true); + void QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true); void AEAttack(Mob *attacker, float dist, int Hand = 13, int count = 0, bool IsFromSpell = false); void AETaunt(Client *caster, float range = 0); @@ -299,7 +299,7 @@ public: void MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true); void AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true); - void RadialSetLogging(Mob *around, bool enabled, bool clients, bool non_clients, float range = 0); + void RadialSetLogging(Mob *around, bool enabled, bool clients, bool non_clients, float range = 0); //trap stuff Mob* GetTrapTrigger(Trap* trap); @@ -316,7 +316,7 @@ public: void SignalMobsByNPCID(uint32 npc_type, int signal_id); void CountNPC(uint32* NPCCount, uint32* NPCLootCount, uint32* gmspawntype_count); void DoZoneDump(ZSDump_Spawn2* spawn2dump, ZSDump_NPC* npcdump, ZSDump_NPC_Loot* npclootdump, NPCType* gmspawntype_dump); - void RemoveEntity(uint16 id); + void RemoveEntity(uint16 id); void SendPetitionToAdmins(Petition* pet); void SendPetitionToAdmins(); void AddLootToNPCS(uint32 item_id, uint32 count); @@ -333,14 +333,14 @@ public: void Evade(Mob *who); void UpdateHoTT(Mob* target); - void Process(); + void Process(); void ClearAggro(Mob* targ); void ClearFeignAggro(Mob* targ); void ClearZoneFeignAggro(Client* targ); void AggroZone(Mob* who, int hate = 0); bool Fighting(Mob* targ); - void RemoveFromHateLists(Mob* mob, bool settoone = false); + void RemoveFromHateLists(Mob* mob, bool settoone = false); void RemoveDebuffs(Mob* caster); @@ -370,8 +370,8 @@ public: void SendGroupLeave(uint32 gid, const char *name); void SendGroupJoin(uint32 gid, const char *name); - void SaveAllClientsTaskState(); - void ReloadAllClientsTaskState(int TaskID=0); + void SaveAllClientsTaskState(); + void ReloadAllClientsTaskState(int TaskID=0); uint16 CreateGroundObject(uint32 itemid, float x, float y, float z, float heading, uint32 decay_time = 300000); uint16 CreateGroundObjectFromModel(const char *model, float x, float y, float z, float heading, uint8 type = 0x00, uint32 decay_time = 0); @@ -398,7 +398,7 @@ public: void DepopAll(int NPCTypeID, bool StartSpawnTimer = true); - uint16 GetFreeID(); + uint16 GetFreeID(); void RefreshAutoXTargets(Client *c); void RefreshClientXTargets(Client *c); @@ -443,8 +443,8 @@ private: Bot* GetBotByBotName(std::string botName); list GetBotsByBotOwnerCharacterID(uint32 botOwnerCharacterID); - bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint16 iSpellTypes); // TODO: Evaluate this closesly in hopes to eliminate - void ShowSpawnWindow(Client* client, int Distance, bool NamedOnly); // TODO: Implement ShowSpawnWindow in the bot class but it needs entity list stuff + bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint16 iSpellTypes); // TODO: Evaluate this closesly in hopes to eliminate + void ShowSpawnWindow(Client* client, int Distance, bool NamedOnly); // TODO: Implement ShowSpawnWindow in the bot class but it needs entity list stuff private: std::list bot_list; #endif diff --git a/zone/errmsg.h b/zone/errmsg.h index 03863ec61..0b65671a1 100644 --- a/zone/errmsg.h +++ b/zone/errmsg.h @@ -1,19 +1,19 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ /* Error messages for mysql clients */ /* error messages for the demon is in share/language/errmsg.sys */ @@ -57,3 +57,4 @@ extern const char *client_errors[]; /* Error messages */ #define CR_NAMEDPIPESETSTATE_ERROR 2018 #define CR_CANT_READ_CHARSET 2019 #define CR_NET_PACKET_TOO_LARGE 2020 + diff --git a/zone/event_codes.h b/zone/event_codes.h index 3a6d9363b..95bc77368 100644 --- a/zone/event_codes.h +++ b/zone/event_codes.h @@ -36,7 +36,7 @@ typedef enum { EVENT_PROXIMITY_SAY, EVENT_CAST, EVENT_SCALE_CALC, - EVENT_ITEM_ENTERZONE, + EVENT_ITEM_ENTERZONE, EVENT_TARGET_CHANGE, //target selected, target changed, or target removed EVENT_HATE_LIST, EVENT_SPELL_EFFECT_CLIENT, diff --git a/zone/exp.cpp b/zone/exp.cpp index 0af39c061..853bc555e 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/features.h" @@ -134,7 +134,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { if(GetGroup()) { if((m_pp.group_leadership_points < MaxBankedGroupLeadershipPoints(GetLevel())) - && (RuleI(Character, KillsPerGroupLeadershipAA) > 0)) + && (RuleI(Character, KillsPerGroupLeadershipAA) > 0)) { AddLeadershipEXP(GROUP_EXP_PER_POINT / RuleI(Character, KillsPerGroupLeadershipAA), 0); Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP); @@ -145,7 +145,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) { else { if((m_pp.raid_leadership_points < MaxBankedRaidLeadershipPoints(GetLevel())) - && (RuleI(Character, KillsPerRaidLeadershipAA) > 0)) + && (RuleI(Character, KillsPerRaidLeadershipAA) > 0)) { AddLeadershipEXP(0, RAID_EXP_PER_POINT / RuleI(Character, KillsPerRaidLeadershipAA)); Message_StringID(MT_Leadership, GAIN_RAID_LEADERSHIP_EXP); @@ -278,7 +278,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { //Message(15, "You have gained %d skill points!!", m_pp.aapoints - last_unspentAA); char val1[20]={0}; - Message_StringID(MT_Experience, GAIN_ABILITY_POINT,ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)"); //You have gained an ability point! You now have %1 ability point%2. + Message_StringID(MT_Experience, GAIN_ABILITY_POINT,ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)"); //You have gained an ability point! You now have %1 ability point%2. //Message(15, "You now have %d skill points available to spend.", m_pp.aapoints); } @@ -307,7 +307,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { uint32 expneeded = GetEXPForLevel(MaxLevel); if(set_exp > expneeded) { - set_exp = expneeded; + set_exp = expneeded; } } } @@ -334,7 +334,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { uint32 expneeded = GetEXPForLevel(maxlevel); if(set_exp > expneeded) { - set_exp = expneeded; + set_exp = expneeded; } } @@ -370,77 +370,77 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { void Client::SetLevel(uint8 set_level, bool command) { - if (GetEXPForLevel(set_level) == 0xFFFFFFFF) { - LogFile->write(EQEMuLog::Error,"Client::SetLevel() GetEXPForLevel(%i) = 0xFFFFFFFF", set_level); - return; - } + if (GetEXPForLevel(set_level) == 0xFFFFFFFF) { + LogFile->write(EQEMuLog::Error,"Client::SetLevel() GetEXPForLevel(%i) = 0xFFFFFFFF", set_level); + return; + } - EQApplicationPacket* outapp = new EQApplicationPacket(OP_LevelUpdate, sizeof(LevelUpdate_Struct)); - LevelUpdate_Struct* lu = (LevelUpdate_Struct*)outapp->pBuffer; - lu->level = set_level; - if(m_pp.level2 != 0) - lu->level_old = m_pp.level2; - else - lu->level_old = level; + EQApplicationPacket* outapp = new EQApplicationPacket(OP_LevelUpdate, sizeof(LevelUpdate_Struct)); + LevelUpdate_Struct* lu = (LevelUpdate_Struct*)outapp->pBuffer; + lu->level = set_level; + if(m_pp.level2 != 0) + lu->level_old = m_pp.level2; + else + lu->level_old = level; - level = set_level; + level = set_level; - if(IsRaidGrouped()) - { - Raid *r = this->GetRaid(); - if(r){ - r->UpdateLevel(GetName(), set_level); - } - } - if(set_level > m_pp.level2) - { - if(m_pp.level2 == 0) - m_pp.points += 5; - else - m_pp.points += (5 * (set_level - m_pp.level2)); + if(IsRaidGrouped()) + { + Raid *r = this->GetRaid(); + if(r){ + r->UpdateLevel(GetName(), set_level); + } + } + if(set_level > m_pp.level2) + { + if(m_pp.level2 == 0) + m_pp.points += 5; + else + m_pp.points += (5 * (set_level - m_pp.level2)); - m_pp.level2 = set_level; - } - if(set_level > m_pp.level) { - parse->EventPlayer(EVENT_LEVEL_UP, this, "", 0); - } + m_pp.level2 = set_level; + } + if(set_level > m_pp.level) { + parse->EventPlayer(EVENT_LEVEL_UP, this, "", 0); + } - m_pp.level = set_level; - if (command){ - m_pp.exp = GetEXPForLevel(set_level); - Message(15, "Welcome to level %i!", set_level); - lu->exp = 0; - } - else { - float tmpxp = (float) ( (float) m_pp.exp - GetEXPForLevel( GetLevel() )) / - ( (float) GetEXPForLevel(GetLevel()+1) - GetEXPForLevel(GetLevel())); - lu->exp = (uint32)(330.0f * tmpxp); - } - QueuePacket(outapp); - safe_delete(outapp); - this->SendAppearancePacket(AT_WhoLevel, set_level); // who level change + m_pp.level = set_level; + if (command){ + m_pp.exp = GetEXPForLevel(set_level); + Message(15, "Welcome to level %i!", set_level); + lu->exp = 0; + } + else { + float tmpxp = (float) ( (float) m_pp.exp - GetEXPForLevel( GetLevel() )) / + ( (float) GetEXPForLevel(GetLevel()+1) - GetEXPForLevel(GetLevel())); + lu->exp = (uint32)(330.0f * tmpxp); + } + QueuePacket(outapp); + safe_delete(outapp); + this->SendAppearancePacket(AT_WhoLevel, set_level); // who level change LogFile->write(EQEMuLog::Normal,"Setting Level for %s to %i", GetName(), set_level); - CalcBonuses(); - if(!RuleB(Character, HealOnLevel)) - { - int mhp = CalcMaxHP(); - if(GetHP() > mhp) - SetHP(mhp); - } - else - { - SetHP(CalcMaxHP()); // Why not, lets give them a free heal - } + CalcBonuses(); + if(!RuleB(Character, HealOnLevel)) + { + int mhp = CalcMaxHP(); + if(GetHP() > mhp) + SetHP(mhp); + } + else + { + SetHP(CalcMaxHP()); // Why not, lets give them a free heal + } DoTributeUpdate(); - SendHPUpdate(); - SetMana(CalcMaxMana()); - UpdateWho(); + SendHPUpdate(); + SetMana(CalcMaxMana()); + UpdateWho(); if(GetMerc()) UpdateMercLevel(); - Save(); + Save(); } // Note: The client calculates exp separately, we cant change this function @@ -507,7 +507,7 @@ void Client::AddLevelBasedExp(uint8 exp_percentage, uint8 max_level) { void Group::SplitExp(uint32 exp, Mob* other) { if( other->CastToNPC()->MerchantType != 0 ) // Ensure NPC isn't a merchant - return; + return; if(other->GetOwner() && other->GetOwner()->IsClient()) // Ensure owner isn't pc return; @@ -549,7 +549,7 @@ void Group::SplitExp(uint32 exp, Mob* other) { if (membercount == 0) return; - for (i = 0; i < MAX_GROUP_MEMBERS; i++) { + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { if (members[i] != nullptr && members[i]->IsClient()) // If Group Member is Client { Client *cmember = members[i]->CastToClient(); @@ -596,7 +596,7 @@ void Raid::SplitExp(uint32 exp, Mob* other) { if (membercount == 0) return; - for (unsigned int x = 0; x < MAX_RAID_MEMBERS; x++) { + for (unsigned int x = 0; x < MAX_RAID_MEMBERS; x++) { if (members[x].member != nullptr) // If Group Member is Client { Client *cmember = members[x].member; @@ -672,5 +672,5 @@ uint32 Client::GetCharMaxLevelFromQGlobal() { ++gcount; } - return false; // Default is false + return false; // Default is false } diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp index 87a9b4317..82c2ff31c 100644 --- a/zone/fearpath.cpp +++ b/zone/fearpath.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -92,9 +92,9 @@ void Mob::CheckFlee() { } if(ratio < run_ratio) { - if( RuleB(Combat, FleeIfNotAlone) - || ( !RuleB(Combat, FleeIfNotAlone) - && (entity_list.GetHatedCount(hate_top, this) == 0))) + if (RuleB(Combat, FleeIfNotAlone) || + (!RuleB(Combat, FleeIfNotAlone) && + (entity_list.GetHatedCount(hate_top, this) == 0))) StartFleeing(); } @@ -127,10 +127,10 @@ void Mob::ProcessFlee() { } float Mob::GetFearSpeed() { - if(flee_mode) { - //we know ratio < FLEE_HP_RATIO - float speed = GetRunspeed(); - float ratio = GetHPRatio(); + if(flee_mode) { + //we know ratio < FLEE_HP_RATIO + float speed = GetRunspeed(); + float ratio = GetHPRatio(); // mob's movement will halt with a decent snare at HP specified by rule. if (ratio <= RuleI(Combat, FleeSnareHPRatio) && GetSnaredAmount() > 40) { @@ -140,11 +140,11 @@ float Mob::GetFearSpeed() { if (ratio < FLEE_HP_MINSPEED) ratio = FLEE_HP_MINSPEED; - speed = speed * 0.5 * ratio / 100; + speed = speed * 0.5 * ratio / 100; - return(speed); - } - return(GetRunspeed()); + return(speed); + } + return(GetRunspeed()); } void Mob::CalculateNewFearpoint() @@ -251,7 +251,7 @@ void Mob::CalculateNewFearpoint() fear_path_state = new MobFearState(); if(zone->pathing->FindNearestFear(fear_path_state, GetX(), GetY(), GetZ())) { #ifdef FEAR_PATHING_DEBUG - LogFile->write(EQEMuLog::Debug, "Fear Pathing Start: found path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", + LogFile->write(EQEMuLog::Debug, "Fear Pathing Start: found path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", GetX(), GetY(), GetZ(), fear_path_state->x, fear_path_state->y, fear_path_state->z); #endif //we found a fear node... were on our way.. @@ -373,7 +373,7 @@ void Mob::CalculateFearPosition() { return; } #ifdef FEAR_PATHING_DEBUG - LogFile->write(EQEMuLog::Debug, "Fear Pathing: on path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", + LogFile->write(EQEMuLog::Debug, "Fear Pathing: on path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", GetX(), GetY(), GetZ(), fear_path_state->x, fear_path_state->y, fear_path_state->z); #endif //we found a fear node... were on our way.. @@ -400,7 +400,7 @@ void Mob::CalculateFearPosition() { if(zone->pathing->FindNearestFear(fear_path_state, GetX(), GetY(), GetZ())) { #ifdef FEAR_PATHING_DEBUG - LogFile->write(EQEMuLog::Debug, "Fear Pathing: ran to find path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", + LogFile->write(EQEMuLog::Debug, "Fear Pathing: ran to find path, moving from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", GetX(), GetY(), GetZ(), fear_path_state->x, fear_path_state->y, fear_path_state->z); #endif //we found a fear node... were on our way.. @@ -422,7 +422,7 @@ void Mob::CalculateFearPosition() { //do not force a path if we are fleeing if(!flee_mode && zone->pathing->FindNearestFear(fear_path_state, GetX(), GetY(), GetZ(), false)) { #ifdef FEAR_PATHING_DEBUG - LogFile->write(EQEMuLog::Debug, "Fear Pathing: Bullshit Path from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", + LogFile->write(EQEMuLog::Debug, "Fear Pathing: Bullshit Path from (%.2f, %.2f, %.2f) to path node (%.2f, %.2f, %.2f)", GetX(), GetY(), GetZ(), fear_path_state->x, fear_path_state->y, fear_path_state->z); #endif //we found a fear node... were on our way.. diff --git a/zone/forage.cpp b/zone/forage.cpp index e7aa48ce0..54ac3b971 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -86,16 +86,16 @@ CREATE TABLE fishing ( // This allows EqEmu to have zone specific foraging - BoB uint32 ZoneDatabase::GetZoneForage(uint32 ZoneID, uint8 skill) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint8 index = 0; uint32 item[FORAGE_ITEM_LIMIT]; uint32 chance[FORAGE_ITEM_LIMIT]; uint32 ret; - for (int c=0; c < FORAGE_ITEM_LIMIT; c++) { + for (int c=0; c < FORAGE_ITEM_LIMIT; c++) { item[c] = 0; } @@ -104,7 +104,7 @@ uint32 ZoneDatabase::GetZoneForage(uint32 ZoneID, uint8 skill) { if (RunQuery(query, MakeAnyLenString(&query, "SELECT itemid,chance FROM forage WHERE zoneid= '%i' and level <= '%i' LIMIT %i", ZoneID, skill, FORAGE_ITEM_LIMIT), errbuf, &result)) { safe_delete_array(query); - while ((row = mysql_fetch_row(result)) && (index < FORAGE_ITEM_LIMIT)) { + while ((row = mysql_fetch_row(result)) && (index < FORAGE_ITEM_LIMIT)) { item[index] = atoi(row[0]); chance[index] = atoi(row[1])+chancepool; LogFile->write(EQEMuLog::Error, "Possible Forage: %d with a %d chance", item[index], chance[index]); @@ -144,9 +144,9 @@ LogFile->write(EQEMuLog::Error, "Possible Forage: %d with a %d chance", item[ind uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint8 &npc_chance) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint8 index = 0; uint32 item[50]; @@ -156,7 +156,7 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint32 chancepool = 0; uint32 ret = 0; - for (int c=0; c<50; c++) { + for (int c=0; c<50; c++) { item[c]=0; chance[c]=0; } @@ -164,7 +164,7 @@ uint32 ZoneDatabase::GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, if (RunQuery(query, MakeAnyLenString(&query, "SELECT itemid,chance,npc_id,npc_chance FROM fishing WHERE (zoneid= '%i' || zoneid = 0) and skill_level <= '%i'",ZoneID, skill ), errbuf, &result)) { safe_delete_array(query); - while ((row = mysql_fetch_row(result))&&(index<50)) { + while ((row = mysql_fetch_row(result))&&(index<50)) { item[index] = atoi(row[0]); chance[index] = atoi(row[1])+chancepool; chancepool = chance[index]; @@ -286,9 +286,9 @@ void Client::GoFish() 13019, // Fresh Fish 13076, // Fish Scales 13076, // Fish Scales - 7007, // Rusty Dagger 7007, // Rusty Dagger - 7007 // Rusty Dagger + 7007, // Rusty Dagger + 7007 // Rusty Dagger }; @@ -316,7 +316,7 @@ void Client::GoFish() uint32 food_id = 0; //25% chance to fish an item. - if (MakeRandomInt(0, 399) <= fishing_skill ) { + if (MakeRandomInt(0, 399) <= fishing_skill ) { uint32 npc_id = 0; uint8 npc_chance = 0; food_id = database.GetZoneFishing(m_pp.zone_id, fishing_skill, npc_id, npc_chance); @@ -366,7 +366,7 @@ void Client::GoFish() safe_delete(inst); } - parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst != nullptr ? inst->GetItem()->ID : 0); + parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst != nullptr ? inst->GetItem()->ID : 0); } else { @@ -382,7 +382,7 @@ void Client::GoFish() Message_StringID(MT_Skills, FISHING_FAILED); //You didn't catch anything. } - parse->EventPlayer(EVENT_FISH_FAILURE, this, "", 0); + parse->EventPlayer(EVENT_FISH_FAILURE, this, "", 0); } //chance to break fishing pole... @@ -475,19 +475,20 @@ void Client::ForageItem(bool guarantee) { safe_delete(inst); } - parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst != nullptr ? inst->GetItem()->ID : 0); + parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst != nullptr ? inst->GetItem()->ID : 0); - int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems; - if(!guarantee && MakeRandomInt(0,99) < ChanceSecondForage) { - this->Message_StringID(MT_Skills, FORAGE_MASTERY); - this->ForageItem(true); - } + int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems; + if(!guarantee && MakeRandomInt(0,99) < ChanceSecondForage) { + this->Message_StringID(MT_Skills, FORAGE_MASTERY); + this->ForageItem(true); + } } else { Message_StringID(MT_Skills, FORAGE_FAILED); - parse->EventPlayer(EVENT_FORAGE_FAILURE, this, "", 0); - } + parse->EventPlayer(EVENT_FORAGE_FAILURE, this, "", 0); + } CheckIncreaseSkill(FORAGE, nullptr, 5); } + diff --git a/zone/forage.h b/zone/forage.h index 1ec559a25..c2f852fd8 100644 --- a/zone/forage.h +++ b/zone/forage.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef FORAGE_H diff --git a/zone/groups.cpp b/zone/groups.cpp index b2ce46c13..85d75ff0d 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -116,253 +116,252 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu if(copper == 0 && silver == 0 && gold == 0 && platinum == 0) return; - uint32 i; - uint8 membercount = 0; - for (i = 0; i < MAX_GROUP_MEMBERS; i++) { - if (members[i] != nullptr) { + uint32 i; + uint8 membercount = 0; + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { + if (members[i] != nullptr) { + membercount++; + } + } - membercount++; - } - } + if (membercount == 0) + return; - if (membercount == 0) - return; + uint32 mod; + //try to handle round off error a little better + if(membercount > 1) { + mod = platinum % membercount; + if((mod) > 0) { + platinum -= mod; + gold += 10 * mod; + } + mod = gold % membercount; + if((mod) > 0) { + gold -= mod; + silver += 10 * mod; + } + mod = silver % membercount; + if((mod) > 0) { + silver -= mod; + copper += 10 * mod; + } + } - uint32 mod; - //try to handle round off error a little better - if(membercount > 1) { - mod = platinum % membercount; - if((mod) > 0) { - platinum -= mod; - gold += 10 * mod; - } - mod = gold % membercount; - if((mod) > 0) { - gold -= mod; - silver += 10 * mod; - } - mod = silver % membercount; - if((mod) > 0) { - silver -= mod; - copper += 10 * mod; - } - } + //calculate the splits + //We can still round off copper pieces, but I dont care + uint32 sc; + uint32 cpsplit = copper / membercount; + sc = copper % membercount; + uint32 spsplit = silver / membercount; + uint32 gpsplit = gold / membercount; + uint32 ppsplit = platinum / membercount; - //calculate the splits - //We can still round off copper pieces, but I dont care - uint32 sc; - uint32 cpsplit = copper / membercount; - sc = copper % membercount; - uint32 spsplit = silver / membercount; - uint32 gpsplit = gold / membercount; - uint32 ppsplit = platinum / membercount; + char buf[128]; + buf[63] = '\0'; + string msg = "You receive"; + bool one = false; - char buf[128]; - buf[63] = '\0'; - string msg = "You receive"; - bool one = false; + if(ppsplit > 0) { + snprintf(buf, 63, " %u platinum", ppsplit); + msg += buf; + one = true; + } + if(gpsplit > 0) { + if(one) + msg += ","; + snprintf(buf, 63, " %u gold", gpsplit); + msg += buf; + one = true; + } + if(spsplit > 0) { + if(one) + msg += ","; + snprintf(buf, 63, " %u silver", spsplit); + msg += buf; + one = true; + } + if(cpsplit > 0) { + if(one) + msg += ","; + //this message is not 100% accurate for the splitter + //if they are receiving any roundoff + snprintf(buf, 63, " %u copper", cpsplit); + msg += buf; + one = true; + } + msg += " as your split"; - if(ppsplit > 0) { - snprintf(buf, 63, " %u platinum", ppsplit); - msg += buf; - one = true; - } - if(gpsplit > 0) { - if(one) - msg += ","; - snprintf(buf, 63, " %u gold", gpsplit); - msg += buf; - one = true; - } - if(spsplit > 0) { - if(one) - msg += ","; - snprintf(buf, 63, " %u silver", spsplit); - msg += buf; - one = true; - } - if(cpsplit > 0) { - if(one) - msg += ","; - //this message is not 100% accurate for the splitter - //if they are receiving any roundoff - snprintf(buf, 63, " %u copper", cpsplit); - msg += buf; - one = true; - } - msg += " as your split"; - - for (i = 0; i < MAX_GROUP_MEMBERS; i++) { - if (members[i] != nullptr && members[i]->IsClient()) { // If Group Member is Client - Client *c = members[i]->CastToClient(); + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { + if (members[i] != nullptr && members[i]->IsClient()) { // If Group Member is Client + Client *c = members[i]->CastToClient(); //I could not get MoneyOnCorpse to work, so we use this c->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true); c->Message(2, msg.c_str()); - } - } + } + } } bool Group::AddMember(Mob* newmember, const char *NewMemberName, uint32 CharacterID) { - bool InZone = true; - bool ismerc = false; + bool InZone = true; + bool ismerc = false; - // This method should either be passed a Mob*, if the new member is in this zone, or a nullptr Mob* - // and the name and CharacterID of the new member, if they are out of zone. - // - if(!newmember && !NewMemberName) - return false; + // This method should either be passed a Mob*, if the new member is in this zone, or a nullptr Mob* + // and the name and CharacterID of the new member, if they are out of zone. + // + if(!newmember && !NewMemberName) + return false; - if(GroupCount() >= MAX_GROUP_MEMBERS) //Sanity check for merging groups together. + if(GroupCount() >= MAX_GROUP_MEMBERS) //Sanity check for merging groups together. + return false; + + if(!newmember) + InZone = false; + else + { + NewMemberName = newmember->GetCleanName(); + + if(newmember->IsClient()) + CharacterID = newmember->CastToClient()->CharacterID(); + if(newmember->IsMerc()) + { + Client* owner = newmember->CastToMerc()->GetMercOwner(); + if(owner) + { + CharacterID = owner->CastToClient()->CharacterID(); + NewMemberName = newmember->GetName(); + ismerc = true; + } + } + } + + uint32 i = 0; + + // See if they are already in the group + // + for (i = 0; i < MAX_GROUP_MEMBERS; ++i) + if(!strcasecmp(membername[i], NewMemberName)) return false; - if(!newmember) - InZone = false; - else - { - NewMemberName = newmember->GetCleanName(); + // Put them in the group + for (i = 0; i < MAX_GROUP_MEMBERS; ++i) + { + if (membername[i][0] == '\0') + { + if(InZone) + members[i] = newmember; - if(newmember->IsClient()) - CharacterID = newmember->CastToClient()->CharacterID(); - if(newmember->IsMerc()) - { - Client* owner = newmember->CastToMerc()->GetMercOwner(); - if(owner) - { - CharacterID = owner->CastToClient()->CharacterID(); - NewMemberName = newmember->GetName(); - ismerc = true; - } - } - } + break; + } + } - uint32 i = 0; + if (i == MAX_GROUP_MEMBERS) + return false; - // See if they are already in the group - // - for (i = 0; i < MAX_GROUP_MEMBERS; ++i) - if(!strcasecmp(membername[i], NewMemberName)) - return false; - - // Put them in the group - for (i = 0; i < MAX_GROUP_MEMBERS; ++i) - { - if (membername[i][0] == '\0') - { - if(InZone) - members[i] = newmember; - - break; - } - } - - if (i == MAX_GROUP_MEMBERS) - return false; - - strcpy(membername[i], NewMemberName); + strcpy(membername[i], NewMemberName); MemberRoles[i] = 0; - int x=1; + int x=1; - //build the template join packet - EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); - GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; - strcpy(gj->membername, NewMemberName); - gj->action = groupActJoin; + //build the template join packet + EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); + GroupJoin_Struct* gj = (GroupJoin_Struct*) outapp->pBuffer; + strcpy(gj->membername, NewMemberName); + gj->action = groupActJoin; - gj->leader_aas = LeaderAbilities; + gj->leader_aas = LeaderAbilities; - for (i = 0;i < MAX_GROUP_MEMBERS; i++) { - if (members[i] != nullptr && members[i] != newmember) { - //fill in group join & send it - if(members[i]->IsMerc()) - { - strcpy(gj->yourname, members[i]->GetName()); - } - else - { - strcpy(gj->yourname, members[i]->GetCleanName()); - } - if(members[i]->IsClient()) { - members[i]->CastToClient()->QueuePacket(outapp); + for (i = 0;i < MAX_GROUP_MEMBERS; i++) { + if (members[i] != nullptr && members[i] != newmember) { + //fill in group join & send it + if(members[i]->IsMerc()) + { + strcpy(gj->yourname, members[i]->GetName()); + } + else + { + strcpy(gj->yourname, members[i]->GetCleanName()); + } + if(members[i]->IsClient()) { + members[i]->CastToClient()->QueuePacket(outapp); - //put new member into existing person's list - strcpy(members[i]->CastToClient()->GetPP().groupMembers[this->GroupCount()-1], NewMemberName); - } + //put new member into existing person's list + strcpy(members[i]->CastToClient()->GetPP().groupMembers[this->GroupCount()-1], NewMemberName); + } - //put this existing person into the new member's list - if(InZone && newmember->IsClient()) { - if(IsLeader(members[i])) - strcpy(newmember->CastToClient()->GetPP().groupMembers[0], members[i]->GetCleanName()); - else { - strcpy(newmember->CastToClient()->GetPP().groupMembers[x], members[i]->GetCleanName()); - x++; - } - } - } - } - - if(InZone) - { - //put new member in his own list. - newmember->SetGrouped(true); - - if(newmember->IsClient()) - { - strcpy(newmember->CastToClient()->GetPP().groupMembers[x], NewMemberName); - newmember->CastToClient()->Save(); - database.SetGroupID(NewMemberName, GetID(), newmember->CastToClient()->CharacterID(), false); - SendMarkedNPCsToMember(newmember->CastToClient()); - - NotifyMainTank(newmember->CastToClient(), 1); - NotifyMainAssist(newmember->CastToClient(), 1); - NotifyPuller(newmember->CastToClient(), 1); - } - - if(newmember->IsMerc()) - { - Client* owner = newmember->CastToMerc()->GetMercOwner(); - if(owner) - { - database.SetGroupID(newmember->GetName(), GetID(), owner->CharacterID(), true); - } + //put this existing person into the new member's list + if(InZone && newmember->IsClient()) { + if(IsLeader(members[i])) + strcpy(newmember->CastToClient()->GetPP().groupMembers[0], members[i]->GetCleanName()); + else { + strcpy(newmember->CastToClient()->GetPP().groupMembers[x], members[i]->GetCleanName()); + x++; } + } + } + } + + if(InZone) + { + //put new member in his own list. + newmember->SetGrouped(true); + + if(newmember->IsClient()) + { + strcpy(newmember->CastToClient()->GetPP().groupMembers[x], NewMemberName); + newmember->CastToClient()->Save(); + database.SetGroupID(NewMemberName, GetID(), newmember->CastToClient()->CharacterID(), false); + SendMarkedNPCsToMember(newmember->CastToClient()); + + NotifyMainTank(newmember->CastToClient(), 1); + NotifyMainAssist(newmember->CastToClient(), 1); + NotifyPuller(newmember->CastToClient(), 1); + } + + if(newmember->IsMerc()) + { + Client* owner = newmember->CastToMerc()->GetMercOwner(); + if(owner) + { + database.SetGroupID(newmember->GetName(), GetID(), owner->CharacterID(), true); + } + } #ifdef BOTS - for (i = 0;i < MAX_GROUP_MEMBERS; i++) { - if (members[i] != nullptr && members[i]->IsBot()) { - members[i]->CastToBot()->CalcChanceToCast(); - } - } + for (i = 0;i < MAX_GROUP_MEMBERS; i++) { + if (members[i] != nullptr && members[i]->IsBot()) { + members[i]->CastToBot()->CalcChanceToCast(); + } + } #endif //BOTS - } - else - database.SetGroupID(NewMemberName, GetID(), CharacterID, ismerc); + } + else + database.SetGroupID(NewMemberName, GetID(), CharacterID, ismerc); - safe_delete(outapp); + safe_delete(outapp); - return true; + return true; } void Group::AddMember(const char *NewMemberName) { - // This method should be called when both the new member and the group leader are in a different zone to this one. - // - for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) - if(!strcasecmp(membername[i], NewMemberName)) - { - return; - } + // This method should be called when both the new member and the group leader are in a different zone to this one. + // + for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) + if(!strcasecmp(membername[i], NewMemberName)) + { + return; + } - for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) - { - if (membername[i][0] == '\0') - { - strcpy(membername[i], NewMemberName); + for (uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) + { + if (membername[i][0] == '\0') + { + strcpy(membername[i], NewMemberName); MemberRoles[i] = 0; - break; - } - } + break; + } + } } @@ -374,7 +373,7 @@ void Group::QueuePacket(const EQApplicationPacket *app, bool ack_req) members[i]->CastToClient()->QueuePacket(app, ack_req); } -// solar: sends the rest of the group's hps to member. this is useful when +// solar: sends the rest of the group's hps to member. this is useful when // someone first joins a group, but otherwise there shouldn't be a need to // call it void Group::SendHPPacketsTo(Mob *member) @@ -413,7 +412,7 @@ void Group::SendHPPacketsFrom(Mob *member) if(!member) return; - member->CreateHPPacket(&hp_app); + member->CreateHPPacket(&hp_app); EQApplicationPacket outapp(OP_MobManaUpdate, sizeof(MobManaUpdate_Struct)); uint32 i; @@ -482,26 +481,26 @@ void Group::MemberZoned(Mob* removemob) { if(removemob == GetLeader()) SetLeader(nullptr); - for (i = 0; i < MAX_GROUP_MEMBERS; i++) { - if (members[i] == removemob) { + for (i = 0; i < MAX_GROUP_MEMBERS; i++) { + if (members[i] == removemob) { members[i] = nullptr; //should NOT clear the name, it is used for world communication. break; - } + } #ifdef BOTS if (members[i] != nullptr && members[i]->IsBot()) { members[i]->CastToBot()->CalcChanceToCast(); } #endif //BOTS - } - if(removemob->IsClient() && HasRole(removemob, RoleAssist)) - SetGroupAssistTarget(0); + } + if(removemob->IsClient() && HasRole(removemob, RoleAssist)) + SetGroupAssistTarget(0); - if(removemob->IsClient() && HasRole(removemob, RoleTank)) - SetGroupTankTarget(0); + if(removemob->IsClient() && HasRole(removemob, RoleTank)) + SetGroupTankTarget(0); - if(removemob->IsClient() && HasRole(removemob, RolePuller)) - SetGroupPullerTarget(0); + if(removemob->IsClient() && HasRole(removemob, RolePuller)) + SetGroupPullerTarget(0); } bool Group::DelMemberOOZ(const char *Name) { @@ -550,7 +549,7 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) memset(membername[i],0,64); MemberRoles[i] = 0; break; - } + } } //handle leader quitting group gracefully @@ -604,7 +603,7 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) if(oldmember->IsClient()) oldmember->CastToClient()->QueuePacket(outapp); - } + } if(oldmember->IsClient()) database.SetGroupID(oldmember->GetCleanName(), 0, oldmember->CastToClient()->CharacterID()); @@ -622,7 +621,7 @@ bool Group::DelMember(Mob* oldmember,bool ignoresender) if(HasRole(oldmember, RoleAssist)) { - SetGroupAssistTarget(0); + SetGroupAssistTarget(0); UnDelegateMainAssist(oldmember->GetName()); } @@ -771,7 +770,7 @@ void Group::GroupMessage(Mob* sender, uint8 language, uint8 lang_skill, const ch } uint32 Group::GetTotalGroupDamage(Mob* other) { - uint32 total = 0; + uint32 total = 0; uint32 i; for (i = 0; i < MAX_GROUP_MEMBERS; i++) { @@ -825,7 +824,7 @@ void Group::DisbandGroup() { entity_list.RemoveGroup(GetID()); if(GetID() != 0) - database.ClearGroup(GetID()); + database.ClearGroup(GetID()); if(Leader && (Leader->IsLFP())) { Leader->UpdateLFP(); @@ -920,12 +919,12 @@ uint32 Group::GetHighestLevel() uint32 level = 1; uint32 i; for (i = 0; i < MAX_GROUP_MEMBERS; i++) - { + { if (members[i]) - { + { if(members[i]->GetLevel() > level) level = members[i]->GetLevel(); - } + } } return level; } @@ -934,12 +933,12 @@ uint32 Group::GetLowestLevel() uint32 level = 255; uint32 i; for (i = 0; i < MAX_GROUP_MEMBERS; i++) - { + { if (members[i]) - { + { if(members[i]->GetLevel() < level) level = members[i]->GetLevel(); - } + } } return level; } @@ -947,10 +946,10 @@ uint32 i; void Group::TeleportGroup(Mob* sender, uint32 zoneID, uint16 instance_id, float x, float y, float z, float heading) { uint32 i; - for (i = 0; i < MAX_GROUP_MEMBERS; i++) - { + for (i = 0; i < MAX_GROUP_MEMBERS; i++) + { if (members[i] != nullptr && members[i]->IsClient() && members[i] != sender) - { + { members[i]->CastToClient()->MovePC(zoneID, instance_id, x, y, z, heading, 0, ZoneSolicited); } } @@ -958,11 +957,11 @@ void Group::TeleportGroup(Mob* sender, uint32 zoneID, uint16 instance_id, float bool Group::LearnMembers() { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; MYSQL_ROW row; if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT name FROM group_id WHERE groupid=%lu", (unsigned long)GetID()), - errbuf,&result)){ + errbuf,&result)){ safe_delete_array(query); if(mysql_num_rows(result) < 1) { //could prolly be 2 mysql_free_result(result); @@ -1102,7 +1101,7 @@ void Group::BalanceHP(int32 penalty) { if(members[gi]){ if((members[gi]->GetMaxHP() - dmgtaken) < 1){ //this way the ability will never kill someone - members[gi]->SetHP(1); //but it will come darn close + members[gi]->SetHP(1); //but it will come darn close members[gi]->SendHPUpdate(); } else{ @@ -1277,7 +1276,7 @@ void Group::DelegateMainTank(const char *NewMainTankName, uint8 toggle) char *Query = nullptr; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET maintank='%s' WHERE gid=%i LIMIT 1", - MainTankName.c_str(), GetID()), errbuff)) + MainTankName.c_str(), GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to set group main tank: %s\n", errbuff); safe_delete_array(Query); @@ -1326,7 +1325,7 @@ void Group::DelegateMainAssist(const char *NewMainAssistName, uint8 toggle) char *Query = nullptr; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET assist='%s' WHERE gid=%i LIMIT 1", - MainAssistName.c_str(), GetID()), errbuff)) + MainAssistName.c_str(), GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to set group main assist: %s\n", errbuff); safe_delete_array(Query); @@ -1375,7 +1374,7 @@ void Group::DelegatePuller(const char *NewPullerName, uint8 toggle) char *Query = nullptr; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET puller='%s' WHERE gid=%i LIMIT 1", - PullerName.c_str(), GetID()), errbuff)) + PullerName.c_str(), GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to set group main puller: %s\n", errbuff); safe_delete_array(Query); @@ -1529,7 +1528,7 @@ void Group::UnDelegateMainTank(const char *OldMainTankName, uint8 toggle) char *Query = 0; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET maintank='' WHERE gid=%i LIMIT 1", - GetID()), errbuff)) + GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to clear group main tank: %s\n", errbuff); safe_delete_array(Query); @@ -1583,7 +1582,7 @@ void Group::UnDelegateMainAssist(const char *OldMainAssistName, uint8 toggle) char *Query = 0; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET assist='' WHERE gid=%i LIMIT 1", - GetID()), errbuff)) + GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to clear group main assist: %s\n", errbuff); safe_delete_array(Query); @@ -1615,7 +1614,7 @@ void Group::UnDelegatePuller(const char *OldPullerName, uint8 toggle) char *Query = 0; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET puller='' WHERE gid=%i LIMIT 1", - GetID()), errbuff)) + GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to clear group main puller: %s\n", errbuff); safe_delete_array(Query); @@ -1758,7 +1757,7 @@ void Group::DelegateMarkNPC(const char *NewNPCMarkerName) char *Query = 0; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET marknpc='%s' WHERE gid=%i LIMIT 1", - NewNPCMarkerName, GetID()), errbuff)) + NewNPCMarkerName, GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to set group mark npc: %s\n", errbuff); safe_delete_array(Query); @@ -1844,7 +1843,7 @@ void Group::UnDelegateMarkNPC(const char *OldNPCMarkerName) char *Query = 0; if (!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE group_leaders SET marknpc='' WHERE gid=%i LIMIT 1", - GetID()), errbuff)) + GetID()), errbuff)) LogFile->write(EQEMuLog::Error, "Unable to clear group marknpc: %s\n", errbuff); safe_delete_array(Query); @@ -2135,3 +2134,4 @@ bool Group::HasRole(Mob *m, uint8 Role) } return false; } + diff --git a/zone/groups.h b/zone/groups.h index a8b7955b5..ddcb3fb21 100644 --- a/zone/groups.h +++ b/zone/groups.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef GROUPS_H #define GROUPS_H @@ -125,7 +125,7 @@ public: void SetNPCMarker(const char *NewNPCMarkerName); void UnMarkNPC(uint16 ID); void SendMarkedNPCsToMember(Client *c, bool Clear = false); - inline int GetLeadershipAA(int AAID) { return LeaderAbilities.ranks[AAID]; } + inline int GetLeadershipAA(int AAID) { return LeaderAbilities.ranks[AAID]; } void ClearAllNPCMarks(); void QueueHPPacketsForNPCHealthAA(Mob* sender, const EQApplicationPacket* app); void ChangeLeader(Mob* newleader); diff --git a/zone/guild.cpp b/zone/guild.cpp index 29538128a..3be3f6fdd 100644 --- a/zone/guild.cpp +++ b/zone/guild.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -382,7 +382,7 @@ bool ZoneDatabase::CheckGuildDoor(uint8 doorid,uint16 guild_id,const char* zone) MYSQL_ROW row; char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - MYSQL_RES *result; + MYSQL_RES *result; if (!RunQuery(query, MakeAnyLenString(&query, "SELECT guild FROM doors where doorid=%i AND zone='%s'", doorid-128, zone), errbuf, &result)) diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index a8603f0b6..0e4690cee 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "guild_mgr.h" @@ -388,7 +388,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { if(pack->size != sizeof(ServerGuildRankUpdate_Struct)) { _log(GUILDS__ERROR, "Received ServerOP_RankUpdate of incorrect size %d, expected %d", - pack->size, sizeof(ServerGuildRankUpdate_Struct)); + pack->size, sizeof(ServerGuildRankUpdate_Struct)); return; } @@ -461,7 +461,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) { char *Buffer = (char *)pack->pBuffer; uint32 FromID = VARSTRUCT_DECODE_TYPE(uint32, Buffer); - uint32 Count = VARSTRUCT_DECODE_TYPE(uint32, Buffer); + uint32 Count = VARSTRUCT_DECODE_TYPE(uint32, Buffer); Client *c = entity_list.GetClientByCharID(FromID); if (!c || !c->IsInAGuild()) @@ -647,7 +647,7 @@ GuildBankManager::~GuildBankManager() bool GuildBankManager::Load(uint32 GuildID) { - const char *LoadQuery = "SELECT `area`, `slot`, `itemid`, `qty`, `donator`, `permissions`, `whofor` from `guild_bank` " + const char *LoadQuery = "SELECT `area`, `slot`, `itemid`, `qty`, `donator`, `permissions`, `whofor` from `guild_bank` " "WHERE `guildid` = %i"; char errbuf[MYSQL_ERRMSG_SIZE]; @@ -784,15 +784,15 @@ void GuildBankManager::SendGuildBank(Client *c) if(!Item->Stackable) gbius->Init(GuildBankItemUpdate, 1, i, GuildBankDepositArea, 1, Item->ID, Item->Icon, 1, - (*Iterator)->Items.DepositArea[i].Permissions, 0, 0); + (*Iterator)->Items.DepositArea[i].Permissions, 0, 0); else { if((*Iterator)->Items.DepositArea[i].Quantity == Item->StackSize) gbius->Init(GuildBankItemUpdate, 1, i, GuildBankDepositArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.DepositArea[i].Quantity, (*Iterator)->Items.DepositArea[i].Permissions, 0, 0); + (*Iterator)->Items.DepositArea[i].Quantity, (*Iterator)->Items.DepositArea[i].Permissions, 0, 0); else gbius->Init(GuildBankItemUpdate, 1, i, GuildBankDepositArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.DepositArea[i].Quantity, (*Iterator)->Items.DepositArea[i].Permissions, 1, 0); + (*Iterator)->Items.DepositArea[i].Quantity, (*Iterator)->Items.DepositArea[i].Permissions, 1, 0); } strn0cpy(gbius->ItemName, Item->Name, sizeof(gbius->ItemName)); @@ -822,15 +822,15 @@ void GuildBankManager::SendGuildBank(Client *c) if(!Item->Stackable) gbius->Init(GuildBankItemUpdate, 1, i, GuildBankMainArea, 1, Item->ID, Item->Icon, 1, - (*Iterator)->Items.MainArea[i].Permissions, 0, Useable); + (*Iterator)->Items.MainArea[i].Permissions, 0, Useable); else { if((*Iterator)->Items.MainArea[i].Quantity == Item->StackSize) gbius->Init(GuildBankItemUpdate, 1, i, GuildBankMainArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.MainArea[i].Quantity, (*Iterator)->Items.MainArea[i].Permissions, 0, Useable); + (*Iterator)->Items.MainArea[i].Quantity, (*Iterator)->Items.MainArea[i].Permissions, 0, Useable); else gbius->Init(GuildBankItemUpdate, 1, i, GuildBankMainArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.MainArea[i].Quantity, (*Iterator)->Items.MainArea[i].Permissions, 1, Useable); + (*Iterator)->Items.MainArea[i].Quantity, (*Iterator)->Items.MainArea[i].Permissions, 1, Useable); } strn0cpy(gbius->ItemName, Item->Name, sizeof(gbius->ItemName)); @@ -932,7 +932,7 @@ bool GuildBankManager::AddItem(uint32 GuildID, uint8 Area, uint32 ItemID, int32 } const char *Query="INSERT INTO `guild_bank` (`guildid`, `area`, `slot`, `itemid`, `qty`, `donator`, `permissions`, `WhoFor`) " - "VALUES (%i, %i, %i, %i, %i, '%s', %i, '%s')"; + "VALUES (%i, %i, %i, %i, %i, '%s', %i, '%s')"; char errbuf[MYSQL_ERRMSG_SIZE]; @@ -1014,7 +1014,7 @@ int GuildBankManager::Promote(uint32 GuildID, int SlotID) strn0cpy((*Iterator)->Items.MainArea[MainSlot].WhoFor, (*Iterator)->Items.DepositArea[SlotID].WhoFor, sizeof((*Iterator)->Items.MainArea[MainSlot].WhoFor)); - const char *Query="UPDATE `guild_bank` SET `area` = 1, `slot` = %i WHERE `guildid` = %i AND `area` = 0 AND `slot` = %i LIMIT 1"; + const char *Query="UPDATE `guild_bank` SET `area` = 1, `slot` = %i WHERE `guildid` = %i AND `area` = 0 AND `slot` = %i LIMIT 1"; char errbuf[MYSQL_ERRMSG_SIZE]; @@ -1043,10 +1043,10 @@ int GuildBankManager::Promote(uint32 GuildID, int SlotID) { if((*Iterator)->Items.MainArea[MainSlot].Quantity == Item->StackSize) gbius.Init(GuildBankItemUpdate, 1, MainSlot, GuildBankMainArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.MainArea[MainSlot].Quantity, 0, 0, 0); + (*Iterator)->Items.MainArea[MainSlot].Quantity, 0, 0, 0); else gbius.Init(GuildBankItemUpdate, 1, MainSlot, GuildBankMainArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.MainArea[MainSlot].Quantity, 0, 1, 0); + (*Iterator)->Items.MainArea[MainSlot].Quantity, 0, 1, 0); } strn0cpy(gbius.ItemName, Item->Name, sizeof(gbius.ItemName)); @@ -1077,7 +1077,7 @@ void GuildBankManager::SetPermissions(uint32 GuildID, uint16 SlotID, uint32 Perm return; } - const char *Query="UPDATE `guild_bank` SET `permissions` = %i, `whofor` = '%s' WHERE `guildid` = %i AND `area` = 1 AND `slot` = %i LIMIT 1"; + const char *Query="UPDATE `guild_bank` SET `permissions` = %i, `whofor` = '%s' WHERE `guildid` = %i AND `area` = 1 AND `slot` = %i LIMIT 1"; char errbuf[MYSQL_ERRMSG_SIZE]; @@ -1112,10 +1112,10 @@ void GuildBankManager::SetPermissions(uint32 GuildID, uint16 SlotID, uint32 Perm { if((*Iterator)->Items.MainArea[SlotID].Quantity == Item->StackSize) gbius.Init(GuildBankItemUpdate, 1, SlotID, GuildBankMainArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.MainArea[SlotID].Quantity, (*Iterator)->Items.MainArea[SlotID].Permissions, 0, 0); + (*Iterator)->Items.MainArea[SlotID].Quantity, (*Iterator)->Items.MainArea[SlotID].Permissions, 0, 0); else gbius.Init(GuildBankItemUpdate, 1, SlotID, GuildBankMainArea, 1, Item->ID, Item->Icon, - (*Iterator)->Items.MainArea[SlotID].Quantity, (*Iterator)->Items.MainArea[SlotID].Permissions, 1, 0); + (*Iterator)->Items.MainArea[SlotID].Quantity, (*Iterator)->Items.MainArea[SlotID].Permissions, 1, 0); } @@ -1126,7 +1126,7 @@ void GuildBankManager::SetPermissions(uint32 GuildID, uint16 SlotID, uint32 Perm entity_list.QueueClientsGuildBankItemUpdate(&gbius, GuildID); } -ItemInst* GuildBankManager::GetItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity) +ItemInst* GuildBankManager::GetItem(uint32 GuildID, uint16 Area, uint16 SlotID, uint32 Quantity) { std::list::iterator Iterator = GetGuildBank(GuildID); @@ -1264,7 +1264,7 @@ bool GuildBankManager::DeleteItem(uint32 GuildID, uint16 Area, uint16 SlotID, ui const char *Query = "UPDATE `guild_bank` SET `qty` = %i where `guildid` = %i AND `area` = %i AND `slot` = %i LIMIT 1"; if(!database.RunQuery(query, MakeAnyLenString(&query, Query, BankArea[SlotID].Quantity - Quantity, - GuildID, Area, SlotID), errbuf)) + GuildID, Area, SlotID), errbuf)) { _log(GUILDS__BANK_ERROR, "Update item failed. %s : %s", query, errbuf); @@ -1481,7 +1481,7 @@ bool GuildApproval::ProcessApproval() { if(owner && owner->GuildID() != 0) { - owner->Message(10,"You are already in a guild! Guild request deleted."); + owner->Message(10,"You are already in a guild! Guild request deleted."); return false; } if(deletion_timer->Check() || !owner) @@ -1611,3 +1611,4 @@ void GuildApproval::GuildApproved() owner->Message(0, "Your guild was created."); owner = 0; } + diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 2450d5a91..491edc525 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -44,14 +44,14 @@ HateList::~HateList() // checks if target still is in frenzy mode void HateList::CheckFrenzyHate() { - LinkedListIterator iterator(list); - iterator.Reset(); + LinkedListIterator iterator(list); + iterator.Reset(); while(iterator.MoreElements()) - { - if (iterator.GetData()->ent->GetHPRatio() >= 20) - iterator.GetData()->bFrenzy = false; - iterator.Advance(); - } + { + if (iterator.GetData()->ent->GetHPRatio() >= 20) + iterator.GetData()->bFrenzy = false; + iterator.Advance(); + } } void HateList::Wipe() @@ -62,8 +62,8 @@ void HateList::Wipe() while(iterator.MoreElements()) { Mob* m = iterator.GetData()->ent; - parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), m, "0", 0); - iterator.RemoveCurrent(); + parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), m, "0", 0); + iterator.RemoveCurrent(); if(m->IsClient()) m->CastToClient()->DecrementAggroCount(); @@ -80,27 +80,27 @@ bool HateList::IsOnHateList(Mob *mob) tHateEntry *HateList::Find(Mob *ent) { _ZP(HateList_Find); - LinkedListIterator iterator(list); - iterator.Reset(); + LinkedListIterator iterator(list); + iterator.Reset(); while(iterator.MoreElements()) - { - if(iterator.GetData()->ent == ent) - return iterator.GetData(); - iterator.Advance(); - } + { + if(iterator.GetData()->ent == ent) + return iterator.GetData(); + iterator.Advance(); + } return nullptr; } void HateList::Set(Mob* other, uint32 in_hate, uint32 in_dam) { - tHateEntry *p = Find(other); - if(p) - { + tHateEntry *p = Find(other); + if(p) + { if(in_dam > 0) - p->damage = in_dam; + p->damage = in_dam; if(in_hate > 0) - p->hate = in_hate; - } + p->hate = in_hate; + } } Mob* HateList::GetDamageTop(Mob* hater) @@ -111,10 +111,10 @@ Mob* HateList::GetDamageTop(Mob* hater) Raid* r = nullptr; uint32 dmg_amt = 0; - LinkedListIterator iterator(list); - iterator.Reset(); + LinkedListIterator iterator(list); + iterator.Reset(); while(iterator.MoreElements()) - { + { grp = nullptr; r = nullptr; @@ -122,7 +122,7 @@ Mob* HateList::GetDamageTop(Mob* hater) r = entity_list.GetRaidByClient(iterator.GetData()->ent->CastToClient()); } - grp = entity_list.GetGroupByMob(iterator.GetData()->ent); + grp = entity_list.GetGroupByMob(iterator.GetData()->ent); if(iterator.GetData()->ent && r){ if(r->GetTotalRaidDamage(hater) >= dmg_amt) @@ -132,20 +132,20 @@ Mob* HateList::GetDamageTop(Mob* hater) } } else if (iterator.GetData()->ent != nullptr && grp != nullptr) - { + { if (grp->GetTotalGroupDamage(hater) >= dmg_amt) - { + { current = iterator.GetData()->ent; dmg_amt = grp->GetTotalGroupDamage(hater); - } - } - else if (iterator.GetData()->ent != nullptr && (uint32)iterator.GetData()->damage >= dmg_amt) - { + } + } + else if (iterator.GetData()->ent != nullptr && (uint32)iterator.GetData()->damage >= dmg_amt) + { current = iterator.GetData()->ent; dmg_amt = iterator.GetData()->damage; - } - iterator.Advance(); - } + } + iterator.Advance(); + } return current; } @@ -155,15 +155,15 @@ Mob* HateList::GetClosest(Mob *hater) { float closedist = 99999.9f; float thisdist; - LinkedListIterator iterator(list); - iterator.Reset(); + LinkedListIterator iterator(list); + iterator.Reset(); while(iterator.MoreElements()) { thisdist = iterator.GetData()->ent->DistNoRootNoZ(*hater); if(iterator.GetData()->ent != nullptr && thisdist <= closedist) { closedist = thisdist; close = iterator.GetData()->ent; } - iterator.Advance(); + iterator.Advance(); } if (close == 0 && hater->IsNPC()) @@ -177,7 +177,7 @@ Mob* HateList::GetClosest(Mob *hater) { void HateList::Add(Mob *ent, int32 in_hate, int32 in_dam, bool bFrenzy, bool iAddIfNotExist) { if(!ent) - return; + return; if(ent->IsCorpse()) return; @@ -193,17 +193,17 @@ void HateList::Add(Mob *ent, int32 in_hate, int32 in_dam, bool bFrenzy, bool iAd p->bFrenzy = bFrenzy; } else if (iAddIfNotExist) { - p = new tHateEntry; - p->ent = ent; - p->damage = (in_dam>=0)?in_dam:0; - p->hate = in_hate; - p->bFrenzy = bFrenzy; - list.Append(p); + p = new tHateEntry; + p->ent = ent; + p->damage = (in_dam>=0)?in_dam:0; + p->hate = in_hate; + p->bFrenzy = bFrenzy; + list.Append(p); parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "1", 0); if(ent->IsClient()) ent->CastToClient()->IncrementAggroCount(); - } + } } bool HateList::RemoveEnt(Mob *ent) @@ -216,14 +216,14 @@ bool HateList::RemoveEnt(Mob *ent) { if(iterator.GetData()->ent == ent) { - parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "0", 0); + parse->EventNPC(EVENT_HATE_LIST, owner->CastToNPC(), ent, "0", 0); iterator.RemoveCurrent(); found = true; if(ent->IsClient()) ent->CastToClient()->DecrementAggroCount(); - } + } else iterator.Advance(); } @@ -234,21 +234,21 @@ void HateList::DoFactionHits(int32 nfl_id) { _ZP(HateList_DoFactionHits); if (nfl_id <= 0) return; - LinkedListIterator iterator(list); - iterator.Reset(); + LinkedListIterator iterator(list); + iterator.Reset(); while(iterator.MoreElements()) - { - Client *p; + { + Client *p; - if (iterator.GetData()->ent && iterator.GetData()->ent->IsClient()) - p = iterator.GetData()->ent->CastToClient(); - else - p = nullptr; + if (iterator.GetData()->ent && iterator.GetData()->ent->IsClient()) + p = iterator.GetData()->ent->CastToClient(); + else + p = nullptr; - if (p) + if (p) p->SetFactionLevel(p->CharacterID(), nfl_id, p->GetBaseClass(), p->GetBaseRace(), p->GetDeity()); - iterator.Advance(); - } + iterator.Advance(); + } } Mob *HateList::GetTop(Mob *center) @@ -260,13 +260,13 @@ Mob *HateList::GetTop(Mob *center) if (RuleB(Aggro,SmartAggroList)){ Mob* topClientTypeInRange = nullptr; int32 hateClientTypeInRange = -1; - int skipped_count = 0; + int skipped_count = 0; LinkedListIterator iterator(list); iterator.Reset(); while(iterator.MoreElements()) { - tHateEntry *cur = iterator.GetData(); + tHateEntry *cur = iterator.GetData(); int16 aggroMod = 0; if(!cur){ @@ -279,13 +279,13 @@ Mob *HateList::GetTop(Mob *center) continue; } - if(center->IsNPC() && center->CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { - if(!zone->watermap->InLiquid(cur->ent->GetX(), cur->ent->GetY(), cur->ent->GetZ())) { - skipped_count++; - iterator.Advance(); - continue; - } - } + if(center->IsNPC() && center->CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { + if(!zone->watermap->InLiquid(cur->ent->GetX(), cur->ent->GetY(), cur->ent->GetZ())) { + skipped_count++; + iterator.Advance(); + continue; + } + } if(cur->ent->DivineAura() || cur->ent->IsMezzed() || cur->ent->IsFeared()){ if(hate == -1) @@ -362,7 +362,7 @@ Mob *HateList::GetTop(Mob *center) } #endif //BOTS - if(!isTopClientType) { + if(!isTopClientType) { if(top->IsMerc()) { isTopClientType = true; topClientTypeInRange = top; @@ -373,28 +373,28 @@ Mob *HateList::GetTop(Mob *center) return topClientTypeInRange; return top; - } + } else { if(top == nullptr && skipped_count > 0) { - return center->GetTarget(); - } + return center->GetTarget(); + } return top; - } + } } else{ LinkedListIterator iterator(list); iterator.Reset(); - int skipped_count = 0; + int skipped_count = 0; while(iterator.MoreElements()) { - tHateEntry *cur = iterator.GetData(); - if(center->IsNPC() && center->CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { - if(!zone->watermap->InLiquid(cur->ent->GetX(), cur->ent->GetY(), cur->ent->GetZ())) { - skipped_count++; - iterator.Advance(); - continue; - } - } + tHateEntry *cur = iterator.GetData(); + if(center->IsNPC() && center->CastToNPC()->IsUnderwaterOnly() && zone->HasWaterMap()) { + if(!zone->watermap->InLiquid(cur->ent->GetX(), cur->ent->GetY(), cur->ent->GetZ())) { + skipped_count++; + iterator.Advance(); + continue; + } + } if(cur->ent != nullptr && ((cur->hate > hate) || cur->bFrenzy )) { @@ -404,8 +404,8 @@ Mob *HateList::GetTop(Mob *center) iterator.Advance(); } if(top == nullptr && skipped_count > 0) { - return center->GetTarget(); - } + return center->GetTarget(); + } return top; } } @@ -434,32 +434,32 @@ Mob *HateList::GetMostHate(){ Mob *HateList::GetRandom() { - int count = 0; - LinkedListIterator iterator(list); - iterator.Reset(); + int count = 0; + LinkedListIterator iterator(list); + iterator.Reset(); while(iterator.MoreElements()) - { - iterator.Advance(); - count++; - } + { + iterator.Advance(); + count++; + } if(!count) return nullptr; - int random = MakeRandomInt(0, count-1); - iterator.Reset(); - for (int i = 0; i < random; i++) - iterator.Advance(); - return iterator.GetData()->ent; + int random = MakeRandomInt(0, count-1); + iterator.Reset(); + for (int i = 0; i < random; i++) + iterator.Advance(); + return iterator.GetData()->ent; } int32 HateList::GetEntHate(Mob *ent, bool damage) { tHateEntry *p; - p = Find(ent); + p = Find(ent); if ( p && damage) - return p->damage; + return p->damage; else if (p) return p->hate; else diff --git a/zone/hate_list.h b/zone/hate_list.h index 07c2dd16a..72dfc106b 100644 --- a/zone/hate_list.h +++ b/zone/hate_list.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef HATELIST_H @@ -22,41 +22,41 @@ class tHateEntry { public: - Mob *ent; - int32 damage, hate; - bool bFrenzy; + Mob *ent; + int32 damage, hate; + bool bFrenzy; }; class HateList { public: - HateList(); - ~HateList(); + HateList(); + ~HateList(); - // adds a mob to the hatelist - void Add(Mob *ent, int32 in_hate=0, int32 in_dam=0, bool bFrenzy = false, bool iAddIfNotExist = true); - // sets existing hate - void Set(Mob *other, uint32 in_hate, uint32 in_dam); - // removes mobs from hatelist - bool RemoveEnt(Mob *ent); - // Remove all - void Wipe(); - // ??? - void DoFactionHits(int32 nfl_id); - // Gets Hate amount for mob - int32 GetEntHate(Mob *ent, bool damage = false); - // gets top hated mob - Mob *GetTop(Mob *center); - // gets any on the list - Mob *GetRandom(); - // get closest mob or nullptr if list empty - Mob *GetClosest(Mob *hater); - // gets top mob or nullptr if hate list empty - Mob *GetDamageTop(Mob *hater); - // used to check if mob is on hatelist - bool IsOnHateList(Mob *); - // used to remove or add frenzy hate - void CheckFrenzyHate(); + // adds a mob to the hatelist + void Add(Mob *ent, int32 in_hate=0, int32 in_dam=0, bool bFrenzy = false, bool iAddIfNotExist = true); + // sets existing hate + void Set(Mob *other, uint32 in_hate, uint32 in_dam); + // removes mobs from hatelist + bool RemoveEnt(Mob *ent); + // Remove all + void Wipe(); + // ??? + void DoFactionHits(int32 nfl_id); + // Gets Hate amount for mob + int32 GetEntHate(Mob *ent, bool damage = false); + // gets top hated mob + Mob *GetTop(Mob *center); + // gets any on the list + Mob *GetRandom(); + // get closest mob or nullptr if list empty + Mob *GetClosest(Mob *hater); + // gets top mob or nullptr if hate list empty + Mob *GetDamageTop(Mob *hater); + // used to check if mob is on hatelist + bool IsOnHateList(Mob *); + // used to remove or add frenzy hate + void CheckFrenzyHate(); //Gets the target with the most hate regardless of things like frenzy etc. Mob* GetMostHate(); @@ -64,7 +64,7 @@ public: void SpellCast(Mob *caster, uint32 spell_id, float range); - bool IsEmpty(); + bool IsEmpty(); void PrintToClient(Client *c); //For accessing the hate list via perl; don't use for anything else @@ -74,9 +74,9 @@ public: void SetOwner(Mob *newOwner) { owner = newOwner; } protected: - tHateEntry *Find(Mob *ent); + tHateEntry *Find(Mob *ent); private: - LinkedList list; + LinkedList list; Mob *owner; }; diff --git a/zone/horse.cpp b/zone/horse.cpp index a7c904ebf..ef4b23812 100644 --- a/zone/horse.cpp +++ b/zone/horse.cpp @@ -1,23 +1,21 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - - #include "../common/debug.h" #include "masterentity.h" #include "../common/Item.h" @@ -127,18 +125,16 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) { return nullptr; } else { - LogFile->write(EQEMuLog::Error, "Error in Mount query '%s': %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "Error in Mount query '%s': %s", query, errbuf); safe_delete_array(query); return nullptr; } } - - void Client::SummonHorse(uint16 spell_id) { if (GetHorseId() != 0) { - Message(13,"You already have a Horse. Get off, Fatbutt!"); + Message(13,"You already have a Horse. Get off, Fatbutt!"); return; } if(!Horse::IsHorseSpell(spell_id)) { @@ -205,4 +201,3 @@ void Mob::CreateHorseSpawnPacket(EQApplicationPacket* app, const char* ownername #endif } - diff --git a/zone/horse.h b/zone/horse.h index a9915edf0..c9ecaaac7 100644 --- a/zone/horse.h +++ b/zone/horse.h @@ -1,24 +1,23 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator +Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef HORSES_H #define HORSES_H - #include "../common/debug.h" #include "npc.h" @@ -42,7 +41,4 @@ protected: static const NPCType *BuildHorseType(uint16 spell_id); }; - - - #endif diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 0a7d070d6..b20a0f4e2 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -41,145 +41,145 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { ItemInst *cur = nullptr; int i; - if(where_to_check & invWhereWorn) { - for (i=0; i<=21; i++) { // Equipped - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + if(where_to_check & invWhereWorn) { + for (i=0; i<=21; i++) { // Equipped + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } + DeleteItemInInventory(i, 0, true); + } + } - // Power Source Slot - if (GetItemIDAt(9999) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(9999) != INVALID_ID)) { - cur = m_inv.GetItem(9999); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + // Power Source Slot + if (GetItemIDAt(9999) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(9999) != INVALID_ID)) { + cur = m_inv.GetItem(9999); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - if (GetClientVersion() >= EQClientSoF) - DeleteItemInInventory(9999, 0, true); - else - DeleteItemInInventory(9999, 0, false); // Prevents Titanium crash - } - } + if (GetClientVersion() >= EQClientSoF) + DeleteItemInInventory(9999, 0, true); + else + DeleteItemInInventory(9999, 0, false); // Prevents Titanium crash + } + } - if(where_to_check & invWhereCursor) { - if (GetItemIDAt(30) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(30) != INVALID_ID)) { - cur = m_inv.GetItem(30); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + if(where_to_check & invWhereCursor) { + if (GetItemIDAt(30) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(30) != INVALID_ID)) { + cur = m_inv.GetItem(30); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(30, 0, true); - } + DeleteItemInInventory(30, 0, true); + } - for (i=331; i<=340; i++) { // cursor's containers - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + for (i=331; i<=340; i++) { // cursor's containers + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } - } + DeleteItemInInventory(i, 0, true); + } + } + } - if(where_to_check & invWherePersonal) { - for (i=22; i<=29; i++) { // Equipped - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + if(where_to_check & invWherePersonal) { + for (i=22; i<=29; i++) { // Equipped + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } + DeleteItemInInventory(i, 0, true); + } + } - for (i=251; i<=330; i++) { // Main inventory's containers - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + for (i=251; i<=330; i++) { // Main inventory's containers + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } - } + DeleteItemInInventory(i, 0, true); + } + } + } - if(where_to_check & invWhereBank) { - for (i=2000; i<=2023; i++) { // Bank slots - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + if(where_to_check & invWhereBank) { + for (i=2000; i<=2023; i++) { // Bank slots + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } + DeleteItemInInventory(i, 0, true); + } + } - for (i=2031; i<=2270; i++) { // Bank's containers - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + for (i=2031; i<=2270; i++) { // Bank's containers + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } - } + DeleteItemInInventory(i, 0, true); + } + } + } - if(where_to_check & invWhereSharedBank) { - for (i=2500; i<=2501; i++) { // Shared bank - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + if(where_to_check & invWhereSharedBank) { + for (i=2500; i<=2501; i++) { // Shared bank + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } + DeleteItemInInventory(i, 0, true); + } + } - for (i=2531; i<=2550; i++) { // Shared bank's containers - if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { - cur = m_inv.GetItem(i); - if(cur && cur->GetItem()->Stackable) { - x += cur->GetCharges(); - } else { - x++; - } + for (i=2531; i<=2550; i++) { // Shared bank's containers + if (GetItemIDAt(i) == itemnum || (itemnum == 0xFFFE && GetItemIDAt(i) != INVALID_ID)) { + cur = m_inv.GetItem(i); + if(cur && cur->GetItem()->Stackable) { + x += cur->GetCharges(); + } else { + x++; + } - DeleteItemInInventory(i, 0, true); - } - } - } + DeleteItemInInventory(i, 0, true); + } + } + } return x; } @@ -305,7 +305,7 @@ void Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, } } } - else { // Item was already in inventory & is a LORE item or was a GM only item. Give them a message about it. + else { // Item was already in inventory & is a LORE item or was a GM only item. Give them a message about it. if (foundlore){ DuplicateLoreMessage(item_id); //Message(0, "You already have a %s (%i) in your inventory!", item->Name, item_id); @@ -447,14 +447,14 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd if(bagitem) { int16 bagslot_id = Inventory::CalcSlotId(slot_id, bag_idx); - qsaudit->items[++parent_offset].char_slot = bagslot_id; - qsaudit->items[parent_offset].item_id = bagitem->GetID(); - qsaudit->items[parent_offset].charges = bagitem->GetCharges(); - qsaudit->items[parent_offset].aug_1 = bagitem->GetAugmentItemID(1); - qsaudit->items[parent_offset].aug_2 = bagitem->GetAugmentItemID(2); - qsaudit->items[parent_offset].aug_3 = bagitem->GetAugmentItemID(3); - qsaudit->items[parent_offset].aug_4 = bagitem->GetAugmentItemID(4); - qsaudit->items[parent_offset].aug_5 = bagitem->GetAugmentItemID(5); + qsaudit->items[++parent_offset].char_slot = bagslot_id; + qsaudit->items[parent_offset].item_id = bagitem->GetID(); + qsaudit->items[parent_offset].charges = bagitem->GetCharges(); + qsaudit->items[parent_offset].aug_1 = bagitem->GetAugmentItemID(1); + qsaudit->items[parent_offset].aug_2 = bagitem->GetAugmentItemID(2); + qsaudit->items[parent_offset].aug_3 = bagitem->GetAugmentItemID(3); + qsaudit->items[parent_offset].aug_4 = bagitem->GetAugmentItemID(4); + qsaudit->items[parent_offset].aug_5 = bagitem->GetAugmentItemID(5); } } } @@ -470,14 +470,14 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd const ItemInst* inst=nullptr; if (slot_id==SLOT_CURSOR) { list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); - if(update_db) - database.SaveCursor(character_id, s, e); + if(update_db) + database.SaveCursor(character_id, s, e); } else { // Save change to database inst = m_inv[slot_id]; - if(update_db) - database.SaveInventory(character_id, inst, slot_id); + if(update_db) + database.SaveInventory(character_id, inst, slot_id); } if(client_update && IsValidSlot(slot_id)) { @@ -958,10 +958,10 @@ bool Client::IsValidSlot(uint32 slot) bool Client::IsBankSlot(uint32 slot) { - if((slot >= 2000 && slot <= 2023) || // Bank - (slot >= 2031 && slot <= 2270) || // Bank bags - (slot >= 2500 && slot <= 2501) || // Shared bank - (slot >= 2531 && slot <= 2550)) // Shared bank bags + if ((slot >= 2000 && slot <= 2023) || // Bank + (slot >= 2031 && slot <= 2270) || // Bank bags + (slot >= 2500 && slot <= 2501) || // Shared bank + (slot >= 2531 && slot <= 2550)) // Shared bank bags { return true; } @@ -1464,30 +1464,30 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { const ItemInst* from_inst = m_inv[postaction_call?to_slot_id:from_slot_id]; if(from_inst) { - qsaudit->items[move_count].from_slot = from_slot_id; - qsaudit->items[move_count].to_slot = to_slot_id; - qsaudit->items[move_count].item_id = from_inst->GetID(); - qsaudit->items[move_count].charges = from_inst->GetCharges(); - qsaudit->items[move_count].aug_1 = from_inst->GetAugmentItemID(1); - qsaudit->items[move_count].aug_2 = from_inst->GetAugmentItemID(2); - qsaudit->items[move_count].aug_3 = from_inst->GetAugmentItemID(3); - qsaudit->items[move_count].aug_4 = from_inst->GetAugmentItemID(4); - qsaudit->items[move_count++].aug_5 = from_inst->GetAugmentItemID(5); + qsaudit->items[move_count].from_slot = from_slot_id; + qsaudit->items[move_count].to_slot = to_slot_id; + qsaudit->items[move_count].item_id = from_inst->GetID(); + qsaudit->items[move_count].charges = from_inst->GetCharges(); + qsaudit->items[move_count].aug_1 = from_inst->GetAugmentItemID(1); + qsaudit->items[move_count].aug_2 = from_inst->GetAugmentItemID(2); + qsaudit->items[move_count].aug_3 = from_inst->GetAugmentItemID(3); + qsaudit->items[move_count].aug_4 = from_inst->GetAugmentItemID(4); + qsaudit->items[move_count++].aug_5 = from_inst->GetAugmentItemID(5); if(from_inst->IsType(ItemClassContainer)) { for(uint8 bag_idx = 0; bag_idx < from_inst->GetItem()->BagSlots; bag_idx++) { const ItemInst* from_baginst = from_inst->GetItem(bag_idx); if(from_baginst) { - qsaudit->items[move_count].from_slot = Inventory::CalcSlotId(from_slot_id, bag_idx); - qsaudit->items[move_count].to_slot = Inventory::CalcSlotId(to_slot_id, bag_idx); - qsaudit->items[move_count].item_id = from_baginst->GetID(); - qsaudit->items[move_count].charges = from_baginst->GetCharges(); - qsaudit->items[move_count].aug_1 = from_baginst->GetAugmentItemID(1); - qsaudit->items[move_count].aug_2 = from_baginst->GetAugmentItemID(2); - qsaudit->items[move_count].aug_3 = from_baginst->GetAugmentItemID(3); - qsaudit->items[move_count].aug_4 = from_baginst->GetAugmentItemID(4); - qsaudit->items[move_count++].aug_5 = from_baginst->GetAugmentItemID(5); + qsaudit->items[move_count].from_slot = Inventory::CalcSlotId(from_slot_id, bag_idx); + qsaudit->items[move_count].to_slot = Inventory::CalcSlotId(to_slot_id, bag_idx); + qsaudit->items[move_count].item_id = from_baginst->GetID(); + qsaudit->items[move_count].charges = from_baginst->GetCharges(); + qsaudit->items[move_count].aug_1 = from_baginst->GetAugmentItemID(1); + qsaudit->items[move_count].aug_2 = from_baginst->GetAugmentItemID(2); + qsaudit->items[move_count].aug_3 = from_baginst->GetAugmentItemID(3); + qsaudit->items[move_count].aug_4 = from_baginst->GetAugmentItemID(4); + qsaudit->items[move_count++].aug_5 = from_baginst->GetAugmentItemID(5); } } } @@ -1497,30 +1497,30 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { const ItemInst* to_inst = m_inv[postaction_call?from_slot_id:to_slot_id]; if(to_inst) { - qsaudit->items[move_count].from_slot = to_slot_id; - qsaudit->items[move_count].to_slot = from_slot_id; - qsaudit->items[move_count].item_id = to_inst->GetID(); - qsaudit->items[move_count].charges = to_inst->GetCharges(); - qsaudit->items[move_count].aug_1 = to_inst->GetAugmentItemID(1); - qsaudit->items[move_count].aug_2 = to_inst->GetAugmentItemID(2); - qsaudit->items[move_count].aug_3 = to_inst->GetAugmentItemID(3); - qsaudit->items[move_count].aug_4 = to_inst->GetAugmentItemID(4); - qsaudit->items[move_count++].aug_5 = to_inst->GetAugmentItemID(5); + qsaudit->items[move_count].from_slot = to_slot_id; + qsaudit->items[move_count].to_slot = from_slot_id; + qsaudit->items[move_count].item_id = to_inst->GetID(); + qsaudit->items[move_count].charges = to_inst->GetCharges(); + qsaudit->items[move_count].aug_1 = to_inst->GetAugmentItemID(1); + qsaudit->items[move_count].aug_2 = to_inst->GetAugmentItemID(2); + qsaudit->items[move_count].aug_3 = to_inst->GetAugmentItemID(3); + qsaudit->items[move_count].aug_4 = to_inst->GetAugmentItemID(4); + qsaudit->items[move_count++].aug_5 = to_inst->GetAugmentItemID(5); if(to_inst->IsType(ItemClassContainer)) { for(uint8 bag_idx = 0; bag_idx < to_inst->GetItem()->BagSlots; bag_idx++) { const ItemInst* to_baginst = to_inst->GetItem(bag_idx); if(to_baginst) { - qsaudit->items[move_count].from_slot = Inventory::CalcSlotId(to_slot_id, bag_idx); - qsaudit->items[move_count].to_slot = Inventory::CalcSlotId(from_slot_id, bag_idx); - qsaudit->items[move_count].item_id = to_baginst->GetID(); - qsaudit->items[move_count].charges = to_baginst->GetCharges(); - qsaudit->items[move_count].aug_1 = to_baginst->GetAugmentItemID(1); - qsaudit->items[move_count].aug_2 = to_baginst->GetAugmentItemID(2); - qsaudit->items[move_count].aug_3 = to_baginst->GetAugmentItemID(3); - qsaudit->items[move_count].aug_4 = to_baginst->GetAugmentItemID(4); - qsaudit->items[move_count++].aug_5 = to_baginst->GetAugmentItemID(5); + qsaudit->items[move_count].from_slot = Inventory::CalcSlotId(to_slot_id, bag_idx); + qsaudit->items[move_count].to_slot = Inventory::CalcSlotId(from_slot_id, bag_idx); + qsaudit->items[move_count].item_id = to_baginst->GetID(); + qsaudit->items[move_count].charges = to_baginst->GetCharges(); + qsaudit->items[move_count].aug_1 = to_baginst->GetAugmentItemID(1); + qsaudit->items[move_count].aug_2 = to_baginst->GetAugmentItemID(2); + qsaudit->items[move_count].aug_3 = to_baginst->GetAugmentItemID(3); + qsaudit->items[move_count].aug_4 = to_baginst->GetAugmentItemID(4); + qsaudit->items[move_count++].aug_5 = to_baginst->GetAugmentItemID(5); } } } @@ -1913,7 +1913,7 @@ uint32 Client::GetEquipmentColor(uint8 material_slot) const return 0; } -bool Client::LootToStack(uint32 itemid) { //Loots stackable items to existing stacks - Wiz +bool Client::LootToStack(uint32 itemid) { //Loots stackable items to existing stacks - Wiz // @merth: Need to do loot code with new inventory struct /* const Item_Struct* item; @@ -2079,7 +2079,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { _log(INVENTORY__BANDOLIER, "Char: %s activating set %i", GetName(), bss->number); int16 slot; int16 WeaponSlot; - ItemInst *BandolierItems[4]; // Temporary holding area for the weapons we pull out of their inventory + ItemInst *BandolierItems[4]; // Temporary holding area for the weapons we pull out of their inventory // First we pull the items for this bandolier set out of their inventory, this makes space to put the // currently equipped items back. @@ -2091,7 +2091,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { // Check if the player has the item specified in the bandolier set on them. // slot = m_inv.HasItem(m_pp.bandoliers[bss->number].items[BandolierSlot].item_id, 1, - invWhereWorn|invWherePersonal); + invWhereWorn|invWherePersonal); // removed 'invWhereCursor' argument from above and implemented slots 30, 331-340 checks here if (slot == SLOT_INVALID) { @@ -2121,7 +2121,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { // the client does. if(((BandolierSlot == bandolierAmmo) || (BandolierSlot == bandolierRange)) && - BandolierItems[BandolierSlot] && BandolierItems[BandolierSlot]->IsStackable()){ + BandolierItems[BandolierSlot] && BandolierItems[BandolierSlot]->IsStackable()){ int Charges = BandolierItems[BandolierSlot]->GetCharges(); // If there is more than one charge if(Charges > 1) { @@ -2145,12 +2145,12 @@ void Client::SetBandolier(const EQApplicationPacket *app) { if(InvItem) { // If there was an item in that weapon slot, put it in the inventory _log(INVENTORY__BANDOLIER, "returning item %s in weapon slot %i to inventory", - InvItem->GetItem()->Name, WeaponSlot); + InvItem->GetItem()->Name, WeaponSlot); if(MoveItemToInventory(InvItem)) database.SaveInventory(character_id, 0, WeaponSlot); else _log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), - InvItem->GetItem()->Name); + InvItem->GetItem()->Name); safe_delete(InvItem); } @@ -2185,7 +2185,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { // If there was already an item in that weapon slot that we replaced, find a place to put it if(!MoveItemToInventory(InvItem)) _log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), - InvItem->GetItem()->Name); + InvItem->GetItem()->Name); safe_delete(InvItem); } } @@ -2196,13 +2196,13 @@ void Client::SetBandolier(const EQApplicationPacket *app) { ItemInst *InvItem = m_inv.PopItem(WeaponSlot); if(InvItem) { _log(INVENTORY__BANDOLIER, "Bandolier has no item for slot %i, returning item %s to inventory", - WeaponSlot, InvItem->GetItem()->Name); + WeaponSlot, InvItem->GetItem()->Name); // If there was an item in that weapon slot, put it in the inventory if(MoveItemToInventory(InvItem)) database.SaveInventory(character_id, 0, WeaponSlot); else _log(INVENTORY__BANDOLIER, "Char: %s, ERROR returning %s to inventory", GetName(), - InvItem->GetItem()->Name); + InvItem->GetItem()->Name); safe_delete(InvItem); } } @@ -2249,7 +2249,7 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); int ChargesToMove = ItemToReturn->GetCharges() < ChargeSlotsLeft ? ItemToReturn->GetCharges() : - ChargeSlotsLeft; + ChargeSlotsLeft; InvItem->SetCharges(InvItem->GetCharges() + ChargesToMove); @@ -2274,22 +2274,22 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { uint8 BagSlot; for (BagSlot=0; BagSlotGetItem()->ID == ItemID) && - (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { + if (InvItem && (InvItem->GetItem()->ID == ItemID) && + (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { int ChargeSlotsLeft = InvItem->GetItem()->StackSize - InvItem->GetCharges(); int ChargesToMove = ItemToReturn->GetCharges() < ChargeSlotsLeft - ? ItemToReturn->GetCharges() : ChargeSlotsLeft; + ? ItemToReturn->GetCharges() : ChargeSlotsLeft; InvItem->SetCharges(InvItem->GetCharges() + ChargesToMove); if(UpdateClient) SendItemPacket(BaseSlotID + BagSlot, m_inv.GetItem(BaseSlotID + BagSlot), - ItemPacketTrade); + ItemPacketTrade); database.SaveInventory(character_id, m_inv.GetItem(BaseSlotID + BagSlot), - BaseSlotID + BagSlot); + BaseSlotID + BagSlot); ItemToReturn->SetCharges(ItemToReturn->GetCharges() - ChargesToMove); @@ -2357,41 +2357,42 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { } void Inventory::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value) { - ItemInst *inst = GetItem(slot_id); - if(inst) { - inst->SetCustomData(identifier, value); - database.SaveInventory(character_id, inst, slot_id); - } + ItemInst *inst = GetItem(slot_id); + if(inst) { + inst->SetCustomData(identifier, value); + database.SaveInventory(character_id, inst, slot_id); + } } void Inventory::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value) { - ItemInst *inst = GetItem(slot_id); - if(inst) { - inst->SetCustomData(identifier, value); - database.SaveInventory(character_id, inst, slot_id); - } + ItemInst *inst = GetItem(slot_id); + if(inst) { + inst->SetCustomData(identifier, value); + database.SaveInventory(character_id, inst, slot_id); + } } void Inventory::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value) { - ItemInst *inst = GetItem(slot_id); - if(inst) { - inst->SetCustomData(identifier, value); - database.SaveInventory(character_id, inst, slot_id); - } + ItemInst *inst = GetItem(slot_id); + if(inst) { + inst->SetCustomData(identifier, value); + database.SaveInventory(character_id, inst, slot_id); + } } void Inventory::SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value) { - ItemInst *inst = GetItem(slot_id); - if(inst) { - inst->SetCustomData(identifier, value); - database.SaveInventory(character_id, inst, slot_id); - } + ItemInst *inst = GetItem(slot_id); + if(inst) { + inst->SetCustomData(identifier, value); + database.SaveInventory(character_id, inst, slot_id); + } } std::string Inventory::GetCustomItemData(int16 slot_id, std::string identifier) { - ItemInst *inst = GetItem(slot_id); - if(inst) { - return inst->GetCustomData(identifier); - } - return ""; + ItemInst *inst = GetItem(slot_id); + if(inst) { + return inst->GetCustomData(identifier); + } + return ""; } + diff --git a/zone/loottables.cpp b/zone/loottables.cpp index d211d3e4d..875d5d762 100644 --- a/zone/loottables.cpp +++ b/zone/loottables.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -61,15 +61,15 @@ void ZoneDatabase::AddLootTableToNPC(NPC* npc,uint32 loottable_id, ItemList* ite *copper = MakeRandomInt(mincoin, maxcoin); *silver = MakeRandomInt(mincoin, maxcoin); *gold = MakeRandomInt(mincoin, maxcoin); - if(*copper > cash) { *copper = cash; } - cash -= *copper; - if(*silver>(cash/10)) { *silver = (cash/10); } - cash -= *silver*10; - if(*gold > (cash/100)) { *gold = (cash/100); } - cash -= *gold*100; - } - if (cash < 0) { - cash = 0; + if(*copper > cash) { *copper = cash; } + cash -= *copper; + if(*silver>(cash/10)) { *silver = (cash/10); } + cash -= *silver*10; + if(*gold > (cash/100)) { *gold = (cash/100); } + cash -= *gold*100; + } + if (cash < 0) { + cash = 0; } *plat = cash / 1000; cash -= *plat * 1000; @@ -86,21 +86,21 @@ void ZoneDatabase::AddLootTableToNPC(NPC* npc,uint32 loottable_id, ItemList* ite // Do items for (uint32 i=0; iNumEntries; i++) { for (uint32 k = 1; k <= lts->Entries[i].multiplier; k++) { - uint8 droplimit = lts->Entries[i].droplimit; - uint8 mindrop = lts->Entries[i].mindrop; + uint8 droplimit = lts->Entries[i].droplimit; + uint8 mindrop = lts->Entries[i].mindrop; - //LootTable Entry probability - float ltchance = 0.0f; - ltchance = lts->Entries[i].probability; + //LootTable Entry probability + float ltchance = 0.0f; + ltchance = lts->Entries[i].probability; - float drop_chance = 0.0f; - if(ltchance > 0.0 && ltchance < 100.0) { - drop_chance = MakeRandomFloat(0.0, 100.0); - } + float drop_chance = 0.0f; + if(ltchance > 0.0 && ltchance < 100.0) { + drop_chance = MakeRandomFloat(0.0, 100.0); + } - if (ltchance != 0.0 && (ltchance == 100.0 || drop_chance < ltchance)) { - AddLootDropToNPC(npc,lts->Entries[i].lootdrop_id, itemlist, droplimit, mindrop); - } + if (ltchance != 0.0 && (ltchance == 100.0 || drop_chance < ltchance)) { + AddLootDropToNPC(npc,lts->Entries[i].lootdrop_id, itemlist, droplimit, mindrop); + } } } } @@ -216,11 +216,11 @@ void NPC::AddLootDrop(const Item_Struct *item2, ItemList* itemlist, int16 charge // Equip rules are as follows: // If the item has the NoPet flag set it will not be equipped. // An empty slot takes priority. The first empty one that an item can - // fit into will be the one picked for the item. + // fit into will be the one picked for the item. // AC is the primary choice for which item gets picked for a slot. // If AC is identical HP is considered next. // If an item can fit into multiple slots we'll pick the last one where - // it is an improvement. + // it is an improvement. if (!item2->NoPet) { for (int i=0; !found && i=0, y<0 */ -enum { //node flags +enum { //node flags nodeFinal = 0x01 //7 more bits if theres something to use them for... }; @@ -120,7 +120,7 @@ typedef uint16 NodeRef; nodeHeader head; unsigned int * pfaces; char mask; - struct _node * node1, *node2, *node3, *node4; + struct _node * node1, *node2, *node3, *node4; }NODE, *PNODE;*/ class Map { diff --git a/zone/masterentity.h b/zone/masterentity.h index f4199c168..3764028d4 100644 --- a/zone/masterentity.h +++ b/zone/masterentity.h @@ -1,5 +1,5 @@ -//Trumpcard: EntityLists are composed of multiple list types. This is the -//master that includes all types. When entity.h is required, many of these are as well. +//Trumpcard: EntityLists are composed of multiple list types. This is the +//master that includes all types. When entity.h is required, many of these are as well. #include "entity.h" #include "groups.h" diff --git a/zone/merc.cpp b/zone/merc.cpp index 1a2ff67e7..e1a4d0ec6 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -61,7 +61,7 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading) skills[r] = database.GetSkillCap(GetClass(),(SkillType)r,GetLevel()); } - GetMercSize(); + GetMercSize(); CalcBonuses(); SetHP(GetMaxHP()); @@ -1367,11 +1367,11 @@ bool Merc::Process() } if (GetDepop()) - { + { SetMercCharacterID(0); SetOwnerID(0); return false; - } + } if(!GetMercOwner()) { //p_depop = true; //this was causing a crash - removed merc from entity list, but not group @@ -1417,7 +1417,7 @@ bool Merc::Process() } if(confidence_timer.Check()) { - _check_confidence = true; + _check_confidence = true; } if (sendhpupdate_timer.Check()) { @@ -1521,50 +1521,50 @@ void Merc::AI_Process() { if(DivineAura()) return; - int hateCount = entity_list.GetHatedCount(this, nullptr); - if(GetHatedCount() < hateCount) { - SetHatedCount(hateCount); + int hateCount = entity_list.GetHatedCount(this, nullptr); + if(GetHatedCount() < hateCount) { + SetHatedCount(hateCount); if(!CheckConfidence()) { if(!confidence_timer.Enabled()) { confidence_timer.Start(10000); } } - } + } //Check specific conditions for merc to lose confidence and flee (or regain confidence once fleeing) - if(_check_confidence) { - //not already running - if(!_lost_confidence) { - //and fail confidence check - if(!CheckConfidence()) { - _lost_confidence = true; + if(_check_confidence) { + //not already running + if(!_lost_confidence) { + //and fail confidence check + if(!CheckConfidence()) { + _lost_confidence = true; - //move to bottom of hate lists? - //Iterate though hatelist - // SetHate(other, hate, damage) + //move to bottom of hate lists? + //Iterate though hatelist + // SetHate(other, hate, damage) - if(RuleB(Combat, EnableFearPathing)) { - CalculateNewFearpoint(); - if(curfp) { - return; - } - } - else { - Stun(12000 - (6000 - tic_timer.GetRemainingTime())); - } - } - } - else { //are fleeing due to lost confidence - if(CheckConfidence()) { //passed test - regain confidence - _lost_confidence = false; - } - } + if(RuleB(Combat, EnableFearPathing)) { + CalculateNewFearpoint(); + if(curfp) { + return; + } + } + else { + Stun(12000 - (6000 - tic_timer.GetRemainingTime())); + } + } + } + else { //are fleeing due to lost confidence + if(CheckConfidence()) { //passed test - regain confidence + _lost_confidence = false; + } + } - //they are in flee mode - if(_lost_confidence) - return; - } + //they are in flee mode + if(_lost_confidence) + return; + } // Let's check if we have a los with our target. // If we don't, our hate_list is wiped. @@ -1795,10 +1795,10 @@ void Merc::AI_Process() { //TODO: Implement passive stances. //if(GetStance() != MercStancePassive) { if(!AI_IdleCastCheck() && !IsCasting()) { - if(GetArchetype() == ARCHETYPE_CASTER) { - MercMeditate(true); - } - } + if(GetArchetype() == ARCHETYPE_CASTER) { + MercMeditate(true); + } + } } if(AImovement_timer->Check()) { @@ -1944,9 +1944,9 @@ bool Merc::AI_IdleCastCheck() { if(!entity_list.Merc_AICheckCloseBeneficialSpells(this, 100, MercAISpellRange, SpellType_Cure)) { if(!entity_list.Merc_AICheckCloseBeneficialSpells(this, 100, MercAISpellRange, SpellType_Heal)) { if(!entity_list.Merc_AICheckCloseBeneficialSpells(this, 100, MercAISpellRange, SpellType_Resurrect)) { - if(!entity_list.Merc_AICheckCloseBeneficialSpells(this, 100, MercAISpellRange, SpellType_Buff)) { - failedToCast = true; - } + if(!entity_list.Merc_AICheckCloseBeneficialSpells(this, 100, MercAISpellRange, SpellType_Buff)) { + failedToCast = true; + } } } } @@ -1954,7 +1954,7 @@ bool Merc::AI_IdleCastCheck() { break; case MELEEDPS: if(!entity_list.Merc_AICheckCloseBeneficialSpells(this, 100, MercAISpellRange, SpellType_Buff)) { - failedToCast = true; + failedToCast = true; } break; case CASTERDPS: @@ -2000,28 +2000,28 @@ bool EntityList::Merc_AICheckCloseBeneficialSpells(Merc* caster, uint8 iChance, int8 mercCasterClass = caster->GetClass(); if(caster->HasGroup()) { - if( mercCasterClass == HEALER) { - if( iSpellTypes == SpellType_Heal ) { - if(caster->AICastSpell(100, SpellType_Heal)) - return true; - } + if( mercCasterClass == HEALER) { + if( iSpellTypes == SpellType_Heal ) { + if(caster->AICastSpell(100, SpellType_Heal)) + return true; + } - if( iSpellTypes == SpellType_Cure ) { - if(caster->AICastSpell(100, SpellType_Cure)) - return true; - } + if( iSpellTypes == SpellType_Cure ) { + if(caster->AICastSpell(100, SpellType_Cure)) + return true; + } - if( iSpellTypes == SpellType_Resurrect ) { - if(caster->AICastSpell(100, SpellType_Resurrect)) - return true; - } - } + if( iSpellTypes == SpellType_Resurrect ) { + if(caster->AICastSpell(100, SpellType_Resurrect)) + return true; + } + } - //Ok for the buffs.. - if( iSpellTypes == SpellType_Buff) { - if(caster->AICastSpell(100, SpellType_Buff)) - return true; - } + //Ok for the buffs.. + if( iSpellTypes == SpellType_Buff) { + if(caster->AICastSpell(100, SpellType_Buff)) + return true; + } } return false; @@ -2071,7 +2071,7 @@ bool Merc::AIDoSpellCast(uint16 spellid, Mob* tar, int32 mana_cost, uint32* oDon SetMana(hasMana); extraMana = false; } - else { //handle spell recast and recast timers + else { //handle spell recast and recast timers SetSpellTimeCanCast(mercSpell.spellid, spells[spellid].recast_time); if(spells[spellid].EndurTimerIndex > 0) { @@ -2114,15 +2114,15 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) { selectedMercSpell.time_cancast = 0; switch(mercClass) - { - case TANK: + { + case TANK: case MELEEDPS: isDiscipline = true; break; default: - isDiscipline = false; + isDiscipline = false; break; - } + } switch (iSpellTypes) { case SpellType_Heal: { @@ -2373,25 +2373,25 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) { selectedMercSpell = GetBestMercSpellForAENuke(this, tar); - if(selectedMercSpell.spellid == 0 && !tar->SpecAttacks[UNSTUNABLE] && !tar->IsStunned()) { - uint8 stunChance = 15; - if(MakeRandomInt(1, 100) <= stunChance) { - selectedMercSpell = GetBestMercSpellForStun(this); - } - } + if(selectedMercSpell.spellid == 0 && !tar->SpecAttacks[UNSTUNABLE] && !tar->IsStunned()) { + uint8 stunChance = 15; + if(MakeRandomInt(1, 100) <= stunChance) { + selectedMercSpell = GetBestMercSpellForStun(this); + } + } - if(selectedMercSpell.spellid == 0) { - uint8 lureChance = 25; - if(MakeRandomInt(1, 100) <= lureChance) { - selectedMercSpell = GetBestMercSpellForNukeByTargetResists(this, tar); - } - } + if(selectedMercSpell.spellid == 0) { + uint8 lureChance = 25; + if(MakeRandomInt(1, 100) <= lureChance) { + selectedMercSpell = GetBestMercSpellForNukeByTargetResists(this, tar); + } + } - if(selectedMercSpell.spellid == 0) { - selectedMercSpell = GetBestMercSpellForNuke(this); - } + if(selectedMercSpell.spellid == 0) { + selectedMercSpell = GetBestMercSpellForNuke(this); + } - break; + break; } if(selectedMercSpell.spellid > 0) { @@ -2486,48 +2486,48 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) { break; } case SpellType_Resurrect: { - Corpse *corpse = GetGroupMemberCorpse(); + Corpse *corpse = GetGroupMemberCorpse(); - if(corpse) { - selectedMercSpell = GetFirstMercSpellBySpellType(this, SpellType_Resurrect); + if(corpse) { + selectedMercSpell = GetFirstMercSpellBySpellType(this, SpellType_Resurrect); - if(selectedMercSpell.spellid == 0) + if(selectedMercSpell.spellid == 0) break; - uint32 TempDontRootMeBeforeTime = corpse->DontRootMeBefore(); + uint32 TempDontRootMeBeforeTime = corpse->DontRootMeBefore(); castedSpell = AIDoSpellCast(selectedMercSpell.spellid, corpse, spells[selectedMercSpell.spellid].mana, &TempDontRootMeBeforeTime); //CastSpell(selectedMercSpell.spellid, corpse->GetID(), 1, -1, -1, &TempDontRootMeBeforeTime); - corpse->SetDontRootMeBefore(TempDontRootMeBeforeTime); - } + corpse->SetDontRootMeBefore(TempDontRootMeBeforeTime); + } break; } case SpellType_Escape: { Mob* tar = GetTarget(); - uint8 hpr = (uint8)GetHPRatio(); - bool mayGetAggro = false; + uint8 hpr = (uint8)GetHPRatio(); + bool mayGetAggro = false; - if(tar && (mercClass == CASTERDPS) || (mercClass == MELEEDPS)) { - mayGetAggro = HasOrMayGetAggro(); //classes have hate reducing spells + if(tar && (mercClass == CASTERDPS) || (mercClass == MELEEDPS)) { + mayGetAggro = HasOrMayGetAggro(); //classes have hate reducing spells - if (mayGetAggro) { - selectedMercSpell = GetFirstMercSpellBySpellType(this, SpellType_Escape); + if (mayGetAggro) { + selectedMercSpell = GetFirstMercSpellBySpellType(this, SpellType_Escape); - if(selectedMercSpell.spellid == 0) - break; + if(selectedMercSpell.spellid == 0) + break; - if(isDiscipline) { - castedSpell = UseDiscipline(selectedMercSpell.spellid, tar->GetID()); - } - else { - castedSpell = AIDoSpellCast(selectedMercSpell.spellid, tar, -1); - } - } - } - break; - } + if(isDiscipline) { + castedSpell = UseDiscipline(selectedMercSpell.spellid, tar->GetID()); + } + else { + castedSpell = AIDoSpellCast(selectedMercSpell.spellid, tar, -1); + } + } + } + break; + } } } } @@ -2614,12 +2614,12 @@ bool Merc::HasOrMayGetAggro() { Mob *topHate = GetTarget()->GetHateTop(); if(topHate == this) - mayGetAggro = true; //I currently have aggro + mayGetAggro = true; //I currently have aggro else { uint32 myHateAmt = GetTarget()->GetHateAmount(this); uint32 topHateAmt = GetTarget()->GetHateAmount(topHate); - if(myHateAmt > 0 && topHateAmt > 0 && (uint8)((myHateAmt/topHateAmt)*100) > 90) //I have 90% as much hate as top, next action may give me aggro + if(myHateAmt > 0 && topHateAmt > 0 && (uint8)((myHateAmt/topHateAmt)*100) > 90) //I have 90% as much hate as top, next action may give me aggro mayGetAggro = true; } } @@ -2677,7 +2677,7 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) { int16 focus_max_real = 0; //item focus - for(int x =0; x < MAX_WORN_INVENTORY; ++x) + for(int x =0; x < MAX_WORN_INVENTORY; ++x) { TempItem = nullptr; if (equipment[x] == 0) @@ -2728,8 +2728,8 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) { int buff_tracker = -1; int buff_slot = 0; - uint16 focusspellid = 0; - uint16 focusspell_tracker = 0; + uint16 focusspellid = 0; + uint16 focusspell_tracker = 0; uint32 buff_max = GetMaxTotalSlots(); for (buff_slot = 0; buff_slot < buff_max; buff_slot++) { focusspellid = buffs[buff_slot].spellid; @@ -2811,8 +2811,8 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) { int32 Merc::Additional_SpellDmg(uint16 spell_id, bool bufftick) { int32 spell_dmg = 0; - spell_dmg += GetFocusEffect(focusFF_Damage_Amount, spell_id); - spell_dmg += GetFocusEffect(focusSpellDamage, spell_id); + spell_dmg += GetFocusEffect(focusFF_Damage_Amount, spell_id); + spell_dmg += GetFocusEffect(focusSpellDamage, spell_id); //For DOTs you need to apply the damage over the duration of the dot to each tick (this is how live did it) if (bufftick){ @@ -2845,8 +2845,8 @@ int32 Merc::GetActSpellDamage(uint16 spell_id, int32 value) { if (tt == ST_UndeadAE || tt == ST_Undead || tt == ST_Summoned) { //undead/summoned spells modifier += GetFocusEffect(focusImprovedUndeadDamage, spell_id); - } else { - //damage spells. + } else { + //damage spells. modifier += GetFocusEffect(focusImprovedDamage, spell_id); modifier += GetFocusEffect(focusSpellEffectiveness, spell_id); modifier += GetFocusEffect(focusImprovedDamage2, spell_id); @@ -2877,7 +2877,7 @@ int32 Merc::GetActSpellDamage(uint16 spell_id, int32 value) { ratio += RuleI(Spells, WizCritRatio); } if(aabonuses.SpellCritDmgIncrease > 0) // wizards get an additional bonus - ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% + ratio += aabonuses.SpellCritDmgIncrease * 1.5; //108%, 115%, 124%, close to Graffe's 207%, 215%, & 225% } @@ -2903,8 +2903,8 @@ int32 Merc::Additional_Heal(uint16 spell_id) { int32 heal_amt = 0; - heal_amt += GetFocusEffect(focusAdditionalHeal, spell_id); - heal_amt += GetFocusEffect(focusAdditionalHeal2, spell_id); + heal_amt += GetFocusEffect(focusAdditionalHeal, spell_id); + heal_amt += GetFocusEffect(focusAdditionalHeal2, spell_id); if (heal_amt){ int duration = CalcBuffDuration(this, this, spell_id); @@ -2945,17 +2945,17 @@ int32 Merc::GetActSpellHealing(uint16 spell_id, int32 value) { if(MakeRandomInt(0,99) < chance) { entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s performs an exceptional heal! (%d)", GetName(), ((value * modifier / 50) + heal_amt*2)); - heal_amt = ((value * modifier / 50) + heal_amt*2); + heal_amt = ((value * modifier / 50) + heal_amt*2); } else{ - heal_amt = ((value * modifier / 100) + heal_amt); + heal_amt = ((value * modifier / 100) + heal_amt); } } // Hots else { chance += itembonuses.CriticalHealChance + spellbonuses.CriticalHealChance + aabonuses.CriticalHealChance; if(MakeRandomInt(0,99) < chance) - heal_amt = ((value * modifier / 50) + heal_amt*2); + heal_amt = ((value * modifier / 50) + heal_amt*2); } heal_amt = (heal_amt * GetHealScale() / 100); @@ -3031,119 +3031,119 @@ int8 Merc::GetChanceToCastBySpellType(int16 spellType) { switch (spellType) { case SpellType_Nuke: { switch(mercClass) - { - case TANK: { - chance = 100; - break; - } - case HEALER:{ - break; - } - case MELEEDPS:{ + { + case TANK: { chance = 100; - break; - } - case CASTERDPS:{ - chance = 100; - break; - } - } + break; + } + case HEALER:{ + break; + } + case MELEEDPS:{ + chance = 100; + break; + } + case CASTERDPS:{ + chance = 100; + break; + } + } break; } case SpellType_Heal: { switch(mercClass) - { - case TANK: { - break; - } - case HEALER:{ - chance = 100; - break; - } - case MELEEDPS:{ - break; - } - case CASTERDPS:{ - break; - } - } + { + case TANK: { + break; + } + case HEALER:{ + chance = 100; + break; + } + case MELEEDPS:{ + break; + } + case CASTERDPS:{ + break; + } + } break; } case SpellType_Root: { switch(mercClass) - { - case TANK: { - break; - } - case HEALER:{ - break; - } - case MELEEDPS:{ - break; - } - case CASTERDPS:{ - break; - } - } + { + case TANK: { + break; + } + case HEALER:{ + break; + } + case MELEEDPS:{ + break; + } + case CASTERDPS:{ + break; + } + } break; } case SpellType_Buff: { switch(mercClass) - { - case TANK: { - break; - } - case HEALER:{ - chance = IsEngaged() ? 0 : 100; - break; - } - case MELEEDPS:{ - break; - } - case CASTERDPS:{ - break; - } - } + { + case TANK: { + break; + } + case HEALER:{ + chance = IsEngaged() ? 0 : 100; + break; + } + case MELEEDPS:{ + break; + } + case CASTERDPS:{ + break; + } + } break; } case SpellType_InCombatBuff: { switch(mercClass) - { - case TANK: { - chance = 50; - break; - } - case HEALER:{ - break; - } - case MELEEDPS:{ + { + case TANK: { chance = 50; - break; - } - case CASTERDPS:{ - break; - } - } + break; + } + case HEALER:{ + break; + } + case MELEEDPS:{ + chance = 50; + break; + } + case CASTERDPS:{ + break; + } + } break; } case SpellType_Escape: { switch(mercClass) - { - case TANK: { - break; - } - case HEALER:{ - break; - } - case MELEEDPS:{ + { + case TANK: { + break; + } + case HEALER:{ + break; + } + case MELEEDPS:{ chance = 100; - break; - } - case CASTERDPS:{ + break; + } + case CASTERDPS:{ chance = 100; - break; - } - } + break; + } + } break; } default: @@ -3156,8 +3156,8 @@ int8 Merc::GetChanceToCastBySpellType(int16 spellType) { bool Merc::CheckStance(int16 stance) { - //checks of current stance matches stances listed as valid for spell in database - //stance = 0 for all stances, stance # for only that stance & -stance# for all but that stance + //checks of current stance matches stances listed as valid for spell in database + //stance = 0 for all stances, stance # for only that stance & -stance# for all but that stance if(stance == 0 || (stance > 0 && stance == GetStance()) || (stance < 0 && abs(stance) != GetStance())) { @@ -3536,48 +3536,48 @@ MercSpell Merc::GetFirstMercSpellForSingleTargetHeal(Merc* caster) { } MercSpell Merc::GetBestMercSpellForGroupHeal(Merc* caster) { - MercSpell result; + MercSpell result; - result.spellid = 0; + result.spellid = 0; result.stance = 0; result.type = 0; result.slot = 0; result.proc_chance = 0; result.time_cancast = 0; - if(caster) { - std::list mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP); + if(caster) { + std::list mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CurrentHP); - for(std::list::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) { - // Assuming all the spells have been loaded into this list by level and in descending order - if(IsRegularGroupHealSpell(mercSpellListItr->spellid) - && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) { - result.spellid = mercSpellListItr->spellid; - result.stance = mercSpellListItr->stance; - result.type = mercSpellListItr->type; - result.slot = mercSpellListItr->slot; - result.proc_chance = mercSpellListItr->proc_chance; - result.time_cancast = mercSpellListItr->time_cancast; + for(std::list::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) { + // Assuming all the spells have been loaded into this list by level and in descending order + if(IsRegularGroupHealSpell(mercSpellListItr->spellid) + && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) { + result.spellid = mercSpellListItr->spellid; + result.stance = mercSpellListItr->stance; + result.type = mercSpellListItr->type; + result.slot = mercSpellListItr->slot; + result.proc_chance = mercSpellListItr->proc_chance; + result.time_cancast = mercSpellListItr->time_cancast; - break; - } + break; } - } + } + } - return result; + return result; } MercSpell Merc::GetBestMercSpellForGroupHealOverTime(Merc* caster) { - MercSpell result; + MercSpell result; - result.spellid = 0; + result.spellid = 0; result.stance = 0; result.type = 0; result.slot = 0; result.proc_chance = 0; result.time_cancast = 0; - if(caster) { + if(caster) { std::list mercHoTSpellList = GetMercSpellsForSpellEffect(caster, SE_HealOverTime); for(std::list::iterator mercSpellListItr = mercHoTSpellList.begin(); mercSpellListItr != mercHoTSpellList.end(); mercSpellListItr++) { @@ -3602,39 +3602,39 @@ MercSpell Merc::GetBestMercSpellForGroupHealOverTime(Merc* caster) { break; } } - } + } - return result; + return result; } MercSpell Merc::GetBestMercSpellForGroupCompleteHeal(Merc* caster) { - MercSpell result; + MercSpell result; - result.spellid = 0; + result.spellid = 0; result.stance = 0; result.type = 0; result.slot = 0; result.proc_chance = 0; result.time_cancast = 0; - if(caster) { - std::list mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CompleteHeal); + if(caster) { + std::list mercSpellList = GetMercSpellsForSpellEffect(caster, SE_CompleteHeal); - for(std::list::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) { - // Assuming all the spells have been loaded into this list by level and in descending order - if(IsGroupCompleteHealSpell(mercSpellListItr->spellid) - && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) { - result.spellid = mercSpellListItr->spellid; - result.stance = mercSpellListItr->stance; - result.type = mercSpellListItr->type; - result.slot = mercSpellListItr->slot; - result.proc_chance = mercSpellListItr->proc_chance; - result.time_cancast = mercSpellListItr->time_cancast; + for(std::list::iterator mercSpellListItr = mercSpellList.begin(); mercSpellListItr != mercSpellList.end(); mercSpellListItr++) { + // Assuming all the spells have been loaded into this list by level and in descending order + if(IsGroupCompleteHealSpell(mercSpellListItr->spellid) + && CheckSpellRecastTimers(caster, mercSpellListItr->spellid)) { + result.spellid = mercSpellListItr->spellid; + result.stance = mercSpellListItr->stance; + result.type = mercSpellListItr->type; + result.slot = mercSpellListItr->slot; + result.proc_chance = mercSpellListItr->proc_chance; + result.time_cancast = mercSpellListItr->time_cancast; - break; - } + break; } - } + } + } return result; } @@ -4304,10 +4304,10 @@ int32 Merc::GetSpellRecastTimer(Merc *caster, uint16 timer_id) { bool Merc::CheckSpellRecastTimers(Merc *caster, uint16 spell_id) { if(caster) { - MercSpell mercSpell = GetMercSpellBySpellID(caster, spell_id); - if(mercSpell.spellid > 0 && mercSpell.time_cancast < Timer::GetCurrentTime()) { //checks spell recast - if(GetSpellRecastTimer(caster, spells[spell_id].EndurTimerIndex) < Timer::GetCurrentTime()) { //checks for spells on the same timer - return true; //can cast spell + MercSpell mercSpell = GetMercSpellBySpellID(caster, spell_id); + if(mercSpell.spellid > 0 && mercSpell.time_cancast < Timer::GetCurrentTime()) { //checks spell recast + if(GetSpellRecastTimer(caster, spells[spell_id].EndurTimerIndex) < Timer::GetCurrentTime()) { //checks for spells on the same timer + return true; //can cast spell } } } @@ -4338,7 +4338,7 @@ int32 Merc::GetDisciplineRecastTimer(Merc *caster, uint16 timer_id) { int32 Merc::GetDisciplineRemainingTime(Merc *caster, uint16 timer_id) { int32 result = 0; if(caster && timer_id > 0) { - int32 time_cancast = GetDisciplineRecastTimer(caster, timer_id); + int32 time_cancast = GetDisciplineRecastTimer(caster, timer_id); if(time_cancast > Timer::GetCurrentTime()) result = time_cancast - Timer::GetCurrentTime(); } @@ -4348,9 +4348,9 @@ int32 Merc::GetDisciplineRemainingTime(Merc *caster, uint16 timer_id) { bool Merc::CheckDisciplineRecastTimers(Merc *caster, uint16 spell_id, uint16 timer_id) { if(caster) { MercSpell mercSpell = GetMercSpellBySpellID(caster, spell_id); - if(mercSpell.spellid > 0 && mercSpell.time_cancast < Timer::GetCurrentTime()) { //checks spell recast - if(timer_id > 0 && !(GetDisciplineRecastTimer(caster, timer_id) < Timer::GetCurrentTime())) { //checks for spells on the same timer - return false; //can't cast spell + if(mercSpell.spellid > 0 && mercSpell.time_cancast < Timer::GetCurrentTime()) { //checks spell recast + if(timer_id > 0 && !(GetDisciplineRecastTimer(caster, timer_id) < Timer::GetCurrentTime())) { //checks for spells on the same timer + return false; //can't cast spell } return true; } @@ -4399,7 +4399,7 @@ bool Merc::CheckAETaunt() { if(g) { for(int i = 0; i < g->GroupCount(); i++) { - //if(npc->IsOnHatelist(g->members[i]) && g->members[i]->GetTarget() != npc && g->members[i]->IsEngaged()) { + //if(npc->IsOnHatelist(g->members[i]) && g->members[i]->GetTarget() != npc && g->members[i]->IsEngaged()) { if(GetTarget() != npc && g->members[i]->GetTarget() != npc && npc->IsOnHatelist(g->members[i])) { result++; } @@ -4411,61 +4411,61 @@ bool Merc::CheckAETaunt() { } if(result >= 1) { - if(MERC_DEBUG > 0) - Message(7, "%s: Attempting AE Taunt", GetCleanName()); - return true; + if(MERC_DEBUG > 0) + Message(7, "%s: Attempting AE Taunt", GetCleanName()); + return true; } } return false; } Corpse* Merc::GetGroupMemberCorpse() { - Corpse* corpse = nullptr; + Corpse* corpse = nullptr; - if(HasGroup()) { - Group* g = GetGroup(); + if(HasGroup()) { + Group* g = GetGroup(); - if(g) { - for(int i = 0; i < g->GroupCount(); i++) { - if(g->members[i] && g->members[i]->IsClient()) { - corpse = entity_list.GetCorpseByOwnerWithinRange(g->members[i]->CastToClient(), this, RuleI(Mercs, ResurrectRadius)); + if(g) { + for(int i = 0; i < g->GroupCount(); i++) { + if(g->members[i] && g->members[i]->IsClient()) { + corpse = entity_list.GetCorpseByOwnerWithinRange(g->members[i]->CastToClient(), this, RuleI(Mercs, ResurrectRadius)); - if(corpse && !corpse->Rezzed()) { - return corpse; - } - } - } - } - } - return 0; + if(corpse && !corpse->Rezzed()) { + return corpse; + } + } + } + } + } + return 0; } bool Merc::TryHide() { - if(GetClass() != MELEEDPS) { - return false; - } + if(GetClass() != MELEEDPS) { + return false; + } - //don't hide if already hidden - if(hidden == true) { - return false; - } + //don't hide if already hidden + if(hidden == true) { + return false; + } - EQApplicationPacket* outapp = new EQApplicationPacket(OP_SpawnAppearance, sizeof(SpawnAppearance_Struct)); + EQApplicationPacket* outapp = new EQApplicationPacket(OP_SpawnAppearance, sizeof(SpawnAppearance_Struct)); SpawnAppearance_Struct* sa_out = (SpawnAppearance_Struct*)outapp->pBuffer; sa_out->spawn_id = GetID(); sa_out->type = 0x03; sa_out->parameter = 1; entity_list.QueueClients(this, outapp, true); safe_delete(outapp); - hidden = true; + hidden = true; - return true; + return true; } //Checks if Merc still has confidence. Can be checked to begin fleeing, or to regain confidence after confidence loss - true = confident, false = confidence loss bool Merc::CheckConfidence() { - bool result = true; - int ConfidenceLossChance = 0; + bool result = true; + int ConfidenceLossChance = 0; float ConfidenceCheck = 0; int ConfidenceRating = 2 * GetProficiencyID(); @@ -4474,8 +4474,8 @@ bool Merc::CheckConfidence() { for(std::list::iterator itr = npc_list.begin(); itr != npc_list.end(); itr++) { NPC* mob = *itr; - float ConRating = 1.0; - int CurrentCon = 0; + float ConRating = 1.0; + int CurrentCon = 0; if(!mob) continue; @@ -4494,7 +4494,7 @@ bool Merc::CheckConfidence() { if(mob->DistNoRoot(*this) > AggroRange) continue; CurrentCon = this->GetLevelCon(mob->GetLevel()); - switch(CurrentCon) { + switch(CurrentCon) { case CON_GREEN: { ConRating = 0; @@ -4509,9 +4509,9 @@ bool Merc::CheckConfidence() { case CON_BLUE: { ConRating = 0.6; break; - } + } - case CON_WHITE: { + case CON_WHITE: { ConRating = 1.0; break; } @@ -4530,20 +4530,20 @@ bool Merc::CheckConfidence() { ConRating = 0; break; } - } + } ConfidenceCheck += ConRating; } - if(ConfidenceRating < ConfidenceCheck) { - ConfidenceLossChance = 25 - ( 5 * (GetTierID() - 1)); - } + if(ConfidenceRating < ConfidenceCheck) { + ConfidenceLossChance = 25 - ( 5 * (GetTierID() - 1)); + } - if(MakeRandomInt(0 ,100) < ConfidenceLossChance) { - result = false; - } + if(MakeRandomInt(0 ,100) < ConfidenceLossChance) { + result = false; + } - return result; + return result; } void Merc::MercMeditate(bool isSitting) { @@ -5021,9 +5021,9 @@ bool Merc::LoadMercSpells() { GetMercOwner()->Message(7, "Mercenary Debug: Spell list for merc."); for (int i = merc_spells.size() - 1; i >= 0; i--) { - GetMercOwner()->Message(7, "%i] Slot: %i, SpellID: %i, Type: %i, Stance: %i, Proc Chance: %i", i, merc_spells[i].slot, merc_spells[i].spellid, merc_spells[i].type, merc_spells[i].stance, merc_spells[i].proc_chance); + GetMercOwner()->Message(7, "%i] Slot: %i, SpellID: %i, Type: %i, Stance: %i, Proc Chance: %i", i, merc_spells[i].slot, merc_spells[i].spellid, merc_spells[i].type, merc_spells[i].stance, merc_spells[i].proc_chance); }*/ - } + } return true; } @@ -5107,7 +5107,7 @@ Merc* Merc::LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id, merc->drakkin_heritage = c->GetMercInfo().drakkinHeritage; merc->drakkin_tattoo = c->GetMercInfo().drakkinTattoo; merc->drakkin_details = c->GetMercInfo().drakkinDetails; - } + } if(merc->GetMercID()) { database.LoadMercBuffs(merc); @@ -5157,7 +5157,7 @@ void Merc::UpdateMercStats(Client *c) { level = npc_type->level; max_dmg = (npc_type->max_dmg * npc_type->scalerate) / 100; min_dmg = (npc_type->min_dmg * npc_type->scalerate) / 100; - _baseSTR = (npc_type->STR * npc_type->scalerate) / 100; + _baseSTR = (npc_type->STR * npc_type->scalerate) / 100; _baseSTA = (npc_type->STA * npc_type->scalerate) / 100; _baseDEX = (npc_type->DEX * npc_type->scalerate) / 100; _baseAGI = (npc_type->AGI * npc_type->scalerate) / 100; @@ -5165,13 +5165,13 @@ void Merc::UpdateMercStats(Client *c) { _baseINT = (npc_type->INT * npc_type->scalerate) / 100; _baseCHA = (npc_type->CHA * npc_type->scalerate) / 100; _baseATK = (npc_type->ATK * npc_type->scalerate) / 100; - _baseMR = (npc_type->MR * npc_type->scalerate) / 100; - _baseFR = (npc_type->FR * npc_type->scalerate) / 100; - _baseDR = (npc_type->DR * npc_type->scalerate) / 100; - _basePR = (npc_type->PR * npc_type->scalerate) / 100; - _baseCR = (npc_type->CR * npc_type->scalerate) / 100; - _baseCorrup = (npc_type->Corrup * npc_type->scalerate) / 100; - _baseAC = (npc_type->AC * npc_type->scalerate) / 100; + _baseMR = (npc_type->MR * npc_type->scalerate) / 100; + _baseFR = (npc_type->FR * npc_type->scalerate) / 100; + _baseDR = (npc_type->DR * npc_type->scalerate) / 100; + _basePR = (npc_type->PR * npc_type->scalerate) / 100; + _baseCR = (npc_type->CR * npc_type->scalerate) / 100; + _baseCorrup = (npc_type->Corrup * npc_type->scalerate) / 100; + _baseAC = (npc_type->AC * npc_type->scalerate) / 100; attack_speed = npc_type->attack_speed; attack_count = npc_type->attack_count; spellscale = npc_type->spellscale; @@ -5190,7 +5190,7 @@ void Merc::UpdateMercAppearance(Client *c) { } void Merc::AddItem(uint8 slot, uint32 item_id) { - equipment[slot] = item_id; + equipment[slot] = item_id; } bool Merc::Spawn(Client *owner) { @@ -5230,7 +5230,7 @@ bool Merc::Spawn(Client *owner) { void Client::UpdateMercTimer() { - Merc *merc = GetMerc(); + Merc *merc = GetMerc(); if(merc && !merc->IsSuspended()) { @@ -5240,7 +5240,7 @@ void Client::UpdateMercTimer() if(CheckCanRetainMerc(upkeep)) { if(RuleB(Mercs, ChargeMercUpkeepCost)) { - TakeMoneyFromPP((upkeep * 100), true); + TakeMoneyFromPP((upkeep * 100), true); } } else { @@ -5319,7 +5319,7 @@ bool Client::CheckCanHireMerc(Mob* merchant, uint32 template_id) { //check for sufficient funds if(RuleB(Mercs, ChargeMercPurchaseCost)) { - uint32 cost = Merc::CalcPurchaseCost(template_id, GetLevel()) * 100; // Cost is in gold + uint32 cost = Merc::CalcPurchaseCost(template_id, GetLevel()) * 100; // Cost is in gold if(cost > 0 && !HasMoney(cost)) { SendMercMerchantResponsePacket(1); return false; @@ -5422,7 +5422,7 @@ bool Client::CheckCanUnsuspendMerc() { if (GetClientVersion() < EQClientRoF) SendMercMerchantResponsePacket(4); // ?? else - SendMercMerchantResponsePacket(4); // ?? + SendMercMerchantResponsePacket(4); // ?? return false; } @@ -5493,7 +5493,7 @@ void Client::SuspendMercCommand() Merc* CurrentMerc = GetMerc(); if(CurrentMerc && GetMercID()) { - //CurrentMerc->Save(); + //CurrentMerc->Save(); CurrentMerc->Suspend(); } } diff --git a/zone/merc.h b/zone/merc.h index 4ed6e6332..21e372f7e 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -8,9 +8,9 @@ using namespace std; #define MAXMERCS 1 #define MERC_DEBUG 0 #define TANK 1 -#define HEALER 2 +#define HEALER 2 #define MELEEDPS 9 -#define CASTERDPS 12 +#define CASTERDPS 12 const int MercAISpellRange = 100; // TODO: Write a method that calcs what the merc's spell range is based on spell, equipment, AA, whatever and replace this enum MercStanceType { @@ -30,7 +30,7 @@ struct MercSpell { uint32 type; // 0 = never, must be one (and only one) of the defined values int16 stance; // 0 = all, + = only this stance, - = all except this stance int16 slot; - uint16 proc_chance; + uint16 proc_chance; uint32 time_cancast; // when we can cast this spell next }; @@ -156,12 +156,12 @@ public: uint32 GetMercTemplateID() { return _MercTemplateID; } uint32 GetMercType() { return _MercType; } uint32 GetMercSubType() { return _MercSubType; } - uint8 GetProficiencyID() { return _ProficiencyID; } - uint8 GetTierID() { return _TierID; } + uint8 GetProficiencyID() { return _ProficiencyID; } + uint8 GetTierID() { return _TierID; } uint32 GetCostFormula() { return _CostFormula; } uint32 GetMercNameType() { return _NameType; } uint32 GetStance() { return _currentStance; } - int GetHatedCount() { return _hatedCount; } + int GetHatedCount() { return _hatedCount; } inline const uint8 GetClientVersion() const { return _OwnerClientVersion; } @@ -174,8 +174,8 @@ public: void CheckHateList(); bool CheckTaunt(); bool CheckAETaunt(); - bool CheckConfidence(); - bool TryHide(); + bool CheckConfidence(); + bool TryHide(); // stat functions virtual void CalcBonuses(); @@ -267,15 +267,15 @@ public: protected: void CalcItemBonuses(StatBonuses* newbon); void AddItemBonuses(const Item_Struct *item, StatBonuses* newbon); - int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); + int CalcRecommendedLevelBonus(uint8 level, uint8 reclevel, int basestat); int16 GetFocusEffect(focusType type, uint16 spell_id); std::vector merc_spells; std::map timers; - uint16 skills[HIGHEST_SKILL+1]; - uint32 equipment[MAX_WORN_INVENTORY]; //this is an array of item IDs + uint16 skills[HIGHEST_SKILL+1]; + uint32 equipment[MAX_WORN_INVENTORY]; //this is an array of item IDs uint16 d_meele_texture1; //this is an item Material value uint16 d_meele_texture2; //this is an item Material value (offhand) uint8 prim_melee_type; //Sets the Primary Weapon attack message and animation @@ -283,22 +283,22 @@ protected: private: - int16 CalcAC(); - int16 GetACMit(); - int16 GetACAvoid(); - int16 acmod(); - int16 CalcATK(); - //int CalcHaste(); + int16 CalcAC(); + int16 GetACMit(); + int16 GetACAvoid(); + int16 acmod(); + int16 CalcATK(); + //int CalcHaste(); - int16 CalcSTR(); - int16 CalcSTA(); - int16 CalcDEX(); - int16 CalcAGI(); - int16 CalcINT(); - int16 CalcWIS(); - int16 CalcCHA(); + int16 CalcSTR(); + int16 CalcSTA(); + int16 CalcDEX(); + int16 CalcAGI(); + int16 CalcINT(); + int16 CalcWIS(); + int16 CalcCHA(); - int16 CalcMR(); + int16 CalcMR(); int16 CalcFR(); int16 CalcDR(); int16 CalcPR(); @@ -323,10 +323,10 @@ private: void DoEnduranceUpkeep(); //does the endurance upkeep void CalcRestState(); - int GroupLeadershipAAHealthEnhancement(); - int GroupLeadershipAAManaEnhancement(); + int GroupLeadershipAAHealthEnhancement(); + int GroupLeadershipAAManaEnhancement(); int GroupLeadershipAAHealthRegeneration(); - int GroupLeadershipAAOffenseEnhancement(); + int GroupLeadershipAAOffenseEnhancement(); void GetMercSize(); void GenerateAppearance(); @@ -362,8 +362,8 @@ private: uint32 _MercTemplateID; uint32 _MercType; uint32 _MercSubType; - uint8 _ProficiencyID; - uint8 _TierID; + uint8 _ProficiencyID; + uint8 _TierID; uint8 _CostFormula; uint8 _NameType; uint8 _OwnerClientVersion; @@ -375,9 +375,9 @@ private: bool _medding; bool _suspended; bool p_depop; - bool _check_confidence; - bool _lost_confidence; - int _hatedCount; + bool _check_confidence; + bool _lost_confidence; + int _hatedCount; uint32 owner_char_id; Timer endupkeep_timer; Timer rest_timer; diff --git a/zone/mob.cpp b/zone/mob.cpp index 7daaad8cf..3ec74db43 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -31,59 +31,59 @@ extern EntityList entity_list; extern Zone* zone; extern WorldServer worldserver; -Mob::Mob(const char* in_name, - const char* in_lastname, - int32 in_cur_hp, - int32 in_max_hp, - uint8 in_gender, - uint16 in_race, - uint8 in_class, - bodyType in_bodytype, - uint8 in_deity, - uint8 in_level, - uint32 in_npctype_id, - float in_size, - float in_runspeed, - float in_heading, - float in_x_pos, - float in_y_pos, - float in_z_pos, +Mob::Mob(const char* in_name, + const char* in_lastname, + int32 in_cur_hp, + int32 in_max_hp, + uint8 in_gender, + uint16 in_race, + uint8 in_class, + bodyType in_bodytype, + uint8 in_deity, + uint8 in_level, + uint32 in_npctype_id, + float in_size, + float in_runspeed, + float in_heading, + float in_x_pos, + float in_y_pos, + float in_z_pos, - uint8 in_light, - uint8 in_texture, - uint8 in_helmtexture, - uint16 in_ac, - uint16 in_atk, - uint16 in_str, - uint16 in_sta, - uint16 in_dex, - uint16 in_agi, - uint16 in_int, - uint16 in_wis, - uint16 in_cha, - uint8 in_haircolor, - uint8 in_beardcolor, - uint8 in_eyecolor1, // the eyecolors always seem to be the same, maybe left and right eye? - uint8 in_eyecolor2, - uint8 in_hairstyle, - uint8 in_luclinface, - uint8 in_beard, - uint32 in_drakkin_heritage, - uint32 in_drakkin_tattoo, - uint32 in_drakkin_details, - uint32 in_armor_tint[MAX_MATERIALS], + uint8 in_light, + uint8 in_texture, + uint8 in_helmtexture, + uint16 in_ac, + uint16 in_atk, + uint16 in_str, + uint16 in_sta, + uint16 in_dex, + uint16 in_agi, + uint16 in_int, + uint16 in_wis, + uint16 in_cha, + uint8 in_haircolor, + uint8 in_beardcolor, + uint8 in_eyecolor1, // the eyecolors always seem to be the same, maybe left and right eye? + uint8 in_eyecolor2, + uint8 in_hairstyle, + uint8 in_luclinface, + uint8 in_beard, + uint32 in_drakkin_heritage, + uint32 in_drakkin_tattoo, + uint32 in_drakkin_details, + uint32 in_armor_tint[MAX_MATERIALS], - uint8 in_aa_title, - uint8 in_see_invis, // see through invis/ivu - uint8 in_see_invis_undead, - uint8 in_see_hide, - uint8 in_see_improved_hide, - int32 in_hp_regen, - int32 in_mana_regen, - uint8 in_qglobal, - uint8 in_maxlevel, - uint32 in_scalerate - ) : + uint8 in_aa_title, + uint8 in_see_invis, // see through invis/ivu + uint8 in_see_invis_undead, + uint8 in_see_hide, + uint8 in_see_improved_hide, + int32 in_hp_regen, + int32 in_mana_regen, + uint8 in_qglobal, + uint8 in_maxlevel, + uint32 in_scalerate + ) : attack_timer(2000), attack_dw_timer(2000), ranged_timer(2000), @@ -117,9 +117,9 @@ Mob::Mob(const char* in_name, AI_Init(); SetMoving(false); moved=false; - rewind_x = 0; //Stored x_pos for /rewind - rewind_y = 0; //Stored y_pos for /rewind - rewind_z = 0; //Stored z_pos for /rewind + rewind_x = 0; //Stored x_pos for /rewind + rewind_y = 0; //Stored y_pos for /rewind + rewind_z = 0; //Stored z_pos for /rewind move_tic_count = 0; _egnode = nullptr; @@ -142,19 +142,19 @@ Mob::Mob(const char* in_name, base_gender = in_gender; base_race = in_race; class_ = in_class; - bodytype = in_bodytype; + bodytype = in_bodytype; orig_bodytype = in_bodytype; deity = in_deity; level = in_level; npctype_id = in_npctype_id; size = in_size; base_size = size; - runspeed = in_runspeed; + runspeed = in_runspeed; - // sanity check - if (runspeed < 0 || runspeed > 20) - runspeed = 1.25f; + // sanity check + if (runspeed < 0 || runspeed > 20) + runspeed = 1.25f; heading = in_heading; x_pos = in_x_pos; @@ -216,15 +216,15 @@ Mob::Mob(const char* in_name, InitializeBuffSlots(); - // clear the proc arrays + // clear the proc arrays int i; int j; for (j = 0; j < MAX_PROCS; j++) - { - PermaProcs[j].spellID = SPELL_UNKNOWN; - PermaProcs[j].chance = 0; - PermaProcs[j].base_spellID = SPELL_UNKNOWN; - SpellProcs[j].spellID = SPELL_UNKNOWN; + { + PermaProcs[j].spellID = SPELL_UNKNOWN; + PermaProcs[j].chance = 0; + PermaProcs[j].base_spellID = SPELL_UNKNOWN; + SpellProcs[j].spellID = SPELL_UNKNOWN; DefensiveProcs[j].spellID = SPELL_UNKNOWN; DefensiveProcs[j].chance = 0; @@ -235,7 +235,7 @@ Mob::Mob(const char* in_name, SkillProcs[j].spellID = SPELL_UNKNOWN; SkillProcs[j].chance = 0; SkillProcs[j].base_spellID = SPELL_UNKNOWN; - } + } for (i = 0; i < MAX_MATERIALS; i++) { @@ -262,7 +262,7 @@ Mob::Mob(const char* in_name, _appearance = eaStanding; pRunAnimSpeed = 0; - spellend_timer.Disable(); + spellend_timer.Disable(); bardsong_timer.Disable(); bardsong = 0; bardsong_target_id = 0; @@ -292,7 +292,7 @@ Mob::Mob(const char* in_name, silenced = false; amnesiad = false; inWater = false; - int m; + int m; for (m = 0; m < MAX_SHIELDERS; m++) { shielder[m].shielder_id = 0; @@ -360,7 +360,7 @@ Mob::Mob(const char* in_name, nimbus_effect1 = 0; nimbus_effect2 = 0; nimbus_effect3 = 0; - m_targetable = true; + m_targetable = true; flymode = FlyMode3; // Pathing @@ -412,14 +412,14 @@ Mob::~Mob() entity_list.RemoveFromTargets(this, true); - if(trade) { - Mob *with = trade->With(); - if(with && with->IsClient()) { - with->CastToClient()->FinishTrade(with); - with->trade->Reset(); - } - delete trade; - } + if(trade) { + Mob *with = trade->With(); + if(with && with->IsClient()) { + with->CastToClient()->FinishTrade(with); + with->trade->Reset(); + } + delete trade; + } if(HadTempPets()){ entity_list.DestroyTempPets(this); @@ -460,15 +460,15 @@ void Mob::SetInvisible(uint8 state) { invisible = state; SendAppearancePacket(AT_Invis, invisible); - // Invis and hide breaks charms + // Invis and hide breaks charms - if ((this->GetPetType() == petCharmed) && (invisible || hidden || improved_hidden)) - { - Mob* formerpet = this->GetPet(); + if ((this->GetPetType() == petCharmed) && (invisible || hidden || improved_hidden)) + { + Mob* formerpet = this->GetPet(); - if(formerpet) - formerpet->BuffFadeByEffect(SE_Charm); - } + if(formerpet) + formerpet->BuffFadeByEffect(SE_Charm); + } } //check to see if `this` is invisible to `other` @@ -519,7 +519,7 @@ bool Mob::IsInvisible(Mob* other) const } float Mob::_GetMovementSpeed(int mod) const { - // List of movement speed modifiers, including AAs & spells: + // List of movement speed modifiers, including AAs & spells: // http://everquest.allakhazam.com/db/item.html?item=1721;page=1;howmany=50#m10822246245352 if (IsRooted()) return 0.0f; @@ -788,9 +788,9 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) strcpy(ns->spawn.name, name); if(IsClient()) - { + { strn0cpy(ns->spawn.lastName,lastname,sizeof(ns->spawn.lastName)); - } + } ns->spawn.heading = FloatToEQ19(heading); ns->spawn.x = FloatToEQ19(x_pos);//((int32)x_pos)<<3; ns->spawn.y = FloatToEQ19(y_pos);//((int32)y_pos)<<3; @@ -827,10 +827,9 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) ns->spawn.drakkin_heritage = drakkin_heritage; ns->spawn.drakkin_tattoo = drakkin_tattoo; ns->spawn.drakkin_details = drakkin_details; - ns->spawn.equip_chest2 = texture; + ns->spawn.equip_chest2 = texture; -// ns->spawn.invis2 = 0xff;//this used to be labeled beard.. if its not FF it will turn - //mob invis +// ns->spawn.invis2 = 0xff;//this used to be labeled beard.. if its not FF it will turn mob invis if(helmtexture && helmtexture != 0xFF) { @@ -847,7 +846,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) // 1 - Same as #flymode 1 // 2 - Same as #flymode 2 // 3 - Mobs in water do not sink. A value of 3 in this field appears to be the default setting for all mobs - // (in water or not) according to 6.2 era packet collects. + // (in water or not) according to 6.2 era packet collects. if(IsClient()) { ns->spawn.flymode = FindType(SE_Levitate) ? 2 : 0; @@ -897,7 +896,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) ns->spawn.DestructibleUnk1 = 0x00000224; // Was 0x000001f5; // These next 4 are mostly always sequential // Originally they were 633, 634, 635, 636 - // Changing them all to 633 - no visible effect. + // Changing them all to 633 - no visible effect. // Changing them all to 636 - no visible effect. // Reversing the order of these four numbers and then using #appearance gain had no visible change. // Setting these four ids to zero had no visible effect when the catapult spawned, nor when #appearance was used. @@ -961,7 +960,7 @@ void Mob::CreateHPPacket(EQApplicationPacket* app) snprintf(buf, 9, "%i", GetNextHPEvent()); buf[9] = '\0'; SetNextHPEvent(-1); - parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 0); + parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 0); } } @@ -973,7 +972,7 @@ void Mob::CreateHPPacket(EQApplicationPacket* app) snprintf(buf, 9, "%i", GetNextIncHPEvent()); buf[9] = '\0'; SetNextIncHPEvent(-1); - parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 1); + parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, buf, 1); } } } @@ -999,7 +998,7 @@ void Mob::SendHPUpdate() if(IsGrouped()) { group = entity_list.GetGroupByMob(this); - if(group) //not sure why this might be null, but it happens + if(group) //not sure why this might be null, but it happens group->SendHPPacketsFrom(this); } @@ -1027,7 +1026,7 @@ void Mob::SendHPUpdate() { GetPet()->CastToClient()->QueuePacket(&hp_app, false); } -#endif //MANAGE_HP_PACKETS +#endif //MANAGE_HP_PACKETS // Update the damage state of destructible objects if(IsNPC() && IsDestructibleObject()) @@ -1110,7 +1109,7 @@ void Mob::SendPosUpdate(uint8 iSendToSelf) { #ifdef PACKET_UPDATE_MANAGER entity_list.QueueManaged(this, app, (iSendToSelf==0),false); #else - if(move_tic_count == RuleI(Zone, NPCPositonUpdateTicCount)) + if(move_tic_count == RuleI(Zone, NPCPositonUpdateTicCount)) { entity_list.QueueClients(this, app, (iSendToSelf==0), false); move_tic_count = 0; @@ -1470,7 +1469,7 @@ void Mob::SendIllusionPacket(uint16 in_race, uint8 in_gender, uint8 in_texture, } uint8 Mob::GetDefaultGender(uint16 in_race, uint8 in_gender) { -//cout << "Gender in: " << (int)in_gender << endl; +//cout << "Gender in: " << (int)in_gender << endl; if ((in_race > 0 && in_race <= GNOME ) || in_race == IKSAR || in_race == VAHSHIR || in_race == FROGLOK || in_race == DRAKKIN || in_race == 15 || in_race == 50 || in_race == 57 || in_race == 70 || in_race == 98 || in_race == 118) { @@ -1565,12 +1564,12 @@ void Mob::SendAppearanceEffect(uint32 parm1, uint32 parm2, uint32 parm3, uint32 } void Mob::SendTargetable(bool on, Client *specific_target) { - EQApplicationPacket* outapp = new EQApplicationPacket(OP_Untargetable, sizeof(Untargetable_Struct)); - Untargetable_Struct *ut = (Untargetable_Struct*)outapp->pBuffer; - ut->id = GetID(); - ut->targetable_flag = on == true ? 1 : 0; + EQApplicationPacket* outapp = new EQApplicationPacket(OP_Untargetable, sizeof(Untargetable_Struct)); + Untargetable_Struct *ut = (Untargetable_Struct*)outapp->pBuffer; + ut->id = GetID(); + ut->targetable_flag = on == true ? 1 : 0; - if(specific_target == nullptr) { + if(specific_target == nullptr) { entity_list.QueueClients(this, outapp); } else if (specific_target->IsClient()) { @@ -1694,10 +1693,10 @@ void Mob::TempName(const char *newname) } void Mob::SetTargetable(bool on) { - if(m_targetable != on) { - m_targetable = on; - SendTargetable(on); - } + if(m_targetable != on) { + m_targetable = on; + SendTargetable(on); + } } const int32& Mob::SetMana(int32 amount) @@ -1802,8 +1801,8 @@ void Mob::SetOwnerID(uint16 NewOwnerID) { //heko: for backstab bool Mob::BehindMob(Mob* other, float playerx, float playery) const { - if (!other) - return true; // sure your behind your invisible friend?? (fall thru for sneak) + if (!other) + return true; // sure your behind your invisible friend?? (fall thru for sneak) //see if player is behind mob float angle, lengthb, vectorx, vectory; float mobx = -(other->GetX()); // mob xlocation (inverse because eq is confused) @@ -1953,7 +1952,7 @@ void Mob::SetAttackTimer() { int speed = (int)((36 *(100+DelayMod)/100)*(100.0f+attack_speed)*PermaHaste); if(speed < RuleI(Combat, MinHastedDelay) && IsClient()) //lower bound speed = RuleI(Combat, MinHastedDelay); - TimerToUse->SetAtTrigger(speed, true); // Hand to hand, non-monk 2/36 + TimerToUse->SetAtTrigger(speed, true); // Hand to hand, non-monk 2/36 } } else { //we have a weapon, use its delay @@ -2001,8 +2000,8 @@ void Mob::SetAttackTimer() { bool Mob::CanThisClassDualWield(void) const { if (!IsClient()) { - return(GetSkill(DUAL_WIELD) > 0); - } else { + return(GetSkill(DUAL_WIELD) > 0); + } else { const ItemInst* inst = CastToClient()->GetInv().GetItem(SLOT_PRIMARY); // 2HS, 2HB, or 2HP if (inst && inst->IsType(ItemClassCommon)) { @@ -2013,8 +2012,8 @@ bool Mob::CanThisClassDualWield(void) const //No weapon in hand... using hand-to-hand... //only monks and beastlords? can dual wield their fists. if(class_ != MONK && class_ != MONKGM && class_ != BEASTLORD && class_ != BEASTLORDGM) { - return false; - } + return false; + } } return (CastToClient()->HasSkill(DUAL_WIELD)); // No skill = no chance @@ -2023,14 +2022,14 @@ bool Mob::CanThisClassDualWield(void) const bool Mob::CanThisClassDoubleAttack(void) const { - if(!IsClient()) { - return(GetSkill(DOUBLE_ATTACK) > 0); - } else { - if(aabonuses.GiveDoubleAttack || itembonuses.GiveDoubleAttack || spellbonuses.GiveDoubleAttack) { + if(!IsClient()) { + return(GetSkill(DOUBLE_ATTACK) > 0); + } else { + if(aabonuses.GiveDoubleAttack || itembonuses.GiveDoubleAttack || spellbonuses.GiveDoubleAttack) { return true; } - return(CastToClient()->HasSkill(DOUBLE_ATTACK)); - } + return(CastToClient()->HasSkill(DOUBLE_ATTACK)); + } } bool Mob::IsWarriorClass(void) const @@ -2068,38 +2067,38 @@ bool Mob::IsWarriorClass(void) const bool Mob::CanThisClassParry(void) const { - if(!IsClient()) { - return(GetSkill(PARRY) > 0); - } else { - return(CastToClient()->HasSkill(PARRY)); - } + if(!IsClient()) { + return(GetSkill(PARRY) > 0); + } else { + return(CastToClient()->HasSkill(PARRY)); + } } bool Mob::CanThisClassDodge(void) const { - if(!IsClient()) { - return(GetSkill(DODGE) > 0); - } else { - return(CastToClient()->HasSkill(DODGE)); - } + if(!IsClient()) { + return(GetSkill(DODGE) > 0); + } else { + return(CastToClient()->HasSkill(DODGE)); + } } bool Mob::CanThisClassRiposte(void) const { - if(!IsClient()) { - return(GetSkill(RIPOSTE) > 0); - } else { - return(CastToClient()->HasSkill(RIPOSTE)); - } + if(!IsClient()) { + return(GetSkill(RIPOSTE) > 0); + } else { + return(CastToClient()->HasSkill(RIPOSTE)); + } } bool Mob::CanThisClassBlock(void) const { if(!IsClient()) { - return(GetSkill(BLOCKSKILL) > 0); - } else { - return(CastToClient()->HasSkill(BLOCKSKILL)); - } + return(GetSkill(BLOCKSKILL) > 0); + } else { + return(CastToClient()->HasSkill(BLOCKSKILL)); + } } float Mob::Dist(const Mob &other) const { @@ -2109,8 +2108,8 @@ float Mob::Dist(const Mob &other) const { float zDiff = other.z_pos - z_pos; return sqrtf( (xDiff * xDiff) - + (yDiff * yDiff) - + (zDiff * zDiff) ); + + (yDiff * yDiff) + + (zDiff * zDiff) ); } float Mob::DistNoZ(const Mob &other) const { @@ -2119,7 +2118,7 @@ float Mob::DistNoZ(const Mob &other) const { float yDiff = other.y_pos - y_pos; return sqrtf( (xDiff * xDiff) - + (yDiff * yDiff) ); + + (yDiff * yDiff) ); } float Mob::DistNoRoot(const Mob &other) const { @@ -2129,8 +2128,8 @@ float Mob::DistNoRoot(const Mob &other) const { float zDiff = other.z_pos - z_pos; return ( (xDiff * xDiff) - + (yDiff * yDiff) - + (zDiff * zDiff) ); + + (yDiff * yDiff) + + (zDiff * zDiff) ); } float Mob::DistNoRoot(float x, float y, float z) const { @@ -2140,8 +2139,8 @@ float Mob::DistNoRoot(float x, float y, float z) const { float zDiff = z - z_pos; return ( (xDiff * xDiff) - + (yDiff * yDiff) - + (zDiff * zDiff) ); + + (yDiff * yDiff) + + (zDiff * zDiff) ); } float Mob::DistNoRootNoZ(float x, float y) const { @@ -2149,8 +2148,7 @@ float Mob::DistNoRootNoZ(float x, float y) const { float xDiff = x - x_pos; float yDiff = y - y_pos; - return ( (xDiff * xDiff) - + (yDiff * yDiff) ); + return ( (xDiff * xDiff) + (yDiff * yDiff) ); } float Mob::DistNoRootNoZ(const Mob &other) const { @@ -2169,7 +2167,7 @@ float Mob::GetReciprocalHeading(Mob* target) { float h = (target->GetHeading() / 256.0f) * 6.283184f; // Calculate the reciprocal heading in radians - Result = h + 3.141592f; + Result = h + 3.141592f; // Convert back to eq heading from radians Result = (Result / 6.283184f) * 256.0f; @@ -2255,8 +2253,8 @@ bool Mob::PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, fl } bool Mob::HateSummon() { - // check if mob has ability to summon - // 97% is the offical % that summoning starts on live, not 94 + // check if mob has ability to summon + // 97% is the offical % that summoning starts on live, not 94 // if the mob can summon and is charmed, it can only summon mobs it has LoS to Mob* mob_owner = nullptr; if(GetOwnerID()) @@ -2264,23 +2262,23 @@ bool Mob::HateSummon() { if (GetHPRatio() >= 98 || SpecAttacks[SPECATK_SUMMON] == false || !GetTarget() || (mob_owner && mob_owner->IsClient() && !CheckLosFN(GetTarget()))) - return false; + return false; - // now validate the timer - if (!SpecAttackTimers[SPECATK_SUMMON]) - { - SpecAttackTimers[SPECATK_SUMMON] = new Timer(6000); - SpecAttackTimers[SPECATK_SUMMON]->Start(); - } + // now validate the timer + if (!SpecAttackTimers[SPECATK_SUMMON]) + { + SpecAttackTimers[SPECATK_SUMMON] = new Timer(6000); + SpecAttackTimers[SPECATK_SUMMON]->Start(); + } - // now check the timer - if (!SpecAttackTimers[SPECATK_SUMMON]->Check()) - return false; + // now check the timer + if (!SpecAttackTimers[SPECATK_SUMMON]->Check()) + return false; - // get summon target - SetTarget(GetHateTop()); - if(target) - { + // get summon target + SetTarget(GetHateTop()); + if(target) + { if (target->IsClient()) target->CastToClient()->Message(15,"You have been summoned!"); entity_list.MessageClose(this, true, 500, 10, "%s says,'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() ); @@ -2303,7 +2301,7 @@ bool Mob::HateSummon() { target->GMMove(x_pos, y_pos, z_pos, target->GetHeading()); } - return true; + return true; } return false; } @@ -2331,10 +2329,10 @@ void Mob::FaceTarget(Mob* MobToFace) { } } - if(IsNPC() && !IsEngaged()) { - CastToNPC()->GetRefaceTimer()->Start(15000); - CastToNPC()->GetRefaceTimer()->Enable(); - } + if(IsNPC() && !IsEngaged()) { + CastToNPC()->GetRefaceTimer()->Start(15000); + CastToNPC()->GetRefaceTimer()->Enable(); + } } bool Mob::RemoveFromHateList(Mob* mob) @@ -2367,10 +2365,10 @@ void Mob::WipeHateList() } uint32 Mob::RandomTimer(int min,int max) { - int r = 14000; + int r = 14000; if(min != 0 && max != 0 && min < max) { - r = MakeRandomInt(min, max); + r = MakeRandomInt(min, max); } return r; } @@ -2593,7 +2591,7 @@ void Mob::Emote(const char *format, ...) void Mob::QuestJournalledSay(Client *QuestInitiator, const char *str) { - entity_list.QuestJournalledSayClose(this, QuestInitiator, 200, GetCleanName(), str); + entity_list.QuestJournalledSayClose(this, QuestInitiator, 200, GetCleanName(), str); } const char *Mob::GetCleanName() @@ -2619,17 +2617,16 @@ void Mob::SetNextIncHPEvent( int inchpevent ) //warp for quest function,from sandy void Mob::Warp( float x, float y, float z ) { - x_pos = x; - y_pos = y; - z_pos = z; + x_pos = x; + y_pos = y; + z_pos = z; - Mob* target = GetTarget(); - if ( target ) { - FaceTarget( target ); - } - - SendPosition(); + Mob* target = GetTarget(); + if (target) { + FaceTarget( target ); + } + SendPosition(); } bool Mob::DivineAura() const @@ -2757,7 +2754,7 @@ void Mob::ExecWeaponProc(uint16 spell_id, Mob *on) { int32 twinproc_chance = 0; if(IsClient()) - twinproc_chance = CastToClient()->GetFocusEffect(focusTwincast, spell_id); + twinproc_chance = CastToClient()->GetFocusEffect(focusTwincast, spell_id); if(twinproc_chance && (MakeRandomInt(0,99) < twinproc_chance)) twinproc = true; @@ -2819,7 +2816,7 @@ void Mob::SetTarget(Mob* mob) { if(IsNPC()) parse->EventNPC(EVENT_TARGET_CHANGE, CastToNPC(), mob, "", 0); //parse->Event(EVENT_TARGET_CHANGE, this->GetNPCTypeID(), 0, this->CastToNPC(), mob); else if (IsClient()) - parse->EventPlayer(EVENT_TARGET_CHANGE, CastToClient(), "", 0); //parse->Event(EVENT_TARGET_CHANGE, 0, "", (NPC*)nullptr, this->CastToClient()); + parse->EventPlayer(EVENT_TARGET_CHANGE, CastToClient(), "", 0); //parse->Event(EVENT_TARGET_CHANGE, 0, "", (NPC*)nullptr, this->CastToClient()); if(IsPet() && GetOwner() && GetOwner()->IsClient()) GetOwner()->CastToClient()->UpdateXTargetType(MyPetTarget, mob); @@ -3751,10 +3748,10 @@ void Mob::DelGlobal(const char *varname) { } if (!database.RunQuery(query, - MakeAnyLenString(&query, - "DELETE FROM quest_globals WHERE name='%s'" - " && (npcid=0 || npcid=%i) && (charid=0 || charid=%i) && (zoneid=%i || zoneid=0)", - varname,qgNpcid,qgCharid,qgZoneid),errbuf)) + MakeAnyLenString(&query, + "DELETE FROM quest_globals WHERE name='%s'" + " && (npcid=0 || npcid=%i) && (charid=0 || charid=%i) && (zoneid=%i || zoneid=0)", + varname,qgNpcid,qgCharid,qgZoneid),errbuf)) { //_log(QUESTS, "DelGlobal error deleting %s : %s", varname, errbuf); } @@ -4024,7 +4021,7 @@ bool Mob::TrySpellOnDeath() } if(spellbonuses.SpellOnDeath[i]) { - if(MakeRandomInt(0, 99) < static_cast(spellbonuses.SpellOnDeath[i + 1])) { + if(MakeRandomInt(0, 99) < static_cast(spellbonuses.SpellOnDeath[i + 1])) { SpellFinished(spellbonuses.SpellOnDeath[i], this); } } @@ -4061,7 +4058,7 @@ void Mob::SetGrouped(bool v) if(IsClient()) { - parse->EventPlayer(EVENT_GROUP_CHANGE, CastToClient(), "", 0); + parse->EventPlayer(EVENT_GROUP_CHANGE, CastToClient(), "", 0); if(!v) CastToClient()->RemoveGroupXTargets(); @@ -4078,7 +4075,7 @@ void Mob::SetRaidGrouped(bool v) if(IsClient()) { - parse->EventPlayer(EVENT_GROUP_CHANGE, CastToClient(), "", 0); + parse->EventPlayer(EVENT_GROUP_CHANGE, CastToClient(), "", 0); } } @@ -4117,7 +4114,7 @@ int16 Mob::GetMeleeMinDamageMod_SE(uint16 skill) { int dmg_mod = 0; - dmg_mod = itembonuses.MinDamageModifier[skill] + spellbonuses.MinDamageModifier[skill] + + dmg_mod = itembonuses.MinDamageModifier[skill] + spellbonuses.MinDamageModifier[skill] + itembonuses.MinDamageModifier[HIGHEST_SKILL+1] + spellbonuses.MinDamageModifier[HIGHEST_SKILL+1]; if(dmg_mod < -100) @@ -4151,16 +4148,16 @@ int16 Mob::GetSkillDmgAmt(uint16 skill) // All skill dmg(only spells do this) + Skill specific skill_dmg += spellbonuses.SkillDamageAmount[HIGHEST_SKILL+1] + itembonuses.SkillDamageAmount[HIGHEST_SKILL+1] + aabonuses.SkillDamageAmount[HIGHEST_SKILL+1] - + itembonuses.SkillDamageAmount[skill] + spellbonuses.SkillDamageAmount[skill] + aabonuses.SkillDamageAmount[skill]; + + itembonuses.SkillDamageAmount[skill] + spellbonuses.SkillDamageAmount[skill] + aabonuses.SkillDamageAmount[skill]; skill_dmg += spellbonuses.SkillDamageAmount2[HIGHEST_SKILL+1] + itembonuses.SkillDamageAmount2[HIGHEST_SKILL+1] - + itembonuses.SkillDamageAmount2[skill] + spellbonuses.SkillDamageAmount2[skill]; + + itembonuses.SkillDamageAmount2[skill] + spellbonuses.SkillDamageAmount2[skill]; // Deplete the buff if needed - if (spellbonuses.SkillDamageAmount[HIGHEST_SKILL+1] || spellbonuses.SkillDamageAmount[skill]) + if (spellbonuses.SkillDamageAmount[HIGHEST_SKILL+1] || spellbonuses.SkillDamageAmount[skill]) CheckHitsRemaining(0, false,false, SE_SkillDamageAmount,0,true,skill); - if (spellbonuses.SkillDamageAmount2[HIGHEST_SKILL+1] || spellbonuses.SkillDamageAmount2[skill]) + if (spellbonuses.SkillDamageAmount2[HIGHEST_SKILL+1] || spellbonuses.SkillDamageAmount2[skill]) CheckHitsRemaining(0, false,false, SE_SkillDamageAmount2,0,true,skill); return skill_dmg; @@ -4302,32 +4299,32 @@ void Mob::RemoveNimbusEffect(int effectid) } bool Mob::IsBoat() const { - return (race == 72 || race == 73 || race == 114 || race == 404 || race == 550 || race == 551 || race == 552); + return (race == 72 || race == 73 || race == 114 || race == 404 || race == 550 || race == 551 || race == 552); } void Mob::SetBodyType(bodyType new_body, bool overwrite_orig) { - bool needs_spawn_packet = false; - if(bodytype == 11 || bodytype >= 65 || new_body == 11 || new_body >= 65) { - needs_spawn_packet = true; - } + bool needs_spawn_packet = false; + if(bodytype == 11 || bodytype >= 65 || new_body == 11 || new_body >= 65) { + needs_spawn_packet = true; + } - if(overwrite_orig) { - orig_bodytype = new_body; - } - bodytype = new_body; + if(overwrite_orig) { + orig_bodytype = new_body; + } + bodytype = new_body; - if(needs_spawn_packet) { - EQApplicationPacket* app = new EQApplicationPacket; - CreateDespawnPacket(app, true); - entity_list.QueueClients(this, app); - CreateSpawnPacket(app, this); - entity_list.QueueClients(this, app); - safe_delete(app); - } + if(needs_spawn_packet) { + EQApplicationPacket* app = new EQApplicationPacket; + CreateDespawnPacket(app, true); + entity_list.QueueClients(this, app); + CreateSpawnPacket(app, this); + entity_list.QueueClients(this, app); + safe_delete(app); + } } -void Mob::ModSkillDmgTaken(SkillType skill_num, int value) +void Mob::ModSkillDmgTaken(SkillType skill_num, int value) { if (skill_num <= HIGHEST_SKILL) SkillDmgTaken_Mod[skill_num] = value; @@ -4490,7 +4487,7 @@ bool Mob::PassLimitToSkill(uint16 spell_id, uint16 skill) { // Faction Mods for Alliance type spells void Mob::AddFactionBonus(uint32 pFactionID,int32 bonus) { - map :: const_iterator faction_bonus; + map :: const_iterator faction_bonus; typedef std::pair NewFactionBonus; faction_bonus = faction_bonuses.find(pFactionID); @@ -4510,7 +4507,7 @@ void Mob::AddFactionBonus(uint32 pFactionID,int32 bonus) { // Faction Mods from items void Mob::AddItemFactionBonus(uint32 pFactionID,int32 bonus) { - map :: const_iterator faction_bonus; + map :: const_iterator faction_bonus; typedef std::pair NewFactionBonus; faction_bonus = item_faction_bonuses.find(pFactionID); @@ -4529,7 +4526,7 @@ void Mob::AddItemFactionBonus(uint32 pFactionID,int32 bonus) { } int32 Mob::GetFactionBonus(uint32 pFactionID) { - map :: const_iterator faction_bonus; + map :: const_iterator faction_bonus; faction_bonus = faction_bonuses.find(pFactionID); if(faction_bonus != faction_bonuses.end()) { @@ -4539,7 +4536,7 @@ int32 Mob::GetFactionBonus(uint32 pFactionID) { } int32 Mob::GetItemFactionBonus(uint32 pFactionID) { - map :: const_iterator faction_bonus; + map :: const_iterator faction_bonus; faction_bonus = item_faction_bonuses.find(pFactionID); if(faction_bonus != item_faction_bonuses.end()) { diff --git a/zone/mob.h b/zone/mob.h index 95a16a854..b300eb9b6 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef MOB_H #define MOB_H @@ -33,758 +33,758 @@ class EGNode; class MobFearState; class Mob : public Entity { public: - enum CLIENT_CONN_STATUS { CLIENT_CONNECTING, CLIENT_CONNECTED, CLIENT_LINKDEAD, - CLIENT_KICKED, DISCONNECTED, CLIENT_ERROR, CLIENT_CONNECTINGALL }; - enum eStandingPetOrder { SPO_Follow, SPO_Sit, SPO_Guard }; + enum CLIENT_CONN_STATUS { CLIENT_CONNECTING, CLIENT_CONNECTED, CLIENT_LINKDEAD, + CLIENT_KICKED, DISCONNECTED, CLIENT_ERROR, CLIENT_CONNECTINGALL }; + enum eStandingPetOrder { SPO_Follow, SPO_Sit, SPO_Guard }; - Mob(const char* in_name, - const char* in_lastname, - int32 in_cur_hp, - int32 in_max_hp, - uint8 in_gender, - uint16 in_race, - uint8 in_class, - bodyType in_bodytype, - uint8 in_deity, - uint8 in_level, - uint32 in_npctype_id, - float in_size, - float in_runspeed, - float in_heading, - float in_x_pos, - float in_y_pos, - float in_z_pos, - uint8 in_light, - uint8 in_texture, - uint8 in_helmtexture, - uint16 in_ac, - uint16 in_atk, - uint16 in_str, - uint16 in_sta, - uint16 in_dex, - uint16 in_agi, - uint16 in_int, - uint16 in_wis, - uint16 in_cha, - uint8 in_haircolor, - uint8 in_beardcolor, - uint8 in_eyecolor1, // the eyecolors always seem to be the same, maybe left and right eye? - uint8 in_eyecolor2, - uint8 in_hairstyle, - uint8 in_luclinface, - uint8 in_beard, - uint32 in_drakkin_heritage, - uint32 in_drakkin_tattoo, - uint32 in_drakkin_details, - uint32 in_armor_tint[MAX_MATERIALS], - uint8 in_aa_title, - uint8 in_see_invis, // see through invis - uint8 in_see_invis_undead, // see through invis vs. undead - uint8 in_see_hide, - uint8 in_see_improved_hide, - int32 in_hp_regen, - int32 in_mana_regen, - uint8 in_qglobal, - uint8 in_maxlevel, - uint32 in_scalerate - ); - virtual ~Mob(); + Mob(const char* in_name, + const char* in_lastname, + int32 in_cur_hp, + int32 in_max_hp, + uint8 in_gender, + uint16 in_race, + uint8 in_class, + bodyType in_bodytype, + uint8 in_deity, + uint8 in_level, + uint32 in_npctype_id, + float in_size, + float in_runspeed, + float in_heading, + float in_x_pos, + float in_y_pos, + float in_z_pos, + uint8 in_light, + uint8 in_texture, + uint8 in_helmtexture, + uint16 in_ac, + uint16 in_atk, + uint16 in_str, + uint16 in_sta, + uint16 in_dex, + uint16 in_agi, + uint16 in_int, + uint16 in_wis, + uint16 in_cha, + uint8 in_haircolor, + uint8 in_beardcolor, + uint8 in_eyecolor1, // the eyecolors always seem to be the same, maybe left and right eye? + uint8 in_eyecolor2, + uint8 in_hairstyle, + uint8 in_luclinface, + uint8 in_beard, + uint32 in_drakkin_heritage, + uint32 in_drakkin_tattoo, + uint32 in_drakkin_details, + uint32 in_armor_tint[MAX_MATERIALS], + uint8 in_aa_title, + uint8 in_see_invis, // see through invis + uint8 in_see_invis_undead, // see through invis vs. undead + uint8 in_see_hide, + uint8 in_see_improved_hide, + int32 in_hp_regen, + int32 in_mana_regen, + uint8 in_qglobal, + uint8 in_maxlevel, + uint32 in_scalerate + ); + virtual ~Mob(); - inline virtual bool IsMob() const { return true; } - inline virtual bool InZone() const { return true; } + inline virtual bool IsMob() const { return true; } + inline virtual bool InZone() const { return true; } - //Somewhat sorted: needs documenting! + //Somewhat sorted: needs documenting! - //Attack - virtual void RogueBackstab(Mob* other, bool min_damage = false, int ReuseTime = 10); - virtual void RogueAssassinate(Mob* other); // solar - bool BehindMob(Mob* other = 0, float playerx = 0.0f, float playery = 0.0f) const; - virtual void RangedAttack(Mob* other) { } - virtual void ThrowingAttack(Mob* other) { } - uint16 GetThrownDamage(int16 wDmg, int32& TotalDmg, int& minDmg); - // 13 = Primary (default), 14 = secondary - virtual bool Attack(Mob* other, int Hand = 13, bool FromRiposte = false, bool IsStrikethrough = false, - bool IsFromSpell = false) = 0; - int MonkSpecialAttack(Mob* other, uint8 skill_used); - virtual void TryBackstab(Mob *other,int ReuseTime = 10); - void TriggerDefensiveProcs(const ItemInst* weapon, Mob *on, uint16 hand = 13, int damage = 0); - virtual bool AvoidDamage(Mob* attacker, int32 &damage, bool CanRiposte = true); - virtual bool CheckHitChance(Mob* attacker, SkillType skillinuse, int Hand, int16 chance_mod = 0); - virtual void TryCriticalHit(Mob *defender, uint16 skill, int32 &damage); - void TryPetCriticalHit(Mob *defender, uint16 skill, int32 &damage); - virtual bool TryFinishingBlow(Mob *defender, SkillType skillinuse); - virtual bool TryHeadShot(Mob* defender, SkillType skillInUse); - virtual void DoRiposte(Mob* defender); - void ApplyMeleeDamageBonus(uint16 skill, int32 &damage); - virtual void MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit); - bool CombatRange(Mob* other); + //Attack + virtual void RogueBackstab(Mob* other, bool min_damage = false, int ReuseTime = 10); + virtual void RogueAssassinate(Mob* other); // solar + bool BehindMob(Mob* other = 0, float playerx = 0.0f, float playery = 0.0f) const; + virtual void RangedAttack(Mob* other) { } + virtual void ThrowingAttack(Mob* other) { } + uint16 GetThrownDamage(int16 wDmg, int32& TotalDmg, int& minDmg); + // 13 = Primary (default), 14 = secondary + virtual bool Attack(Mob* other, int Hand = 13, bool FromRiposte = false, bool IsStrikethrough = false, + bool IsFromSpell = false) = 0; + int MonkSpecialAttack(Mob* other, uint8 skill_used); + virtual void TryBackstab(Mob *other,int ReuseTime = 10); + void TriggerDefensiveProcs(const ItemInst* weapon, Mob *on, uint16 hand = 13, int damage = 0); + virtual bool AvoidDamage(Mob* attacker, int32 &damage, bool CanRiposte = true); + virtual bool CheckHitChance(Mob* attacker, SkillType skillinuse, int Hand, int16 chance_mod = 0); + virtual void TryCriticalHit(Mob *defender, uint16 skill, int32 &damage); + void TryPetCriticalHit(Mob *defender, uint16 skill, int32 &damage); + virtual bool TryFinishingBlow(Mob *defender, SkillType skillinuse); + virtual bool TryHeadShot(Mob* defender, SkillType skillInUse); + virtual void DoRiposte(Mob* defender); + void ApplyMeleeDamageBonus(uint16 skill, int32 &damage); + virtual void MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit); + bool CombatRange(Mob* other); - //Appearance - void SendLevelAppearance(); - void SendAppearanceEffect(uint32 parm1, uint32 parm2, uint32 parm3, uint32 parm4, uint32 parm5, - Client *specific_target=nullptr); - void SendTargetable(bool on, Client *specific_target = nullptr); - virtual void SendWearChange(uint8 material_slot); - virtual void SendTextureWC(uint8 slot, uint16 texture, uint32 hero_forge_model = 0, uint32 elite_material = 0, - uint32 unknown06 = 0, uint32 unknown18 = 0); - virtual void SetSlotTint(uint8 material_slot, uint8 red_tint, uint8 green_tint, uint8 blue_tint); - virtual void WearChange(uint8 material_slot, uint16 texture, uint32 color); - void DoAnim(const int animnum, int type=0, bool ackreq = true, eqFilterType filter = FilterNone); - void ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow = false, float speed = 0, - float angle = 0, float tilt = 0, float arc = 0); - void ChangeSize(float in_size, bool bNoRestriction = false); - inline uint8 SeeInvisible() const { return see_invis; } - inline bool SeeInvisibleUndead() const { return see_invis_undead; } - inline bool SeeHide() const { return see_hide; } - inline bool SeeImprovedHide() const { return see_improved_hide; } - bool IsInvisible(Mob* other = 0) const; - void SetInvisible(uint8 state); - bool AttackAnimation(SkillType &skillinuse, int Hand, const ItemInst* weapon); + //Appearance + void SendLevelAppearance(); + void SendAppearanceEffect(uint32 parm1, uint32 parm2, uint32 parm3, uint32 parm4, uint32 parm5, + Client *specific_target=nullptr); + void SendTargetable(bool on, Client *specific_target = nullptr); + virtual void SendWearChange(uint8 material_slot); + virtual void SendTextureWC(uint8 slot, uint16 texture, uint32 hero_forge_model = 0, uint32 elite_material = 0, + uint32 unknown06 = 0, uint32 unknown18 = 0); + virtual void SetSlotTint(uint8 material_slot, uint8 red_tint, uint8 green_tint, uint8 blue_tint); + virtual void WearChange(uint8 material_slot, uint16 texture, uint32 color); + void DoAnim(const int animnum, int type=0, bool ackreq = true, eqFilterType filter = FilterNone); + void ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow = false, float speed = 0, + float angle = 0, float tilt = 0, float arc = 0); + void ChangeSize(float in_size, bool bNoRestriction = false); + inline uint8 SeeInvisible() const { return see_invis; } + inline bool SeeInvisibleUndead() const { return see_invis_undead; } + inline bool SeeHide() const { return see_hide; } + inline bool SeeImprovedHide() const { return see_improved_hide; } + bool IsInvisible(Mob* other = 0) const; + void SetInvisible(uint8 state); + bool AttackAnimation(SkillType &skillinuse, int Hand, const ItemInst* weapon); - //Song - bool UseBardSpellLogic(uint16 spell_id = 0xffff, int slot = -1); - bool ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot); - void BardPulse(uint16 spell_id, Mob *caster); + //Song + bool UseBardSpellLogic(uint16 spell_id = 0xffff, int slot = -1); + bool ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, uint16 slot); + void BardPulse(uint16 spell_id, Mob *caster); - //Spell - void SendSpellEffect(uint32 effectid, uint32 duration, uint32 finish_delay, bool zone_wide, - uint32 unk020, bool perm_effect = false, Client *c = nullptr); - bool IsBeneficialAllowed(Mob *target); - virtual int GetCasterLevel(uint16 spell_id); - void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0, - bool item_bonus = false, uint32 ticsremaining = 0, int buffslot = -1); - void NegateSpellsBonuses(uint16 spell_id); - virtual float GetActSpellRange(uint16 spell_id, float range, bool IsBard = false) { return range;} - virtual int32 GetActSpellDamage(uint16 spell_id, int32 value) { return value; } - virtual int32 GetActSpellHealing(uint16 spell_id, int32 value) { return value; } - virtual int32 GetActSpellCost(uint16 spell_id, int32 cost){ return cost;} - virtual int32 GetActSpellDuration(uint16 spell_id, int32 duration){ return duration;} - virtual int32 GetActSpellCasttime(uint16 spell_id, int32 casttime); - float ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use_resist_override = false, - int resist_override = 0, bool CharismaCheck = false); - uint16 GetSpecializeSkillValue(uint16 spell_id) const; - void SendSpellBarDisable(); - void SendSpellBarEnable(uint16 spellid); - void ZeroCastingVars(); - virtual void SpellProcess(); - virtual bool CastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, - int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, - uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, uint32 type = 0, int16 *resist_adjust = nullptr); - virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, - int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, - uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, uint32 type = 0, int16 resist_adjust = 0); - void CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, uint16 mana_used, - uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0); - bool SpellFinished(uint16 spell_id, Mob *target, uint16 slot = 10, uint16 mana_used = 0, - uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false); - virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect = false, - bool use_resist_adjust = false, int16 resist_adjust = 0, bool isproc = false); - virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100); - virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, - CastAction_type &CastAction); - virtual bool CheckFizzle(uint16 spell_id); - virtual bool IsImmuneToSpell(uint16 spell_id, Mob *caster); - virtual float GetAOERange(uint16 spell_id); - void InterruptSpell(uint16 spellid = SPELL_UNKNOWN); - void InterruptSpell(uint16, uint16, uint16 spellid = SPELL_UNKNOWN); - inline bool IsCasting() const { return((casting_spell_id != 0)); } - uint16 CastingSpellID() const { return casting_spell_id; } + //Spell + void SendSpellEffect(uint32 effectid, uint32 duration, uint32 finish_delay, bool zone_wide, + uint32 unk020, bool perm_effect = false, Client *c = nullptr); + bool IsBeneficialAllowed(Mob *target); + virtual int GetCasterLevel(uint16 spell_id); + void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0, + bool item_bonus = false, uint32 ticsremaining = 0, int buffslot = -1); + void NegateSpellsBonuses(uint16 spell_id); + virtual float GetActSpellRange(uint16 spell_id, float range, bool IsBard = false) { return range;} + virtual int32 GetActSpellDamage(uint16 spell_id, int32 value) { return value; } + virtual int32 GetActSpellHealing(uint16 spell_id, int32 value) { return value; } + virtual int32 GetActSpellCost(uint16 spell_id, int32 cost){ return cost;} + virtual int32 GetActSpellDuration(uint16 spell_id, int32 duration){ return duration;} + virtual int32 GetActSpellCasttime(uint16 spell_id, int32 casttime); + float ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use_resist_override = false, + int resist_override = 0, bool CharismaCheck = false); + uint16 GetSpecializeSkillValue(uint16 spell_id) const; + void SendSpellBarDisable(); + void SendSpellBarEnable(uint16 spellid); + void ZeroCastingVars(); + virtual void SpellProcess(); + virtual bool CastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, + int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, + uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, uint32 type = 0, int16 *resist_adjust = nullptr); + virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot = 10, int32 casttime = -1, + int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF, + uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, uint32 type = 0, int16 resist_adjust = 0); + void CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, uint16 mana_used, + uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0); + bool SpellFinished(uint16 spell_id, Mob *target, uint16 slot = 10, uint16 mana_used = 0, + uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false); + virtual bool SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect = false, + bool use_resist_adjust = false, int16 resist_adjust = 0, bool isproc = false); + virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100); + virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, + CastAction_type &CastAction); + virtual bool CheckFizzle(uint16 spell_id); + virtual bool IsImmuneToSpell(uint16 spell_id, Mob *caster); + virtual float GetAOERange(uint16 spell_id); + void InterruptSpell(uint16 spellid = SPELL_UNKNOWN); + void InterruptSpell(uint16, uint16, uint16 spellid = SPELL_UNKNOWN); + inline bool IsCasting() const { return((casting_spell_id != 0)); } + uint16 CastingSpellID() const { return casting_spell_id; } - //Buff - void BuffProcess(); - virtual void DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, Mob* caster = 0); - void BuffFadeBySpellID(uint16 spell_id); - void BuffFadeByEffect(int effectid, int skipslot = -1); - void BuffFadeAll(); - void BuffFadeDetrimental(); - void BuffFadeBySlot(int slot, bool iRecalcBonuses = true); - void BuffFadeDetrimentalByCaster(Mob *caster); - void BuffFadeBySitModifier(); - void BuffModifyDurationBySpellID(uint16 spell_id, int32 newDuration); - int AddBuff(Mob *caster, const uint16 spell_id, int duration = 0, int32 level_override = -1); - int CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite = false); - int CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caster_level_override = -1); - void SendPetBuffsToClient(); - virtual int GetCurrentBuffSlots() const { return 0; } - virtual int GetCurrentSongSlots() const { return 0; } - virtual int GetCurrentDiscSlots() const { return 0; } - virtual int GetMaxBuffSlots() const { return 0; } - virtual int GetMaxSongSlots() const { return 0; } - virtual int GetMaxDiscSlots() const { return 0; } - virtual int GetMaxTotalSlots() const { return 0; } - virtual void InitializeBuffSlots() { buffs = nullptr; current_buff_count = 0; } - virtual void UninitializeBuffSlots() { } - inline bool HasRune() const { return m_hasRune; } - inline bool HasSpellRune() const { return m_hasSpellRune; } - inline bool HasPartialMeleeRune() const { return m_hasPartialMeleeRune; } - inline bool HasPartialSpellRune() const { return m_hasPartialSpellRune; } - inline void SetHasRune(bool hasRune) { m_hasRune = hasRune; } - inline void SetHasSpellRune(bool hasSpellRune) { m_hasSpellRune = hasSpellRune; } - inline void SetHasPartialMeleeRune(bool hasPartialMeleeRune) { m_hasPartialMeleeRune = hasPartialMeleeRune; } - inline void SetHasPartialSpellRune(bool hasPartialSpellRune) { m_hasPartialSpellRune = hasPartialSpellRune; } - EQApplicationPacket *MakeBuffsPacket(bool for_target = true); - void SendBuffsToClient(Client *c); - inline Buffs_Struct* GetBuffs() { return buffs; } - void DoGravityEffect(); - void DamageShield(Mob* other, bool spell_ds = false); - int32 RuneAbsorb(int32 damage, uint16 type); - bool FindBuff(uint16 spellid); - bool FindType(uint16 type, bool bOffensive = false, uint16 threshold = 100); - int16 GetBuffSlotFromType(uint16 type); - uint16 GetSpellIDFromSlot(uint8 slot); - int CountDispellableBuffs(); - bool HasBuffIcon(Mob* caster, Mob* target, uint16 spell_id); - bool CheckHitsRemaining(uint32 buff_slot, bool when_spell_done=false, bool negate=false,uint16 type=0, - uint16 spell_id=0, bool use_skill=false,uint16 skill=0); - void SpreadVirus(uint16 spell_id, uint16 casterID); - bool IsNimbusEffectActive(uint32 nimbus_effect); - void SetNimbusEffect(uint32 nimbus_effect); - inline virtual uint32 GetNimbusEffect1() const { return nimbus_effect1; } - inline virtual uint32 GetNimbusEffect2() const { return nimbus_effect2; } - inline virtual uint32 GetNimbusEffect3() const { return nimbus_effect3; } - void RemoveNimbusEffect(int effectid); + //Buff + void BuffProcess(); + virtual void DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, Mob* caster = 0); + void BuffFadeBySpellID(uint16 spell_id); + void BuffFadeByEffect(int effectid, int skipslot = -1); + void BuffFadeAll(); + void BuffFadeDetrimental(); + void BuffFadeBySlot(int slot, bool iRecalcBonuses = true); + void BuffFadeDetrimentalByCaster(Mob *caster); + void BuffFadeBySitModifier(); + void BuffModifyDurationBySpellID(uint16 spell_id, int32 newDuration); + int AddBuff(Mob *caster, const uint16 spell_id, int duration = 0, int32 level_override = -1); + int CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite = false); + int CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caster_level_override = -1); + void SendPetBuffsToClient(); + virtual int GetCurrentBuffSlots() const { return 0; } + virtual int GetCurrentSongSlots() const { return 0; } + virtual int GetCurrentDiscSlots() const { return 0; } + virtual int GetMaxBuffSlots() const { return 0; } + virtual int GetMaxSongSlots() const { return 0; } + virtual int GetMaxDiscSlots() const { return 0; } + virtual int GetMaxTotalSlots() const { return 0; } + virtual void InitializeBuffSlots() { buffs = nullptr; current_buff_count = 0; } + virtual void UninitializeBuffSlots() { } + inline bool HasRune() const { return m_hasRune; } + inline bool HasSpellRune() const { return m_hasSpellRune; } + inline bool HasPartialMeleeRune() const { return m_hasPartialMeleeRune; } + inline bool HasPartialSpellRune() const { return m_hasPartialSpellRune; } + inline void SetHasRune(bool hasRune) { m_hasRune = hasRune; } + inline void SetHasSpellRune(bool hasSpellRune) { m_hasSpellRune = hasSpellRune; } + inline void SetHasPartialMeleeRune(bool hasPartialMeleeRune) { m_hasPartialMeleeRune = hasPartialMeleeRune; } + inline void SetHasPartialSpellRune(bool hasPartialSpellRune) { m_hasPartialSpellRune = hasPartialSpellRune; } + EQApplicationPacket *MakeBuffsPacket(bool for_target = true); + void SendBuffsToClient(Client *c); + inline Buffs_Struct* GetBuffs() { return buffs; } + void DoGravityEffect(); + void DamageShield(Mob* other, bool spell_ds = false); + int32 RuneAbsorb(int32 damage, uint16 type); + bool FindBuff(uint16 spellid); + bool FindType(uint16 type, bool bOffensive = false, uint16 threshold = 100); + int16 GetBuffSlotFromType(uint16 type); + uint16 GetSpellIDFromSlot(uint8 slot); + int CountDispellableBuffs(); + bool HasBuffIcon(Mob* caster, Mob* target, uint16 spell_id); + bool CheckHitsRemaining(uint32 buff_slot, bool when_spell_done=false, bool negate=false,uint16 type=0, + uint16 spell_id=0, bool use_skill=false,uint16 skill=0); + void SpreadVirus(uint16 spell_id, uint16 casterID); + bool IsNimbusEffectActive(uint32 nimbus_effect); + void SetNimbusEffect(uint32 nimbus_effect); + inline virtual uint32 GetNimbusEffect1() const { return nimbus_effect1; } + inline virtual uint32 GetNimbusEffect2() const { return nimbus_effect2; } + inline virtual uint32 GetNimbusEffect3() const { return nimbus_effect3; } + void RemoveNimbusEffect(int effectid); - //Basic Stats/Inventory - virtual void SetLevel(uint8 in_level, bool command = false) { level = in_level; } - void TempName(const char *newname = nullptr); - void SetTargetable(bool on); - bool IsTargetable() const { return m_targetable; } - virtual uint16 GetSkill(SkillType skill_num) const { return 0; } - virtual uint32 GetEquipment(uint8 material_slot) const { return(0); } - virtual int32 GetEquipmentMaterial(uint8 material_slot) const; - virtual uint32 GetEquipmentColor(uint8 material_slot) const; - virtual uint32 IsEliteMaterialItem(uint8 material_slot) const; - bool AffectedBySpellExcludingSlot(int slot, int effect); - virtual void Death(Mob* killerMob, int32 damage, uint16 spell_id, SkillType attack_skill) = 0; - virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, - bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false) = 0; - inline virtual void SetHP(int32 hp) { if (hp >= max_hp) cur_hp = max_hp; else cur_hp = hp;} - bool ChangeHP(Mob* other, int32 amount, uint16 spell_id = 0, int8 buffslot = -1, bool iBuffTic = false); - inline void SetOOCRegen(int32 newoocregen) {oocregen = newoocregen;} - virtual void Heal(); - virtual void HealDamage(uint32 ammount, Mob* caster = nullptr); - virtual void SetMaxHP() { cur_hp = max_hp; } - virtual inline uint16 GetBaseRace() const { return base_race; } - virtual inline uint8 GetBaseGender() const { return base_gender; } - virtual inline uint16 GetDeity() const { return deity; } - inline uint16 GetRace() const { return race; } - inline uint8 GetGender() const { return gender; } - inline uint8 GetTexture() const { return texture; } - inline uint8 GetHelmTexture() const { return helmtexture; } - inline uint8 GetHairColor() const { return haircolor; } - inline uint8 GetBeardColor() const { return beardcolor; } - inline uint8 GetEyeColor1() const { return eyecolor1; } - inline uint8 GetEyeColor2() const { return eyecolor2; } - inline uint8 GetHairStyle() const { return hairstyle; } - inline uint8 GetLuclinFace() const { return luclinface; } - inline uint8 GetBeard() const { return beard; } - inline uint8 GetDrakkinHeritage() const { return drakkin_heritage; } - inline uint8 GetDrakkinTattoo() const { return drakkin_tattoo; } - inline uint8 GetDrakkinDetails() const { return drakkin_details; } - inline uint32 GetArmorTint(uint8 i) const { return armor_tint[(i < MAX_MATERIALS) ? i : 0]; } - inline uint8 GetClass() const { return class_; } - inline uint8 GetLevel() const { return level; } - inline const char* GetName() const { return name; } - inline const char* GetOrigName() const { return orig_name; } - inline const char* GetLastName() const { return lastname; } - const char *GetCleanName(); - virtual void SetName(const char *new_name = nullptr) { new_name ? strn0cpy(name, new_name, 64) : - strn0cpy(name, GetName(), 64); return; }; - inline Mob* GetTarget() const { return target; } - virtual void SetTarget(Mob* mob); - virtual inline float GetHPRatio() const { return max_hp == 0 ? 0 : ((float)cur_hp/max_hp*100); } - inline virtual int16 GetAC() const { return AC + itembonuses.AC + spellbonuses.AC; } - inline virtual int16 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK; } - inline virtual int16 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } - inline virtual int16 GetSTR() const { return STR + itembonuses.STR + spellbonuses.STR; } - inline virtual int16 GetSTA() const { return STA + itembonuses.STA + spellbonuses.STA; } - inline virtual int16 GetDEX() const { return DEX + itembonuses.DEX + spellbonuses.DEX; } - inline virtual int16 GetAGI() const { return AGI + itembonuses.AGI + spellbonuses.AGI; } - inline virtual int16 GetINT() const { return INT + itembonuses.INT + spellbonuses.INT; } - inline virtual int16 GetWIS() const { return WIS + itembonuses.WIS + spellbonuses.WIS; } - inline virtual int16 GetCHA() const { return CHA + itembonuses.CHA + spellbonuses.CHA; } - inline virtual int16 GetMR() const { return MR + itembonuses.MR + spellbonuses.MR; } - inline virtual int16 GetFR() const { return FR + itembonuses.FR + spellbonuses.FR; } - inline virtual int16 GetDR() const { return DR + itembonuses.DR + spellbonuses.DR; } - inline virtual int16 GetPR() const { return PR + itembonuses.PR + spellbonuses.PR; } - inline virtual int16 GetCR() const { return CR + itembonuses.CR + spellbonuses.CR; } - inline virtual int16 GetCorrup() const { return Corrup + itembonuses.Corrup + spellbonuses.Corrup; } - inline StatBonuses GetItemBonuses() const { return itembonuses; } - inline StatBonuses GetSpellBonuses() const { return spellbonuses; } - inline StatBonuses GetAABonuses() const { return aabonuses; } - inline virtual int16 GetMaxSTR() const { return GetSTR(); } - inline virtual int16 GetMaxSTA() const { return GetSTA(); } - inline virtual int16 GetMaxDEX() const { return GetDEX(); } - inline virtual int16 GetMaxAGI() const { return GetAGI(); } - inline virtual int16 GetMaxINT() const { return GetINT(); } - inline virtual int16 GetMaxWIS() const { return GetWIS(); } - inline virtual int16 GetMaxCHA() const { return GetCHA(); } - inline virtual int16 GetMaxMR() const { return 255; } - inline virtual int16 GetMaxPR() const { return 255; } - inline virtual int16 GetMaxDR() const { return 255; } - inline virtual int16 GetMaxCR() const { return 255; } - inline virtual int16 GetMaxFR() const { return 255; } - inline virtual int16 GetDelayDeath() const { return 0; } - inline int32 GetHP() const { return cur_hp; } - inline int32 GetMaxHP() const { return max_hp; } - virtual int32 CalcMaxHP(); - inline int32 GetMaxMana() const { return max_mana; } - inline int32 GetMana() const { return cur_mana; } - int32 GetItemHPBonuses(); - int32 GetSpellHPBonuses(); - virtual const int32& SetMana(int32 amount); - inline float GetManaRatio() const { return max_mana == 0 ? 100 : - ((static_cast(cur_mana) / max_mana) * 100); } - virtual int32 CalcMaxMana(); - uint32 GetNPCTypeID() const { return npctype_id; } - inline const float GetX() const { return x_pos; } - inline const float GetY() const { return y_pos; } - inline const float GetZ() const { return z_pos; } - inline const float GetHeading() const { return heading; } - inline const float GetSize() const { return size; } - inline const float GetBaseSize() const { return base_size; } - inline const float GetTarX() const { return tarx; } - inline const float GetTarY() const { return tary; } - inline const float GetTarZ() const { return tarz; } - inline const float GetTarVX() const { return tar_vx; } - inline const float GetTarVY() const { return tar_vy; } - inline const float GetTarVZ() const { return tar_vz; } - inline const float GetTarVector() const { return tar_vector; } - inline const uint8 GetTarNDX() const { return tar_ndx; } - bool IsBoat() const; + //Basic Stats/Inventory + virtual void SetLevel(uint8 in_level, bool command = false) { level = in_level; } + void TempName(const char *newname = nullptr); + void SetTargetable(bool on); + bool IsTargetable() const { return m_targetable; } + virtual uint16 GetSkill(SkillType skill_num) const { return 0; } + virtual uint32 GetEquipment(uint8 material_slot) const { return(0); } + virtual int32 GetEquipmentMaterial(uint8 material_slot) const; + virtual uint32 GetEquipmentColor(uint8 material_slot) const; + virtual uint32 IsEliteMaterialItem(uint8 material_slot) const; + bool AffectedBySpellExcludingSlot(int slot, int effect); + virtual void Death(Mob* killerMob, int32 damage, uint16 spell_id, SkillType attack_skill) = 0; + virtual void Damage(Mob* from, int32 damage, uint16 spell_id, SkillType attack_skill, + bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false) = 0; + inline virtual void SetHP(int32 hp) { if (hp >= max_hp) cur_hp = max_hp; else cur_hp = hp;} + bool ChangeHP(Mob* other, int32 amount, uint16 spell_id = 0, int8 buffslot = -1, bool iBuffTic = false); + inline void SetOOCRegen(int32 newoocregen) {oocregen = newoocregen;} + virtual void Heal(); + virtual void HealDamage(uint32 ammount, Mob* caster = nullptr); + virtual void SetMaxHP() { cur_hp = max_hp; } + virtual inline uint16 GetBaseRace() const { return base_race; } + virtual inline uint8 GetBaseGender() const { return base_gender; } + virtual inline uint16 GetDeity() const { return deity; } + inline uint16 GetRace() const { return race; } + inline uint8 GetGender() const { return gender; } + inline uint8 GetTexture() const { return texture; } + inline uint8 GetHelmTexture() const { return helmtexture; } + inline uint8 GetHairColor() const { return haircolor; } + inline uint8 GetBeardColor() const { return beardcolor; } + inline uint8 GetEyeColor1() const { return eyecolor1; } + inline uint8 GetEyeColor2() const { return eyecolor2; } + inline uint8 GetHairStyle() const { return hairstyle; } + inline uint8 GetLuclinFace() const { return luclinface; } + inline uint8 GetBeard() const { return beard; } + inline uint8 GetDrakkinHeritage() const { return drakkin_heritage; } + inline uint8 GetDrakkinTattoo() const { return drakkin_tattoo; } + inline uint8 GetDrakkinDetails() const { return drakkin_details; } + inline uint32 GetArmorTint(uint8 i) const { return armor_tint[(i < MAX_MATERIALS) ? i : 0]; } + inline uint8 GetClass() const { return class_; } + inline uint8 GetLevel() const { return level; } + inline const char* GetName() const { return name; } + inline const char* GetOrigName() const { return orig_name; } + inline const char* GetLastName() const { return lastname; } + const char *GetCleanName(); + virtual void SetName(const char *new_name = nullptr) { new_name ? strn0cpy(name, new_name, 64) : + strn0cpy(name, GetName(), 64); return; }; + inline Mob* GetTarget() const { return target; } + virtual void SetTarget(Mob* mob); + virtual inline float GetHPRatio() const { return max_hp == 0 ? 0 : ((float)cur_hp/max_hp*100); } + inline virtual int16 GetAC() const { return AC + itembonuses.AC + spellbonuses.AC; } + inline virtual int16 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK; } + inline virtual int16 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } + inline virtual int16 GetSTR() const { return STR + itembonuses.STR + spellbonuses.STR; } + inline virtual int16 GetSTA() const { return STA + itembonuses.STA + spellbonuses.STA; } + inline virtual int16 GetDEX() const { return DEX + itembonuses.DEX + spellbonuses.DEX; } + inline virtual int16 GetAGI() const { return AGI + itembonuses.AGI + spellbonuses.AGI; } + inline virtual int16 GetINT() const { return INT + itembonuses.INT + spellbonuses.INT; } + inline virtual int16 GetWIS() const { return WIS + itembonuses.WIS + spellbonuses.WIS; } + inline virtual int16 GetCHA() const { return CHA + itembonuses.CHA + spellbonuses.CHA; } + inline virtual int16 GetMR() const { return MR + itembonuses.MR + spellbonuses.MR; } + inline virtual int16 GetFR() const { return FR + itembonuses.FR + spellbonuses.FR; } + inline virtual int16 GetDR() const { return DR + itembonuses.DR + spellbonuses.DR; } + inline virtual int16 GetPR() const { return PR + itembonuses.PR + spellbonuses.PR; } + inline virtual int16 GetCR() const { return CR + itembonuses.CR + spellbonuses.CR; } + inline virtual int16 GetCorrup() const { return Corrup + itembonuses.Corrup + spellbonuses.Corrup; } + inline StatBonuses GetItemBonuses() const { return itembonuses; } + inline StatBonuses GetSpellBonuses() const { return spellbonuses; } + inline StatBonuses GetAABonuses() const { return aabonuses; } + inline virtual int16 GetMaxSTR() const { return GetSTR(); } + inline virtual int16 GetMaxSTA() const { return GetSTA(); } + inline virtual int16 GetMaxDEX() const { return GetDEX(); } + inline virtual int16 GetMaxAGI() const { return GetAGI(); } + inline virtual int16 GetMaxINT() const { return GetINT(); } + inline virtual int16 GetMaxWIS() const { return GetWIS(); } + inline virtual int16 GetMaxCHA() const { return GetCHA(); } + inline virtual int16 GetMaxMR() const { return 255; } + inline virtual int16 GetMaxPR() const { return 255; } + inline virtual int16 GetMaxDR() const { return 255; } + inline virtual int16 GetMaxCR() const { return 255; } + inline virtual int16 GetMaxFR() const { return 255; } + inline virtual int16 GetDelayDeath() const { return 0; } + inline int32 GetHP() const { return cur_hp; } + inline int32 GetMaxHP() const { return max_hp; } + virtual int32 CalcMaxHP(); + inline int32 GetMaxMana() const { return max_mana; } + inline int32 GetMana() const { return cur_mana; } + int32 GetItemHPBonuses(); + int32 GetSpellHPBonuses(); + virtual const int32& SetMana(int32 amount); + inline float GetManaRatio() const { return max_mana == 0 ? 100 : + ((static_cast(cur_mana) / max_mana) * 100); } + virtual int32 CalcMaxMana(); + uint32 GetNPCTypeID() const { return npctype_id; } + inline const float GetX() const { return x_pos; } + inline const float GetY() const { return y_pos; } + inline const float GetZ() const { return z_pos; } + inline const float GetHeading() const { return heading; } + inline const float GetSize() const { return size; } + inline const float GetBaseSize() const { return base_size; } + inline const float GetTarX() const { return tarx; } + inline const float GetTarY() const { return tary; } + inline const float GetTarZ() const { return tarz; } + inline const float GetTarVX() const { return tar_vx; } + inline const float GetTarVY() const { return tar_vy; } + inline const float GetTarVZ() const { return tar_vz; } + inline const float GetTarVector() const { return tar_vector; } + inline const uint8 GetTarNDX() const { return tar_ndx; } + bool IsBoat() const; - //Group - virtual bool HasRaid() = 0; - virtual bool HasGroup() = 0; - virtual Raid* GetRaid() = 0; - virtual Group* GetGroup() = 0; + //Group + virtual bool HasRaid() = 0; + virtual bool HasGroup() = 0; + virtual Raid* GetRaid() = 0; + virtual Group* GetGroup() = 0; - //Faction - virtual inline int32 GetPrimaryFaction() const { return 0; } + //Faction + virtual inline int32 GetPrimaryFaction() const { return 0; } - //Movement - void Warp( float x, float y, float z ); - inline bool IsMoving() const { return moving; } - virtual void SetMoving(bool move) { moving = move; delta_x = 0; delta_y = 0; delta_z = 0; delta_heading = 0; } - virtual void GoToBind(uint8 bindnum = 0) { } - virtual void Gate(); - float GetWalkspeed() const { return(_GetMovementSpeed(-47)); } - float GetRunspeed() const { return(_GetMovementSpeed(0)); } - float GetBaseRunspeed() const { return runspeed; } - float GetMovespeed() const { return IsRunning() ? GetRunspeed() : GetWalkspeed(); } - bool IsRunning() const { return m_is_running; } - void SetRunning(bool val) { m_is_running = val; } - virtual void GMMove(float x, float y, float z, float heading = 0.01, bool SendUpdate = true); - void SetDeltas(float delta_x, float delta_y, float delta_z, float delta_h); - void SetTargetDestSteps(uint8 target_steps) { tar_ndx = target_steps; } - void SendPosUpdate(uint8 iSendToSelf = 0); - void MakeSpawnUpdateNoDelta(PlayerPositionUpdateServer_Struct* spu); - void MakeSpawnUpdate(PlayerPositionUpdateServer_Struct* spu); - void SendPosition(); - void SetFlyMode(uint8 flymode); - inline void Teleport(VERTEX NewPosition) { x_pos = NewPosition.x; y_pos = NewPosition.y; - z_pos = NewPosition.z; }; + //Movement + void Warp( float x, float y, float z ); + inline bool IsMoving() const { return moving; } + virtual void SetMoving(bool move) { moving = move; delta_x = 0; delta_y = 0; delta_z = 0; delta_heading = 0; } + virtual void GoToBind(uint8 bindnum = 0) { } + virtual void Gate(); + float GetWalkspeed() const { return(_GetMovementSpeed(-47)); } + float GetRunspeed() const { return(_GetMovementSpeed(0)); } + float GetBaseRunspeed() const { return runspeed; } + float GetMovespeed() const { return IsRunning() ? GetRunspeed() : GetWalkspeed(); } + bool IsRunning() const { return m_is_running; } + void SetRunning(bool val) { m_is_running = val; } + virtual void GMMove(float x, float y, float z, float heading = 0.01, bool SendUpdate = true); + void SetDeltas(float delta_x, float delta_y, float delta_z, float delta_h); + void SetTargetDestSteps(uint8 target_steps) { tar_ndx = target_steps; } + void SendPosUpdate(uint8 iSendToSelf = 0); + void MakeSpawnUpdateNoDelta(PlayerPositionUpdateServer_Struct* spu); + void MakeSpawnUpdate(PlayerPositionUpdateServer_Struct* spu); + void SendPosition(); + void SetFlyMode(uint8 flymode); + inline void Teleport(VERTEX NewPosition) { x_pos = NewPosition.x; y_pos = NewPosition.y; + z_pos = NewPosition.z; }; - //AI - static uint32 GetLevelCon(uint8 mylevel, uint8 iOtherLevel); - inline uint32 GetLevelCon(uint8 iOtherLevel) const { - return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GREEN; } - virtual void AddToHateList(Mob* other, int32 hate = 0, int32 damage = 0, bool iYellForHelp = true, - bool bFrenzy = false, bool iBuffTic = false); - bool RemoveFromHateList(Mob* mob); - void SetHate(Mob* other, int32 hate = 0, int32 damage = 0) { hate_list.Set(other,hate,damage);} - uint32 GetHateAmount(Mob* tmob, bool is_dam = false) { return hate_list.GetEntHate(tmob,is_dam);} - uint32 GetDamageAmount(Mob* tmob) { return hate_list.GetEntHate(tmob, true);} - Mob* GetHateTop() { return hate_list.GetTop(this);} - Mob* GetHateDamageTop(Mob* other) { return hate_list.GetDamageTop(other);} - Mob* GetHateRandom() { return hate_list.GetRandom();} - Mob* GetHateMost() { return hate_list.GetMostHate();} - bool IsEngaged() { return(!hate_list.IsEmpty()); } - bool HateSummon(); - void FaceTarget(Mob* MobToFace = 0); - void SetHeading(float iHeading) { if(heading != iHeading) { pLastChange = Timer::GetCurrentTime(); - heading = iHeading; } } - void WipeHateList(); - void AddFeignMemory(Client* attacker); - void RemoveFromFeignMemory(Client* attacker); - void ClearFeignMemory(); - void PrintHateListToClient(Client *who) { hate_list.PrintToClient(who); } - void GetHateList(std::list &h_list) { return hate_list.GetHateList(h_list); } - bool CheckLos(Mob* other); - bool CheckLosFN(Mob* other); - bool CheckLosFN(float posX, float posY, float posZ, float mobSize); - inline void SetChanged() { pLastChange = Timer::GetCurrentTime(); } - inline const uint32 LastChange() const { return pLastChange; } + //AI + static uint32 GetLevelCon(uint8 mylevel, uint8 iOtherLevel); + inline uint32 GetLevelCon(uint8 iOtherLevel) const { + return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GREEN; } + virtual void AddToHateList(Mob* other, int32 hate = 0, int32 damage = 0, bool iYellForHelp = true, + bool bFrenzy = false, bool iBuffTic = false); + bool RemoveFromHateList(Mob* mob); + void SetHate(Mob* other, int32 hate = 0, int32 damage = 0) { hate_list.Set(other,hate,damage);} + uint32 GetHateAmount(Mob* tmob, bool is_dam = false) { return hate_list.GetEntHate(tmob,is_dam);} + uint32 GetDamageAmount(Mob* tmob) { return hate_list.GetEntHate(tmob, true);} + Mob* GetHateTop() { return hate_list.GetTop(this);} + Mob* GetHateDamageTop(Mob* other) { return hate_list.GetDamageTop(other);} + Mob* GetHateRandom() { return hate_list.GetRandom();} + Mob* GetHateMost() { return hate_list.GetMostHate();} + bool IsEngaged() { return(!hate_list.IsEmpty()); } + bool HateSummon(); + void FaceTarget(Mob* MobToFace = 0); + void SetHeading(float iHeading) { if(heading != iHeading) { pLastChange = Timer::GetCurrentTime(); + heading = iHeading; } } + void WipeHateList(); + void AddFeignMemory(Client* attacker); + void RemoveFromFeignMemory(Client* attacker); + void ClearFeignMemory(); + void PrintHateListToClient(Client *who) { hate_list.PrintToClient(who); } + void GetHateList(std::list &h_list) { return hate_list.GetHateList(h_list); } + bool CheckLos(Mob* other); + bool CheckLosFN(Mob* other); + bool CheckLosFN(float posX, float posY, float posZ, float mobSize); + inline void SetChanged() { pLastChange = Timer::GetCurrentTime(); } + inline const uint32 LastChange() const { return pLastChange; } - //Quest - void QuestReward(Client *c = nullptr, uint32 silver = 0, uint32 gold = 0, uint32 platinum = 0); - void CameraEffect(uint32 duration, uint32 intensity, Client *c = nullptr, bool global = false); - inline bool GetQglobal() const { return qglobal; } + //Quest + void QuestReward(Client *c = nullptr, uint32 silver = 0, uint32 gold = 0, uint32 platinum = 0); + void CameraEffect(uint32 duration, uint32 intensity, Client *c = nullptr, bool global = false); + inline bool GetQglobal() const { return qglobal; } - //Other Packet - void CreateDespawnPacket(EQApplicationPacket* app, bool Decay); - void CreateHorseSpawnPacket(EQApplicationPacket* app, const char* ownername, uint16 ownerid, Mob* ForWho = 0); - void CreateSpawnPacket(EQApplicationPacket* app, Mob* ForWho = 0); - virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); - void CreateHPPacket(EQApplicationPacket* app); - void SendHPUpdate(); + //Other Packet + void CreateDespawnPacket(EQApplicationPacket* app, bool Decay); + void CreateHorseSpawnPacket(EQApplicationPacket* app, const char* ownername, uint16 ownerid, Mob* ForWho = 0); + void CreateSpawnPacket(EQApplicationPacket* app, Mob* ForWho = 0); + virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); + void CreateHPPacket(EQApplicationPacket* app); + void SendHPUpdate(); - //Util - static uint32 RandomTimer(int min, int max); - static uint8 GetDefaultGender(uint16 in_race, uint8 in_gender = 0xFF); - static void CreateSpawnPacket(EQApplicationPacket* app, NewSpawn_Struct* ns); - uint16 GetSkillByItemType(int ItemType); - virtual void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr); - virtual void MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, const char *petname = nullptr); - bool IsWarriorClass() const; - char GetCasterClass() const; - uint8 GetArchetype() const; - void SetZone(uint32 zone_id, uint32 instance_id); - void ShowStats(Client* client); - void ShowBuffs(Client* client); - void ShowBuffList(Client* client); - float Dist(const Mob &) const; - float DistNoZ(const Mob &) const; - float DistNoRoot(const Mob &) const; - float DistNoRoot(float x, float y, float z) const; - float DistNoRootNoZ(float x, float y) const; - float DistNoRootNoZ(const Mob &) const; - static float GetReciprocalHeading(Mob* target); - bool PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, float &z_dest, - bool lookForAftArc = true); + //Util + static uint32 RandomTimer(int min, int max); + static uint8 GetDefaultGender(uint16 in_race, uint8 in_gender = 0xFF); + static void CreateSpawnPacket(EQApplicationPacket* app, NewSpawn_Struct* ns); + uint16 GetSkillByItemType(int ItemType); + virtual void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr); + virtual void MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, const char *petname = nullptr); + bool IsWarriorClass() const; + char GetCasterClass() const; + uint8 GetArchetype() const; + void SetZone(uint32 zone_id, uint32 instance_id); + void ShowStats(Client* client); + void ShowBuffs(Client* client); + void ShowBuffList(Client* client); + float Dist(const Mob &) const; + float DistNoZ(const Mob &) const; + float DistNoRoot(const Mob &) const; + float DistNoRoot(float x, float y, float z) const; + float DistNoRootNoZ(float x, float y) const; + float DistNoRootNoZ(const Mob &) const; + static float GetReciprocalHeading(Mob* target); + bool PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, float &z_dest, + bool lookForAftArc = true); - //Procs - bool AddRangedProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); - bool RemoveRangedProc(uint16 spell_id, bool bAll = false); - bool HasRangedProcs() const; - bool AddDefensiveProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); - bool RemoveDefensiveProc(uint16 spell_id, bool bAll = false); - bool HasDefensiveProcs() const; - bool AddSkillProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); - bool RemoveSkillProc(uint16 spell_id, bool bAll = false); - bool HasSkillProcs() const; - bool AddProcToWeapon(uint16 spell_id, bool bPerma = false, uint16 iChance = 3); - bool RemoveProcFromWeapon(uint16 spell_id, bool bAll = false); - bool HasProcs() const; + //Procs + bool AddRangedProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); + bool RemoveRangedProc(uint16 spell_id, bool bAll = false); + bool HasRangedProcs() const; + bool AddDefensiveProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); + bool RemoveDefensiveProc(uint16 spell_id, bool bAll = false); + bool HasDefensiveProcs() const; + bool AddSkillProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN); + bool RemoveSkillProc(uint16 spell_id, bool bAll = false); + bool HasSkillProcs() const; + bool AddProcToWeapon(uint16 spell_id, bool bPerma = false, uint16 iChance = 3); + bool RemoveProcFromWeapon(uint16 spell_id, bool bAll = false); + bool HasProcs() const; - //Logging - bool IsLoggingEnabled() const { return(logging_enabled); } - void EnableLogging() { logging_enabled = true; } - void DisableLogging() { logging_enabled = false; } + //Logging + bool IsLoggingEnabled() const { return(logging_enabled); } + void EnableLogging() { logging_enabled = true; } + void DisableLogging() { logging_enabled = false; } - //More stuff to sort: - virtual bool IsAttackAllowed(Mob *target, bool isSpellAttack = false); - bool IsTargeted() const { return (targeted > 0); } - inline void IsTargeted(int in_tar) { targeted += in_tar; if(targeted < 0) targeted = 0;} - void SetFollowID(uint32 id) { follow = id; } - void SetFollowDistance(uint32 dist) { follow_dist = dist; } - uint32 GetFollowID() const { return follow; } - uint32 GetFollowDistance() const { return follow_dist; } + //More stuff to sort: + virtual bool IsAttackAllowed(Mob *target, bool isSpellAttack = false); + bool IsTargeted() const { return (targeted > 0); } + inline void IsTargeted(int in_tar) { targeted += in_tar; if(targeted < 0) targeted = 0;} + void SetFollowID(uint32 id) { follow = id; } + void SetFollowDistance(uint32 dist) { follow_dist = dist; } + uint32 GetFollowID() const { return follow; } + uint32 GetFollowDistance() const { return follow_dist; } - virtual void Message(uint32 type, const char* message, ...) { } - virtual void Message_StringID(uint32 type, uint32 string_id, uint32 distance = 0) { } - virtual void Message_StringID(uint32 type, uint32 string_id, const char* message, const char* message2 = 0, - const char* message3 = 0, const char* message4 = 0, const char* message5 = 0, const char* message6 = 0, - const char* message7 = 0, const char* message8 = 0, const char* message9 = 0, uint32 distance = 0) { } - void Say(const char *format, ...); - void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, - const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); - void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, - const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); - void Shout(const char *format, ...); - void Emote(const char *format, ...); - void QuestJournalledSay(Client *QuestInitiator, const char *str); - uint32 GetItemStat(uint32 itemid, const char *identifier); + virtual void Message(uint32 type, const char* message, ...) { } + virtual void Message_StringID(uint32 type, uint32 string_id, uint32 distance = 0) { } + virtual void Message_StringID(uint32 type, uint32 string_id, const char* message, const char* message2 = 0, + const char* message3 = 0, const char* message4 = 0, const char* message5 = 0, const char* message6 = 0, + const char* message7 = 0, const char* message8 = 0, const char* message9 = 0, uint32 distance = 0) { } + void Say(const char *format, ...); + void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, + const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); + void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, + const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); + void Shout(const char *format, ...); + void Emote(const char *format, ...); + void QuestJournalledSay(Client *QuestInitiator, const char *str); + uint32 GetItemStat(uint32 itemid, const char *identifier); - int16 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false); - uint8 IsFocusEffect(uint16 spellid, int effect_index, bool AA=false,uint32 aa_effect=0); - void SendIllusionPacket(uint16 in_race, uint8 in_gender = 0xFF, uint8 in_texture = 0xFF, uint8 in_helmtexture = 0xFF, uint8 in_haircolor = 0xFF, uint8 in_beardcolor = 0xFF, uint8 in_eyecolor1 = 0xFF, uint8 in_eyecolor2 = 0xFF, uint8 in_hairstyle = 0xFF, uint8 in_luclinface = 0xFF, uint8 in_beard = 0xFF, uint8 in_aa_title = 0xFF, uint32 in_drakkin_heritage = 0xFFFFFFFF, uint32 in_drakkin_tattoo = 0xFFFFFFFF, uint32 in_drakkin_details = 0xFFFFFFFF, float in_size = 0xFFFFFFFF); - virtual void Stun(int duration); - virtual void UnStun(); - inline void Silence(bool newval) { silenced = newval; } - inline void Amnesia(bool newval) { amnesiad = newval; } - void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0); - void TypesTemporaryPets(uint32 typesid, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme = false); - void WakeTheDead(uint16 spell_id, Mob *target, uint32 duration); - void Spin(); - void Kill(); - bool PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id); - bool TryDeathSave(); - bool TryDivineSave(); - void DoBuffWearOffEffect(uint32 index); - void TryTriggerOnCast(uint32 spell_id, bool aa_trigger); - void TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger); - void TrySpellTrigger(Mob *target, uint32 spell_id); - void TryApplyEffect(Mob *target, uint32 spell_id); - void TryTwincast(Mob *caster, Mob *target, uint32 spell_id); - void TrySympatheticProc(Mob *target, uint32 spell_id); - bool TryFadeEffect(int slot); - uint16 GetSpellEffectResistChance(uint16 spell_id); - int16 GetHealRate(uint16 spell_id); - int16 GetCriticalHealRate(uint16 spell_id); - int32 GetVulnerability(int32 damage, Mob *caster, uint32 spell_id, uint32 ticsremaining); - int32 GetAdditionalDamage(Mob *caster, uint32 spell_id, bool use_skill = false, uint16 skill=0); - int16 GetSkillDmgTaken(const SkillType skill_used); - void DoKnockback(Mob *caster, uint32 pushback, uint32 pushup); - int16 CalcResistChanceBonus(); - int16 CalcFearResistChance(); - void TrySpellOnKill(uint8 level, uint16 spell_id); - bool TrySpellOnDeath(); - void CastOnCurer(uint32 spell_id); - void CastOnCure(uint32 spell_id); - void CastOnNumHitFade(uint32 spell_id); - int SlowMitigation(bool slow_msg=false, Mob *caster = nullptr,int slow_value = 0); - int16 GetCritDmgMob(uint16 skill); - int16 GetMeleeDamageMod_SE(uint16 skill); - int16 GetMeleeMinDamageMod_SE(uint16 skill); - int16 GetCrippBlowChance(); - int16 GetSkillReuseTime(uint16 skill); - int16 GetCriticalChanceBonus(uint16 skill); - int16 GetSkillDmgAmt(uint16 skill); - bool TryReflectSpell(uint32 spell_id); - bool CanBlockSpell() const { return(spellbonuses.BlockNextSpell); } - bool DoHPToManaCovert(uint16 mana_cost = 0); - int32 ApplySpellEffectiveness(Mob* caster, int16 spell_id, int32 value, bool IsBard = false); + int16 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false); + uint8 IsFocusEffect(uint16 spellid, int effect_index, bool AA=false,uint32 aa_effect=0); + void SendIllusionPacket(uint16 in_race, uint8 in_gender = 0xFF, uint8 in_texture = 0xFF, uint8 in_helmtexture = 0xFF, uint8 in_haircolor = 0xFF, uint8 in_beardcolor = 0xFF, uint8 in_eyecolor1 = 0xFF, uint8 in_eyecolor2 = 0xFF, uint8 in_hairstyle = 0xFF, uint8 in_luclinface = 0xFF, uint8 in_beard = 0xFF, uint8 in_aa_title = 0xFF, uint32 in_drakkin_heritage = 0xFFFFFFFF, uint32 in_drakkin_tattoo = 0xFFFFFFFF, uint32 in_drakkin_details = 0xFFFFFFFF, float in_size = 0xFFFFFFFF); + virtual void Stun(int duration); + virtual void UnStun(); + inline void Silence(bool newval) { silenced = newval; } + inline void Amnesia(bool newval) { amnesiad = newval; } + void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0); + void TypesTemporaryPets(uint32 typesid, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme = false); + void WakeTheDead(uint16 spell_id, Mob *target, uint32 duration); + void Spin(); + void Kill(); + bool PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id); + bool TryDeathSave(); + bool TryDivineSave(); + void DoBuffWearOffEffect(uint32 index); + void TryTriggerOnCast(uint32 spell_id, bool aa_trigger); + void TriggerOnCast(uint32 focus_spell, uint32 spell_id, bool aa_trigger); + void TrySpellTrigger(Mob *target, uint32 spell_id); + void TryApplyEffect(Mob *target, uint32 spell_id); + void TryTwincast(Mob *caster, Mob *target, uint32 spell_id); + void TrySympatheticProc(Mob *target, uint32 spell_id); + bool TryFadeEffect(int slot); + uint16 GetSpellEffectResistChance(uint16 spell_id); + int16 GetHealRate(uint16 spell_id); + int16 GetCriticalHealRate(uint16 spell_id); + int32 GetVulnerability(int32 damage, Mob *caster, uint32 spell_id, uint32 ticsremaining); + int32 GetAdditionalDamage(Mob *caster, uint32 spell_id, bool use_skill = false, uint16 skill=0); + int16 GetSkillDmgTaken(const SkillType skill_used); + void DoKnockback(Mob *caster, uint32 pushback, uint32 pushup); + int16 CalcResistChanceBonus(); + int16 CalcFearResistChance(); + void TrySpellOnKill(uint8 level, uint16 spell_id); + bool TrySpellOnDeath(); + void CastOnCurer(uint32 spell_id); + void CastOnCure(uint32 spell_id); + void CastOnNumHitFade(uint32 spell_id); + int SlowMitigation(bool slow_msg=false, Mob *caster = nullptr,int slow_value = 0); + int16 GetCritDmgMob(uint16 skill); + int16 GetMeleeDamageMod_SE(uint16 skill); + int16 GetMeleeMinDamageMod_SE(uint16 skill); + int16 GetCrippBlowChance(); + int16 GetSkillReuseTime(uint16 skill); + int16 GetCriticalChanceBonus(uint16 skill); + int16 GetSkillDmgAmt(uint16 skill); + bool TryReflectSpell(uint32 spell_id); + bool CanBlockSpell() const { return(spellbonuses.BlockNextSpell); } + bool DoHPToManaCovert(uint16 mana_cost = 0); + int32 ApplySpellEffectiveness(Mob* caster, int16 spell_id, int32 value, bool IsBard = false); - void ModSkillDmgTaken(SkillType skill_num, int value); - int16 GetModSkillDmgTaken(const SkillType skill_num); - void ModVulnerability(uint8 resist, int16 value); - int16 GetModVulnerability(const uint8 resist); + void ModSkillDmgTaken(SkillType skill_num, int value); + int16 GetModSkillDmgTaken(const SkillType skill_num); + void ModVulnerability(uint8 resist, int16 value); + int16 GetModVulnerability(const uint8 resist); - void SetAllowBeneficial(bool value) { m_AllowBeneficial = value; } - bool GetAllowBeneficial() { return m_AllowBeneficial; } - void SetDisableMelee(bool value) { m_DisableMelee = value; } - bool IsMeleeDisabled() { return m_DisableMelee; } + void SetAllowBeneficial(bool value) { m_AllowBeneficial = value; } + bool GetAllowBeneficial() { return m_AllowBeneficial; } + void SetDisableMelee(bool value) { m_DisableMelee = value; } + bool IsMeleeDisabled() { return m_DisableMelee; } - bool IsOffHandAtk() const { return offhand; } - inline void OffHandAtk(bool val) { offhand = val; } + bool IsOffHandAtk() const { return offhand; } + inline void OffHandAtk(bool val) { offhand = val; } - inline void SetFlurryChance(uint8 value) { NPC_FlurryChance = value;} - uint8 GetFlurryChance() { return NPC_FlurryChance; } + inline void SetFlurryChance(uint8 value) { NPC_FlurryChance = value;} + uint8 GetFlurryChance() { return NPC_FlurryChance; } - static uint32 GetAppearanceValue(EmuAppearance iAppearance); - void SendAppearancePacket(uint32 type, uint32 value, bool WholeZone = true, bool iIgnoreSelf = false, Client *specific_target=nullptr); - void SetAppearance(EmuAppearance app, bool iIgnoreSelf = true); - inline EmuAppearance GetAppearance() const { return _appearance; } - inline const uint8 GetRunAnimSpeed() const { return pRunAnimSpeed; } - inline void SetRunAnimSpeed(int8 in) { if (pRunAnimSpeed != in) { pRunAnimSpeed = in; pLastChange = Timer::GetCurrentTime(); } } - bool IsDestructibleObject() { return destructibleobject; } - void SetDestructibleObject(bool in) { destructibleobject = in; } + static uint32 GetAppearanceValue(EmuAppearance iAppearance); + void SendAppearancePacket(uint32 type, uint32 value, bool WholeZone = true, bool iIgnoreSelf = false, Client *specific_target=nullptr); + void SetAppearance(EmuAppearance app, bool iIgnoreSelf = true); + inline EmuAppearance GetAppearance() const { return _appearance; } + inline const uint8 GetRunAnimSpeed() const { return pRunAnimSpeed; } + inline void SetRunAnimSpeed(int8 in) { if (pRunAnimSpeed != in) { pRunAnimSpeed = in; pLastChange = Timer::GetCurrentTime(); } } + bool IsDestructibleObject() { return destructibleobject; } + void SetDestructibleObject(bool in) { destructibleobject = in; } - Mob* GetPet(); - void SetPet(Mob* newpet); - virtual Mob* GetOwner(); - virtual Mob* GetOwnerOrSelf(); - Mob* GetUltimateOwner(); - void SetPetID(uint16 NewPetID); - inline uint16 GetPetID() const { return petid; } - inline PetType GetPetType() const { return typeofpet; } - void SetPetType(PetType p) { typeofpet = p; } - inline int16 GetPetPower() const { return (petpower < 0) ? 0 : petpower; } - void SetPetPower(int16 p) { if (p < 0) petpower = 0; else petpower = p; } - bool IsFamiliar() const { return(typeofpet == petFamiliar); } - bool IsAnimation() const { return(typeofpet == petAnimation); } - bool IsCharmed() const { return(typeofpet == petCharmed); } - void SetOwnerID(uint16 NewOwnerID); - inline uint16 GetOwnerID() const { return ownerid; } - inline virtual bool HasOwner() { if(GetOwnerID()==0){return false;} return( entity_list.GetMob(GetOwnerID()) != 0); } - inline virtual bool IsPet() { return(HasOwner() && !IsMerc()); } - inline bool HasPet() const { if(GetPetID()==0){return false;} return (entity_list.GetMob(GetPetID()) != 0);} - bool HadTempPets() const { return(hasTempPet); } - void TempPets(bool i) { hasTempPet = i; } - bool HasPetAffinity() { if (aabonuses.GivePetGroupTarget || itembonuses.GivePetGroupTarget || spellbonuses.GivePetGroupTarget) return true; return false; } + Mob* GetPet(); + void SetPet(Mob* newpet); + virtual Mob* GetOwner(); + virtual Mob* GetOwnerOrSelf(); + Mob* GetUltimateOwner(); + void SetPetID(uint16 NewPetID); + inline uint16 GetPetID() const { return petid; } + inline PetType GetPetType() const { return typeofpet; } + void SetPetType(PetType p) { typeofpet = p; } + inline int16 GetPetPower() const { return (petpower < 0) ? 0 : petpower; } + void SetPetPower(int16 p) { if (p < 0) petpower = 0; else petpower = p; } + bool IsFamiliar() const { return(typeofpet == petFamiliar); } + bool IsAnimation() const { return(typeofpet == petAnimation); } + bool IsCharmed() const { return(typeofpet == petCharmed); } + void SetOwnerID(uint16 NewOwnerID); + inline uint16 GetOwnerID() const { return ownerid; } + inline virtual bool HasOwner() { if(GetOwnerID()==0){return false;} return( entity_list.GetMob(GetOwnerID()) != 0); } + inline virtual bool IsPet() { return(HasOwner() && !IsMerc()); } + inline bool HasPet() const { if(GetPetID()==0){return false;} return (entity_list.GetMob(GetPetID()) != 0);} + bool HadTempPets() const { return(hasTempPet); } + void TempPets(bool i) { hasTempPet = i; } + bool HasPetAffinity() { if (aabonuses.GivePetGroupTarget || itembonuses.GivePetGroupTarget || spellbonuses.GivePetGroupTarget) return true; return false; } - inline const bodyType GetBodyType() const { return bodytype; } - inline const bodyType GetOrigBodyType() const { return orig_bodytype; } - void SetBodyType(bodyType new_body, bool overwrite_orig); + inline const bodyType GetBodyType() const { return bodytype; } + inline const bodyType GetOrigBodyType() const { return orig_bodytype; } + void SetBodyType(bodyType new_body, bool overwrite_orig); - uint8 invisible, see_invis; - bool invulnerable, invisible_undead, invisible_animals, sneaking, hidden, improved_hidden; - bool see_invis_undead, see_hide, see_improved_hide; - bool qglobal; + uint8 invisible, see_invis; + bool invulnerable, invisible_undead, invisible_animals, sneaking, hidden, improved_hidden; + bool see_invis_undead, see_hide, see_improved_hide; + bool qglobal; - virtual void SetAttackTimer(); - inline void SetInvul(bool invul) { invulnerable=invul; } - inline bool GetInvul(void) { return invulnerable; } - inline void SetExtraHaste(int Haste) { ExtraHaste = Haste; } - virtual int GetHaste(); + virtual void SetAttackTimer(); + inline void SetInvul(bool invul) { invulnerable=invul; } + inline bool GetInvul(void) { return invulnerable; } + inline void SetExtraHaste(int Haste) { ExtraHaste = Haste; } + virtual int GetHaste(); - uint8 GetWeaponDamageBonus(const Item_Struct* Weapon); - uint16 GetDamageTable(SkillType skillinuse); - virtual int GetMonkHandToHandDamage(void); + uint8 GetWeaponDamageBonus(const Item_Struct* Weapon); + uint16 GetDamageTable(SkillType skillinuse); + virtual int GetMonkHandToHandDamage(void); - bool CanThisClassDoubleAttack(void) const; - bool CanThisClassDualWield(void) const; - bool CanThisClassRiposte(void) const; - bool CanThisClassDodge(void) const; - bool CanThisClassParry(void) const; - bool CanThisClassBlock(void) const; + bool CanThisClassDoubleAttack(void) const; + bool CanThisClassDualWield(void) const; + bool CanThisClassRiposte(void) const; + bool CanThisClassDodge(void) const; + bool CanThisClassParry(void) const; + bool CanThisClassBlock(void) const; - int GetMonkHandToHandDelay(void); - uint16 GetClassLevelFactor(); - void Mesmerize(); - inline bool IsMezzed() const { return mezzed; } - inline bool IsStunned() const { return stunned; } - inline bool IsSilenced() const { return silenced; } - inline bool IsAmnesiad() const { return amnesiad; } - inline uint16 GetErrorNumber() const {return adverrorinfo;} + int GetMonkHandToHandDelay(void); + uint16 GetClassLevelFactor(); + void Mesmerize(); + inline bool IsMezzed() const { return mezzed; } + inline bool IsStunned() const { return stunned; } + inline bool IsSilenced() const { return silenced; } + inline bool IsAmnesiad() const { return amnesiad; } + inline uint16 GetErrorNumber() const {return adverrorinfo;} - int32 ReduceDamage(int32 damage); - int32 AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker); + int32 ReduceDamage(int32 damage); + int32 AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker); - virtual void DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int32 min_damage = 1, int32 hate_override = -1, int ReuseTime = 10, bool HitChance=false); - virtual void DoThrowingAttackDmg(Mob* other, const ItemInst* RangeWeapon=nullptr, const Item_Struct* item=nullptr, uint16 weapon_damage=0, int16 chance_mod=0,int16 focus=0); - virtual void DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skillinuse, int16 chance_mod=0, int16 focus=0, bool CanRiposte=false); - virtual void DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon=nullptr, const ItemInst* Ammo=nullptr, uint16 weapon_damage=0, int16 chance_mod=0, int16 focus=0); - bool CanDoSpecialAttack(Mob *other); - bool Flurry(); - bool Rampage(); - bool AddRampage(Mob*); - void ClearRampage(); - void AreaRampage(); + virtual void DoSpecialAttackDamage(Mob *who, SkillType skill, int32 max_damage, int32 min_damage = 1, int32 hate_override = -1, int ReuseTime = 10, bool HitChance=false); + virtual void DoThrowingAttackDmg(Mob* other, const ItemInst* RangeWeapon=nullptr, const Item_Struct* item=nullptr, uint16 weapon_damage=0, int16 chance_mod=0,int16 focus=0); + virtual void DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skillinuse, int16 chance_mod=0, int16 focus=0, bool CanRiposte=false); + virtual void DoArcheryAttackDmg(Mob* other, const ItemInst* RangeWeapon=nullptr, const ItemInst* Ammo=nullptr, uint16 weapon_damage=0, int16 chance_mod=0, int16 focus=0); + bool CanDoSpecialAttack(Mob *other); + bool Flurry(); + bool Rampage(); + bool AddRampage(Mob*); + void ClearRampage(); + void AreaRampage(); - void StartEnrage(); - void ProcessEnrage(); - bool IsEnraged(); - void Taunt(NPC* who, bool always_succeed, float chance_bonus = 0); + void StartEnrage(); + void ProcessEnrage(); + bool IsEnraged(); + void Taunt(NPC* who, bool always_succeed, float chance_bonus = 0); - virtual void AI_Init(); - virtual void AI_Start(uint32 iMoveDelay = 0); - virtual void AI_Stop(); - virtual void AI_Process(); + virtual void AI_Init(); + virtual void AI_Start(uint32 iMoveDelay = 0); + virtual void AI_Stop(); + virtual void AI_Process(); - const char* GetEntityVariable(const char *id); - void SetEntityVariable(const char *id, const char *m_var); - bool EntityVariableExists(const char *id); + const char* GetEntityVariable(const char *id); + void SetEntityVariable(const char *id, const char *m_var); + bool EntityVariableExists(const char *id); - void AI_Event_Engaged(Mob* attacker, bool iYellForHelp = true); - void AI_Event_NoLongerEngaged(); + void AI_Event_Engaged(Mob* attacker, bool iYellForHelp = true); + void AI_Event_NoLongerEngaged(); - FACTION_VALUE GetSpecialFactionCon(Mob* iOther); - inline const bool IsAIControlled() const { return pAIControlled; } - inline const float GetAggroRange() const { return (spellbonuses.AggroRange == -1) ? pAggroRange : spellbonuses.AggroRange; } - inline const float GetAssistRange() const { return (spellbonuses.AssistRange == -1) ? pAssistRange : spellbonuses.AssistRange; } + FACTION_VALUE GetSpecialFactionCon(Mob* iOther); + inline const bool IsAIControlled() const { return pAIControlled; } + inline const float GetAggroRange() const { return (spellbonuses.AggroRange == -1) ? pAggroRange : spellbonuses.AggroRange; } + inline const float GetAssistRange() const { return (spellbonuses.AssistRange == -1) ? pAssistRange : spellbonuses.AssistRange; } - inline void SetPetOrder(eStandingPetOrder i) { pStandingPetOrder = i; } - inline const eStandingPetOrder GetPetOrder() const { return pStandingPetOrder; } - inline void SetHeld(bool nState) { held = nState; } - inline const bool IsHeld() const { return held; } - inline void SetNoCast(bool nState) { nocast = nState; } - inline const bool IsNoCast() const { return nocast; } - inline void SetFocused(bool nState) { focused = nState; } - inline const bool IsFocused() const { return focused; } - inline const bool IsRoamer() const { return roamer; } - inline const bool IsRooted() const { return rooted || permarooted; } - inline const bool HasVirus() const { return has_virus; } - int GetSnaredAmount(); + inline void SetPetOrder(eStandingPetOrder i) { pStandingPetOrder = i; } + inline const eStandingPetOrder GetPetOrder() const { return pStandingPetOrder; } + inline void SetHeld(bool nState) { held = nState; } + inline const bool IsHeld() const { return held; } + inline void SetNoCast(bool nState) { nocast = nState; } + inline const bool IsNoCast() const { return nocast; } + inline void SetFocused(bool nState) { focused = nState; } + inline const bool IsFocused() const { return focused; } + inline const bool IsRoamer() const { return roamer; } + inline const bool IsRooted() const { return rooted || permarooted; } + inline const bool HasVirus() const { return has_virus; } + int GetSnaredAmount(); - int GetCurWp() { return cur_wp; } + int GetCurWp() { return cur_wp; } - //old fear function - //void SetFeared(Mob *caster, uint32 duration, bool flee = false); - float GetFearSpeed(); - bool IsFeared() { return curfp; } // This returns true if the mob is feared or fleeing due to low HP - //old fear: inline void StartFleeing() { SetFeared(GetHateTop(), FLEE_RUN_DURATION, true); } - inline void StartFleeing() { flee_mode = true; CalculateNewFearpoint(); } - void ProcessFlee(); - void CheckFlee(); + //old fear function + //void SetFeared(Mob *caster, uint32 duration, bool flee = false); + float GetFearSpeed(); + bool IsFeared() { return curfp; } // This returns true if the mob is feared or fleeing due to low HP + //old fear: inline void StartFleeing() { SetFeared(GetHateTop(), FLEE_RUN_DURATION, true); } + inline void StartFleeing() { flee_mode = true; CalculateNewFearpoint(); } + void ProcessFlee(); + void CheckFlee(); - inline bool CheckAggro(Mob* other) {return hate_list.IsOnHateList(other);} - float CalculateHeadingToTarget(float in_x, float in_y); - bool CalculateNewPosition(float x, float y, float z, float speed, bool checkZ = false); - virtual bool CalculateNewPosition2(float x, float y, float z, float speed, bool checkZ = true); - float CalculateDistance(float x, float y, float z); - float GetGroundZ(float new_x, float new_y, float z_offset=0.0); - void SendTo(float new_x, float new_y, float new_z); - void SendToFixZ(float new_x, float new_y, float new_z); - void NPCSpecialAttacks(const char* parse, int permtag, bool reset = true, bool remove = false); - inline uint32 DontHealMeBefore() const { return pDontHealMeBefore; } - inline uint32 DontBuffMeBefore() const { return pDontBuffMeBefore; } - inline uint32 DontDotMeBefore() const { return pDontDotMeBefore; } - inline uint32 DontRootMeBefore() const { return pDontRootMeBefore; } - inline uint32 DontSnareMeBefore() const { return pDontSnareMeBefore; } - inline uint32 DontCureMeBefore() const { return pDontCureMeBefore; } - void SetDontRootMeBefore(uint32 time) { pDontRootMeBefore = time; } - void SetDontHealMeBefore(uint32 time) { pDontHealMeBefore = time; } - void SetDontBuffMeBefore(uint32 time) { pDontBuffMeBefore = time; } - void SetDontDotMeBefore(uint32 time) { pDontDotMeBefore = time; } - void SetDontSnareMeBefore(uint32 time) { pDontSnareMeBefore = time; } - void SetDontCureMeBefore(uint32 time) { pDontCureMeBefore = time; } + inline bool CheckAggro(Mob* other) {return hate_list.IsOnHateList(other);} + float CalculateHeadingToTarget(float in_x, float in_y); + bool CalculateNewPosition(float x, float y, float z, float speed, bool checkZ = false); + virtual bool CalculateNewPosition2(float x, float y, float z, float speed, bool checkZ = true); + float CalculateDistance(float x, float y, float z); + float GetGroundZ(float new_x, float new_y, float z_offset=0.0); + void SendTo(float new_x, float new_y, float new_z); + void SendToFixZ(float new_x, float new_y, float new_z); + void NPCSpecialAttacks(const char* parse, int permtag, bool reset = true, bool remove = false); + inline uint32 DontHealMeBefore() const { return pDontHealMeBefore; } + inline uint32 DontBuffMeBefore() const { return pDontBuffMeBefore; } + inline uint32 DontDotMeBefore() const { return pDontDotMeBefore; } + inline uint32 DontRootMeBefore() const { return pDontRootMeBefore; } + inline uint32 DontSnareMeBefore() const { return pDontSnareMeBefore; } + inline uint32 DontCureMeBefore() const { return pDontCureMeBefore; } + void SetDontRootMeBefore(uint32 time) { pDontRootMeBefore = time; } + void SetDontHealMeBefore(uint32 time) { pDontHealMeBefore = time; } + void SetDontBuffMeBefore(uint32 time) { pDontBuffMeBefore = time; } + void SetDontDotMeBefore(uint32 time) { pDontDotMeBefore = time; } + void SetDontSnareMeBefore(uint32 time) { pDontSnareMeBefore = time; } + void SetDontCureMeBefore(uint32 time) { pDontCureMeBefore = time; } - // calculate interruption of spell via movement of mob - void SaveSpellLoc() {spell_x = x_pos; spell_y = y_pos; spell_z = z_pos; } - inline float GetSpellX() const {return spell_x;} - inline float GetSpellY() const {return spell_y;} - inline float GetSpellZ() const {return spell_z;} - inline bool IsGrouped() const { return isgrouped; } - void SetGrouped(bool v); - inline bool IsRaidGrouped() const { return israidgrouped; } - void SetRaidGrouped(bool v); - inline bool IsLooting() const { return islooting; } - void SetLooting(bool val) { islooting = val; } + // calculate interruption of spell via movement of mob + void SaveSpellLoc() {spell_x = x_pos; spell_y = y_pos; spell_z = z_pos; } + inline float GetSpellX() const {return spell_x;} + inline float GetSpellY() const {return spell_y;} + inline float GetSpellZ() const {return spell_z;} + inline bool IsGrouped() const { return isgrouped; } + void SetGrouped(bool v); + inline bool IsRaidGrouped() const { return israidgrouped; } + void SetRaidGrouped(bool v); + inline bool IsLooting() const { return islooting; } + void SetLooting(bool val) { islooting = val; } - bool CheckWillAggro(Mob *mob); + bool CheckWillAggro(Mob *mob); - void InstillDoubt(Mob *who); - int16 GetResist(uint8 type) const; - Mob* GetShieldTarget() const { return shield_target; } - void SetShieldTarget(Mob* mob) { shield_target = mob; } - bool HasActiveSong() const { return(bardsong != 0); } - bool Charmed() const { return charmed; } - static uint32 GetLevelHP(uint8 tlevel); - uint32 GetZoneID() const; //for perl - virtual int32 CheckAggroAmount(uint16 spellid, bool isproc = false); - virtual int32 CheckHealAggroAmount(uint16 spellid, uint32 heal_possible = 0); - virtual uint32 GetAA(uint32 aa_id) const { return(0); } + void InstillDoubt(Mob *who); + int16 GetResist(uint8 type) const; + Mob* GetShieldTarget() const { return shield_target; } + void SetShieldTarget(Mob* mob) { shield_target = mob; } + bool HasActiveSong() const { return(bardsong != 0); } + bool Charmed() const { return charmed; } + static uint32 GetLevelHP(uint8 tlevel); + uint32 GetZoneID() const; //for perl + virtual int32 CheckAggroAmount(uint16 spellid, bool isproc = false); + virtual int32 CheckHealAggroAmount(uint16 spellid, uint32 heal_possible = 0); + virtual uint32 GetAA(uint32 aa_id) const { return(0); } - uint16 GetInstrumentMod(uint16 spell_id) const; - int CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level = 1, Mob *caster = nullptr, int ticsremaining = 0); - int CalcSpellEffectValue_formula(int formula, int base, int max, int caster_level, uint16 spell_id, int ticsremaining = 0); - virtual int CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, int caster_level2, Mob* caster1 = nullptr, Mob* caster2 = nullptr); - uint32 GetCastedSpellInvSlot() const { return casting_spell_inventory_slot; } + uint16 GetInstrumentMod(uint16 spell_id) const; + int CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level = 1, Mob *caster = nullptr, int ticsremaining = 0); + int CalcSpellEffectValue_formula(int formula, int base, int max, int caster_level, uint16 spell_id, int ticsremaining = 0); + virtual int CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, int caster_level2, Mob* caster1 = nullptr, Mob* caster2 = nullptr); + uint32 GetCastedSpellInvSlot() const { return casting_spell_inventory_slot; } - // HP Event - inline int GetNextHPEvent() const { return nexthpevent; } - void SetNextHPEvent( int hpevent ); - void SendItemAnimation(Mob *to, const Item_Struct *item, SkillType skillInUse); - inline int& GetNextIncHPEvent() { return nextinchpevent; } - void SetNextIncHPEvent( int inchpevent ); + // HP Event + inline int GetNextHPEvent() const { return nexthpevent; } + void SetNextHPEvent( int hpevent ); + void SendItemAnimation(Mob *to, const Item_Struct *item, SkillType skillInUse); + inline int& GetNextIncHPEvent() { return nextinchpevent; } + void SetNextIncHPEvent( int inchpevent ); - bool DivineAura() const; - bool SpecAttacks[SPECATK_MAXNUM]; - bool HasNPCSpecialAtk(const char* parse); - Shielders_Struct shielder[MAX_SHIELDERS]; - Trade* trade; + bool DivineAura() const; + bool SpecAttacks[SPECATK_MAXNUM]; + bool HasNPCSpecialAtk(const char* parse); + Shielders_Struct shielder[MAX_SHIELDERS]; + Trade* trade; - inline float GetCWPX() const { return(cur_wp_x); } - inline float GetCWPY() const { return(cur_wp_y); } - inline float GetCWPZ() const { return(cur_wp_z); } - inline float GetCWPH() const { return(cur_wp_heading); } - inline float GetCWPP() const { return(static_cast(cur_wp_pause)); } - inline int GetCWP() const { return(cur_wp); } - void SetCurrentWP(uint16 waypoint) { cur_wp = waypoint; } - virtual FACTION_VALUE GetReverseFactionCon(Mob* iOther) { return FACTION_INDIFFERENT; } + inline float GetCWPX() const { return(cur_wp_x); } + inline float GetCWPY() const { return(cur_wp_y); } + inline float GetCWPZ() const { return(cur_wp_z); } + inline float GetCWPH() const { return(cur_wp_heading); } + inline float GetCWPP() const { return(static_cast(cur_wp_pause)); } + inline int GetCWP() const { return(cur_wp); } + void SetCurrentWP(uint16 waypoint) { cur_wp = waypoint; } + virtual FACTION_VALUE GetReverseFactionCon(Mob* iOther) { return FACTION_INDIFFERENT; } - inline bool IsTrackable() const { return(trackable); } - Timer* GetAIThinkTimer() { return AIthink_timer; } - Timer* GetAIMovementTimer() { return AImovement_timer; } - Timer GetAttackTimer() { return attack_timer; } - Timer GetAttackDWTimer() { return attack_dw_timer; } - inline bool IsFindable() { return findable; } - inline uint8 GetManaPercent() { return (uint8)((float)cur_mana / (float)max_mana * 100.0f); } - virtual uint8 GetEndurancePercent() { return 0; } + inline bool IsTrackable() const { return(trackable); } + Timer* GetAIThinkTimer() { return AIthink_timer; } + Timer* GetAIMovementTimer() { return AImovement_timer; } + Timer GetAttackTimer() { return attack_timer; } + Timer GetAttackDWTimer() { return attack_dw_timer; } + inline bool IsFindable() { return findable; } + inline uint8 GetManaPercent() { return (uint8)((float)cur_mana / (float)max_mana * 100.0f); } + virtual uint8 GetEndurancePercent() { return 0; } - inline virtual bool IsBlockedBuff(int16 SpellID) { return false; } - inline virtual bool IsBlockedPetBuff(int16 SpellID) { return false; } + inline virtual bool IsBlockedBuff(int16 SpellID) { return false; } + inline virtual bool IsBlockedPetBuff(int16 SpellID) { return false; } - void SetGlobal(const char *varname, const char *newvalue, int options, const char *duration, Mob *other = nullptr); - void TarGlobal(const char *varname, const char *value, const char *duration, int npcid, int charid, int zoneid); - void DelGlobal(const char *varname); + void SetGlobal(const char *varname, const char *newvalue, int options, const char *duration, Mob *other = nullptr); + void TarGlobal(const char *varname, const char *value, const char *duration, int npcid, int charid, int zoneid); + void DelGlobal(const char *varname); inline void SetEmoteID(uint16 emote) { emoteid = emote; } inline uint16 GetEmoteID() { return emoteid; } @@ -814,336 +814,336 @@ public: int mod_spell_resist(int resist_chance, int level_mod, int resist_modifier, int target_resist, uint8 resist_type, uint16 spell_id, Mob* caster); protected: - void CommonDamage(Mob* other, int32 &damage, const uint16 spell_id, const SkillType attack_skill, bool &avoidable, const int8 buffslot, const bool iBuffTic); - static uint16 GetProcID(uint16 spell_id, uint8 effect_index); - float _GetMovementSpeed(int mod) const; - virtual bool MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, bool checkZ); + void CommonDamage(Mob* other, int32 &damage, const uint16 spell_id, const SkillType attack_skill, bool &avoidable, const int8 buffslot, const bool iBuffTic); + static uint16 GetProcID(uint16 spell_id, uint8 effect_index); + float _GetMovementSpeed(int mod) const; + virtual bool MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, bool checkZ); - virtual bool AI_EngagedCastCheck() { return(false); } - virtual bool AI_PursueCastCheck() { return(false); } - virtual bool AI_IdleCastCheck() { return(false); } + virtual bool AI_EngagedCastCheck() { return(false); } + virtual bool AI_PursueCastCheck() { return(false); } + virtual bool AI_IdleCastCheck() { return(false); } - bool IsFullHP; - bool moved; + bool IsFullHP; + bool moved; - std::vector RampageArray; - std::map m_EntityVariables; + std::vector RampageArray; + std::map m_EntityVariables; - int16 SkillDmgTaken_Mod[HIGHEST_SKILL+2]; - int16 Vulnerability_Mod[HIGHEST_RESIST+2]; - bool m_AllowBeneficial; - bool m_DisableMelee; - uint8 NPC_FlurryChance; + int16 SkillDmgTaken_Mod[HIGHEST_SKILL+2]; + int16 Vulnerability_Mod[HIGHEST_RESIST+2]; + bool m_AllowBeneficial; + bool m_DisableMelee; + uint8 NPC_FlurryChance; - bool isgrouped; - bool israidgrouped; - bool pendinggroup; - bool islooting; - uint8 texture; - uint8 helmtexture; + bool isgrouped; + bool israidgrouped; + bool pendinggroup; + bool islooting; + uint8 texture; + uint8 helmtexture; - int AC; - int16 ATK; - int16 STR; - int16 STA; - int16 DEX; - int16 AGI; - int16 INT; - int16 WIS; - int16 CHA; - int16 MR; - int16 CR; - int16 FR; - int16 DR; - int16 PR; - int16 Corrup; - bool moving; - int targeted; - bool findable; - bool trackable; - int32 cur_hp; - int32 max_hp; - int32 base_hp; - int32 cur_mana; - int32 max_mana; - int32 hp_regen; - int32 mana_regen; - int32 oocregen; - uint8 maxlevel; - uint32 scalerate; - Buffs_Struct *buffs; - uint32 current_buff_count; - Timer *buff_tic_timer; - StatBonuses itembonuses; - StatBonuses spellbonuses; - StatBonuses aabonuses; - uint16 petid; - uint16 ownerid; - PetType typeofpet; - int16 petpower; - uint32 follow; - uint32 follow_dist; + int AC; + int16 ATK; + int16 STR; + int16 STA; + int16 DEX; + int16 AGI; + int16 INT; + int16 WIS; + int16 CHA; + int16 MR; + int16 CR; + int16 FR; + int16 DR; + int16 PR; + int16 Corrup; + bool moving; + int targeted; + bool findable; + bool trackable; + int32 cur_hp; + int32 max_hp; + int32 base_hp; + int32 cur_mana; + int32 max_mana; + int32 hp_regen; + int32 mana_regen; + int32 oocregen; + uint8 maxlevel; + uint32 scalerate; + Buffs_Struct *buffs; + uint32 current_buff_count; + Timer *buff_tic_timer; + StatBonuses itembonuses; + StatBonuses spellbonuses; + StatBonuses aabonuses; + uint16 petid; + uint16 ownerid; + PetType typeofpet; + int16 petpower; + uint32 follow; + uint32 follow_dist; - uint8 gender; - uint16 race; - uint8 base_gender; - uint16 base_race; - uint8 class_; - bodyType bodytype; - bodyType orig_bodytype; - uint16 deity; - uint8 level; - uint32 npctype_id; - float x_pos; - float y_pos; - float z_pos; - float heading; - uint16 animation; - float base_size; - float size; - float runspeed; - uint32 pLastChange; - bool held; - bool nocast; - bool focused; - void CalcSpellBonuses(StatBonuses* newbon); - virtual void CalcBonuses(); - void TrySkillProc(Mob *on, uint16 skill, float chance); - bool PassLimitToSkill(uint16 spell_id, uint16 skill); - bool PassLimitClass(uint32 Classes_, uint16 Class_); - void TryDefensiveProc(const ItemInst* weapon, Mob *on, uint16 hand = 13, int damage=0); - void TryWeaponProc(const Item_Struct* weapon, Mob *on, uint16 hand = 13); - void TryWeaponProc(const ItemInst* weapon, Mob *on, uint16 hand = 13); - void ExecWeaponProc(uint16 spell_id, Mob *on); - virtual float GetProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_speed = 30, uint16 hand = 13); - virtual float GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_speed = 30, uint16 hand = 13); - int GetWeaponDamage(Mob *against, const Item_Struct *weapon_item); - int GetWeaponDamage(Mob *against, const ItemInst *weapon_item, uint32 *hate = nullptr); - int GetKickDamage(); - int GetBashDamage(); - virtual void ApplySpecialAttackMod(SkillType skill, int32 &dmg, int32 &mindmg); - bool HasDied(); - void CalculateNewFearpoint(); - float FindGroundZ(float new_x, float new_y, float z_offset=0.0); - VERTEX UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &WaypointChange, bool &NodeReached); - void PrintRoute(); - void UpdateRuneFlags(); + uint8 gender; + uint16 race; + uint8 base_gender; + uint16 base_race; + uint8 class_; + bodyType bodytype; + bodyType orig_bodytype; + uint16 deity; + uint8 level; + uint32 npctype_id; + float x_pos; + float y_pos; + float z_pos; + float heading; + uint16 animation; + float base_size; + float size; + float runspeed; + uint32 pLastChange; + bool held; + bool nocast; + bool focused; + void CalcSpellBonuses(StatBonuses* newbon); + virtual void CalcBonuses(); + void TrySkillProc(Mob *on, uint16 skill, float chance); + bool PassLimitToSkill(uint16 spell_id, uint16 skill); + bool PassLimitClass(uint32 Classes_, uint16 Class_); + void TryDefensiveProc(const ItemInst* weapon, Mob *on, uint16 hand = 13, int damage=0); + void TryWeaponProc(const Item_Struct* weapon, Mob *on, uint16 hand = 13); + void TryWeaponProc(const ItemInst* weapon, Mob *on, uint16 hand = 13); + void ExecWeaponProc(uint16 spell_id, Mob *on); + virtual float GetProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_speed = 30, uint16 hand = 13); + virtual float GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 weapon_speed = 30, uint16 hand = 13); + int GetWeaponDamage(Mob *against, const Item_Struct *weapon_item); + int GetWeaponDamage(Mob *against, const ItemInst *weapon_item, uint32 *hate = nullptr); + int GetKickDamage(); + int GetBashDamage(); + virtual void ApplySpecialAttackMod(SkillType skill, int32 &dmg, int32 &mindmg); + bool HasDied(); + void CalculateNewFearpoint(); + float FindGroundZ(float new_x, float new_y, float z_offset=0.0); + VERTEX UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &WaypointChange, bool &NodeReached); + void PrintRoute(); + void UpdateRuneFlags(); - virtual float GetSympatheticProcChances(float &ProcBonus, float &ProcChance, int32 cast_time, int16 ProcRateMod); + virtual float GetSympatheticProcChances(float &ProcBonus, float &ProcChance, int32 cast_time, int16 ProcRateMod); - enum {MAX_PROCS = 4}; - tProc PermaProcs[MAX_PROCS]; - tProc SpellProcs[MAX_PROCS]; - tProc DefensiveProcs[MAX_PROCS]; - tProc RangedProcs[MAX_PROCS]; - tProc SkillProcs[MAX_PROCS]; + enum {MAX_PROCS = 4}; + tProc PermaProcs[MAX_PROCS]; + tProc SpellProcs[MAX_PROCS]; + tProc DefensiveProcs[MAX_PROCS]; + tProc RangedProcs[MAX_PROCS]; + tProc SkillProcs[MAX_PROCS]; - char name[64]; - char orig_name[64]; - char clean_name[64]; - char lastname[64]; + char name[64]; + char orig_name[64]; + char clean_name[64]; + char lastname[64]; - bool bEnraged; - Timer *SpecAttackTimers[SPECATK_MAXNUM]; - bool destructibleobject; + bool bEnraged; + Timer *SpecAttackTimers[SPECATK_MAXNUM]; + bool destructibleobject; - int32 delta_heading; - float delta_x; - float delta_y; - float delta_z; + int32 delta_heading; + float delta_x; + float delta_y; + float delta_z; - uint8 light; + uint8 light; - float fixedZ; - EmuAppearance _appearance; - uint8 pRunAnimSpeed; - bool m_is_running; + float fixedZ; + EmuAppearance _appearance; + uint8 pRunAnimSpeed; + bool m_is_running; - Timer attack_timer; - Timer attack_dw_timer; - Timer ranged_timer; - float attack_speed; //% increase/decrease in attack speed (not haste) - float slow_mitigation; // Allows for a slow mitigation based on a % in decimal form. IE, 1 = 100% mitigation, .5 is 50% - Timer tic_timer; - Timer mana_timer; + Timer attack_timer; + Timer attack_dw_timer; + Timer ranged_timer; + float attack_speed; //% increase/decrease in attack speed (not haste) + float slow_mitigation; // Allows for a slow mitigation based on a % in decimal form. IE, 1 = 100% mitigation, .5 is 50% + Timer tic_timer; + Timer mana_timer; - float rewind_x; - float rewind_y; - float rewind_z; - Timer rewind_timer; + float rewind_x; + float rewind_y; + float rewind_z; + Timer rewind_timer; - //spell casting vars - Timer spellend_timer; - uint16 casting_spell_id; - float spell_x, spell_y, spell_z; - int attacked_count; - bool delaytimer; - uint16 casting_spell_targetid; - uint16 casting_spell_slot; - uint16 casting_spell_mana; - uint32 casting_spell_inventory_slot; - uint32 casting_spell_timer; - uint32 casting_spell_timer_duration; - uint32 casting_spell_type; - int16 casting_spell_resist_adjust; - uint16 bardsong; - uint8 bardsong_slot; - uint32 bardsong_target_id; + //spell casting vars + Timer spellend_timer; + uint16 casting_spell_id; + float spell_x, spell_y, spell_z; + int attacked_count; + bool delaytimer; + uint16 casting_spell_targetid; + uint16 casting_spell_slot; + uint16 casting_spell_mana; + uint32 casting_spell_inventory_slot; + uint32 casting_spell_timer; + uint32 casting_spell_timer_duration; + uint32 casting_spell_type; + int16 casting_spell_resist_adjust; + uint16 bardsong; + uint8 bardsong_slot; + uint32 bardsong_target_id; - // Currently 3 max nimbus particle effects at a time - uint32 nimbus_effect1; - uint32 nimbus_effect2; - uint32 nimbus_effect3; + // Currently 3 max nimbus particle effects at a time + uint32 nimbus_effect1; + uint32 nimbus_effect2; + uint32 nimbus_effect3; - uint8 haircolor; - uint8 beardcolor; - uint8 eyecolor1; // the eyecolors always seem to be the same, maybe left and right eye? - uint8 eyecolor2; - uint8 hairstyle; - uint8 luclinface; // - uint8 beard; - uint32 drakkin_heritage; - uint32 drakkin_tattoo; - uint32 drakkin_details; - uint32 armor_tint[MAX_MATERIALS]; + uint8 haircolor; + uint8 beardcolor; + uint8 eyecolor1; // the eyecolors always seem to be the same, maybe left and right eye? + uint8 eyecolor2; + uint8 hairstyle; + uint8 luclinface; // + uint8 beard; + uint32 drakkin_heritage; + uint32 drakkin_tattoo; + uint32 drakkin_details; + uint32 armor_tint[MAX_MATERIALS]; - uint8 aa_title; + uint8 aa_title; - Mob* shield_target; + Mob* shield_target; - int ExtraHaste; // for the #haste command - bool mezzed; - bool stunned; - bool charmed; //this isnt fully implemented yet - bool rooted; - bool silenced; - bool amnesiad; - bool inWater; // Set to true or false by Water Detection code if enabled by rules - bool has_virus; // whether this mob has a viral spell on them - uint16 viral_spells[MAX_SPELL_TRIGGER*2]; // Stores the spell ids of the viruses on target and caster ids - int16 rooted_mod; //Modifier to root break chance, defined when root is cast on a target. - bool offhand; + int ExtraHaste; // for the #haste command + bool mezzed; + bool stunned; + bool charmed; //this isnt fully implemented yet + bool rooted; + bool silenced; + bool amnesiad; + bool inWater; // Set to true or false by Water Detection code if enabled by rules + bool has_virus; // whether this mob has a viral spell on them + uint16 viral_spells[MAX_SPELL_TRIGGER*2]; // Stores the spell ids of the viruses on target and caster ids + int16 rooted_mod; //Modifier to root break chance, defined when root is cast on a target. + bool offhand; - Timer stunned_timer; - Timer spun_timer; - Timer bardsong_timer; - Timer gravity_timer; - Timer viral_timer; - uint8 viral_timer_counter; - uint16 adverrorinfo; + Timer stunned_timer; + Timer spun_timer; + Timer bardsong_timer; + Timer gravity_timer; + Timer viral_timer; + uint8 viral_timer_counter; + uint16 adverrorinfo; - // MobAI stuff - eStandingPetOrder pStandingPetOrder; - uint32 minLastFightingDelayMoving; - uint32 maxLastFightingDelayMoving; - float pAggroRange; - float pAssistRange; - Timer* AIthink_timer; - Timer* AImovement_timer; - Timer* AItarget_check_timer; - bool movetimercompleted; - bool permarooted; - Timer* AIscanarea_timer; - Timer* AIwalking_timer; - Timer* AIfeignremember_timer; - uint32 pLastFightingDelayMoving; - HateList hate_list; - std::set feign_memory_list; - // This is to keep track of mobs we cast faction mod spells on - std::map faction_bonuses; // Primary FactionID, Bonus - void AddFactionBonus(uint32 pFactionID,int32 bonus); - int32 GetFactionBonus(uint32 pFactionID); - // This is to keep track of item faction modifiers - std::map item_faction_bonuses; // Primary FactionID, Bonus - void AddItemFactionBonus(uint32 pFactionID,int32 bonus); - int32 GetItemFactionBonus(uint32 pFactionID); - void ClearItemFactionBonuses(); + // MobAI stuff + eStandingPetOrder pStandingPetOrder; + uint32 minLastFightingDelayMoving; + uint32 maxLastFightingDelayMoving; + float pAggroRange; + float pAssistRange; + Timer* AIthink_timer; + Timer* AImovement_timer; + Timer* AItarget_check_timer; + bool movetimercompleted; + bool permarooted; + Timer* AIscanarea_timer; + Timer* AIwalking_timer; + Timer* AIfeignremember_timer; + uint32 pLastFightingDelayMoving; + HateList hate_list; + std::set feign_memory_list; + // This is to keep track of mobs we cast faction mod spells on + std::map faction_bonuses; // Primary FactionID, Bonus + void AddFactionBonus(uint32 pFactionID,int32 bonus); + int32 GetFactionBonus(uint32 pFactionID); + // This is to keep track of item faction modifiers + std::map item_faction_bonuses; // Primary FactionID, Bonus + void AddItemFactionBonus(uint32 pFactionID,int32 bonus); + int32 GetItemFactionBonus(uint32 pFactionID); + void ClearItemFactionBonuses(); - void CalculateFearPosition(); - uint32 move_tic_count; + void CalculateFearPosition(); + uint32 move_tic_count; - bool flee_mode; - Timer flee_timer; + bool flee_mode; + Timer flee_timer; - bool pAIControlled; - bool roamer; - bool logging_enabled; + bool pAIControlled; + bool roamer; + bool logging_enabled; - int wandertype; - int pausetype; + int wandertype; + int pausetype; - int cur_wp; - float cur_wp_x; - float cur_wp_y; - float cur_wp_z; - int cur_wp_pause; - float cur_wp_heading; + int cur_wp; + float cur_wp_x; + float cur_wp_y; + float cur_wp_z; + int cur_wp_pause; + float cur_wp_heading; - int patrol; - float fear_walkto_x; - float fear_walkto_y; - float fear_walkto_z; - bool curfp; + int patrol; + float fear_walkto_x; + float fear_walkto_y; + float fear_walkto_z; + bool curfp; - // Pathing - // - VERTEX PathingDestination; - VERTEX PathingLastPosition; - int PathingLoopCount; - int PathingLastNodeVisited; - list Route; - LOSType PathingLOSState; - Timer *PathingLOSCheckTimer; - Timer *PathingRouteUpdateTimerShort; - Timer *PathingRouteUpdateTimerLong; - bool DistractedFromGrid; - int PathingTraversedNodes; + // Pathing + // + VERTEX PathingDestination; + VERTEX PathingLastPosition; + int PathingLoopCount; + int PathingLastNodeVisited; + list Route; + LOSType PathingLOSState; + Timer *PathingLOSCheckTimer; + Timer *PathingRouteUpdateTimerShort; + Timer *PathingRouteUpdateTimerLong; + bool DistractedFromGrid; + int PathingTraversedNodes; - uint32 pDontHealMeBefore; - uint32 pDontBuffMeBefore; - uint32 pDontDotMeBefore; - uint32 pDontRootMeBefore; - uint32 pDontSnareMeBefore; - uint32 pDontCureMeBefore; + uint32 pDontHealMeBefore; + uint32 pDontBuffMeBefore; + uint32 pDontDotMeBefore; + uint32 pDontRootMeBefore; + uint32 pDontSnareMeBefore; + uint32 pDontCureMeBefore; - // Bind wound - Timer bindwound_timer; - Mob* bindwound_target; - // hp event - int nexthpevent; - int nextinchpevent; + // Bind wound + Timer bindwound_timer; + Mob* bindwound_target; + // hp event + int nexthpevent; + int nextinchpevent; - //temppet - bool hasTempPet; + //temppet + bool hasTempPet; - EGNode *_egnode; //the EG node we are in - float tarx; - float tary; - float tarz; - uint8 tar_ndx; - float tar_vector; - float tar_vx; - float tar_vy; - float tar_vz; - float test_vector; + EGNode *_egnode; //the EG node we are in + float tarx; + float tary; + float tarz; + uint8 tar_ndx; + float tar_vector; + float tar_vx; + float tar_vy; + float tar_vz; + float test_vector; - bool m_hasRune; - bool m_hasSpellRune; - bool m_hasPartialMeleeRune; - bool m_hasPartialSpellRune; - bool m_hasDeathSaveChance; - uint32 m_spellHitsLeft[38]; // Used to track which spells will have their numhits incremented when spell finishes casting, 38 Buffslots - int flymode; - bool m_targetable; - int QGVarDuration(const char *fmt); - void InsertQuestGlobal(int charid, int npcid, int zoneid, const char *name, const char *value, int expdate); + bool m_hasRune; + bool m_hasSpellRune; + bool m_hasPartialMeleeRune; + bool m_hasPartialSpellRune; + bool m_hasDeathSaveChance; + uint32 m_spellHitsLeft[38]; // Used to track which spells will have their numhits incremented when spell finishes casting, 38 Buffslots + int flymode; + bool m_targetable; + int QGVarDuration(const char *fmt); + void InsertQuestGlobal(int charid, int npcid, int zoneid, const char *name, const char *value, int expdate); uint16 emoteid; private: - void _StopSong(); //this is not what you think it is - Mob* target; + void _StopSong(); //this is not what you think it is + Mob* target; }; #endif diff --git a/zone/net.cpp b/zone/net.cpp index ec54148a5..60e891b23 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -1,20 +1,20 @@ #define DONT_SHARED_OPCODES -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/features.h" @@ -40,7 +40,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif volatile bool RunLoops = true; @@ -115,8 +115,8 @@ void Shutdown(); extern void MapOpcodes(); int main(int argc, char** argv) { - RegisterExecutablePlatform(ExePlatformZone); - set_exception_handler(); + RegisterExecutablePlatform(ExePlatformZone); + set_exception_handler(); const char *zone_name; @@ -183,8 +183,8 @@ int main(int argc, char** argv) { _log(ZONE__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION); /* - * Setup nice signal handlers - */ + * Setup nice signal handlers + */ if (signal(SIGINT, CatchSignal) == SIG_ERR) { _log(ZONE__INIT_ERR, "Could not set signal handler"); return 0; @@ -215,7 +215,7 @@ int main(int argc, char** argv) { _log(ZONE__INIT, "Loading items"); if (!database.LoadItems()) { _log(ZONE__INIT_ERR, "Loading items FAILED!"); - _log(ZONE__INIT, "Failed. But ignoring error and going on..."); + _log(ZONE__INIT, "Failed. But ignoring error and going on..."); } _log(ZONE__INIT, "Loading npc faction lists"); @@ -229,7 +229,7 @@ int main(int argc, char** argv) { _log(ZONE__INIT_ERR, "Loading loot FAILED!"); CheckEQEMuErrorAndPause(); return 0; - } + } _log(ZONE__INIT, "Loading skill caps"); if (!database.LoadSkillCaps()) { _log(ZONE__INIT_ERR, "Loading skill caps FAILED!"); @@ -237,8 +237,8 @@ int main(int argc, char** argv) { return 0; } - _log(ZONE__INIT, "Loading spells"); - EQEmu::MemoryMappedFile *mmf = nullptr; + _log(ZONE__INIT, "Loading spells"); + EQEmu::MemoryMappedFile *mmf = nullptr; LoadSpells(&mmf); _log(ZONE__INIT, "Loading guilds"); @@ -283,13 +283,13 @@ int main(int argc, char** argv) { taskmanager->LoadTasks(); } - parse = new QuestParserCollection(); + parse = new QuestParserCollection(); #ifdef EMBPERL PerlXSParser *pxs = new PerlXSParser(); parse->RegisterQuestInterface(pxs, "pl"); #endif Parser *ps = new Parser(); - //parse->RegisterQuestInterface(ps, "qst"); + //parse->RegisterQuestInterface(ps, "qst"); //now we have our parser, load the quests @@ -476,7 +476,7 @@ int main(int argc, char** argv) { safe_delete(parse); #ifdef EMBPERL - safe_delete(pxs); + safe_delete(pxs); #endif safe_delete(ps); safe_delete(mmf); @@ -514,8 +514,8 @@ void Shutdown() uint32 NetConnection::GetIP() { - char name[255+1]; - size_t len = 0; + char name[255+1]; + size_t len = 0; hostent* host = 0; if (gethostname(name, len) < 0 || len <= 0) @@ -584,25 +584,25 @@ NetConnection::~NetConnection() { } void LoadSpells(EQEmu::MemoryMappedFile **mmf) { - int records = database.GetMaxSpellID() + 1; + int records = database.GetMaxSpellID() + 1; - try { - EQEmu::IPCMutex mutex("spells"); - mutex.Lock(); - *mmf = new EQEmu::MemoryMappedFile("shared/spells"); - uint32 size = (*mmf)->Size(); - if(size != (records * sizeof(SPDat_Spell_Struct))) { - EQ_EXCEPT("Zone", "Unable to load spells: (*mmf)->Size() != records * sizeof(SPDat_Spell_Struct)"); - } + try { + EQEmu::IPCMutex mutex("spells"); + mutex.Lock(); + *mmf = new EQEmu::MemoryMappedFile("shared/spells"); + uint32 size = (*mmf)->Size(); + if(size != (records * sizeof(SPDat_Spell_Struct))) { + EQ_EXCEPT("Zone", "Unable to load spells: (*mmf)->Size() != records * sizeof(SPDat_Spell_Struct)"); + } - spells = reinterpret_cast((*mmf)->Get()); - mutex.Unlock(); - } catch(std::exception &ex) { - LogFile->write(EQEMuLog::Error, "Error loading spells: %s", ex.what()); - return; - } + spells = reinterpret_cast((*mmf)->Get()); + mutex.Unlock(); + } catch(std::exception &ex) { + LogFile->write(EQEMuLog::Error, "Error loading spells: %s", ex.what()); + return; + } - SPDAT_RECORDS = records; + SPDAT_RECORDS = records; } diff --git a/zone/net.h b/zone/net.h index 25f5002c7..e81dd6d51 100644 --- a/zone/net.h +++ b/zone/net.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef _WINDOWS #include diff --git a/zone/npc.cpp b/zone/npc.cpp index ad0525fee..bb5743956 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -28,7 +28,7 @@ using namespace std; #ifdef _WINDOWS #define snprintf _snprintf #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #else #include #include @@ -56,55 +56,55 @@ extern EntityList entity_list; NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float heading, int iflymode, bool IsCorpse) : Mob(d->name, - d->lastname, - d->max_hp, - d->max_hp, - d->gender, - d->race, - d->class_, - (bodyType)d->bodytype, - d->deity, - d->level, - d->npc_id, - d->size, - d->runspeed, - heading, - x, - y, - z, - d->light, - d->texture, - d->helmtexture, - d->AC, - d->ATK, - d->STR, - d->STA, - d->DEX, - d->AGI, - d->INT, - d->WIS, - d->CHA, - d->haircolor, - d->beardcolor, - d->eyecolor1, - d->eyecolor2, - d->hairstyle, - d->luclinface, - d->beard, - d->drakkin_heritage, - d->drakkin_tattoo, - d->drakkin_details, - (uint32*)d->armor_tint, - 0, - d->see_invis, // pass see_invis/see_ivu flags to mob constructor - d->see_invis_undead, - d->see_hide, - d->see_improved_hide, - d->hp_regen, - d->mana_regen, - d->qglobal, - d->maxlevel, - d->scalerate ), + d->lastname, + d->max_hp, + d->max_hp, + d->gender, + d->race, + d->class_, + (bodyType)d->bodytype, + d->deity, + d->level, + d->npc_id, + d->size, + d->runspeed, + heading, + x, + y, + z, + d->light, + d->texture, + d->helmtexture, + d->AC, + d->ATK, + d->STR, + d->STA, + d->DEX, + d->AGI, + d->INT, + d->WIS, + d->CHA, + d->haircolor, + d->beardcolor, + d->eyecolor1, + d->eyecolor2, + d->hairstyle, + d->luclinface, + d->beard, + d->drakkin_heritage, + d->drakkin_tattoo, + d->drakkin_details, + (uint32*)d->armor_tint, + 0, + d->see_invis, // pass see_invis/see_ivu flags to mob constructor + d->see_invis_undead, + d->see_hide, + d->see_improved_hide, + d->hp_regen, + d->mana_regen, + d->qglobal, + d->maxlevel, + d->scalerate ), attacked_timer(CombatEventTimer_expire), swarm_timer(100), classattack_timer(1000), @@ -135,7 +135,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float platinum = 0; max_dmg = d->max_dmg; min_dmg = d->min_dmg; - attack_count = d->attack_count; + attack_count = d->attack_count; grid = 0; wp_m = 0; max_wp=0; @@ -152,11 +152,11 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float findable = d->findable; trackable = d->trackable; - MR = d->MR; - CR = d->CR; - DR = d->DR; - FR = d->FR; - PR = d->PR; + MR = d->MR; + CR = d->CR; + DR = d->DR; + FR = d->FR; + PR = d->PR; Corrup = d->Corrup; STR = d->STR; @@ -166,7 +166,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float INT = d->INT; WIS = d->WIS; CHA = d->CHA; - npc_mana = d->Mana; + npc_mana = d->Mana; //quick fix of ordering if they screwed it up in the DB if(max_dmg < min_dmg) { @@ -195,8 +195,8 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float accuracy_rating = d->accuracy_rating; ATK = d->ATK; - CalcMaxMana(); - SetMana(GetMaxMana()); + CalcMaxMana(); + SetMana(GetMaxMana()); MerchantType = d->merchanttype; adventure_template_id = d->adventure_template; @@ -208,7 +208,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float guard_y = -1; guard_z = -1; guard_heading = 0; - guard_anim = eaStanding; + guard_anim = eaStanding; roambox_distance = 0; roambox_max_x = -2; roambox_max_y = -2; @@ -244,7 +244,7 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float slow_mitigation = d->slow_mitigation; EntityList::RemoveNumbers(name); - entity_list.MakeNameUnique(name); + entity_list.MakeNameUnique(name); npc_aggro = d->npc_aggro; @@ -343,8 +343,8 @@ NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float ldon_locked_skill = 0; ldon_trap_detected = 0; } - reface_timer = new Timer(15000); - reface_timer->Disable(); + reface_timer = new Timer(15000); + reface_timer->Disable(); qGlobals = nullptr; guard_x_saved = 0; guard_y_saved = 0; @@ -393,7 +393,7 @@ NPC::~NPC() faction_list.clear(); } - safe_delete(reface_timer); + safe_delete(reface_timer); safe_delete(swarmInfoPtr); safe_delete(qGlobals); UninitializeBuffSlots(); @@ -444,7 +444,7 @@ void NPC::RemoveItem(uint32 item_id, uint16 quantity, uint16 slot) { itemlist.erase(cur); return; } - else if (item->item_id == item_id && item->equipSlot == slot && quantity >= 1) { + else if (item->item_id == item_id && item->equipSlot == slot && quantity >= 1) { //cout<<"NPC::RemoveItem"<<" equipSlot:"<equipSlot<<" quantity:"<< quantity<charges <= quantity) itemlist.erase(cur); @@ -517,7 +517,7 @@ void NPC::QueryLoot(Client* to) { to->Message(0, "minlvl: %i maxlvl: %i %i: %c%06X000000000000000000000000000000000000000%s%c",(*cur)->minlevel, (*cur)->maxlevel, (int) item->ID,0x12, item->ID, item->Name, 0x12); } else - LogFile->write(EQEMuLog::Error, "Database error, invalid item"); + LogFile->write(EQEMuLog::Error, "Database error, invalid item"); x++; } to->Message(0, "%i items on %s.", x, GetName()); @@ -525,24 +525,24 @@ void NPC::QueryLoot(Client* to) { void NPC::AddCash(uint16 in_copper, uint16 in_silver, uint16 in_gold, uint16 in_platinum) { if(in_copper >= 0) - copper = in_copper; - else - copper = 0; + copper = in_copper; + else + copper = 0; - if(in_silver >= 0) - silver = in_silver; - else - silver = 0; + if(in_silver >= 0) + silver = in_silver; + else + silver = 0; - if(in_gold >= 0) - gold = in_gold; - else - gold = 0; + if(in_gold >= 0) + gold = in_gold; + else + gold = 0; - if(in_platinum >= 0) - platinum = in_platinum; - else - platinum = 0; + if(in_platinum >= 0) + platinum = in_platinum; + else + platinum = 0; } void NPC::AddCash() { @@ -563,32 +563,32 @@ bool NPC::Process() { _ZP(NPC_Process); - adverrorinfo = 1; + adverrorinfo = 1; if (IsStunned() && stunned_timer.Check()) - { - this->stunned = false; - this->stunned_timer.Disable(); + { + this->stunned = false; + this->stunned_timer.Disable(); this->spun_timer.Disable(); - } + } - if (p_depop) - { - Mob* owner = entity_list.GetMob(this->ownerid); - if (owner != 0) - { - //if(GetBodyType() != BT_SwarmPet) - // owner->SetPetID(0); + if (p_depop) + { + Mob* owner = entity_list.GetMob(this->ownerid); + if (owner != 0) + { + //if(GetBodyType() != BT_SwarmPet) + // owner->SetPetID(0); this->ownerid = 0; - this->petid = 0; - } - return false; - } + this->petid = 0; + } + return false; + } - adverrorinfo = 2; + adverrorinfo = 2; - SpellProcess(); + SpellProcess(); - if(tic_timer.Check()) + if(tic_timer.Check()) { BuffProcess(); @@ -604,7 +604,7 @@ bool NPC::Process() if(oocregen > 0){ //should pull from Mob class OOCRegen += GetMaxHP() * oocregen / 100; } - //Lieka Edit: Fixing NPC regen. NPCs should regen to full during a set duration, not based on their HPs. Increase NPC's HPs by % of total HPs / tick. + //Lieka Edit:Fixing NPC regen.NPCs should regen to full during a set duration, not based on their HPs.Increase NPC's HPs by % of total HPs / tick. if((GetHP() < GetMaxHP()) && !IsPet()) { if(!IsEngaged()) {//NPC out of combat if(hp_regen > OOCRegen) @@ -648,7 +648,7 @@ bool NPC::Process() } } } - } + } if (sendhpupdate_timer.Check() && (IsTargeted() || (IsPet() && GetOwner() && GetOwner()->IsClient()))) { if(!IsFullHP || cur_hpCheck() && !IsEngaged() && (guard_x == GetX() && guard_y == GetY() && guard_z == GetZ())) { - SetHeading(guard_heading); - SendPosition(); - reface_timer->Disable(); - } + if(reface_timer->Check() && !IsEngaged() && (guard_x == GetX() && guard_y == GetY() && guard_z == GetZ())) { + SetHeading(guard_heading); + SendPosition(); + reface_timer->Disable(); + } - if (IsMezzed()) - return true; + if (IsMezzed()) + return true; if(IsStunned()) { if(spun_timer.Check()) @@ -710,7 +710,7 @@ bool NPC::Process() AI_Process(); - return true; + return true; } uint32 NPC::CountLoot() { @@ -755,7 +755,7 @@ bool NPC::DatabaseCastAccepted(int spell_id) { else return false; break; - } + } case SE_CurrentHPOnce: case SE_CurrentHP: { if(this->GetHPRatio() < 100 && spells[spell_id].buffduration == 0) @@ -763,7 +763,7 @@ bool NPC::DatabaseCastAccepted(int spell_id) { else return false; break; - } + } case SE_HealOverTime: { if(this->GetHPRatio() < 100) @@ -771,10 +771,10 @@ bool NPC::DatabaseCastAccepted(int spell_id) { else return false; break; - } + } case SE_DamageShield: { return true; - } + } case SE_NecPet: case SE_SummonPet: { if(GetPet()){ @@ -784,12 +784,12 @@ bool NPC::DatabaseCastAccepted(int spell_id) { return false; } break; - } + } case SE_LocateCorpse: case SE_SummonCorpse: { return false; //Pfft, npcs don't need to summon corpses/locate corpses! break; - } + } default: if(spells[spell_id].goodEffect == 1 && !(spells[spell_id].buffduration == 0 && this->GetHPRatio() == 100) && !IsEngaged()) return true; @@ -984,10 +984,10 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; uint32 tmp = 0; uint32 tmp2 = 0; - uint32 last_insert_id = 0; + uint32 last_insert_id = 0; switch (command) { case 0: { // Create a new NPC and add all spawn related data uint32 npc_type_id = 0; @@ -1025,7 +1025,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver if (npc_type_id) { if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO npc_types (id, name, level, race, class, hp, gender, texture, helmtexture, size, loottable_id, merchant_id, face, runspeed, prim_melee_type, sec_melee_type) values(%i,\"%s\",%i,%i,%i,%i,%i,%i,%i,%f,%i,%i,%i,%f,%i,%i)", npc_type_id, tmpstr, spawn->GetLevel(), spawn->GetRace(), spawn->GetClass(), spawn->GetMaxHP(), spawn->GetGender(), spawn->GetTexture(), spawn->GetHelmTexture(), spawn->GetSize(), spawn->GetLoottableID(), spawn->MerchantType, 0, spawn->GetRunspeed(), 28, 28), errbuf, 0, 0, &npc_type_id)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } @@ -1033,7 +1033,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver else { if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO npc_types (name, level, race, class, hp, gender, texture, helmtexture, size, loottable_id, merchant_id, face, runspeed, prim_melee_type, sec_melee_type) values(\"%s\",%i,%i,%i,%i,%i,%i,%i,%f,%i,%i,%i,%f,%i,%i)", tmpstr, spawn->GetLevel(), spawn->GetRace(), spawn->GetClass(), spawn->GetMaxHP(), spawn->GetGender(), spawn->GetTexture(), spawn->GetHelmTexture(), spawn->GetSize(), spawn->GetLoottableID(), spawn->MerchantType, 0, spawn->GetRunspeed(), 28, 28), errbuf, 0, 0, &npc_type_id)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } @@ -1042,21 +1042,21 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver safe_delete_array(query); snprintf(tmpstr, sizeof(tmpstr), "%s-%s", zone, spawn->GetName()); if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawngroup (id, name) values(%i, '%s')", tmp, tmpstr), errbuf, 0, 0, &spawngroupid)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } if(c) c->LogSQL(query); safe_delete_array(query); if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) values('%s', %u, %f, %f, %f, %i, %f, %i)", zone, zone_version, spawn->GetX(), spawn->GetY(), spawn->GetZ(), 1200, spawn->GetHeading(), spawngroupid), errbuf, 0, 0, &tmp)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } if(c) c->LogSQL(query); safe_delete_array(query); if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawnentry (spawngroupID, npcID, chance) values(%i, %i, %i)", spawngroupid, npc_type_id, 100), errbuf, 0)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } @@ -1070,7 +1070,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver char tmpstr[64]; snprintf(tmpstr, sizeof(tmpstr), "%s%s%i", zone, spawn->GetName(),Timer::GetCurrentTime()); if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawngroup (name) values('%s')", tmpstr), errbuf, 0, 0, &last_insert_id)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } @@ -1086,7 +1086,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver else respawntime = 1200; if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) values('%s', %u, %f, %f, %f, %i, %f, %i)", zone, zone_version, spawn->GetX(), spawn->GetY(), spawn->GetZ(), respawntime, spawn->GetHeading(), last_insert_id), errbuf, 0, 0, &spawnid)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } @@ -1094,7 +1094,7 @@ uint32 ZoneDatabase::NPCSpawnDB(uint8 command, const char* zone, uint32 zone_ver safe_delete_array(query); if (!RunQuery(query, MakeAnyLenString(&query, "INSERT INTO spawnentry (spawngroupID, npcID, chance) values(%i, %i, %i)", last_insert_id, tmp2, 100), errbuf, 0)) { - LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "NPCSpawnDB Error: %s %s", query, errbuf); safe_delete(query); return false; } @@ -1318,7 +1318,7 @@ void NPC::PickPocket(Client* thief) { bool is_arrow = (item->ItemType == ItemTypeArrow) ? true : false; int slot_id = thief->GetInv().FindFreeSlot(false, true, inst->GetItem()->Size, is_arrow); if (/*!Equipped(item->ID) &&*/ - !item->Magic && item->NoDrop != 0 && !inst->IsType(ItemClassContainer) && slot_id != SLOT_INVALID + !item->Magic && item->NoDrop != 0 && !inst->IsType(ItemClassContainer) && slot_id != SLOT_INVALID /*&& steal_skill > item->StealSkill*/ ) { slot[x] = slot_id; @@ -1387,38 +1387,38 @@ void NPC::PickPocket(Client* thief) { { switch (steal_type) { - case 0:{ - if (amt > GetPlatinum()) - amt = GetPlatinum(); - SetPlatinum(GetPlatinum()-amt); - thief->AddMoneyToPP(0,0,0,amt,false); - thief->SendPickPocketResponse(this, amt, PickPocketPlatinum); - break; - } - case 1:{ - if (amt > GetGold()) - amt = GetGold(); - SetGold(GetGold()-amt); - thief->AddMoneyToPP(0,0,amt,0,false); - thief->SendPickPocketResponse(this, amt, PickPocketGold); - break; - } - case 2:{ - if (amt > GetSilver()) - amt = GetSilver(); - SetSilver(GetSilver()-amt); - thief->AddMoneyToPP(0,amt,0,0,false); - thief->SendPickPocketResponse(this, amt, PickPocketSilver); - break; - } - case 3:{ - if (amt > GetCopper()) - amt = GetCopper(); - SetCopper(GetCopper()-amt); - thief->AddMoneyToPP(amt,0,0,0,false); - thief->SendPickPocketResponse(this, amt, PickPocketCopper); - break; - } + case 0:{ + if (amt > GetPlatinum()) + amt = GetPlatinum(); + SetPlatinum(GetPlatinum()-amt); + thief->AddMoneyToPP(0,0,0,amt,false); + thief->SendPickPocketResponse(this, amt, PickPocketPlatinum); + break; + } + case 1:{ + if (amt > GetGold()) + amt = GetGold(); + SetGold(GetGold()-amt); + thief->AddMoneyToPP(0,0,amt,0,false); + thief->SendPickPocketResponse(this, amt, PickPocketGold); + break; + } + case 2:{ + if (amt > GetSilver()) + amt = GetSilver(); + SetSilver(GetSilver()-amt); + thief->AddMoneyToPP(0,amt,0,0,false); + thief->SendPickPocketResponse(this, amt, PickPocketSilver); + break; + } + case 3:{ + if (amt > GetCopper()) + amt = GetCopper(); + SetCopper(GetCopper()-amt); + thief->AddMoneyToPP(amt,0,0,0,false); + thief->SendPickPocketResponse(this, amt, PickPocketCopper); + break; + } } } else @@ -1430,18 +1430,18 @@ void NPC::PickPocket(Client* thief) { } void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool remove) { - if(reset) + if(reset) { for(int i = 0; i < SPECATK_MAXNUM; i++) { SpecAttacks[i] = false; safe_delete(SpecAttackTimers[i]); } - } + } const char* orig_parse = parse; - while (*parse) - { + while (*parse) + { switch(*parse) { case 'E': @@ -1569,7 +1569,7 @@ void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool rem break; } parse++; - } + } if(permtag == 1 && this->GetNPCTypeID() > 0) { @@ -1584,8 +1584,8 @@ bool Mob::HasNPCSpecialAtk(const char* parse) { bool HasAllAttacks = true; - while (*parse && HasAllAttacks == true) - { + while (*parse && HasAllAttacks == true) + { switch(*parse) { case 'E': @@ -1730,7 +1730,7 @@ bool Mob::HasNPCSpecialAtk(const char* parse) { break; } parse++; - } + } return HasAllAttacks; } @@ -1847,7 +1847,7 @@ void NPC::ModifyNPCStat(const char *identifier, const char *newValue) return; } - if(id == "max_mana") + if(id == "max_mana") { npc_mana = atoi(val.c_str()); CalcMaxMana(); @@ -1937,7 +1937,7 @@ void NPC::ModifyNPCStat(const char *identifier, const char *newValue) return; } - if(id == "attack_count") + if(id == "attack_count") { attack_count = atoi(val.c_str()); return; @@ -2070,26 +2070,26 @@ void NPC::LevelScale() { void NPC::CalcNPCResists() { - if (!MR) - MR = (GetLevel() * 11)/10; - if (!CR) - CR = (GetLevel() * 11)/10; - if (!DR) - DR = (GetLevel() * 11)/10; - if (!FR) - FR = (GetLevel() * 11)/10; - if (!PR) - PR = (GetLevel() * 11)/10; + if (!MR) + MR = (GetLevel() * 11)/10; + if (!CR) + CR = (GetLevel() * 11)/10; + if (!DR) + DR = (GetLevel() * 11)/10; + if (!FR) + FR = (GetLevel() * 11)/10; + if (!PR) + PR = (GetLevel() * 11)/10; if (!Corrup) - Corrup = 15; + Corrup = 15; return; } void NPC::CalcNPCRegen() { - // Fix for lazy db-updaters (regen values left at 0) - if (GetCasterClass() != 'N' && mana_regen == 0) - mana_regen = (GetLevel() / 10) + 4; + // Fix for lazy db-updaters (regen values left at 0) + if (GetCasterClass() != 'N' && mana_regen == 0) + mana_regen = (GetLevel() / 10) + 4; else if(mana_regen < 0) mana_regen = 0; else @@ -2100,25 +2100,25 @@ void NPC::CalcNPCRegen() { if(hp_regen == 0) { if(GetLevel() <= 6) - hp_regen = 1; - else if(GetLevel() > 6 && GetLevel() <= 10) - hp_regen = 2; - else if(GetLevel() > 10 && GetLevel() <= 15) - hp_regen = 3; - else if(GetLevel() > 15 && GetLevel() <= 20) - hp_regen = 5; - else if(GetLevel() > 20 && GetLevel() <= 30) - hp_regen = 7; - else if(GetLevel() > 30 && GetLevel() <= 35) - hp_regen = 9; - else if(GetLevel() > 35 && GetLevel() <= 40) - hp_regen = 12; - else if(GetLevel() > 40 && GetLevel() <= 45) - hp_regen = 18; - else if(GetLevel() > 45 && GetLevel() <= 50) - hp_regen = 21; - else - hp_regen = 30; + hp_regen = 1; + else if(GetLevel() > 6 && GetLevel() <= 10) + hp_regen = 2; + else if(GetLevel() > 10 && GetLevel() <= 15) + hp_regen = 3; + else if(GetLevel() > 15 && GetLevel() <= 20) + hp_regen = 5; + else if(GetLevel() > 20 && GetLevel() <= 30) + hp_regen = 7; + else if(GetLevel() > 30 && GetLevel() <= 35) + hp_regen = 9; + else if(GetLevel() > 35 && GetLevel() <= 40) + hp_regen = 12; + else if(GetLevel() > 40 && GetLevel() <= 45) + hp_regen = 18; + else if(GetLevel() > 45 && GetLevel() <= 50) + hp_regen = 21; + else + hp_regen = 30; } else if(hp_regen < 0) { hp_regen = 0; } else @@ -2138,16 +2138,16 @@ void NPC::CalcNPCDamage() { max_dmg = ((((99000)*(GetLevel()-64))/400)*AC_adjust/10); } else if (GetLevel() >= 60 && GetLevel() <= 65){ - if(min_dmg==0) + if(min_dmg==0) min_dmg = (GetLevel()+(GetLevel()/3)); - if(max_dmg==0) - max_dmg = (GetLevel()*3)*AC_adjust/10; + if(max_dmg==0) + max_dmg = (GetLevel()*3)*AC_adjust/10; } else if (GetLevel() >= 51 && GetLevel() <= 59){ - if(min_dmg==0) - min_dmg = (GetLevel()+(GetLevel()/3)); - if(max_dmg==0) - max_dmg = (GetLevel()*3)*AC_adjust/10; + if(min_dmg==0) + min_dmg = (GetLevel()+(GetLevel()/3)); + if(max_dmg==0) + max_dmg = (GetLevel()*3)*AC_adjust/10; } else if (GetLevel() >= 40 && GetLevel() <= 50) { if (min_dmg==0) @@ -2156,15 +2156,15 @@ void NPC::CalcNPCDamage() { max_dmg = (GetLevel()*3)*AC_adjust/10; } else if (GetLevel() >= 28 && GetLevel() <= 39) { - if (min_dmg==0) + if (min_dmg==0) min_dmg = GetLevel() / 2; - if (max_dmg==0) + if (max_dmg==0) max_dmg = ((GetLevel()*2)+2)*AC_adjust/10; } else if (GetLevel() <= 27) { - if (min_dmg==0) + if (min_dmg==0) min_dmg=1; - if (max_dmg==0) + if (max_dmg==0) max_dmg = (GetLevel()*2)*AC_adjust/10; } @@ -2228,42 +2228,42 @@ void NPC::SetSwarmTarget(int target_id) int32 NPC::CalcMaxMana() { if(npc_mana == 0) { - switch (GetCasterClass()) { - case 'I': - max_mana = (((GetINT()/2)+1) * GetLevel()) + spellbonuses.Mana + itembonuses.Mana; - break; - case 'W': - max_mana = (((GetWIS()/2)+1) * GetLevel()) + spellbonuses.Mana + itembonuses.Mana; - break; - case 'N': - default: - max_mana = 0; - break; - } - if (max_mana < 0) { - max_mana = 0; - } + switch (GetCasterClass()) { + case 'I': + max_mana = (((GetINT()/2)+1) * GetLevel()) + spellbonuses.Mana + itembonuses.Mana; + break; + case 'W': + max_mana = (((GetWIS()/2)+1) * GetLevel()) + spellbonuses.Mana + itembonuses.Mana; + break; + case 'N': + default: + max_mana = 0; + break; + } + if (max_mana < 0) { + max_mana = 0; + } - return max_mana; - } else { - switch (GetCasterClass()) { - case 'I': - max_mana = npc_mana + spellbonuses.Mana + itembonuses.Mana; - break; - case 'W': - max_mana = npc_mana + spellbonuses.Mana + itembonuses.Mana; - break; - case 'N': - default: - max_mana = 0; - break; - } - if (max_mana < 0) { - max_mana = 0; - } + return max_mana; + } else { + switch (GetCasterClass()) { + case 'I': + max_mana = npc_mana + spellbonuses.Mana + itembonuses.Mana; + break; + case 'W': + max_mana = npc_mana + spellbonuses.Mana + itembonuses.Mana; + break; + case 'N': + default: + max_mana = 0; + break; + } + if (max_mana < 0) { + max_mana = 0; + } - return max_mana; - } + return max_mana; + } } void NPC::SignalNPC(int _signal_id) diff --git a/zone/npc.h b/zone/npc.h index 5090c2bdb..cd9b2baaa 100644 --- a/zone/npc.h +++ b/zone/npc.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef NPC_H #define NPC_H @@ -34,7 +34,7 @@ using namespace std; #include "../common/rulesys.h" #ifdef _WINDOWS - #define M_PI 3.141592 + #define M_PI 3.141592 #endif #define LEAVECOMBAT 0 @@ -64,7 +64,7 @@ struct AISpells_Struct { uint32 time_cancast; // when we can cast this spell next int32 recast_delay; int16 priority; - int16 resist_adjust; + int16 resist_adjust; }; class AA_SwarmPetInfo; @@ -134,7 +134,7 @@ public: virtual void RangedAttack(Mob* other); virtual void ThrowingAttack(Mob* other) { } - int32 GetNumberOfAttacks() const { return attack_count; } + int32 GetNumberOfAttacks() const { return attack_count; } bool DatabaseCastAccepted(int spell_id); bool IsFactionListAlly(uint32 other_faction); @@ -156,7 +156,7 @@ public: void AddLootTable(); void AddLootTable(uint32 ldid); void DescribeAggro(Client *towho, Mob *mob, bool verbose); - void RemoveItem(uint32 item_id, uint16 quantity = 0, uint16 slot = 0); + void RemoveItem(uint32 item_id, uint16 quantity = 0, uint16 slot = 0); void CheckMinMaxLevel(Mob *them); void ClearItemList(); ServerLootItem_Struct* GetItem(int slot_id); @@ -179,7 +179,7 @@ public: inline void SetPlatinum(uint32 amt) { platinum = amt; } - virtual int32 CalcMaxMana(); + virtual int32 CalcMaxMana(); void SetGrid(int32 grid_){ grid=grid_; } void SetSp2(uint32 sg2){ spawn_group=sg2; } void SetWaypointMax(uint16 wp_){ wp_m=wp_; } @@ -197,9 +197,9 @@ public: float GetGuardPointX() const { return guard_x; } float GetGuardPointY() const { return guard_y; } float GetGuardPointZ() const { return guard_z; } - float GetGuardPointH() const { return guard_heading; } - EmuAppearance GetGuardPointAnim() const { return guard_anim; } - void SaveGuardPointAnim(EmuAppearance anim) { guard_anim = anim; } + float GetGuardPointH() const { return guard_heading; } + EmuAppearance GetGuardPointAnim() const { return guard_anim; } + void SaveGuardPointAnim(EmuAppearance anim) { guard_anim = anim; } void SetFlyMode(uint8 FlyMode){ flymode=FlyMode; } uint32 GetFlyMode() const { return flymode; } @@ -221,22 +221,22 @@ public: inline int32 GetNPCFactionID() const { return npc_faction_id; } inline int32 GetPrimaryFaction() const { return primary_faction; } - int32 GetNPCHate(Mob* in_ent) {return hate_list.GetEntHate(in_ent);} - bool IsOnHatelist(Mob*p) { return hate_list.IsOnHateList(p);} + int32 GetNPCHate(Mob* in_ent) {return hate_list.GetEntHate(in_ent);} + bool IsOnHatelist(Mob*p) { return hate_list.IsOnHateList(p);} void SetNPCFactionID(int32 in) { npc_faction_id = in; database.GetFactionIdsForNPC(npc_faction_id, &faction_list, &primary_faction); } - float org_x, org_y, org_z, org_heading; + float org_x, org_y, org_z, org_heading; uint32 GetMaxDMG() const {return max_dmg;} uint32 GetMinDMG() const {return min_dmg;} float GetSlowMitigation() const {return slow_mitigation;} float GetAttackSpeed() const {return attack_speed;} bool IsAnimal() const { return(bodytype == BT_Animal); } - uint16 GetPetSpellID() const {return pet_spell_id;} - void SetPetSpellID(uint16 amt) {pet_spell_id = amt;} + uint16 GetPetSpellID() const {return pet_spell_id;} + void SetPetSpellID(uint16 amt) {pet_spell_id = amt;} uint32 GetMaxDamage(uint8 tlevel); - void SetTaunting(bool tog) {taunting = tog;} + void SetTaunting(bool tog) {taunting = tog;} void PickPocket(Client* thief); void StartSwarmTimer(uint32 duration) { swarm_timer.Start(duration); } void AddLootDrop(const Item_Struct*dbitem, ItemList* itemlistconst, int16 charges, uint8 minlevel, uint8 maxlevel, bool equipit, bool wearchange = false); @@ -244,7 +244,7 @@ public: void CheckSignal(); //waypoint crap - int GetMaxWp() const { return max_wp; } + int GetMaxWp() const { return max_wp; } void DisplayWaypointInfo(Client *to); void CalculateNewWaypoint(); void AssignWaypoints(int32 grid); @@ -256,7 +256,7 @@ public: void ResumeWandering(); void PauseWandering(int pausetime); void MoveTo(float mtx, float mty, float mtz, float mth, bool saveguardspot); - void GetClosestWaypoint(list &wp_list, int count, float m_x, float m_y, float m_z); + void GetClosestWaypoint(list &wp_list, int count, float m_x, float m_y, float m_z); uint32 GetEquipment(uint8 material_slot) const; // returns item id int32 GetEquipmentMaterial(uint8 material_slot) const; @@ -286,7 +286,7 @@ public: inline void GiveNPCTypeData(NPCType *ours) { NPCTypedata_ours = ours; } inline const uint32 GetNPCSpellsID() const { return npc_spells_id; } - ItemList itemlist; //kathgar - why is this public? Doing other things or I would check the code + ItemList itemlist; //kathgar - why is this public? Doing other things or I would check the code NPCProximity* proximity; Spawn2* respawn2; @@ -326,7 +326,7 @@ public: //The corpse we make can only be looted by people who got credit for the kill const bool HasPrivateCorpse() const { return NPCTypedata->private_corpse; } - const bool IsUnderwaterOnly() const { return NPCTypedata->underwater; } + const bool IsUnderwaterOnly() const { return NPCTypedata->underwater; } const char* GetRawNPCTypeName() const { return NPCTypedata->name; } bool GetDepop() { return p_depop; } @@ -336,17 +336,17 @@ public: uint32 GetAdventureTemplate() const { return adventure_template_id; } void AddSpellToNPCList(int16 iPriority, int16 iSpellID, uint16 iType, int16 iManaCost, int32 iRecastDelay, int16 iResistAdjust); void RemoveSpellFromNPCList(int16 spell_id); - Timer *GetRefaceTimer() const { return reface_timer; } - const uint32 GetAltCurrencyType() const { return NPCTypedata->alt_currency_type; } + Timer *GetRefaceTimer() const { return reface_timer; } + const uint32 GetAltCurrencyType() const { return NPCTypedata->alt_currency_type; } NPC_Emote_Struct* GetNPCEmote(uint16 emoteid, uint8 event_); void DoNPCEmote(uint8 event_, uint16 emoteid); bool CanTalk(); - inline void SetSpellScale(float amt) { spellscale = amt; } + inline void SetSpellScale(float amt) { spellscale = amt; } inline float GetSpellScale() { return spellscale; } - inline void SetHealScale(float amt) { healscale = amt; } + inline void SetHealScale(float amt) { healscale = amt; } inline float GetHealScale() { return healscale; } void AddQuestItem(ItemInst* inst) { questItems.Insert(inst); } @@ -472,24 +472,24 @@ protected: uint32 silver; uint32 gold; uint32 platinum; - int32 grid; - uint32 spawn_group; + int32 grid; + uint32 spawn_group; uint16 wp_m; int32 npc_faction_id; int32 primary_faction; Timer attacked_timer; //running while we are being attacked (damaged) - Timer swarm_timer; - Timer classattack_timer; + Timer swarm_timer; + Timer classattack_timer; Timer knightattack_timer; - Timer assist_timer; //ask for help from nearby mobs + Timer assist_timer; //ask for help from nearby mobs Timer qglobal_purge_timer; bool combat_event; //true if we are in combat, false otherwise - Timer sendhpupdate_timer; + Timer sendhpupdate_timer; Timer enraged_timer; - Timer *reface_timer; + Timer *reface_timer; uint32 npc_spells_id; uint8 casting_spell_AIindex; @@ -504,15 +504,15 @@ protected: uint32 max_dmg; uint32 min_dmg; int32 accuracy_rating; - int16 attack_count; - uint32 npc_mana; - float spellscale; - float healscale; + int16 attack_count; + uint32 npc_mana; + float spellscale; + float healscale; //pet crap: uint16 pet_spell_id; bool taunting; - Timer taunt_timer; //for pet taunting + Timer taunt_timer; //for pet taunting bool npc_aggro; @@ -523,9 +523,9 @@ protected: void _ClearWaypints(); int max_wp; int save_wp; - float guard_x, guard_y, guard_z, guard_heading; + float guard_x, guard_y, guard_z, guard_heading; float guard_x_saved, guard_y_saved, guard_z_saved, guard_heading_saved; - EmuAppearance guard_anim; + EmuAppearance guard_anim; float roambox_max_x; float roambox_max_y; float roambox_min_x; @@ -535,8 +535,8 @@ protected: float roambox_movingto_y; uint32 roambox_delay; - uint16 skills[HIGHEST_SKILL+1]; - uint32 equipment[MAX_WORN_INVENTORY]; //this is an array of item IDs + uint16 skills[HIGHEST_SKILL+1]; + uint32 equipment[MAX_WORN_INVENTORY]; //this is an array of item IDs uint16 d_meele_texture1; //this is an item Material value uint16 d_meele_texture2; //this is an item Material value (offhand) uint8 prim_melee_type; //Sets the Primary Weapon attack message and animation diff --git a/zone/object.h b/zone/object.h index 4328f3ff9..d122c29e2 100644 --- a/zone/object.h +++ b/zone/object.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef OBJECT_H #define OBJECT_H @@ -91,7 +91,7 @@ IT10725_ACTORDEF=Shuriken #define OT_TEIRDALFORGE 0x20 //dark elf #define OT_OGGOKFORGE 0x21 //ogre #define OT_STORMGUARDF 0x22 //dwarven -#define OT_VALEFORGE 0x31 //halfling +#define OT_VALEFORGE 0x31 //halfling // gnome forge 0x23 (ak'anon forge) // barbarian forge 0x24 (northman forge) // @@ -175,12 +175,12 @@ public: uint32 GetDBID(); uint32 GetType(); - void SetType(uint32 type); - void SetDBID(uint32 dbid); + void SetType(uint32 type); + void SetDBID(uint32 dbid); uint32 GetIcon(); - void SetIcon(uint32 icon); + void SetIcon(uint32 icon); uint32 GetItemID(); - void SetItemID(uint32 itemid); + void SetItemID(uint32 itemid); void GetObjectData(Object_Struct* Data); void SetObjectData(Object_Struct* Data); void GetLocation(float* x, float* y, float* z); diff --git a/zone/oldcode.cpp b/zone/oldcode.cpp index 504343993..031e2492f 100644 --- a/zone/oldcode.cpp +++ b/zone/oldcode.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -36,30 +36,30 @@ using namespace std; #define snprintf _snprintf #define vsnprintf _vsnprintf #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif bool spells_loaded = false; volatile bool RunLoops = true; extern volatile bool ZoneLoaded; #ifdef SHAREMEM - #include "../common/EMuShareMem.h" - extern LoadEMuShareMemDLL EMuShareMemDLL; - #ifndef WIN32 - #include - #include - #include - #include + #include "../common/EMuShareMem.h" + extern LoadEMuShareMemDLL EMuShareMemDLL; + #ifndef WIN32 + #include + #include + #include + #include #ifndef FREEBSD - union semun { - int val; - struct semid_ds *buf; - ushort *array; - struct seminfo *__buf; - void *__pad; - }; + union semun { + int val; + struct semid_ds *buf; + ushort *array; + struct seminfo *__buf; + void *__pad; + }; #endif - #endif + #endif #endif @@ -674,20 +674,20 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { token[u]=(char)0; } //cout << "end class"; - /*for(y=0; y< 3;y++) - { - in.get(temp); - while(chrcmpI(&temp,&sep)) - { - strncat(token,&temp,1); - a++; - in.get(temp); - } - spells[tempid].unknown1[y]=atoi(token); - cout << spells[tempid].unknown1[y] << '^'; - a=0; - for(u=0;u<64;u++) - token[u]=(char)0; + /*for(y=0; y< 3;y++) + { + in.get(temp); + while(chrcmpI(&temp,&sep)) + { + strncat(token,&temp,1); + a++; + in.get(temp); + } + spells[tempid].unknown1[y]=atoi(token); + cout << spells[tempid].unknown1[y] << '^'; + a=0; + for(u=0;u<64;u++) + token[u]=(char)0; } in.get(temp); @@ -754,23 +754,23 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { token[u]=(char)0; for(y=0; y< 23;y++) - { + { in.get(temp); while(chrcmpI(&temp,&sep)) { strncat(token,&temp,1); a++; in.get(temp); - } + } spells[tempid].Spacing2[y]=atoi(token); //cout << spells[tempid].base[y] << '^'; a=0; for(u=0;u<64;u++) - token[u]=(char)0; + token[u]=(char)0; } - in.get(temp); - while(chrcmpI(&temp,&sep)) + in.get(temp); + while(chrcmpI(&temp,&sep)) { strncat(token,&temp,1); a++; @@ -780,9 +780,9 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { //cout << spells[tempid].ResistDiff << '^'; a=0; for(u=0;u<64;u++) - token[u]=(char)0; + token[u]=(char)0; - in.get(temp); + in.get(temp); for(y=0; y< 2;y++) { in.get(temp); @@ -799,8 +799,8 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { token[u]=(char)0; } - in.get(temp); - while(chrcmpI(&temp,&sep)) + in.get(temp); + while(chrcmpI(&temp,&sep)) { strncat(token,&temp,1); a++; @@ -810,9 +810,9 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { //cout << spells[tempid].RecourseLink << '^'; a=0; for(u=0;u<64;u++) - token[u]=(char)0; + token[u]=(char)0; - while(temp!='\n') + while(temp!='\n') in.get(temp); //cout << endl; @@ -840,7 +840,7 @@ void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) { void ZoneDatabase::UpdateAndDeleteAATimers(uint32 charid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; char *query2 = 0; if (!RunQuery(query, MakeAnyLenString(&query, "delete from aa_timers where charid=%i and UNIX_TIMESTAMP(now())>=end",charid), errbuf)) { @@ -855,7 +855,7 @@ void ZoneDatabase::UpdateAndDeleteAATimers(uint32 charid){ void ZoneDatabase::UpdateTimersClientConnected(uint32 charid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "update aa_timers set end=(UNIX_TIMESTAMP(now())+(end-begin)),begin=UNIX_TIMESTAMP(now()) where charid=%i",charid), errbuf)) { LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf); } @@ -864,8 +864,8 @@ void ZoneDatabase::UpdateTimersClientConnected(uint32 charid){ void ZoneDatabase::GetAATimers(uint32 charid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT ability,begin,end from aa_timers WHERE charid=%i", charid), errbuf, &result)) { @@ -887,8 +887,8 @@ void ZoneDatabase::GetAATimers(uint32 charid){ uint32 ZoneDatabase::GetTimerRemaining(uint32 charid,uint32 ability){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; MYSQL_ROW row; uint32 remain=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT end-begin from aa_timers WHERE charid=%i and ability=%i", charid,ability), errbuf, &result)) { @@ -906,7 +906,7 @@ uint32 ZoneDatabase::GetTimerRemaining(uint32 charid,uint32 ability){ void ZoneDatabase::UpdateAATimers(uint32 charid,uint32 endtime,uint32 begintime,uint32 ability){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if(begintime==0){ if (!RunQuery(query, MakeAnyLenString(&query, "replace into aa_timers (charid,end,begin,ability) values(%i,UNIX_TIMESTAMP(now())+%i,UNIX_TIMESTAMP(now()),%i)",charid,endtime,ability), errbuf)) { LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf); @@ -1148,7 +1148,7 @@ int32 Client::GenericFocus(uint16 spell_id, uint16 modspellid) return 100; break; default: - LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown limit effect %d", spells[modspellid].base[i]); + LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown limit effect %d", spells[modspellid].base[i]); } break; case SE_LimitCastTime: @@ -1167,7 +1167,7 @@ int32 Client::GenericFocus(uint16 spell_id, uint16 modspellid) return 100; break; default: - LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown limit spelltype %d", spells[modspellid].base[i]); + LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown limit spelltype %d", spells[modspellid].base[i]); } break; case SE_LimitMinDur: @@ -1182,7 +1182,7 @@ int32 Client::GenericFocus(uint16 spell_id, uint16 modspellid) modifier -= modspell.base[i]; break; default: - LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown effectid %d", modspell.effectid[i]); + LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown effectid %d", modspell.effectid[i]); } } @@ -1212,7 +1212,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] uint32 duration = 0; uint32 reuse = 0; - switch(disc_in->disc_id){ + switch(disc_in->disc_id){ // Shared? case discResistant: { // Resistant // 1 minute duration @@ -1223,7 +1223,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] duration = 60; reuse = 60*60; entity_list.MessageClose(this, false, 100, 0, "%s has become more resistant!", GetName()); - break; + break; } case discFearless: { // Fearless // 11 second duration @@ -1235,20 +1235,20 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] reuse = 60*60; entity_list.MessageClose_StringID(this, false, 100, 0, DISCIPLINE_FEARLESS, GetName()); //entity_list.MessageClose(this, false, 100, 0, "%s becomes fearless!", GetName()); - break; + break; } case discWhirlwind: { // Counterattack/Whirlwind/Furious // warrior level 56 // rogue/monk level 53 // 9 second duration // 1 hour reuse - if ( (GetClass() == WARRIOR && GetLevel() <= 56) + if ((GetClass() == WARRIOR && GetLevel() <= 56) ||(GetLevel() <= 53) ) return; duration = 9; reuse = 60*60; entity_list.MessageClose(this, false, 100, 0, "%s\'s face becomes twisted with fury!", GetName()); - break; + break; } case discFellstrike: { // Duelist/Innerflame/Fellstrike // monk level 56 @@ -1257,21 +1257,21 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // 12 second duration // 30 minute reuse // min 4*base hand/weapon damage - if ( (GetClass() == MONK && GetLevel() <= 55) + if ((GetClass() == MONK && GetLevel() <= 55) ||(GetClass() == WARRIOR && GetLevel() <= 58) ||(GetClass() == ROGUE && GetLevel() <= 59) ) return; duration = 12; reuse = 60*30; entity_list.MessageClose(this, false, 100, 0, "%s\'s muscles bulge with force of will!", GetName()); - break; + break; } case discBlindingSpeed: { // Blindingspeed/Hundredfist // rogue level 58 // monk level 57 // 15 second duration // 30 minute reuse - if ( (GetClass() == MONK && GetLevel() <= 58) + if ((GetClass() == MONK && GetLevel() <= 58) ||(GetClass() == ROGUE && GetLevel() <= 57) ) return; //disc_timer.Start(1000*60*30); @@ -1279,20 +1279,20 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] duration = 15; reuse = 60*30; Message(0, "This discipline not implemented.."); - break; + break; } case discDeadeye: { // Deadeye/Charge // warrior level 53 // rogue level 54 // 14 second duration // 30 minute reuse - if ( (GetClass() == WARRIOR && GetLevel() <= 53) + if ((GetClass() == WARRIOR && GetLevel() <= 53) ||(GetClass() == ROGUE && GetLevel() <= 54) ) return; duration = 14; reuse = 60*30; entity_list.MessageClose(this, false, 100, 0, "%s feels unstopable!", GetName()); - break; + break; } // Warrior case discEvasive: { // Evasive @@ -1303,7 +1303,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // -15% out duration = 3*60; reuse = 15*60; - break; + break; } case discMightystrike: { // Mightystrike // level 54 @@ -1312,7 +1312,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // Auto crit duration = 10; reuse = 60*60; - break; + break; } case discDefensive: { // Defensive // level 55 @@ -1325,7 +1325,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] reuse = 10*60; else reuse = 15*60; - break; + break; } case discPrecise: { // Precise // level 57 @@ -1335,7 +1335,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // +35% out duration = 3*60; reuse = 30*60; - break; + break; } case discAggressive: { // Aggressive // level 60 @@ -1345,7 +1345,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // +35% out duration = 3*60; reuse = 27*60; - break; + break; } // Monk case discStonestance: { // Stonestance @@ -1355,7 +1355,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] reuse = 3*60; else reuse = 12*60; - break; + break; } case discThunderkick: { // Thunderkick // level 52 @@ -1364,7 +1364,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 7*60; duration = 5*60; //hack for now, checked in combat and expired once used. - break; + break; } case discVoidance: { // Voidance // level 54 @@ -1373,7 +1373,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 60*60; duration = 8; - break; + break; } case discSilentfist: { // Silentfist // level 59 @@ -1385,7 +1385,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 7*60; duration = 5*60; //hack for now, checked in combat and expired once used. - break; + break; } case discAshenhand: { // Ashenhand // level 60 @@ -1394,7 +1394,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // Chance to slay reuse = 72*60; duration = 5*60; //hack for now, checked in combat and expired once used. - break; + break; } // Rogue case discNimble: { // Nimble @@ -1407,7 +1407,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 30*60; duration = 12; - break; + break; } case discKinesthetics: { // Kinesthetics // level 57 @@ -1420,7 +1420,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 30*60; duration = 18; - break; + break; } // Paladin case discHolyforge: { // Holyforge @@ -1434,7 +1434,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 72*60; duration = 5*60; - break; + break; } case discSanctification: { // Sanctification // level 60 @@ -1443,7 +1443,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // Spell immunity reuse = 72*60; duration = 15; - break; + break; } // Ranger case discTrueshot: { // Trueshot @@ -1457,7 +1457,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 72*60; duration = 2*60; - break; + break; } case discWeaponshield: { // Weaponshield // level 60 @@ -1466,7 +1466,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // auto parry reuse = 72*60; duration = 20; - break; + break; } // Bard case discDeftdance: { // Deftdance @@ -1480,7 +1480,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 72*60; duration = 10; - break; + break; } case discPuretone: { // Puretone // level 60 @@ -1489,7 +1489,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // Auto instrument reuse = 72*60; duration = 4*60; - break; + break; } // Shadow knight case discUnholyAura: { // Unholy @@ -1502,7 +1502,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else reuse = 72*60; duration = 5*60; //hack for now, checked in combat and expired once used. - break; + break; } case discLeechCurse: { // Leech curse // level 60 @@ -1511,18 +1511,18 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // Heal self for each point of melee damage done reuse = 72*60; duration = 15; - break; + break; } // Default case 0:{ // Timer request break; } default: - LogFile->write(EQEMuLog::Error, "Unknown Discipline requested by client: %s class: %i Disciline:%i", GetName(), class_,disc_in->disc_id); - return; - } + LogFile->write(EQEMuLog::Error, "Unknown Discipline requested by client: %s class: %i Disciline:%i", GetName(), class_,disc_in->disc_id); + return; + } - if(reuse != 0) { + if(reuse != 0) { p_timers.Start(pTimerDisciplineReuse, reuse); //nonpersistent timer for the 'discipline ready' message disc_timer.Start(1000*reuse); @@ -1541,37 +1541,37 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] while(iterator.MoreElements()) { Mob* mob = iterator.GetData(); if (group){ - // Client casting group spell with out target group buffs enabled - // Skip non group members - if ( caster->IsClient() - && !caster->CastToClient()->TGB() - && GetGroupByMob(mob) != 0 - && !GetGroupByMob(mob)->IsGroupMember(caster) - ) { - LogFile->write(EQEMuLog::Debug, "Group spell skipping %s", mob->GetName()); - iterator.Advance(); - continue; - } - // Client casting group spell with target group buffs enabled - else if ( caster->IsClient() - && caster->CastToClient()->TGB() - && GetGroupByMob(mob) != 0 - && GetGroupByMob(mob)->IsGroupMember(caster) - ){ - LogFile->write(EQEMuLog::Debug, "Group spell TGB on %s's Group", mob->GetName()); - GetGroupByMob(mob)->CastGroupSpell(caster, spell_id); - iterator.Advance(); - continue; - } - else if ( caster->IsClient() - && caster->CastToClient()->TGB() - && GetGroupByMob(mob) == 0 - && mob == center - ){ - LogFile->write(EQEMuLog::Debug, "Group spell TGB on %s", mob->GetName()); - caster->SpellOnTarget(spell_id, mob); - return; - } + // Client casting group spell with out target group buffs enabled + // Skip non group members + if (caster->IsClient() + && !caster->CastToClient()->TGB() + && GetGroupByMob(mob) != 0 + && !GetGroupByMob(mob)->IsGroupMember(caster) + ) { + LogFile->write(EQEMuLog::Debug, "Group spell skipping %s", mob->GetName()); + iterator.Advance(); + continue; + } + // Client casting group spell with target group buffs enabled + else if (caster->IsClient() + && caster->CastToClient()->TGB() + && GetGroupByMob(mob) != 0 + && GetGroupByMob(mob)->IsGroupMember(caster) + ){ + LogFile->write(EQEMuLog::Debug, "Group spell TGB on %s's Group", mob->GetName()); + GetGroupByMob(mob)->CastGroupSpell(caster, spell_id); + iterator.Advance(); + continue; + } + else if (caster->IsClient() + && caster->CastToClient()->TGB() + && GetGroupByMob(mob) == 0 + && mob == center + ){ + LogFile->write(EQEMuLog::Debug, "Group spell TGB on %s", mob->GetName()); + caster->SpellOnTarget(spell_id, mob); + return; + } } if ( mob->DistNoZ(*center) <= dist @@ -1586,66 +1586,66 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] else if(caster->IsNPC() && !caster->CastToNPC()->IsInteractive()) { #else else if(caster->IsNPC()) { - #endif - // Npc + #endif + // Npc if (caster->IsAttackAllowed(mob) && spells[spell_id].targettype != ST_AEBard) { - // printf("NPC Spell casted on %s\n", mob->GetName()); + //printf("NPC Spell casted on %s\n", mob->GetName()); caster->SpellOnTarget(spell_id, mob); } else if (mob->IsAIControlled() && spells[spell_id].targettype == ST_AEBard) { - // printf("NPC mgb/aebard spell casted on %s\n", mob->GetName()); + //printf("NPC mgb/aebard spell casted on %s\n", mob->GetName()); caster->SpellOnTarget(spell_id, mob); } else { - // printf("NPC AE, fall thru. spell_id:%i, Target type:%x\n", spell_id, spells[spell_id].targettype); + //printf("NPC AE, fall thru. spell_id:%i, Target type:%x\n", spell_id, spells[spell_id].targettype); } } #ifdef IPC - else if(caster->IsNPC() && caster->CastToNPC()->IsInteractive()) { - // Interactive npc + else if(caster->IsNPC() && caster->CastToNPC()->IsInteractive()) { + // Interactive npc if (caster->IsAttackAllowed(mob) && spells[spell_id].targettype != ST_AEBard && spells[spell_id].targettype != ST_GroupTeleport) { - // printf("IPC Spell casted on %s\n", mob->GetName()); + //printf("IPC Spell casted on %s\n", mob->GetName()); caster->SpellOnTarget(spell_id, mob); } else if (!mob->IsAIControlled() && (spells[spell_id].targettype == ST_AEBard||group) && mob->CastToClient()->GetPVP() == caster->CastToClient()->GetPVP()) { - if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) { - iterator.Advance(); - continue; - } - // printf("IPC mgb/aebard spell casted on %s\n", mob->GetName()); + if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) { + iterator.Advance(); + continue; + } + //printf("IPC mgb/aebard spell casted on %s\n", mob->GetName()); caster->SpellOnTarget(spell_id, mob); } else { - // printf("NPC AE, fall thru. spell_id:%i, Target type:%x\n", spell_id, spells[spell_id].targettype); + //printf("NPC AE, fall thru. spell_id:%i, Target type:%x\n", spell_id, spells[spell_id].targettype); } } #endif - else if (caster->IsClient() && !(caster->CastToClient()->IsBecomeNPC())) { + else if (caster->IsClient() && !(caster->CastToClient()->IsBecomeNPC())) { // Client if (caster->IsAttackAllowed(mob) && spells[spell_id].targettype != ST_AEBard){ - // printf("Client Spell casted on %s\n", mob->GetName()); + //printf("Client Spell casted on %s\n", mob->GetName()); caster->SpellOnTarget(spell_id, mob); } else if(spells[spell_id].targettype == ST_GroupTeleport && mob->IsClient() && mob->isgrouped && caster->isgrouped && entity_list.GetGroupByMob(caster)) { Group* caster_group = entity_list.GetGroupByMob(caster); - if(caster_group != 0 && caster_group->IsGroupMember(mob)) - caster->SpellOnTarget(spell_id,mob); + if(caster_group != 0 && caster_group->IsGroupMember(mob)) + caster->SpellOnTarget(spell_id,mob); } else if (mob->IsClient() && (spells[spell_id].targettype == ST_AEBard||group) && mob->CastToClient()->GetPVP() == caster->CastToClient()->GetPVP()) { if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) { - iterator.Advance(); - continue; - } + iterator.Advance(); + continue; + } else if (mob->IsClient() && spells[spell_id].targettype == ST_AEBard && mob->CastToClient()->GetPVP() == caster->CastToClient()->GetPVP()) caster->SpellOnTarget(spell_id, mob); #ifdef IPC - else if (mob->IsNPC() && mob->CastToNPC()->IsInteractive()) { - if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) - continue; - caster->SpellOnTarget(spell_id, mob); + else if (mob->IsNPC() && mob->CastToNPC()->IsInteractive()) { + if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) + continue; + caster->SpellOnTarget(spell_id, mob); } - #endif + #endif } } else if (caster->IsClient()) { @@ -1662,9 +1662,9 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0] // Queries the loottable: adds item & coin to the npc void ZoneDatabase::AddLootTableToNPC(uint32 loottable_id, ItemList* itemlist, uint32* copper, uint32* silver, uint32* gold, uint32* plat) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; *copper = 0; *silver = 0; *gold = 0; @@ -1747,12 +1747,12 @@ void ZoneDatabase::AddLootTableToNPC(uint32 loottable_id, ItemList* itemlist, ui // maxdrops = size of the array npcd void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; -// This is Wiz's updated Pool Looting functionality. Eventually, the database format should be moved over to use this -// or implemented to support both methods. (A unique identifier in lootable_entries indicates to roll for a pool item +// This is Wiz's updated Pool Looting functionality. Eventually, the database format should be moved over to use this +// or implemented to support both methods. (A unique identifier in lootable_entries indicates to roll for a pool item // in another table. #ifdef POOLLOOTING uint32 chancepool = 0; @@ -1782,14 +1782,14 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { uint32 res; i = 0; - if (chancepool!=0) //avoid divide by zero if some mobs have 0 for chancepool - { - res = rand()%chancepool; - } - else - { - res = 0; - } + if (chancepool!=0) //avoid divide by zero if some mobs have 0 for chancepool + { + res = rand()%chancepool; + } + else + { + res = 0; + } while (items[i] != 0) { @@ -1821,7 +1821,7 @@ void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) { safe_delete_array(query); while ((row = mysql_fetch_row(result))) { - uint8 LootDropMod=1; // place holder till I put it in a database variable to make it configurable. + uint8 LootDropMod=1; // place holder till I put it in a database variable to make it configurable. if( (rand()%100) < ((atoi(row[4]) * LootDropMod)) ) { uint32 itemid = atoi(row[1]); diff --git a/zone/oldcode.h b/zone/oldcode.h index 3ec6f1ec4..6decf7f76 100644 --- a/zone/oldcode.h +++ b/zone/oldcode.h @@ -1,25 +1,22 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef OLDCODE_H #define OLDCODE_H - - - #endif diff --git a/zone/parser.h b/zone/parser.h index 1a3497a93..7d068ff86 100644 --- a/zone/parser.h +++ b/zone/parser.h @@ -84,37 +84,37 @@ public: int ParseCommands(std::string text, int line, int justcheck, uint32 npcid, Mob* other, Mob* mob, std::string filename=string("none")); int ParseIf(std::string text); int pcalc(const char * string); - void ParseVars(std::string& text, uint32 npcid, Mob* mob); + void ParseVars(std::string& text, uint32 npcid, Mob* mob); void Replace(std::string& string1, std::string repstr, std::string rep, int all=0); void scanformat(char *string, const char *format, char arg[10][1024]); bool SetNPCqstID(uint32 iNPCID, int32 iValue); - char * strrstr(char* string, const char * sub); + char * strrstr(char* string, const char * sub); virtual void SendCommands(const char * event, uint32 npcid, NPC* npcmob, Mob* mob); int HasQuestFile(uint32 npcid); - //interface stuff - virtual void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data) {} - virtual void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) {} - virtual void EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) {} - virtual void EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data) {} - virtual void EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data) {} - virtual bool HasQuestSub(uint32 npcid, const char *subname) { return HasQuestFile(npcid) != 0; } - virtual bool PlayerHasQuestSub(const char *subname) { return true; } - virtual bool GlobalPlayerHasQuestSub(const char *subname) { return true; } - virtual bool SpellHasQuestSub(uint32 spell_id, const char *subname) { return true; } - virtual bool ItemHasQuestSub(ItemInst *itm, const char *subname) { return true; } - virtual void AddVar(std::string varname, std::string varval); + //interface stuff + virtual void EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data) {} + virtual void EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) {} + virtual void EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data) {} + virtual void EventItem(QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data) {} + virtual void EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data) {} + virtual bool HasQuestSub(uint32 npcid, const char *subname) { return HasQuestFile(npcid) != 0; } + virtual bool PlayerHasQuestSub(const char *subname) { return true; } + virtual bool GlobalPlayerHasQuestSub(const char *subname) { return true; } + virtual bool SpellHasQuestSub(uint32 spell_id, const char *subname) { return true; } + virtual bool ItemHasQuestSub(ItemInst *itm, const char *subname) { return true; } + virtual void AddVar(std::string varname, std::string varval); virtual void ReloadQuests(bool with_timers = false); - virtual uint32 GetIdentifier() { return 0x04629fff; } + virtual uint32 GetIdentifier() { return 0x04629fff; } private: - //void Event(int event, uint32 npcid, const char * data, Mob* npcmob, Mob* mob); - //changed - Eglin. more reasonable (IMHO) than changing every single referance to the global pointer. + //void Event(int event, uint32 npcid, const char * data, Mob* npcmob, Mob* mob); + //changed - Eglin. more reasonable (IMHO) than changing every single referance to the global pointer. //that's what you get for using globals! :) - virtual void Event(QuestEventID event, uint32 npcid, const char * data, NPC* npcmob, Mob* mob, uint32 extradata = 0); + virtual void Event(QuestEventID event, uint32 npcid, const char * data, NPC* npcmob, Mob* mob, uint32 extradata = 0); uint32 pMaxNPCID; int32* pNPCqstID; diff --git a/zone/pathing.cpp b/zone/pathing.cpp index 93b3f9bea..c269029ec 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -13,7 +13,7 @@ #include "zone.h" #ifdef _WINDOWS -#define snprintf _snprintf +#define snprintf _snprintf #endif //#define PATHDEBUG @@ -114,7 +114,7 @@ bool PathManager::loadPaths(FILE *PathFile) fread(&Head, sizeof(Head), 1, PathFile); LogFile->write(EQEMuLog::Status, "Path File Header: Version %ld, PathNodes %ld", - (long)Head.version, (long)Head.PathNodeCount); + (long)Head.version, (long)Head.PathNodeCount); if(Head.version != 2) { @@ -163,7 +163,7 @@ void PathManager::PrintPathing() for(uint32 i = 0; i < Head.PathNodeCount; ++i) { printf("PathNode: %2d id %2d. (%8.3f, %8.3f, %8.3f), BestZ: %8.3f\n", - i, PathNodes[i].id, PathNodes[i].v.x, PathNodes[i].v.y, PathNodes[i].v.z, PathNodes[i].bestz); + i, PathNodes[i].id, PathNodes[i].v.x, PathNodes[i].v.y, PathNodes[i].v.z, PathNodes[i].bestz); if(PathNodes[i].Neighbours[0].id == -1) @@ -178,7 +178,7 @@ void PathManager::PrintPathing() break; printf(" Neighbour: %2d, Distance %8.3f", PathNodes[i].Neighbours[j].id, - PathNodes[i].Neighbours[j].distance); + PathNodes[i].Neighbours[j].distance); if(PathNodes[i].Neighbours[j].Teleport) printf(" ***** TELEPORT *****"); @@ -294,7 +294,7 @@ list PathManager::FindRoute(int startID, int endID) AStarEntry.GCost = CurrentNode.GCost + PathNodes[CurrentNode.PathNodeID].Neighbours[i].distance; - float FCost = AStarEntry.HCost + AStarEntry.GCost; + float FCost = AStarEntry.HCost + AStarEntry.GCost; #ifdef PATHDEBUG printf("Node: %i, Open Neighbour %i has HCost %8.3f, GCost %8.3f (Total Cost: %8.3f)\n", CurrentNode.PathNodeID, @@ -314,7 +314,7 @@ list PathManager::FindRoute(int startID, int endID) { AlreadyInOpenList = true; - float GCostToNode = CurrentNode.GCost + PathNodes[CurrentNode.PathNodeID].Neighbours[i].distance; + float GCostToNode = CurrentNode.GCost + PathNodes[CurrentNode.PathNodeID].Neighbours[i].distance; if(GCostToNode < (*OpenListIterator).GCost) { @@ -361,7 +361,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) _ZP(Pathing_FindRoute_FromVertices); - _log(PATHING__DEBUG, "FindRoute(%8.3f, %8.3f, %8.3f, %8.3f, %8.3f, %8.3f)", Start.x, Start.y, Start.z, End.x, End.y, End.z); + _log(PATHING__DEBUG, "FindRoute(%8.3f, %8.3f, %8.3f, %8.3f, %8.3f, %8.3f)", Start.x, Start.y, Start.z, End.x, End.y, End.z); list noderoute; @@ -381,10 +381,10 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) for(uint32 i = 0 ; i < Head.PathNodeCount; ++i) { if((ABS(Start.x - PathNodes[i].v.x) <= CandidateNodeRangeXY) && - (ABS(Start.y - PathNodes[i].v.y) <= CandidateNodeRangeXY) && - (ABS(Start.z - PathNodes[i].v.z) <= CandidateNodeRangeZ)) + (ABS(Start.y - PathNodes[i].v.y) <= CandidateNodeRangeXY) && + (ABS(Start.z - PathNodes[i].v.z) <= CandidateNodeRangeZ)) { - TempNode.id = i; + TempNode.id = i; TempNode.Distance = VertexDistanceNoRoot(Start, PathNodes[i].v); SortedByDistance.push_back(TempNode); @@ -420,10 +420,10 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) for(uint32 i = 0 ; i < Head.PathNodeCount; ++i) { if((ABS(End.x - PathNodes[i].v.x) <= CandidateNodeRangeXY) && - (ABS(End.y - PathNodes[i].v.y) <= CandidateNodeRangeXY) && - (ABS(End.z - PathNodes[i].v.z) <= CandidateNodeRangeZ)) + (ABS(End.y - PathNodes[i].v.y) <= CandidateNodeRangeXY) && + (ABS(End.z - PathNodes[i].v.z) <= CandidateNodeRangeZ)) { - TempNode.id = i; + TempNode.id = i; TempNode.Distance = VertexDistanceNoRoot(End, PathNodes[i].v); SortedByDistance.push_back(TempNode); } @@ -479,7 +479,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) break; if(!zone->zonemap->LineIntersectsZone(Start, PathNodes[(*Second)].v, 1.0f, nullptr, nullptr) - && zone->pathing->NoHazards(Start, PathNodes[(*Second)].v)) + && zone->pathing->NoHazards(Start, PathNodes[(*Second)].v)) { noderoute.erase(First); @@ -512,7 +512,7 @@ list PathManager::FindRoute(VERTEX Start, VERTEX End) break; if(!zone->zonemap->LineIntersectsZone(End, PathNodes[(*Second)].v, 1.0f, nullptr, nullptr) - && zone->pathing->NoHazards(End, PathNodes[(*Second)].v)) + && zone->pathing->NoHazards(End, PathNodes[(*Second)].v)) { noderoute.erase(First); @@ -673,7 +673,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo VERTEX From(GetX(), GetY(), GetZ()); - VERTEX HeadPosition(From.x, From.y, From.z + (GetSize() < 6.0 ? 6 : GetSize()) * HEAD_POSITION); + VERTEX HeadPosition(From.x, From.y, From.z + (GetSize() < 6.0 ? 6 : GetSize()) * HEAD_POSITION); VERTEX To(ToX, ToY, ToZ); @@ -761,8 +761,8 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo if((RouteSize == 2) || ((PathingTraversedNodes >= RuleI(Pathing, MinNodesTraversedForLOSCheck)) - && (RouteSize <= RuleI(Pathing, MinNodesLeftForLOSCheck)) - && PathingLOSCheckTimer->Check())) + && (RouteSize <= RuleI(Pathing, MinNodesLeftForLOSCheck)) + && PathingLOSCheckTimer->Check())) { mlog(PATHING__DEBUG, " Checking distance to target."); float Distance = VertexDistanceNoRoot(From, To); @@ -770,7 +770,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo mlog(PATHING__DEBUG, " Distance between From and To (NoRoot) is %8.3f", Distance); if((Distance <= RuleR(Pathing, MinDistanceForLOSCheckShort)) - && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) + && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) { if(!zone->zonemap->LineIntersectsZone(HeadPosition, To, 1.0f, nullptr, nullptr)) PathingLOSState = HaveLOS; @@ -836,7 +836,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo mlog(PATHING__DEBUG, " Now moving to node %i", NextNode); - return zone->pathing->GetPathNodeCoordinates(NextNode); + return zone->pathing->GetPathNodeCoordinates(NextNode); } else { @@ -853,8 +853,8 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo int RouteSize = Route.size(); if((PathingTraversedNodes >= RuleI(Pathing, MinNodesTraversedForLOSCheck)) - && (RouteSize <= RuleI(Pathing, MinNodesLeftForLOSCheck)) - && PathingLOSCheckTimer->Check()) + && (RouteSize <= RuleI(Pathing, MinNodesLeftForLOSCheck)) + && PathingLOSCheckTimer->Check()) { mlog(PATHING__DEBUG, " Checking distance to target."); @@ -863,7 +863,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo mlog(PATHING__DEBUG, " Distance between From and To (NoRoot) is %8.3f", Distance); if((Distance <= RuleR(Pathing, MinDistanceForLOSCheckShort)) - && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) + && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) { if(!zone->zonemap->LineIntersectsZone(HeadPosition, To, 1.0f, nullptr, nullptr)) PathingLOSState = HaveLOS; @@ -901,7 +901,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo float Distance = VertexDistanceNoRoot(From, To); if((Distance <= RuleR(Pathing, MinDistanceForLOSCheckShort)) - && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) + && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) { mlog(PATHING__DEBUG, " Checking for short LOS at distance %8.3f.", Distance); if(!zone->zonemap->LineIntersectsZone(HeadPosition, To, 1.0f, nullptr, nullptr)) @@ -1053,7 +1053,7 @@ VERTEX Mob::UpdatePath(float ToX, float ToY, float ToZ, float Speed, bool &Waypo float Distance = VertexDistanceNoRoot(From, To); if((Distance <= RuleR(Pathing, MinDistanceForLOSCheckLong)) - && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) + && (ABS(From.z - To.z) <= RuleR(Pathing, ZDiffThreshold))) { mlog(PATHING__DEBUG, " Checking for long LOS at distance %8.3f.", Distance); @@ -1121,10 +1121,10 @@ int PathManager::FindNearestPathNode(VERTEX Position) for(uint32 i = 0 ; i < Head.PathNodeCount; ++i) { if((ABS(Position.x - PathNodes[i].v.x) <= CandidateNodeRangeXY) && - (ABS(Position.y - PathNodes[i].v.y) <= CandidateNodeRangeXY) && - (ABS(Position.z - PathNodes[i].v.z) <= CandidateNodeRangeZ)) + (ABS(Position.y - PathNodes[i].v.y) <= CandidateNodeRangeXY) && + (ABS(Position.z - PathNodes[i].v.z) <= CandidateNodeRangeZ)) { - TempNode.id = i; + TempNode.id = i; TempNode.Distance = VertexDistanceNoRoot(Position, PathNodes[i].v); SortedByDistance.push_back(TempNode); @@ -1193,7 +1193,7 @@ bool PathManager::NoHazardsAccurate(VERTEX From, VERTEX To) stepx = (float)To.x - curx; stepy = (float)To.y - cury; stepz = (float)To.z - curz; - float factor = sqrt(stepx*stepx + stepy*stepy + stepz*stepz); + float factor = sqrt(stepx*stepx + stepy*stepy + stepz*stepz); stepx = (stepx/factor)*step_size; stepy = (stepy/factor)*step_size; stepz = (stepz/factor)*step_size; @@ -1955,7 +1955,7 @@ void PathManager::DisconnectNodeToNode(int32 Node1, int32 Node2) bool disconnect_a_from_b = false; if(NodesConnected(a, b)) - disconnect_a_from_b = true; + disconnect_a_from_b = true; bool disconnect_b_from_a = false; if(NodesConnected(b, a)) @@ -2295,3 +2295,4 @@ void PathManager::SortNodes() safe_delete_array(PathNodes); PathNodes = t_PathNodes; } + diff --git a/zone/perl_PlayerCorpse.cpp b/zone/perl_PlayerCorpse.cpp index 288d901a6..7fedb85c2 100644 --- a/zone/perl_PlayerCorpse.cpp +++ b/zone/perl_PlayerCorpse.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -36,7 +36,7 @@ #include "PlayerCorpse.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -804,8 +804,6 @@ XS(boot_Corpse) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "GetCharID"), XS_Corpse_GetCharID, file, "$"); diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index efbf1ba15..d1c6f19f8 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -1696,7 +1696,7 @@ XS(XS_Client_TakeMoneyFromPP) { dXSARGS; if (items < 2 || items > 3) - Perl_croak(aTHX_ "Usage: Client::TakeMoneyFromPP(THIS, copper, updateclient=false)"); + Perl_croak(aTHX_ "Usage: Client::TakeMoneyFromPP(THIS, copper, updateclient=false)"); { Client * THIS; bool RETVAL; @@ -3897,8 +3897,8 @@ XS(XS_Client_GetClientVersionBit) if (items != 1) Perl_croak(aTHX_ "Usage: Client::GetClientVersionBit(THIS)"); { - Client * THIS; - uint32 RETVAL; + Client * THIS; + uint32 RETVAL; dXSTARG; if (sv_derived_from(ST(0), "Client")) { @@ -5453,8 +5453,8 @@ XS(XS_Client_GetItemInInventory) Perl_croak(aTHX_ "Usage: Client::GetItemInInventory(THIS, slot_id)"); { Client * THIS; - int16 slot_id = (int16)SvIV(ST(1)); - ItemInst *RETVAL = nullptr; + int16 slot_id = (int16)SvIV(ST(1)); + ItemInst *RETVAL = nullptr; if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -5465,8 +5465,8 @@ XS(XS_Client_GetItemInInventory) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - RETVAL = THIS->GetInv().GetItem(slot_id); - ST(0) = sv_newmortal(); + RETVAL = THIS->GetInv().GetItem(slot_id); + ST(0) = sv_newmortal(); sv_setref_pv(ST(0), "QuestItem", (void*)RETVAL); } XSRETURN(1); @@ -5480,9 +5480,9 @@ XS(XS_Client_SetCustomItemData) Perl_croak(aTHX_ "Usage: Client::SetCustomItemData(THIS, slot_id, identifier, value)"); { Client * THIS; - int16 slot_id = (int16)SvIV(ST(1)); - Const_char* identifier = SvPV_nolen(ST(2)); - Const_char* value = SvPV_nolen(ST(3)); + int16 slot_id = (int16)SvIV(ST(1)); + Const_char* identifier = SvPV_nolen(ST(2)); + Const_char* value = SvPV_nolen(ST(3)); if (sv_derived_from(ST(0), "Client")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -5493,7 +5493,7 @@ XS(XS_Client_SetCustomItemData) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - THIS->GetInv().SetCustomItemData(THIS->CharacterID(), slot_id, std::string(identifier), std::string(value)); + THIS->GetInv().SetCustomItemData(THIS->CharacterID(), slot_id, std::string(identifier), std::string(value)); } XSRETURN_EMPTY; } @@ -5506,9 +5506,9 @@ XS(XS_Client_GetCustomItemData) Perl_croak(aTHX_ "Usage: Client::GetCustomItemData(THIS, slot_id, identifier)"); { Client * THIS; - int16 slot_id = (int16)SvIV(ST(1)); - Const_char* identifier = SvPV_nolen(ST(2)); - Const_char * RETVAL; + int16 slot_id = (int16)SvIV(ST(1)); + Const_char* identifier = SvPV_nolen(ST(2)); + Const_char * RETVAL; dXSTARG; if (sv_derived_from(ST(0), "Client")) { @@ -5520,9 +5520,9 @@ XS(XS_Client_GetCustomItemData) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - std::string ret_val = THIS->GetInv().GetCustomItemData(slot_id, std::string(identifier)); - RETVAL = ret_val.c_str(); - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; + std::string ret_val = THIS->GetInv().GetCustomItemData(slot_id, std::string(identifier)); + RETVAL = ret_val.c_str(); + sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; } XSRETURN(1); } diff --git a/zone/perl_doors.cpp b/zone/perl_doors.cpp index 5d0f7a15f..77ad1902b 100644 --- a/zone/perl_doors.cpp +++ b/zone/perl_doors.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -36,7 +36,7 @@ #include "doors.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -737,8 +737,6 @@ XS(boot_Doors) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "GetID"),XS_Doors_GetID, file, "$"); newXSproto(strcpy(buf, "SetModelName"),XS_Doors_SetModelName, file, "$$"); diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp index 5703e7c96..255e9278f 100644 --- a/zone/perl_entity.cpp +++ b/zone/perl_entity.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -37,7 +37,7 @@ #include "entity.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp index 1ace3eddb..9db01353b 100644 --- a/zone/perl_groups.cpp +++ b/zone/perl_groups.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -36,7 +36,7 @@ #include "groups.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -632,8 +632,6 @@ XS(boot_Group) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "DisbandGroup"), XS_Group_DisbandGroup, file, "$"); diff --git a/zone/perl_hateentry.cpp b/zone/perl_hateentry.cpp index 456d59413..fa65e8b39 100644 --- a/zone/perl_hateentry.cpp +++ b/zone/perl_hateentry.cpp @@ -1,5 +1,5 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2009 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2009 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -9,11 +9,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -139,3 +139,4 @@ XS(boot_HateEntry) } #endif //EMBPERL_XS_CLASSES + diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index fa57c0423..013975326 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -40,7 +40,7 @@ typedef const char Const_char; #include "client.h" #include "../common/spdat.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -5872,9 +5872,9 @@ XS(XS_Mob_NPCSpecialAttacks) { Mob * THIS; char* parse = (char *)SvPV_nolen(ST(1)); - int permtag = (int)SvIV(ST(2)); - bool reset = items == 4 ? (bool)SvTRUE(ST(3)) : true; - bool remove = items == 5 ? (bool)SvTRUE(ST(4)) : false; + int permtag = (int)SvIV(ST(2)); + bool reset = items == 4 ? (bool)SvTRUE(ST(3)) : true; + bool remove = items == 5 ? (bool)SvTRUE(ST(4)) : false; if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -6792,7 +6792,7 @@ XS(XS_Mob_ProjectileAnim) { dXSARGS; if (items < 3 || items > 8) - Perl_croak(aTHX_ "Usage: Mob::ProjectileAnim(THIS, mob, item_id, IsArrow?, speed, angle, tilt, arc)"); + Perl_croak(aTHX_ "Usage: Mob::ProjectileAnim(THIS, mob, item_id, IsArrow?, speed, angle, tilt, arc)"); { Mob * THIS; @@ -7407,7 +7407,7 @@ XS(XS_Mob_DoKnockback) Perl_croak(aTHX_ "Usage: Mob::DoKnockback(THIS, caster, pushback, pushup)"); { Mob * THIS; - Mob * caster; + Mob * caster; uint32 pushback = (uint16)SvUV(ST(2)); uint32 pushup = (uint16)SvUV(ST(2)); @@ -7477,7 +7477,7 @@ XS(XS_Mob_SetRunning) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - THIS->SetRunning(value); + THIS->SetRunning(value); } XSRETURN_EMPTY; } @@ -7502,7 +7502,7 @@ XS(XS_Mob_IsRunning) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - RETVAL = THIS->IsRunning(); + RETVAL = THIS->IsRunning(); ST(0) = boolSV(RETVAL); sv_2mortal(ST(0)); } @@ -7518,7 +7518,7 @@ XS(XS_Mob_SetBodyType) { Mob * THIS; int32 type = (int32)SvIV(ST(1)); - bool overwrite_orig = false; + bool overwrite_orig = false; if (sv_derived_from(ST(0), "Mob")) { IV tmp = SvIV((SV*)SvRV(ST(0))); @@ -7529,11 +7529,11 @@ XS(XS_Mob_SetBodyType) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - if(items == 3) { - overwrite_orig = (bool)SvTRUE(ST(2)); - } + if(items == 3) { + overwrite_orig = (bool)SvTRUE(ST(2)); + } - THIS->SetBodyType((bodyType)type, overwrite_orig); + THIS->SetBodyType((bodyType)type, overwrite_orig); } XSRETURN_EMPTY; } @@ -7584,7 +7584,7 @@ XS(XS_Mob_SetLD) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - THIS->SendAppearancePacket(AT_Linkdead, value); + THIS->SendAppearancePacket(AT_Linkdead, value); } XSRETURN_EMPTY; } @@ -7735,7 +7735,7 @@ XS(XS_Mob_SetAllowBeneficial) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - THIS->SetAllowBeneficial(value); + THIS->SetAllowBeneficial(value); } XSRETURN_EMPTY; } @@ -7811,7 +7811,7 @@ XS(XS_Mob_ModVulnerability) Perl_croak(aTHX_ "Usage: Mob::ModVulnerability(THIS, resist, value)"); { Mob * THIS; - uint8 resist = (uint8)SvIV(ST(1)); + uint8 resist = (uint8)SvIV(ST(1)); int16 value = (int16)SvIV(ST(2)); if (sv_derived_from(ST(0), "Mob")) { @@ -7902,8 +7902,8 @@ XS(XS_Mob_DoArcheryAttackDmg) { Mob * THIS; Mob* target; - ItemInst* RangeWeapon = nullptr; - ItemInst* Ammo = nullptr; + ItemInst* RangeWeapon = nullptr; + ItemInst* Ammo = nullptr; uint16 weapon_damage = (uint16)SvIV(ST(4)); int16 chance_mod = (int16)SvIV(ST(5)); int16 focus = (int16)SvIV(ST(6)); @@ -7940,7 +7940,7 @@ XS(XS_Mob_DoThrowingAttackDmg) { Mob * THIS; Mob* target; - ItemInst* RangeWeapon = nullptr; + ItemInst* RangeWeapon = nullptr; Item_Struct* item = nullptr; uint16 weapon_damage = (uint16)SvIV(ST(4)); int16 chance_mod = (int16)SvIV(ST(5)); @@ -7988,7 +7988,7 @@ XS(XS_Mob_SetDisableMelee) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - THIS->SetDisableMelee(value); + THIS->SetDisableMelee(value); } XSRETURN_EMPTY; } @@ -8086,8 +8086,6 @@ XS(boot_Mob) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "IsClient"), XS_Mob_IsClient, file, "$"); @@ -8351,7 +8349,7 @@ XS(boot_Mob) newXSproto(strcpy(buf, "SetDeltas"), XS_Mob_SetDeltas, file, "$$$$$"); newXSproto(strcpy(buf, "SetLD"), XS_Mob_SetLD, file, "$$"); newXSproto(strcpy(buf, "SetTargetDestSteps"), XS_Mob_SetTargetDestSteps, file, "$$"); - newXSproto(strcpy(buf, "SetTargetable"), XS_Mob_SetTargetable, file, "$$"); + newXSproto(strcpy(buf, "SetTargetable"), XS_Mob_SetTargetable, file, "$$"); newXSproto(strcpy(buf, "MakeTempPet"), XS_Mob_MakeTempPet, file, "$$;$$$$"); newXSproto(strcpy(buf, "ModSkillDmgTaken"), XS_Mob_ModSkillDmgTaken, file, "$$$"); newXSproto(strcpy(buf, "GetModSkillDmgTaken"), XS_Mob_GetModSkillDmgTaken, file, "$$"); diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp index 381a5c6b7..c89445bd2 100644 --- a/zone/perl_npc.cpp +++ b/zone/perl_npc.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -38,7 +38,7 @@ typedef const char Const_char; #include "npc.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -852,8 +852,8 @@ XS(XS_NPC_GetMinDMG) if (items != 1) Perl_croak(aTHX_ "Usage: NPC::GetMinDMG(THIS)"); { - NPC * THIS; - uint32 RETVAL; + NPC * THIS; + uint32 RETVAL; dXSTARG; if (sv_derived_from(ST(0), "NPC")) { @@ -2154,8 +2154,6 @@ XS(boot_NPC) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "SignalNPC"), XS_NPC_SignalNPC, file, "$$"); diff --git a/zone/perl_object.cpp b/zone/perl_object.cpp index 3c9390c70..9c71ec6ed 100644 --- a/zone/perl_object.cpp +++ b/zone/perl_object.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -36,7 +36,7 @@ #include "object.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -927,8 +927,6 @@ XS(boot_Object) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "Depop"),XS_Object_Depop, file, "$"); newXSproto(strcpy(buf, "Repop"),XS_Object_Repop, file, "$"); diff --git a/zone/perl_perlpacket.cpp b/zone/perl_perlpacket.cpp index 6faf46a7b..05bbf01f6 100644 --- a/zone/perl_perlpacket.cpp +++ b/zone/perl_perlpacket.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by xsubpp version 1.9508 from the - * contents of tmp. Do not edit this file, edit tmp instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by xsubpp version 1.9508 from the +* contents of tmp. Do not edit this file, edit tmp instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -36,7 +36,7 @@ #include "perlpacket.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -47,9 +47,9 @@ XS(XS_PerlPacket_new) if (items < 1 || items > 3) Perl_croak(aTHX_ "Usage: PerlPacket::new(CLASS, opcode= \"OP_Unknown\", len= 0)"); { - char *CLASS = (char *)SvPV_nolen(ST(0)); - PerlPacket *RETVAL; - const char *opcode; + char *CLASS = (char *)SvPV_nolen(ST(0)); + PerlPacket *RETVAL; + const char *opcode; uint32 len; if (items < 2) diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 2b5491ee3..0396ec666 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -1,5 +1,5 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -7,13 +7,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -201,7 +201,7 @@ XS(XS_QuestItem_GetAugment) Perl_croak(aTHX_ "Usage: QuestItem::GetAugment(THIS, augment_id)"); { ItemInst* THIS; - int16 slot_id = (int16)SvIV(ST(1)); + int16 slot_id = (int16)SvIV(ST(1)); ItemInst* RETVAL; if (sv_derived_from(ST(0), "QuestItem")) { @@ -213,8 +213,8 @@ XS(XS_QuestItem_GetAugment) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - RETVAL = THIS->GetAugment(slot_id); - ST(0) = sv_newmortal(); + RETVAL = THIS->GetAugment(slot_id); + ST(0) = sv_newmortal(); sv_setref_pv(ST(0), "QuestItem", (void*)RETVAL); } XSRETURN(1); @@ -240,7 +240,7 @@ XS(XS_QuestItem_GetID) if(THIS == nullptr) Perl_croak(aTHX_ "THIS is nullptr, avoiding crash."); - RETVAL = THIS->GetItem()->ID; + RETVAL = THIS->GetItem()->ID; XSprePUSH; PUSHi((IV)RETVAL); } XSRETURN(1); @@ -272,8 +272,8 @@ XS(boot_QuestItem) newXSproto(strcpy(buf, "IsType"), XS_QuestItem_IsType, file, "$$"); newXSproto(strcpy(buf, "IsAttuned"), XS_QuestItem_IsAttuned, file, "$"); newXSproto(strcpy(buf, "GetCharges"), XS_QuestItem_GetCharges, file, "$"); - newXSproto(strcpy(buf, "GetAugment"), XS_QuestItem_GetAugment, file, "$$"); - newXSproto(strcpy(buf, "GetID"), XS_QuestItem_GetID, file, "$"); + newXSproto(strcpy(buf, "GetAugment"), XS_QuestItem_GetAugment, file, "$$"); + newXSproto(strcpy(buf, "GetID"), XS_QuestItem_GetID, file, "$"); XSRETURN_YES; } diff --git a/zone/perl_raids.cpp b/zone/perl_raids.cpp index 6a9ea9b89..be3aea356 100644 --- a/zone/perl_raids.cpp +++ b/zone/perl_raids.cpp @@ -1,14 +1,14 @@ /* - * This file was generated automatically by ExtUtils::ParseXS version 2.18 from the - * contents of raids.h.xs. Do not edit this file, edit raids.h.xs instead. - * - * ANY CHANGES MADE HERE WILL BE LOST! - * - */ +* This file was generated automatically by ExtUtils::ParseXS version 2.18 from the +* contents of raids.h.xs. Do not edit this file, edit raids.h.xs instead. +* +* ANY CHANGES MADE HERE WILL BE LOST! +* +*/ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -37,7 +37,7 @@ #include "raids.h" #include "client.h" -#ifdef THIS /* this macro seems to leak out on some systems */ +#ifdef THIS /* this macro seems to leak out on some systems */ #undef THIS #endif @@ -593,8 +593,6 @@ XS(boot_Raid) //add the strcpy stuff to get rid of const warnings.... - - XS_VERSION_BOOTCHECK ; newXSproto(strcpy(buf, "IsRaidMember"), XS_Raid_IsRaidMember, file, "$$"); diff --git a/zone/perlpacket.cpp b/zone/perlpacket.cpp index 80f3814ed..262c2a278 100644 --- a/zone/perlpacket.cpp +++ b/zone/perlpacket.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -137,12 +137,10 @@ void PerlPacket::SetString(uint32 pos, char *str) { #pragma pack(1) struct EQ1319 { - int32 part13:13, - part19:19; + int32 part13:13, part19:19; }; struct EQ1913 { - int32 part19:19, - part13:13; + int32 part19:19, part13:13; }; #pragma pack() @@ -191,5 +189,3 @@ float PerlPacket::GetFloat(uint32 pos) { return(*p); } - - diff --git a/zone/perlpacket.h b/zone/perlpacket.h index 039344574..cb50dcd93 100644 --- a/zone/perlpacket.h +++ b/zone/perlpacket.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PERLPACKET_H #define PERLPACKET_H @@ -62,7 +62,4 @@ protected: unsigned char *packet; }; - - - #endif diff --git a/zone/perlparser.cpp b/zone/perlparser.cpp index d69d69c7d..88f97cc40 100644 --- a/zone/perlparser.cpp +++ b/zone/perlparser.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/features.h" @@ -159,7 +159,7 @@ void PerlXSParser::SendCommands(const char * pkgprefix, const char *event, uint3 perl->dosub(std::string(pkgprefix).append("::").append(event).c_str()); #ifdef EMBPERL_XS_CLASSES - std::string eval_str = (std::string)"$" + (std::string)pkgprefix + (std::string)"::client = undef;"; + std::string eval_str = (std::string)"$" + (std::string)pkgprefix + (std::string)"::client = undef;"; eval_str += (std::string)"$" + (std::string)pkgprefix + (std::string)"::npc = undef;"; eval_str += (std::string)"$" + (std::string)pkgprefix + (std::string)"::questitem = undef;"; eval_str += (std::string)"$" + (std::string)pkgprefix + (std::string)"::entity_list = undef;"; @@ -277,8 +277,8 @@ XS(XS__echo); // prototype to pass -Wmissing-prototypes XS(XS__echo) { dXSARGS; - if (items != 2) - Perl_croak(aTHX_ "Usage: echo(id#, str)"); + if (items != 2) + Perl_croak(aTHX_ "Usage: echo(id#, str)"); quest_manager.echo(SvUV(ST(0)), SvPV_nolen(ST(1))); @@ -471,7 +471,7 @@ XS(XS__setstat) XSRETURN_EMPTY; } -XS(XS__incstat); //old setstat command aza +XS(XS__incstat); //old setstat command aza XS(XS__incstat) { dXSARGS; @@ -1878,79 +1878,79 @@ XS(XS__clear_zone_flag) XS(XS__summonburriedplayercorpse); XS(XS__summonburriedplayercorpse) { - dXSARGS; - if (items != 5) - Perl_croak(aTHX_ "Usage: summonburriedplayercorpse(char_id,dest_x,dest_y,dest_z,dest_heading)"); + dXSARGS; + if (items != 5) + Perl_croak(aTHX_ "Usage: summonburriedplayercorpse(char_id,dest_x,dest_y,dest_z,dest_heading)"); - bool RETVAL; - uint32 char_id = (int)SvIV(ST(0)); - float dest_x = (float)SvIV(ST(1)); - float dest_y = (float)SvIV(ST(2)); - float dest_z = (float)SvIV(ST(3)); - float dest_heading = (float)SvIV(ST(4)); + bool RETVAL; + uint32 char_id = (int)SvIV(ST(0)); + float dest_x = (float)SvIV(ST(1)); + float dest_y = (float)SvIV(ST(2)); + float dest_z = (float)SvIV(ST(3)); + float dest_heading = (float)SvIV(ST(4)); - RETVAL = quest_manager.summonburriedplayercorpse(char_id, dest_x, dest_y, dest_z, dest_heading); + RETVAL = quest_manager.summonburriedplayercorpse(char_id, dest_x, dest_y, dest_z, dest_heading); - ST(0) = boolSV(RETVAL); - sv_2mortal(ST(0)); - XSRETURN(1); + ST(0) = boolSV(RETVAL); + sv_2mortal(ST(0)); + XSRETURN(1); } XS(XS__summonallplayercorpses); XS(XS__summonallplayercorpses) { - dXSARGS; - if (items != 5) - Perl_croak(aTHX_ "Usage: summonallplayercorpses(char_id,dest_x,dest_y,dest_z,dest_heading)"); + dXSARGS; + if (items != 5) + Perl_croak(aTHX_ "Usage: summonallplayercorpses(char_id,dest_x,dest_y,dest_z,dest_heading)"); - bool RETVAL; - uint32 char_id = (int)SvIV(ST(0)); - float dest_x = (float)SvIV(ST(1)); - float dest_y = (float)SvIV(ST(2)); - float dest_z = (float)SvIV(ST(3)); - float dest_heading = (float)SvIV(ST(4)); + bool RETVAL; + uint32 char_id = (int)SvIV(ST(0)); + float dest_x = (float)SvIV(ST(1)); + float dest_y = (float)SvIV(ST(2)); + float dest_z = (float)SvIV(ST(3)); + float dest_heading = (float)SvIV(ST(4)); - RETVAL = quest_manager.summonallplayercorpses(char_id, dest_x, dest_y, dest_z, dest_heading); + RETVAL = quest_manager.summonallplayercorpses(char_id, dest_x, dest_y, dest_z, dest_heading); - ST(0) = boolSV(RETVAL); - sv_2mortal(ST(0)); - XSRETURN(1); + ST(0) = boolSV(RETVAL); + sv_2mortal(ST(0)); + XSRETURN(1); } XS(XS__getplayerburriedcorpsecount); XS(XS__getplayerburriedcorpsecount) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: getplayerburriedcorpsecount(char_id)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: getplayerburriedcorpsecount(char_id)"); - uint32 RETVAL; - dXSTARG; + uint32 RETVAL; + dXSTARG; - uint32 char_id = (int)SvIV(ST(0)); + uint32 char_id = (int)SvIV(ST(0)); - RETVAL = quest_manager.getplayerburriedcorpsecount(char_id); - XSprePUSH; PUSHu((IV)RETVAL); + RETVAL = quest_manager.getplayerburriedcorpsecount(char_id); + XSprePUSH; PUSHu((IV)RETVAL); - XSRETURN(1); + XSRETURN(1); } XS(XS__buryplayercorpse); XS(XS__buryplayercorpse) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: buryplayercorpse(char_id)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: buryplayercorpse(char_id)"); - uint32 RETVAL; - dXSTARG; + uint32 RETVAL; + dXSTARG; - uint32 char_id = (int)SvIV(ST(0)); + uint32 char_id = (int)SvIV(ST(0)); - RETVAL = quest_manager.buryplayercorpse(char_id); - XSprePUSH; PUSHu((IV)RETVAL); + RETVAL = quest_manager.buryplayercorpse(char_id); + XSprePUSH; PUSHu((IV)RETVAL); - XSRETURN(1); + XSRETURN(1); } XS(XS__forcedooropen); @@ -2022,14 +2022,14 @@ XS(XS__toggledoorstate) XS(XS__isdooropen); XS(XS__isdooropen) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: isdooropen(doorid)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: isdooropen(doorid)"); - bool RETVAL; - dXSTARG; + bool RETVAL; + dXSTARG; - uint32 doorid = (int)SvIV(ST(0)); + uint32 doorid = (int)SvIV(ST(0)); RETVAL = quest_manager.isdooropen(doorid); XSprePUSH; PUSHu((IV)RETVAL); @@ -2210,9 +2210,9 @@ XS(XS__npcfeature) XS(XS__createbotcount); XS(XS__createbotcount) { - dXSARGS; - int RETVAL; - dXSTARG; + dXSARGS; + int RETVAL; + dXSTARG; RETVAL = quest_manager.createbotcount(); XSprePUSH; PUSHi((IV)RETVAL); @@ -2223,9 +2223,9 @@ XS(XS__createbotcount) XS(XS__spawnbotcount); XS(XS__spawnbotcount) { - dXSARGS; - int RETVAL; - dXSTARG; + dXSARGS; + int RETVAL; + dXSTARG; RETVAL = quest_manager.spawnbotcount(); XSprePUSH; PUSHi((IV)RETVAL); @@ -2236,9 +2236,9 @@ XS(XS__spawnbotcount) XS(XS__botquest); XS(XS__botquest) { - dXSARGS; - bool RETVAL; - dXSTARG; + dXSARGS; + bool RETVAL; + dXSTARG; RETVAL = quest_manager.botquest(); XSprePUSH; PUSHu((IV)RETVAL); @@ -2338,7 +2338,7 @@ XS(XS__istaskenabled); XS(XS__istaskenabled) { dXSARGS; - bool RETVAL; + bool RETVAL; dXSTARG; if(items == 1) { @@ -2356,7 +2356,7 @@ XS(XS__istaskactive); XS(XS__istaskactive) { dXSARGS; - bool RETVAL; + bool RETVAL; dXSTARG; if(items == 1) { @@ -2374,7 +2374,7 @@ XS(XS__istaskactivityactive); XS(XS__istaskactivityactive) { dXSARGS; - bool RETVAL; + bool RETVAL; dXSTARG; if(items == 2) { @@ -2393,7 +2393,7 @@ XS(XS__gettaskactivitydonecount); XS(XS__gettaskactivitydonecount) { dXSARGS; - uint32 RETVAL; + uint32 RETVAL; dXSTARG; if(items == 2) { @@ -2495,7 +2495,7 @@ XS(XS__tasktimeleft); XS(XS__tasktimeleft) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2514,7 +2514,7 @@ XS(XS__istaskcompleted); XS(XS__istaskcompleted) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2533,7 +2533,7 @@ XS(XS__enabledtaskcount); XS(XS__enabledtaskcount) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2552,7 +2552,7 @@ XS(XS__firsttaskinset); XS(XS__firsttaskinset) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2571,7 +2571,7 @@ XS(XS__lasttaskinset); XS(XS__lasttaskinset) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2590,7 +2590,7 @@ XS(XS__nexttaskinset); XS(XS__nexttaskinset) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 2) { @@ -2609,7 +2609,7 @@ XS(XS__activespeaktask); XS(XS__activespeaktask) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 0) { @@ -2627,7 +2627,7 @@ XS(XS__activespeakactivity); XS(XS__activespeakactivity) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2646,7 +2646,7 @@ XS(XS__activetasksinset); XS(XS__activetasksinset) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2665,7 +2665,7 @@ XS(XS__completedtasksinset); XS(XS__completedtasksinset) { dXSARGS; - int RETVAL; + int RETVAL; dXSTARG; if(items == 1) { @@ -2685,7 +2685,7 @@ XS(XS__istaskappropriate); XS(XS__istaskappropriate) { dXSARGS; - bool RETVAL; + bool RETVAL; dXSTARG; if(items == 1) { @@ -2702,13 +2702,13 @@ XS(XS__istaskappropriate) XS(XS__popup); // prototype to pass -Wmissing-prototypes XS(XS__popup) { - dXSARGS; + dXSARGS; int popupid = 0; int buttons = 0; int duration = 0; if((items < 2) || (items > 5)) - Perl_croak(aTHX_ "Usage: popup(windowtitle, text, popupid, buttons, duration)"); + Perl_croak(aTHX_ "Usage: popup(windowtitle, text, popupid, buttons, duration)"); if(items >= 3) popupid = (int)SvIV(ST(2)); @@ -2719,9 +2719,9 @@ XS(XS__istaskappropriate) if(items == 5) duration = (int)SvIV(ST(4)); - quest_manager.popup(SvPV_nolen(ST(0)), SvPV_nolen(ST(1)), popupid, buttons, duration); + quest_manager.popup(SvPV_nolen(ST(0)), SvPV_nolen(ST(1)), popupid, buttons, duration); - XSRETURN_EMPTY; + XSRETURN_EMPTY; } XS(XS__clearspawntimers); XS(XS__clearspawntimers) @@ -3089,11 +3089,11 @@ XS(XS__saylink) { Const_char * RETVAL; char text[250]; char text2[250]; - bool silent = false; + bool silent = false; strcpy(text,(char *)SvPV_nolen(ST(0))); - if(items >= 2) { - silent = ((int)SvIV(ST(1))) == 0 ? false : true; - } + if(items >= 2) { + silent = ((int)SvIV(ST(1))) == 0 ? false : true; + } if (items == 3) strcpy(text2,(char *)SvPV_nolen(ST(2))); else @@ -3137,12 +3137,12 @@ XS(XS__SetRunning) XS(XS__IsRunning); XS(XS__IsRunning) { - dXSARGS; - if (items >= 1) - Perl_croak(aTHX_ "Usage: IsRunning()"); + dXSARGS; + if (items >= 1) + Perl_croak(aTHX_ "Usage: IsRunning()"); - bool RETVAL; - dXSTARG; + bool RETVAL; + dXSTARG; RETVAL = quest_manager.IsRunning(); @@ -3154,14 +3154,14 @@ XS(XS__IsRunning) XS(XS__IsEffectInSpell); XS(XS__IsEffectInSpell) { - dXSARGS; - if (items != 2) - Perl_croak(aTHX_ "Usage: IsEffectInSpell(spell_id, effect_id)"); + dXSARGS; + if (items != 2) + Perl_croak(aTHX_ "Usage: IsEffectInSpell(spell_id, effect_id)"); uint32 spell_id = (uint32)SvUV(ST(0)); uint32 effect_id = (uint32)SvUV(ST(1)); - bool RETVAL; - dXSTARG; + bool RETVAL; + dXSTARG; RETVAL = IsEffectInSpell(spell_id, effect_id); @@ -3173,13 +3173,13 @@ XS(XS__IsEffectInSpell) XS(XS__IsBeneficialSpell); XS(XS__IsBeneficialSpell) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: IsBeneficialSpell(spell_id)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: IsBeneficialSpell(spell_id)"); uint32 spell_id = (uint32)SvUV(ST(0)); - bool RETVAL; - dXSTARG; + bool RETVAL; + dXSTARG; RETVAL = BeneficialSpell(spell_id); @@ -3191,13 +3191,13 @@ XS(XS__IsBeneficialSpell) XS(XS__GetSpellResistType); XS(XS__GetSpellResistType) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: GetSpellResistType(spell_id)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: GetSpellResistType(spell_id)"); uint32 spell_id = (uint32)SvUV(ST(0)); int32 spell_val = 0; - dXSTARG; + dXSTARG; spell_val = GetSpellResistType(spell_id); XSRETURN_UV(spell_val); @@ -3206,13 +3206,13 @@ XS(XS__GetSpellResistType) XS(XS__GetSpellTargetType); XS(XS__GetSpellTargetType) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: GetSpellTargetType(spell_id)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: GetSpellTargetType(spell_id)"); uint32 spell_id = (uint32)SvUV(ST(0)); int32 spell_val = 0; - dXSTARG; + dXSTARG; spell_val = GetSpellTargetType(spell_id); XSRETURN_UV(spell_val); @@ -3243,54 +3243,54 @@ XS(XS_FactionValue) { XS(XS__enabletitle); XS(XS__enabletitle) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: enabletitle(titleset)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: enabletitle(titleset)"); - int titleset = (int)SvIV(ST(0)); + int titleset = (int)SvIV(ST(0)); - quest_manager.enabletitle(titleset); + quest_manager.enabletitle(titleset); - XSRETURN_EMPTY; + XSRETURN_EMPTY; } XS(XS__checktitle); XS(XS__checktitle) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: checktitle(titleset)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: checktitle(titleset)"); - bool RETVAL; - int titleset = (int)SvIV(ST(0)); + bool RETVAL; + int titleset = (int)SvIV(ST(0)); - RETVAL = quest_manager.checktitle(titleset); + RETVAL = quest_manager.checktitle(titleset); - ST(0) = boolSV(RETVAL); - sv_2mortal(ST(0)); - XSRETURN(1); + ST(0) = boolSV(RETVAL); + sv_2mortal(ST(0)); + XSRETURN(1); } XS(XS__removetitle); XS(XS__removetitle) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: removetitle(titleset)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: removetitle(titleset)"); - int titleset = (int)SvIV(ST(0)); + int titleset = (int)SvIV(ST(0)); - quest_manager.removetitle(titleset); + quest_manager.removetitle(titleset); - XSRETURN_EMPTY; + XSRETURN_EMPTY; } XS(XS__wearchange); XS(XS__wearchange) { - dXSARGS; - if (items != 2) - Perl_croak(aTHX_ "Usage: wearchange(slot, texture)"); + dXSARGS; + if (items != 2) + Perl_croak(aTHX_ "Usage: wearchange(slot, texture)"); uint8 slot = (int)SvUV(ST(0)); uint16 texture = (int)SvUV(ST(1)); @@ -3320,72 +3320,72 @@ XS(XS__voicetell) XS(XS__LearnRecipe); XS(XS__LearnRecipe) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: LearnRecipe(recipe_id)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: LearnRecipe(recipe_id)"); - uint32 recipe_id = (uint32)SvIV(ST(0)); + uint32 recipe_id = (uint32)SvIV(ST(0)); - quest_manager.LearnRecipe(recipe_id); + quest_manager.LearnRecipe(recipe_id); - XSRETURN_EMPTY; + XSRETURN_EMPTY; } XS(XS__SendMail); XS(XS__SendMail) { - dXSARGS; - if (items != 4) - Perl_croak(aTHX_ "Usage: SendMail(to, from, subject, message)"); + dXSARGS; + if (items != 4) + Perl_croak(aTHX_ "Usage: SendMail(to, from, subject, message)"); - char *to = (char *)SvPV_nolen(ST(0)); - char *from = (char *)SvPV_nolen(ST(1)); - char *subject = (char *)SvPV_nolen(ST(2)); - char *message = (char *)SvPV_nolen(ST(3)); + char *to = (char *)SvPV_nolen(ST(0)); + char *from = (char *)SvPV_nolen(ST(1)); + char *subject = (char *)SvPV_nolen(ST(2)); + char *message = (char *)SvPV_nolen(ST(3)); - quest_manager.SendMail(to, from, subject, message); + quest_manager.SendMail(to, from, subject, message); - XSRETURN_EMPTY; + XSRETURN_EMPTY; } XS(XS__GetZoneID); XS(XS__GetZoneID) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: GetZoneID(zone)"); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: GetZoneID(zone)"); - char *zone = (char *)SvPV_nolen(ST(0)); - int32 id = quest_manager.GetZoneID(zone); + char *zone = (char *)SvPV_nolen(ST(0)); + int32 id = quest_manager.GetZoneID(zone); - XSRETURN_IV(id); + XSRETURN_IV(id); } XS(XS__GetZoneLongName); XS(XS__GetZoneLongName) { - dXSARGS; - if (items != 1) - Perl_croak(aTHX_ "Usage: GetZoneLongName(zone)"); - dXSTARG; - char *zone = (char *)SvPV_nolen(ST(0)); - Const_char* RETVAL = quest_manager.GetZoneLongName(zone); + dXSARGS; + if (items != 1) + Perl_croak(aTHX_ "Usage: GetZoneLongName(zone)"); + dXSTARG; + char *zone = (char *)SvPV_nolen(ST(0)); + Const_char* RETVAL = quest_manager.GetZoneLongName(zone); - sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; + sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG; XSRETURN(1); } XS(XS__GetTimeSeconds); XS(XS__GetTimeSeconds) { - dXSARGS; - if (items != 0) - Perl_croak(aTHX_ "Usage: GetTimeSeconds()"); + dXSARGS; + if (items != 0) + Perl_croak(aTHX_ "Usage: GetTimeSeconds()"); uint32 seconds = 0; - dXSTARG; + dXSTARG; - seconds = Timer::GetTimeSeconds(); + seconds = Timer::GetTimeSeconds(); XSRETURN_UV(seconds); } @@ -3570,7 +3570,7 @@ EXTERN_C XS(boot_quest) newXS(strcpy(buf, "addloot"), XS__addloot, file); newXS(strcpy(buf, "zone"), XS__zone, file); newXS(strcpy(buf, "settimer"), XS__settimer, file); - newXS(strcpy(buf, "settimerMS"), XS__settimerMS, file); + newXS(strcpy(buf, "settimerMS"), XS__settimerMS, file); newXS(strcpy(buf, "stoptimer"), XS__stoptimer, file); newXS(strcpy(buf, "stopalltimers"), XS__stopalltimers, file); newXS(strcpy(buf, "emote"), XS__emote, file); @@ -3742,14 +3742,14 @@ EXTERN_C XS(boot_quest) newXS(strcpy(buf, "removetitle"), XS__removetitle, file); newXS(strcpy(buf, "wearchange"), XS__wearchange, file); newXS(strcpy(buf, "voicetell"), XS__voicetell, file); - newXS(strcpy(buf, "LearnRecipe"), XS__LearnRecipe, file); - newXS(strcpy(buf, "SendMail"), XS__SendMail, file); - newXS(strcpy(buf, "GetZoneID"), XS__GetZoneID, file); - newXS(strcpy(buf, "GetZoneLongName"), XS__GetZoneLongName, file); - newXS(strcpy(buf, "GetTimeSeconds"), XS__GetTimeSeconds, file); + newXS(strcpy(buf, "LearnRecipe"), XS__LearnRecipe, file); + newXS(strcpy(buf, "SendMail"), XS__SendMail, file); + newXS(strcpy(buf, "GetZoneID"), XS__GetZoneID, file); + newXS(strcpy(buf, "GetZoneLongName"), XS__GetZoneLongName, file); + newXS(strcpy(buf, "GetTimeSeconds"), XS__GetTimeSeconds, file); newXS(strcpy(buf, "handleturnin"), XS__handleturnin, file); - newXS(strcpy(buf, "completehandin"), XS__completehandin, file); - newXS(strcpy(buf, "resethandin"), XS__resethandin, file); + newXS(strcpy(buf, "completehandin"), XS__completehandin, file); + newXS(strcpy(buf, "resethandin"), XS__resethandin, file); newXS(strcpy(buf, "clearhandin"), XS__clearhandin, file); newXS(strcpy(buf, "crosszonesignalclientbycharid"), XS__crosszonesignalclientbycharid, file); newXS(strcpy(buf, "crosszonesignalclientbyname"), XS__crosszonesignalclientbyname, file); diff --git a/zone/perlparser.h b/zone/perlparser.h index c0260b82a..60020306f 100644 --- a/zone/perlparser.h +++ b/zone/perlparser.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ //extends the perl parser to use C methods diff --git a/zone/petitions.cpp b/zone/petitions.cpp index e4d8a60e5..2591298cc 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator +Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -219,7 +219,7 @@ void PetitionList::UpdatePetition(Petition* pet) { void ZoneDatabase::DeletePetitionFromDB(Petition* wpet) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; uint8 checkedout = 0; if (wpet->CheckedOut()) checkedout = 0; @@ -234,7 +234,7 @@ void ZoneDatabase::DeletePetitionFromDB(Petition* wpet) { void ZoneDatabase::UpdatePetitionToDB(Petition* wpet) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; uint8 checkedout = 0; if (wpet->CheckedOut()) checkedout = 1; @@ -251,7 +251,7 @@ void ZoneDatabase::UpdatePetitionToDB(Petition* wpet) { void ZoneDatabase::InsertPetitionToDB(Petition* wpet) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; uint8 checkedout = 0; if (wpet->CheckedOut()) @@ -278,9 +278,9 @@ void ZoneDatabase::InsertPetitionToDB(Petition* wpet) void ZoneDatabase::RefreshPetitionsFromDB() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; Petition* newpet; if (RunQuery(query, MakeAnyLenString(&query, "SELECT petid, charname, accountname, lastgm, petitiontext, zone, urgency, charclass, charrace, charlevel, checkouts, unavailables, ischeckedout, senttime, gmtext from petitions order by petid"), errbuf, &result)) { diff --git a/zone/petitions.h b/zone/petitions.h index ed8def1f8..76db9b006 100644 --- a/zone/petitions.h +++ b/zone/petitions.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef PETITIONS_H #define PETITIONS_H @@ -40,14 +40,14 @@ public: uint32 GetCharRace() { return charrace; } uint32 GetCharClass() { return charclass; } uint32 GetUrgency() { return urgency; } - //char* GetZone() { return this->zone; } + //char* GetZone() { return this->zone; } uint32 GetZone() { return this->zone; } - char* GetCharName() { return charname; } - char* GetAccountName() { return accountname; } - char* GetLastGM() { return lastgm; } + char* GetCharName() { return charname; } + char* GetAccountName() { return accountname; } + char* GetLastGM() { return lastgm; } time_t GetSentTime() { return senttime; } - char* GetPetitionText() { return petitiontext; } - char* GetGMText() { return gmtext; } + char* GetPetitionText() { return petitiontext; } + char* GetGMText() { return gmtext; } bool CheckedOut() { return ischeckedout; } @@ -75,12 +75,12 @@ public: protected: uint32 petid; - char charname[64]; - char accountname[32]; - char lastgm[64]; - char petitiontext[1024]; - char gmtext[1024]; - //char zone[32]; + char charname[64]; + char accountname[32]; + char lastgm[64]; + char petitiontext[1024]; + char gmtext[1024]; + //char zone[32]; uint32 zone; uint32 urgency; // 0 = green, 1 = yellow, 2 = red uint32 charclass; @@ -112,7 +112,7 @@ public: private: LinkedList list; uint32 last_insert_id; - Mutex PList_Mutex; + Mutex PList_Mutex; }; #endif diff --git a/zone/pets.cpp b/zone/pets.cpp index ce5aab779..c508d46c9 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/spdat.h" @@ -445,10 +445,10 @@ bool ZoneDatabase::GetPetEntry(const char *pet_type, PetRecord *into) { bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetRecord *into) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 querylen = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; if (petpower <= 0) { querylen = MakeAnyLenString(&query, @@ -480,7 +480,7 @@ bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetR mysql_free_result(result); } else { - LogFile->write(EQEMuLog::Error, "Error in GetPoweredPetEntry query '%s': %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "Error in GetPoweredPetEntry query '%s': %s", query, errbuf); safe_delete_array(query); } return(false); @@ -579,7 +579,7 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) { buffs[i].ticsremaining = pet_buffs[i].duration; buffs[i].casterlevel = pet_buffs[i].level; buffs[i].casterid = 0; - buffs[i].counters = pet_buffs[i].counters; + buffs[i].counters = pet_buffs[i].counters; buffs[i].numhits = spells[pet_buffs[i].spellid].numhits; } else { @@ -649,14 +649,14 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { // are loaded after that, up to a max depth of 5. (Arbitrary limit // so we don't go into an endless loop if the DB data is cyclic for // some reason.) - // A slot will only get an item put in it if it is empty. That way + // A slot will only get an item put in it if it is empty. That way // an equipmentset can overload a slot for the set(s) it includes. char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 querylen = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; int depth = 0; int32 curset = equipmentset; int32 nextset = -1; @@ -697,7 +697,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { mysql_free_result(result); } else { - LogFile->write(EQEMuLog::Error, "Error in GetBasePetItems query '%s': %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "Error in GetBasePetItems query '%s': %s", query, errbuf); safe_delete_array(query); } curset = nextset; @@ -713,7 +713,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) { } else { - LogFile->write(EQEMuLog::Error, "Error in GetBasePetItems query '%s': %s", query, errbuf); + LogFile->write(EQEMuLog::Error, "Error in GetBasePetItems query '%s': %s", query, errbuf); safe_delete_array(query); return false; } diff --git a/zone/pets.h b/zone/pets.h index a343b0380..92ae8bde2 100644 --- a/zone/pets.h +++ b/zone/pets.h @@ -44,21 +44,8 @@ protected: eStandingPetOrder pStandingPetOrder; bool taunting; - Timer taunt_timer; //for pet taunting + Timer taunt_timer; //for pet taunting };*/ #endif - - - - - - - - - - - - - diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 25ceac1b4..5f6fee48a 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* @@ -109,12 +109,12 @@ void QuestManager::Process() { //make sure the mob is still in zone. if(entity_list.IsMobInZone(cur->mob)){ if(cur->mob->IsNPC()) { - parse->EventNPC(EVENT_TIMER, cur->mob->CastToNPC(), nullptr, cur->name, 0); + parse->EventNPC(EVENT_TIMER, cur->mob->CastToNPC(), nullptr, cur->name, 0); } else { - //this is inheriently unsafe if we ever make it so more than npc/client start timers - parse->EventPlayer(EVENT_TIMER, cur->mob->CastToClient(), cur->name, 0); - } + //this is inheriently unsafe if we ever make it so more than npc/client start timers + parse->EventPlayer(EVENT_TIMER, cur->mob->CastToClient(), cur->name, 0); + } //we MUST reset our iterator since the quest could have removed/added any //number of timers... worst case we have to check a bunch of timers twice @@ -204,7 +204,7 @@ void QuestManager::ClearAllTimers() { //quest perl functions void QuestManager::echo(int colour, const char *str) { - entity_list.MessageClose(initiator, false, 200, colour, str); + entity_list.MessageClose(initiator, false, 200, colour, str); } void QuestManager::say(const char *str) { @@ -213,12 +213,12 @@ void QuestManager::say(const char *str) { return; } else { - if(RuleB(NPC, EnableNPCQuestJournal) && initiator) { - owner->QuestJournalledSay(initiator, str); - } - else { - owner->Say(str); - } + if(RuleB(NPC, EnableNPCQuestJournal) && initiator) { + owner->QuestJournalledSay(initiator, str); + } + else { + owner->Say(str); + } } } @@ -558,7 +558,7 @@ void QuestManager::shout2(const char *str) { void QuestManager::gmsay(const char *str, uint32 color, bool send_to_world, uint32 to_guilddbid, uint32 to_minstatus) { if(send_to_world) - worldserver.SendEmoteMessage(0, to_guilddbid, to_minstatus, color, "%s", str); + worldserver.SendEmoteMessage(0, to_guilddbid, to_minstatus, color, "%s", str); else entity_list.MessageStatus(to_guilddbid, to_minstatus, color, "%s", str); } @@ -797,21 +797,21 @@ void QuestManager::surname(const char *name) { } void QuestManager::permaclass(int class_id) { - //Makes the client the class specified + //Makes the client the class specified initiator->SetBaseClass(class_id); initiator->Save(2); initiator->Kick(); } void QuestManager::permarace(int race_id) { - //Makes the client the race specified + //Makes the client the race specified initiator->SetBaseRace(race_id); initiator->Save(2); initiator->Kick(); } void QuestManager::permagender(int gender_id) { - //Makes the client the gender specified + //Makes the client the gender specified initiator->SetBaseGender(gender_id); initiator->Save(2); initiator->Kick(); @@ -837,9 +837,9 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { ( RuleB(Spells, UseCHAScribeHack) && spells[curspell].effectid[EFFECT_COUNT - 1] != 10 ) ) { - if (book_slot == -1) //no more book slots + if (book_slot == -1) //no more book slots break; - if(!IsDiscipline(curspell) && !initiator->HasSpellScribed(curspell)) { //isn't a discipline & we don't already have it scribed + if(!IsDiscipline(curspell) && !initiator->HasSpellScribed(curspell)) { //isn't a discipline & we don't already have it scribed if (SpellGlobalRule) { // Bool to see if the character has the required QGlobal to scribe it if one exists in the Spell_Globals table SpellGlobalCheckResult = initiator->SpellGlobalCheck(curspell, Char_ID); @@ -855,7 +855,7 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { } } } - return count; //how many spells were scribed successfully + return count; //how many spells were scribed successfully } uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) { @@ -906,7 +906,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) { } //if we get to this point, there's already a discipline in this slot, so we skip it } } - } + } } return count; //how many disciplines were learned successfully } @@ -980,7 +980,7 @@ void QuestManager::pvp(const char *mode) { void QuestManager::movepc(int zone_id, float x, float y, float z, float heading) { if (initiator && initiator->IsClient()) - initiator->MovePC(zone_id, x, y, z, heading); + initiator->MovePC(zone_id, x, y, z, heading); } void QuestManager::gmmove(float x, float y, float z) { @@ -989,23 +989,26 @@ void QuestManager::gmmove(float x, float y, float z) { } void QuestManager::movegrp(int zoneid, float x, float y, float z) { - if (initiator && initiator->IsClient()) + if (initiator && initiator->IsClient()) { Group *g = entity_list.GetGroupByClient(initiator); - if (g != nullptr){ + if (g != nullptr) { g->TeleportGroup(owner, zoneid, 0, x, y, z, 0.0f); - } else { + } + else { Raid *r = entity_list.GetRaidByClient(initiator); - if (r != nullptr){ + if (r != nullptr) { uint32 gid = r->GetGroup(initiator); if (gid >= 0 && gid < 12) { r->TeleportGroup(owner, zoneid, 0, x, y, z, 0.0f, gid); - } else { + } + else { initiator->MovePC(zoneid, x, y, z, 0.0f); } - } else { + } + else { initiator->MovePC(zoneid, x, y, z, 0.0f); - } + } } } } @@ -1195,7 +1198,7 @@ void QuestManager::setglobal(const char *varname, const char *newvalue, int opti /* options value determines the availability of global variables to NPCs when a quest begins ------------------------------------------------------------------ - value npcid player zone + value npcid player zone ------------------------------------------------------------------ 0 this this this 1 all this this @@ -1206,7 +1209,7 @@ void QuestManager::setglobal(const char *varname, const char *newvalue, int opti 6 this all all 7 all all all */ - if (initiator && initiator->IsClient()) // some events like waypoint and spawn don't have a player involved + if (initiator && initiator->IsClient()) // some events like waypoint and spawn don't have a player involved { qgCharid=initiator->CharacterID(); } @@ -1332,7 +1335,7 @@ void QuestManager::delglobal(const char *varname) { int qgZoneid=zone->GetZoneID(); int qgCharid=0; int qgNpcid=owner->GetNPCTypeID(); - if (initiator && initiator->IsClient()) // some events like waypoint and spawn don't have a player involved + if (initiator && initiator->IsClient()) // some events like waypoint and spawn don't have a player involved { qgCharid=initiator->CharacterID(); } @@ -1342,10 +1345,10 @@ void QuestManager::delglobal(const char *varname) { qgCharid=-qgNpcid; // make char id negative npc id as a fudge } if (!database.RunQuery(query, - MakeAnyLenString(&query, - "DELETE FROM quest_globals WHERE name='%s'" - " && (npcid=0 || npcid=%i) && (charid=0 || charid=%i) && (zoneid=%i || zoneid=0)", - varname,qgNpcid,qgCharid,qgZoneid),errbuf)) + MakeAnyLenString(&query, + "DELETE FROM quest_globals WHERE name='%s'" + " && (npcid=0 || npcid=%i) && (charid=0 || charid=%i) && (zoneid=%i || zoneid=0)", + varname,qgNpcid,qgCharid,qgZoneid),errbuf)) { cerr << "delglobal error deleting " << varname << " : " << errbuf << endl; } @@ -1887,7 +1890,8 @@ void QuestManager::npcfeature(char *feature, int setting) void QuestManager::popup(char *title, char *text, uint32 popupid, uint32 buttons, uint32 Duration) { - if(initiator) initiator->SendPopupToClient(title, text, popupid, buttons, Duration); + if(initiator) + initiator->SendPopupToClient(title, text, popupid, buttons, Duration); } #ifdef BOTS @@ -2127,7 +2131,7 @@ bool QuestManager::istaskappropriate(int task) { return false; } void QuestManager::clearspawntimers() { - if(zone) { + if(zone) { //TODO: Dec 19, 2008, replace with code updated for current spawn timers. LinkedListIterator iterator(zone->spawn2_list); iterator.Reset(); @@ -2159,7 +2163,7 @@ int QuestManager::getlevel(uint8 type) else if(type == 1) { Group *g = entity_list.GetGroupByClient(initiator); - if (g != nullptr) + if (g != nullptr) return (g->GetAvgLevel()); else return 0; @@ -2167,7 +2171,7 @@ int QuestManager::getlevel(uint8 type) else if(type == 2) { Raid *r = entity_list.GetRaidByClient(initiator); - if (r != nullptr) + if (r != nullptr) return (r->GetAvgLevel()); else return 0; @@ -2304,7 +2308,7 @@ void QuestManager::UpdateSpawnTimer(uint32 id, uint32 newTime) } } -// used to set the number of an item in the selected merchant's temp item list. Defaults to zero if no quantity is specified. +// used to set the number of an item in the selected merchant's temp item list. Defaults to zero if no quantity is specified. void QuestManager::MerchantSetItem(uint32 NPCid, uint32 itemid, uint32 quantity) { Mob* merchant = entity_list.GetMobByNpcTypeID(NPCid); @@ -2475,9 +2479,9 @@ const char* QuestManager::saylink(char* Phrase, bool silent, char* LinkName) { MYSQL_ROW row; int sayid = 0; - int sz = strlen(Phrase); - char *escaped_string = new char[sz * 2]; - database.DoEscapeString(escaped_string, Phrase, sz); + int sz = strlen(Phrase); + char *escaped_string = new char[sz * 2]; + database.DoEscapeString(escaped_string, Phrase, sz); // Query for an existing phrase and id in the saylink table if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT `id` FROM `saylink` WHERE `phrase` = '%s'", escaped_string),errbuf,&result)) @@ -2490,7 +2494,7 @@ const char* QuestManager::saylink(char* Phrase, bool silent, char* LinkName) { } mysql_free_result(result); } - else // Add a new saylink entry to the database and query it again for the new sayid number + else // Add a new saylink entry to the database and query it again for the new sayid number { safe_delete_array(query); @@ -2516,7 +2520,7 @@ const char* QuestManager::saylink(char* Phrase, bool silent, char* LinkName) { } } safe_delete_array(query); - safe_delete_array(escaped_string); + safe_delete_array(escaped_string); if(silent) sayid = sayid + 750000; @@ -2631,17 +2635,17 @@ uint8 QuestManager::FactionValue() } void QuestManager::enabletitle(int titleset) { - initiator->EnableTitle(titleset); + initiator->EnableTitle(titleset); } bool QuestManager::checktitle(int titleset) { - return initiator->CheckTitle(titleset); + return initiator->CheckTitle(titleset); } void QuestManager::removetitle(int titleset) { - initiator->RemoveTitle(titleset); + initiator->RemoveTitle(titleset); } void QuestManager::wearchange(uint8 slot, uint16 texture) @@ -2684,24 +2688,24 @@ void QuestManager::voicetell(char *str, int macronum, int racenum, int gendernum } void QuestManager::LearnRecipe(uint32 recipe_id) { - if(!initiator) - return; - initiator->LearnRecipe(recipe_id); + if(!initiator) + return; + initiator->LearnRecipe(recipe_id); } void QuestManager::SendMail(const char *to, const char *from, const char *subject, const char *message) { - if(to == nullptr || from == nullptr || subject == nullptr || message == nullptr) { - return; - } + if(to == nullptr || from == nullptr || subject == nullptr || message == nullptr) { + return; + } - uint32 message_len = strlen(message) + 1; - ServerPacket* pack = new ServerPacket(ServerOP_UCSMailMessage, sizeof(ServerMailMessageHeader_Struct) + message_len); + uint32 message_len = strlen(message) + 1; + ServerPacket* pack = new ServerPacket(ServerOP_UCSMailMessage, sizeof(ServerMailMessageHeader_Struct) + message_len); ServerMailMessageHeader_Struct* mail = (ServerMailMessageHeader_Struct*) pack->pBuffer; - strn0cpy(mail->to, to, 64); - strn0cpy(mail->from, from, 64); - strn0cpy(mail->subject, subject, 128); - strcpy(mail->message, message); + strn0cpy(mail->to, to, 64); + strn0cpy(mail->from, from, 64); + strn0cpy(mail->subject, subject, 128); + strcpy(mail->message, message); worldserver.SendPacket(pack); safe_delete(pack); @@ -2715,16 +2719,16 @@ uint16 QuestManager::CreateDoor(const char* model, float x, float y, float z, fl } int32 QuestManager::GetZoneID(const char *zone) { - return static_cast(database.GetZoneID(zone)); + return static_cast(database.GetZoneID(zone)); } const char* QuestManager::GetZoneLongName(const char *zone) { - char *long_name; - database.GetZoneLongName(zone, &long_name); - std::string ln = long_name; - safe_delete_array(long_name); + char *long_name; + database.GetZoneLongName(zone, &long_name); + std::string ln = long_name; + safe_delete_array(long_name); - return ln.c_str(); + return ln.c_str(); } bool QuestManager::TurnInItem(uint32 itm, int charges) @@ -2793,3 +2797,4 @@ void QuestManager::CrossZoneMessagePlayerByName(uint32 Type, const char *CharNam worldserver.SendPacket(pack); safe_delete(pack); } + diff --git a/zone/questmgr.h b/zone/questmgr.h index ce01334b5..b78e01991 100644 --- a/zone/questmgr.h +++ b/zone/questmgr.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __QUEST_MANAGER_H__ #define __QUEST_MANAGER_H__ @@ -62,7 +62,7 @@ public: void addloot(int item_id, int charges = 0, bool equipitem = true); void Zone(const char *zone_name); void settimer(const char *timer_name, int seconds); - void settimerMS(const char *timer_name, int milliseconds); + void settimerMS(const char *timer_name, int milliseconds); void stoptimer(const char *timer_name); void stopalltimers(); void emote(const char *str); @@ -80,7 +80,7 @@ public: // void cumflag(); // void flagnpc(uint32 flag_num, uint8 flag_value); // void flagcheck(uint32 flag_to_check, uint32 flag_to_set); -// bool isflagset(int flag_num); +// bool isflagset(int flag_num); void changedeity(int diety_id); void exp(int amt); void level(int newlevel); @@ -190,15 +190,15 @@ public: int activetasksinset(int taskset); int completedtasksinset(int taskset); bool istaskappropriate(int task); - void clearspawntimers(); + void clearspawntimers(); void ze(int type, const char *str); void we(int type, const char *str); - int getlevel(uint8 type); - int collectitems(uint32 item_id, bool remove); - int collectitems_processSlot(int16 slot_id, uint32 item_id, bool remove); - void enabletitle(int titleset); - bool checktitle(int titlecheck); - void removetitle(int titlecheck); + int getlevel(uint8 type); + int collectitems(uint32 item_id, bool remove); + int collectitems_processSlot(int16 slot_id, uint32 item_id, bool remove); + void enabletitle(int titleset); + bool checktitle(int titlecheck); + void removetitle(int titlecheck); uint16 CreateGroundObject(uint32 itemid, float x, float y, float z, float heading, uint32 decay_time = 300000); uint16 CreateGroundObjectFromModel(const char* model, float x, float y, float z, float heading, uint8 type = 0x00, uint32 decay_time = 0); @@ -227,11 +227,11 @@ public: uint8 FactionValue(); void wearchange(uint8 slot, uint16 texture); void voicetell(char *str, int macronum, int racenum, int gendernum); - void LearnRecipe(uint32 recipe_id); - void SendMail(const char *to, const char *from, const char *subject, const char *message); + void LearnRecipe(uint32 recipe_id); + void SendMail(const char *to, const char *from, const char *subject, const char *message); uint16 CreateDoor( const char* model, float x, float y, float z, float heading, uint8 opentype, uint16 size); - int32 GetZoneID(const char *zone); - const char *GetZoneLongName(const char *zone); + int32 GetZoneID(const char *zone); + const char *GetZoneLongName(const char *zone); //not in here because it retains perl types //thing ChooseRandom(array_of_things) @@ -275,7 +275,7 @@ protected: class QuestTimer { public: inline QuestTimer(int duration, Mob *_mob, string _name) : mob(_mob), name(_name), Timer_(duration) { Timer_.Start(duration, false); } - Mob* mob; + Mob* mob; string name; Timer Timer_; }; diff --git a/zone/queues.h b/zone/queues.h index c6779385a..474d7d898 100644 --- a/zone/queues.h +++ b/zone/queues.h @@ -1,25 +1,25 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ /* - Code for generell handling of priority Queues. - Implemention of queues from "Algoritms in C" by Robert Sedgewick. - Copyright Monty Program KB. - By monty. + Code for generell handling of priority Queues. + Implemention of queues from "Algoritms in C" by Robert Sedgewick. + Copyright Monty Program KB. + By monty. */ #ifndef _queues_h @@ -29,13 +29,13 @@ extern "C" { #endif typedef struct st_queue { - byte **root; - void *first_cmp_arg; - uint elements; - uint max_elements; - uint offset_to_key; /* compare is done on element+offset */ - int max_at_top; /* Set if queue_top gives max */ - int (*compare)(void *, byte *,byte *); + byte **root; + void *first_cmp_arg; + uint elements; + uint max_elements; + uint offset_to_key; /* compare is done on element+offset */ + int max_at_top; /* Set if queue_top gives max */ + int (*compare)(void *, byte *,byte *); } QUEUE; #define queue_top(queue) ((queue)->root[1]) @@ -44,11 +44,11 @@ typedef struct st_queue { #define queue_replaced(queue) _downheap(queue,1) int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key, - pbool max_at_top, int (*compare)(void *,byte *, byte *), - void *first_cmp_arg); + pbool max_at_top, int (*compare)(void *,byte *, byte *), + void *first_cmp_arg); int reinit_queue(QUEUE *queue,uint max_elements,uint offset_to_key, - pbool max_at_top, int (*compare)(void *,byte *, byte *), - void *first_cmp_arg); + pbool max_at_top, int (*compare)(void *,byte *, byte *), + void *first_cmp_arg); void delete_queue(QUEUE *queue); void queue_insert(QUEUE *queue,byte *element); byte *queue_remove(QUEUE *queue,uint idx); diff --git a/zone/raid.h b/zone/raid.h index 8cbd0f1a4..fad4b9fa2 100644 --- a/zone/raid.h +++ b/zone/raid.h @@ -1,23 +1,23 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ -/* Parser needs these defines always, even if USE_RAID is not defined */ -#define RAID_TYPE_0 1 /* Striping */ -#define RAID_TYPE_x 2 /* Some new modes */ +/* Parser needs these defines always, even if USE_RAID is not defined */ +#define RAID_TYPE_0 1 /* Striping */ +#define RAID_TYPE_x 2 /* Some new modes */ #define RAID_TYPE_y 3 #define RAID_DEFAULT_CHUNKS 4 @@ -43,119 +43,119 @@ const char *my_raid_type(int raid_type); /* Trap all occurences of my_...() in source and use our wrapper around this function */ #ifdef MAP_TO_USE_RAID -#define my_read(A,B,C,D) my_raid_read(A,B,C,D) -#define my_write(A,B,C,D) my_raid_write(A,B,C,D) -#define my_pwrite(A,B,C,D,E) my_raid_pwrite(A,B,C,D,E) -#define my_pread(A,B,C,D,E) my_raid_pread(A,B,C,D,E) -#define my_chsize(A,B,C) my_raid_chsize(A,B,C) -#define my_close(A,B) my_raid_close(A,B) -#define my_tell(A,B) my_raid_tell(A,B) -#define my_seek(A,B,C,D) my_raid_seek(A,B,C,D) -#define my_lock(A,B,C,D,E) my_raid_lock(A,B,C,D,E) -#define my_fstat(A,B,C) my_raid_fstat(A,B,C) +#define my_read(A,B,C,D) my_raid_read(A,B,C,D) +#define my_write(A,B,C,D) my_raid_write(A,B,C,D) +#define my_pwrite(A,B,C,D,E) my_raid_pwrite(A,B,C,D,E) +#define my_pread(A,B,C,D,E) my_raid_pread(A,B,C,D,E) +#define my_chsize(A,B,C) my_raid_chsize(A,B,C) +#define my_close(A,B) my_raid_close(A,B) +#define my_tell(A,B) my_raid_tell(A,B) +#define my_seek(A,B,C,D) my_raid_seek(A,B,C,D) +#define my_lock(A,B,C,D,E) my_raid_lock(A,B,C,D,E) +#define my_fstat(A,B,C) my_raid_fstat(A,B,C) #endif /* MAP_TO_USE_RAID */ #ifdef __cplusplus extern "C" { #endif - void init_raid(void); - void end_raid(void); +void init_raid(void); +void end_raid(void); - bool is_raid(File fd); - File my_raid_create(const char *FileName, int CreateFlags, int access_flags, - uint raid_type, uint raid_chunks, ulong raid_chunksize, - myf MyFlags); - File my_raid_open(const char *FileName, int Flags, - uint raid_type, uint raid_chunks, ulong raid_chunksize, - myf MyFlags); - int my_raid_rename(const char *from, const char *to, uint raid_chunks, - myf MyFlags); - int my_raid_delete(const char *from, uint raid_chunks, myf MyFlags); - int my_raid_redel(const char *old_name, const char *new_name, - uint raid_chunks, myf MyFlags); +bool is_raid(File fd); +File my_raid_create(const char *FileName, int CreateFlags, int access_flags, + uint raid_type, uint raid_chunks, ulong raid_chunksize, + myf MyFlags); +File my_raid_open(const char *FileName, int Flags, + uint raid_type, uint raid_chunks, ulong raid_chunksize, + myf MyFlags); +int my_raid_rename(const char *from, const char *to, uint raid_chunks, + myf MyFlags); +int my_raid_delete(const char *from, uint raid_chunks, myf MyFlags); +int my_raid_redel(const char *old_name, const char *new_name, + uint raid_chunks, myf MyFlags); - my_off_t my_raid_seek(File fd, my_off_t pos, int whence, myf MyFlags); - my_off_t my_raid_tell(File fd, myf MyFlags); +my_off_t my_raid_seek(File fd, my_off_t pos, int whence, myf MyFlags); +my_off_t my_raid_tell(File fd, myf MyFlags); - uint my_raid_write(File,const byte *Buffer, uint Count, myf MyFlags); - uint my_raid_read(File Filedes, byte *Buffer, uint Count, myf MyFlags); +uint my_raid_write(File,const byte *Buffer, uint Count, myf MyFlags); +uint my_raid_read(File Filedes, byte *Buffer, uint Count, myf MyFlags); - uint my_raid_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, - myf MyFlags); - uint my_raid_pwrite(int Filedes, const byte *Buffer, uint Count, - my_off_t offset, myf MyFlags); +uint my_raid_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, + myf MyFlags); +uint my_raid_pwrite(int Filedes, const byte *Buffer, uint Count, + my_off_t offset, myf MyFlags); - int my_raid_lock(File,int locktype, my_off_t start, my_off_t length, - myf MyFlags); - int my_raid_chsize(File fd, my_off_t newlength, myf MyFlags); - int my_raid_close(File, myf MyFlags); - int my_raid_fstat(int Filedes, struct stat *buf, myf MyFlags); +int my_raid_lock(File,int locktype, my_off_t start, my_off_t length, + myf MyFlags); +int my_raid_chsize(File fd, my_off_t newlength, myf MyFlags); +int my_raid_close(File, myf MyFlags); +int my_raid_fstat(int Filedes, struct stat *buf, myf MyFlags); #ifdef __cplusplus } class RaidName { - public: - RaidName(const char *FileName); - ~RaidName(); - bool IsRaid(); - int Rename(const char * from, const char * to, myf MyFlags); - private: - uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */ - uint _raid_chunks; /* 1..n */ - ulong _raid_chunksize; /* 1..n in bytes */ + public: + RaidName(const char *FileName); + ~RaidName(); + bool IsRaid(); + int Rename(const char * from, const char * to, myf MyFlags); + private: + uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */ + uint _raid_chunks; /* 1..n */ + ulong _raid_chunksize; /* 1..n in bytes */ }; class RaidFd { - public: - RaidFd(uint raid_type, uint raid_chunks , ulong raid_chunksize); - ~RaidFd(); - File Create(const char *FileName, int CreateFlags, int access_flags, + public: + RaidFd(uint raid_type, uint raid_chunks , ulong raid_chunksize); + ~RaidFd(); + File Create(const char *FileName, int CreateFlags, int access_flags, myf MyFlags); - File Open(const char *FileName, int Flags, myf MyFlags); - my_off_t Seek(my_off_t pos,int whence,myf MyFlags); - my_off_t Tell(myf MyFlags); - int Write(const byte *Buffer, uint Count, myf MyFlags); - int Read(const byte *Buffer, uint Count, myf MyFlags); - int Lock(int locktype, my_off_t start, my_off_t length, myf MyFlags); - int Chsize(File fd, my_off_t newlength, myf MyFlags); - int Fstat(int fd, MY_STAT *stat_area, myf MyFlags ); - int Close(myf MyFlags); - static bool IsRaid(File fd); - static DYNAMIC_ARRAY _raid_map; /* Map of RaidFD* */ - private: + File Open(const char *FileName, int Flags, myf MyFlags); + my_off_t Seek(my_off_t pos,int whence,myf MyFlags); + my_off_t Tell(myf MyFlags); + int Write(const byte *Buffer, uint Count, myf MyFlags); + int Read(const byte *Buffer, uint Count, myf MyFlags); + int Lock(int locktype, my_off_t start, my_off_t length, myf MyFlags); + int Chsize(File fd, my_off_t newlength, myf MyFlags); + int Fstat(int fd, MY_STAT *stat_area, myf MyFlags ); + int Close(myf MyFlags); + static bool IsRaid(File fd); + static DYNAMIC_ARRAY _raid_map; /* Map of RaidFD* */ + private: - uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */ - uint _raid_chunks; /* 1..n */ - ulong _raid_chunksize; /* 1..n in bytes */ + uint _raid_type; /* RAID_TYPE_0 or RAID_TYPE_1 or RAID_TYPE_5 */ + uint _raid_chunks; /* 1..n */ + ulong _raid_chunksize; /* 1..n in bytes */ - ulong _total_block; /* We are operating with block no x (can be 0..many). */ - uint _this_block; /* can be 0.._raid_chunks */ - uint _remaining_bytes; /* Maximum bytes that can be written in this block */ + ulong _total_block; /* We are operating with block no x (can be 0..many). */ + uint _this_block; /* can be 0.._raid_chunks */ + uint _remaining_bytes; /* Maximum bytes that can be written in this block */ - my_off_t _position; - my_off_t _size; /* Cached file size for faster seek(SEEK_END) */ - File _fd; - File *_fd_vector; /* Array of File */ - off_t *_seek_vector; /* Array of cached seek positions */ + my_off_t _position; + my_off_t _size; /* Cached file size for faster seek(SEEK_END) */ + File _fd; + File *_fd_vector; /* Array of File */ + off_t *_seek_vector; /* Array of cached seek positions */ - inline void Calculate() - { - DBUG_ENTER("RaidFd::_Calculate"); - DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu", - (ulong) _position, _raid_chunksize, (ulong) _size)); + inline void Calculate() + { + DBUG_ENTER("RaidFd::_Calculate"); + DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu", + (ulong) _position, _raid_chunksize, (ulong) _size)); - _total_block = (ulong) (_position / _raid_chunksize); - _this_block = _total_block % _raid_chunks; /* can be 0.._raid_chunks */ - _remaining_bytes = (uint) (_raid_chunksize - - (_position - _total_block * _raid_chunksize)); - DBUG_PRINT("info", - ("_total_block: %d this_block: %d _remaining_bytes:%d", - _total_block, _this_block, _remaining_bytes)); - DBUG_VOID_RETURN; - } + _total_block = (ulong) (_position / _raid_chunksize); + _this_block = _total_block % _raid_chunks; /* can be 0.._raid_chunks */ + _remaining_bytes = (uint) (_raid_chunksize - (_position - _total_block * _raid_chunksize)); + DBUG_PRINT("info", + ("_total_block: %d this_block: %d _remaining_bytes:%d", + _total_block, _this_block, _remaining_bytes)); + DBUG_VOID_RETURN; + } }; #endif /* __cplusplus */ #endif /* USE_RAID */ + diff --git a/zone/raids.cpp b/zone/raids.cpp index 8bd5519e3..6de7cf912 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -75,7 +75,7 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo return; char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO raid_members SET raidid=%lu, charid=%lu, groupid=%lu, _class=%d, level=%d, name='%s', isgroupleader=%d, israidleader=%d, islooter=%d", (unsigned long)GetID(), (unsigned long)c->CharacterID(), (unsigned long)group, c->GetClass(), c->GetLevel(), c->GetName(), groupleader, rleader, looter ),errbuf,&result)){ mysql_free_result(result); @@ -103,7 +103,7 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo void Raid::RemoveMember(const char *c) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "DELETE FROM raid_members where name='%s'", c ),errbuf,&result)){ mysql_free_result(result); @@ -134,7 +134,7 @@ void Raid::RemoveMember(const char *c) void Raid::DisbandRaid() { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "DELETE FROM raid_members WHERE raidid=%lu", (unsigned long)GetID()),errbuf,&result)){ mysql_free_result(result); @@ -160,7 +160,7 @@ void Raid::DisbandRaid() void Raid::MoveMember(const char *name, uint32 newGroup) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET groupid=%lu WHERE name='%s'", (unsigned long)newGroup, name),errbuf,&result)){ mysql_free_result(result); @@ -184,7 +184,7 @@ void Raid::MoveMember(const char *name, uint32 newGroup) void Raid::SetGroupLeader(const char *who, bool glFlag) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET isgroupleader=%lu WHERE name='%s'", (unsigned long)glFlag, who),errbuf,&result)){ mysql_free_result(result); @@ -211,7 +211,7 @@ void Raid::SetGroupLeader(const char *who, bool glFlag) void Raid::SetRaidLeader(const char *wasLead, const char *name) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (!database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET israidleader=0 WHERE name='%s'", wasLead),errbuf,&result)){ printf("Set Raid Leader error: %s\n", errbuf); @@ -265,7 +265,7 @@ bool Raid::IsGroupLeader(const char *who) void Raid::UpdateLevel(const char *name, int newLevel) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET level=%lu WHERE name='%s'", (unsigned long)newLevel, name),errbuf,&result)){ mysql_free_result(result); @@ -514,8 +514,8 @@ void Raid::BalanceHP(int32 penalty, uint32 gid) if(members[gi].member){ if(members[gi].GroupNumber == gid) { - if((members[gi].member->GetMaxHP() - dmgtaken) < 1){ //this way the ability will never kill someone - members[gi].member->SetHP(1); //but it will come darn close + if((members[gi].member->GetMaxHP() - dmgtaken) < 1){//this way the ability will never kill someone + members[gi].member->SetHP(1); //but it will come darn close members[gi].member->SendHPUpdate(); } else{ @@ -570,90 +570,89 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum if(copper == 0 && silver == 0 && gold == 0 && platinum == 0) return; - uint32 i; - uint8 membercount = 0; - for (i = 0; i < MAX_RAID_MEMBERS; i++) { - if (members[i].member != nullptr) { + uint32 i; + uint8 membercount = 0; + for (i = 0; i < MAX_RAID_MEMBERS; i++) { + if (members[i].member != nullptr) { + membercount++; + } + } - membercount++; - } - } + if (membercount == 0) + return; - if (membercount == 0) - return; + uint32 mod; + //try to handle round off error a little better + if(membercount > 1) { + mod = platinum % membercount; + if((mod) > 0) { + platinum -= mod; + gold += 10 * mod; + } + mod = gold % membercount; + if((mod) > 0) { + gold -= mod; + silver += 10 * mod; + } + mod = silver % membercount; + if((mod) > 0) { + silver -= mod; + copper += 10 * mod; + } + } - uint32 mod; - //try to handle round off error a little better - if(membercount > 1) { - mod = platinum % membercount; - if((mod) > 0) { - platinum -= mod; - gold += 10 * mod; - } - mod = gold % membercount; - if((mod) > 0) { - gold -= mod; - silver += 10 * mod; - } - mod = silver % membercount; - if((mod) > 0) { - silver -= mod; - copper += 10 * mod; - } - } + //calculate the splits + //We can still round off copper pieces, but I dont care + uint32 sc; + uint32 cpsplit = copper / membercount; + sc = copper % membercount; + uint32 spsplit = silver / membercount; + uint32 gpsplit = gold / membercount; + uint32 ppsplit = platinum / membercount; - //calculate the splits - //We can still round off copper pieces, but I dont care - uint32 sc; - uint32 cpsplit = copper / membercount; - sc = copper % membercount; - uint32 spsplit = silver / membercount; - uint32 gpsplit = gold / membercount; - uint32 ppsplit = platinum / membercount; + char buf[128]; + buf[63] = '\0'; + string msg = "You receive"; + bool one = false; - char buf[128]; - buf[63] = '\0'; - string msg = "You receive"; - bool one = false; + if(ppsplit > 0) { + snprintf(buf, 63, " %u platinum", ppsplit); + msg += buf; + one = true; + } + if(gpsplit > 0) { + if(one) + msg += ","; + snprintf(buf, 63, " %u gold", gpsplit); + msg += buf; + one = true; + } + if(spsplit > 0) { + if(one) + msg += ","; + snprintf(buf, 63, " %u silver", spsplit); + msg += buf; + one = true; + } + if(cpsplit > 0) { + if(one) + msg += ","; + //this message is not 100% accurate for the splitter + //if they are receiving any roundoff + snprintf(buf, 63, " %u copper", cpsplit); + msg += buf; + one = true; + } + msg += " as your split"; - if(ppsplit > 0) { - snprintf(buf, 63, " %u platinum", ppsplit); - msg += buf; - one = true; - } - if(gpsplit > 0) { - if(one) - msg += ","; - snprintf(buf, 63, " %u gold", gpsplit); - msg += buf; - one = true; - } - if(spsplit > 0) { - if(one) - msg += ","; - snprintf(buf, 63, " %u silver", spsplit); - msg += buf; - one = true; - } - if(cpsplit > 0) { - if(one) - msg += ","; - //this message is not 100% accurate for the splitter - //if they are receiving any roundoff - snprintf(buf, 63, " %u copper", cpsplit); - msg += buf; - one = true; - } - msg += " as your split"; - - for (i = 0; i < MAX_RAID_MEMBERS; i++) { - if (members[i].member != nullptr) { // If Group Member is Client + for (i = 0; i < MAX_RAID_MEMBERS; i++) { + if (members[i].member != nullptr) { // If Group Member is Client //I could not get MoneyOnCorpse to work, so we use this members[i].member->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true); members[i].member->Message(2, msg.c_str()); - } - } + } + } } void Raid::GroupBardPulse(Mob* caster, uint16 spellid, uint32 gid){ @@ -721,7 +720,7 @@ void Raid::TeleportRaid(Mob* sender, uint32 zoneID, uint16 instance_id, float x, void Raid::ChangeLootType(uint32 type) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_details SET loottype=%lu WHERE raidid=%lu", (unsigned long)type, (unsigned long)GetID()),errbuf,&result)){ mysql_free_result(result); @@ -734,7 +733,7 @@ void Raid::ChangeLootType(uint32 type) void Raid::AddRaidLooter(const char* looter) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET islooter=1 WHERE name='%s'", looter),errbuf,&result)){ mysql_free_result(result); @@ -771,7 +770,7 @@ void Raid::AddRaidLooter(const char* looter) void Raid::RemoveRaidLooter(const char* looter) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_members SET islooter=0 WHERE name='%s'", looter),errbuf,&result)){ mysql_free_result(result); @@ -1227,7 +1226,7 @@ void Raid::SendRaidGroupRemove(const char *who, uint32 gid) void Raid::LockRaid(bool lockFlag) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "UPDATE raid_details SET locked=%d WHERE raidid=%lu", lockFlag, (unsigned long)GetID()),errbuf,&result)){ mysql_free_result(result); @@ -1253,7 +1252,7 @@ void Raid::LockRaid(bool lockFlag) void Raid::SetRaidDetails() { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; if (database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO raid_details SET raidid=%lu, loottype=4, locked=0", (unsigned long)GetID()),errbuf,&result)){ mysql_free_result(result); @@ -1265,7 +1264,7 @@ void Raid::SetRaidDetails() void Raid::GetRaidDetails() { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; MYSQL_ROW row; if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT locked, loottype FROM raid_details WHERE raidid=%lu", (unsigned long)GetID()),errbuf,&result)){ @@ -1288,7 +1287,7 @@ bool Raid::LearnMembers() { memset(members, 0, (sizeof(RaidMember)*MAX_RAID_MEMBERS)); char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; MYSQL_ROW row; if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT name, groupid, _class, level, isgroupleader, israidleader, islooter FROM raid_members WHERE raidid=%lu", (unsigned long)GetID()),errbuf,&result)){ @@ -1368,7 +1367,7 @@ void Raid::SendHPPacketsTo(Client *c) uint32 gid = this->GetGroup(c); EQApplicationPacket hpapp; - EQApplicationPacket outapp(OP_MobManaUpdate, sizeof(MobManaUpdate_Struct)); + EQApplicationPacket outapp(OP_MobManaUpdate, sizeof(MobManaUpdate_Struct)); for(int x = 0; x < MAX_RAID_MEMBERS; x++) { if(members[x].member) @@ -1377,18 +1376,18 @@ void Raid::SendHPPacketsTo(Client *c) { members[x].member->CreateHPPacket(&hpapp); c->QueuePacket(&hpapp, false); - if(c->GetClientVersion() >= EQClientSoD) - { - outapp.SetOpcode(OP_MobManaUpdate); - MobManaUpdate_Struct *mmus = (MobManaUpdate_Struct *)outapp.pBuffer; - mmus->spawn_id = members[x].member->GetID(); - mmus->mana = members[x].member->GetManaPercent(); - c->QueuePacket(&outapp, false); - outapp.SetOpcode(OP_MobEnduranceUpdate); - MobEnduranceUpdate_Struct *meus = (MobEnduranceUpdate_Struct *)outapp.pBuffer; - meus->endurance = members[x].member->GetEndurancePercent(); - c->QueuePacket(&outapp, false); - } + if(c->GetClientVersion() >= EQClientSoD) + { + outapp.SetOpcode(OP_MobManaUpdate); + MobManaUpdate_Struct *mmus = (MobManaUpdate_Struct *)outapp.pBuffer; + mmus->spawn_id = members[x].member->GetID(); + mmus->mana = members[x].member->GetManaPercent(); + c->QueuePacket(&outapp, false); + outapp.SetOpcode(OP_MobEnduranceUpdate); + MobEnduranceUpdate_Struct *meus = (MobEnduranceUpdate_Struct *)outapp.pBuffer; + meus->endurance = members[x].member->GetEndurancePercent(); + c->QueuePacket(&outapp, false); + } } } } @@ -1403,7 +1402,7 @@ void Raid::SendHPPacketsFrom(Mob *m) if(m->IsClient()) gid = this->GetGroup(m->CastToClient()); EQApplicationPacket hpapp; - EQApplicationPacket outapp(OP_MobManaUpdate, sizeof(MobManaUpdate_Struct)); + EQApplicationPacket outapp(OP_MobManaUpdate, sizeof(MobManaUpdate_Struct)); m->CreateHPPacket(&hpapp); for(int x = 0; x < MAX_RAID_MEMBERS; x++) @@ -1413,18 +1412,18 @@ void Raid::SendHPPacketsFrom(Mob *m) if(!m->IsClient() || ((members[x].member != m->CastToClient()) && (members[x].GroupNumber == gid))) { members[x].member->QueuePacket(&hpapp, false); - if(members[x].member->GetClientVersion() >= EQClientSoD) - { - outapp.SetOpcode(OP_MobManaUpdate); - MobManaUpdate_Struct *mmus = (MobManaUpdate_Struct *)outapp.pBuffer; - mmus->spawn_id = m->GetID(); - mmus->mana = m->GetManaPercent(); - members[x].member->QueuePacket(&outapp, false); - outapp.SetOpcode(OP_MobEnduranceUpdate); - MobEnduranceUpdate_Struct *meus = (MobEnduranceUpdate_Struct *)outapp.pBuffer; - meus->endurance = m->GetEndurancePercent(); - members[x].member->QueuePacket(&outapp, false); - } + if(members[x].member->GetClientVersion() >= EQClientSoD) + { + outapp.SetOpcode(OP_MobManaUpdate); + MobManaUpdate_Struct *mmus = (MobManaUpdate_Struct *)outapp.pBuffer; + mmus->spawn_id = m->GetID(); + mmus->mana = m->GetManaPercent(); + members[x].member->QueuePacket(&outapp, false); + outapp.SetOpcode(OP_MobEnduranceUpdate); + MobEnduranceUpdate_Struct *meus = (MobEnduranceUpdate_Struct *)outapp.pBuffer; + meus->endurance = m->GetEndurancePercent(); + members[x].member->QueuePacket(&outapp, false); + } } } } diff --git a/zone/raids.h b/zone/raids.h index ab0089cea..89f034df0 100644 --- a/zone/raids.h +++ b/zone/raids.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef RAIDS_H #define RAIDS_H @@ -47,7 +47,7 @@ enum { //raid packet types: raidChangeGroupLeader = 13, //136 raid leader, new group leader, group_id? raidBecomeGroupLeader = 14, //472 raidUnknown2 = 15, - raidChangeGroup = 16, //?? len 136 old leader, new leader, 0 (preceeded with a remove2) + raidChangeGroup = 16, //?? len 136 old leader, new leader, 0 (preceeded with a remove2) raidLock = 17, //len 136 leader?, leader, 0 raidUnlock = 18, //len 136 leader?, leader, 0 raidRedStringID = 19, @@ -125,7 +125,7 @@ public: uint32 GetLowestLevel(); uint32 GetGroup(const char *name); uint32 GetGroup(Client *c); - uint16 GetAvgLevel(); + uint16 GetAvgLevel(); uint32 GetLootType() { return LootType; } void ChangeLootType(uint32 type); @@ -143,9 +143,7 @@ public: void LockRaid(bool lockFlag); bool IsLocked() { return locked; } - /* - * Actual Implementation Stuff - */ + //Actual Implementation Stuff void RaidMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0); void CastGroupSpell(Mob* caster,uint16 spellid, uint32 gid); diff --git a/zone/skills.h b/zone/skills.h index 2ea5a7b9f..581b66647 100644 --- a/zone/skills.h +++ b/zone/skills.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef SKILLS_H #define SKILLS_H diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index faf402959..6d2b22e8a 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -76,7 +76,7 @@ Spawn2::Spawn2(uint32 in_spawn2_id, uint32 spawngroup_id, y = in_y; z = in_z; heading = in_heading; - respawn_ = respawn; + respawn_ = respawn; variance_ = variance; grid_ = grid; condition_id = in_cond_id; @@ -225,12 +225,12 @@ bool Spawn2::Process() { npcthis = npc; npc->AddLootTable(); npc->SetSp2(spawngroup_id_); - npc->SaveGuardPointAnim(anim); - npc->SetAppearance((EmuAppearance)anim); + npc->SaveGuardPointAnim(anim); + npc->SetAppearance((EmuAppearance)anim); entity_list.AddNPC(npc); //this limit add must be done after the AddNPC since we need the entity ID. entity_list.LimitAddNPC(npc); - if(sg->roamdist && sg->roambox[0] && sg->roambox[1] && sg->roambox[2] && sg->roambox[3] && sg->delay) + if(sg->roamdist && sg->roambox[0] && sg->roambox[1] && sg->roambox[2] && sg->roambox[3] && sg->delay) npc->AI_SetRoambox(sg->roamdist,sg->roambox[0],sg->roambox[1],sg->roambox[2],sg->roambox[3],sg->delay); if(zone->InstantGrids()) { _log(SPAWNS__MAIN, "Spawn2 %d: Group %d spawned %s (%d) at (%.3f, %.3f, %.3f).", spawn2_id, spawngroup_id_, npc->GetName(), npcid, x, y, z); @@ -415,7 +415,7 @@ bool ZoneDatabase::CreateSpawn2(Client *c, uint32 spawngroup, const char* zone, { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; // if(GetInverseXY()==1) { @@ -683,12 +683,12 @@ void SpawnConditionManager::UpdateDBEvent(SpawnEvent &event) { SpawnCondition cond; len = MakeAnyLenString(&query, - "UPDATE spawn_events SET " - "next_minute=%d, next_hour=%d, next_day=%d, next_month=%d, " - "next_year=%d, enabled=%d " - "WHERE id=%d", - event.next.minute, event.next.hour, event.next.day, event.next.month, - event.next.year, event.enabled?1:0, event.id + "UPDATE spawn_events SET " + "next_minute=%d, next_hour=%d, next_day=%d, next_month=%d, " + "next_year=%d, enabled=%d " + "WHERE id=%d", + event.next.minute, event.next.hour, event.next.day, event.next.month, + event.next.year, event.enabled?1:0, event.id ); if(!database.RunQuery(query, len, errbuf)) { LogFile->write(EQEMuLog::Error, "Unable to update spawn event '%s': %s\n", query, errbuf); @@ -722,8 +722,8 @@ bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, stri bool ret = false; len = MakeAnyLenString(&query, - "SELECT id,cond_id,period,next_minute,next_hour,next_day,next_month,next_year,enabled,action,argument,zone " - "FROM spawn_events WHERE id=%d", event_id); + "SELECT id,cond_id,period,next_minute,next_hour,next_day,next_month,next_year,enabled,action,argument,zone " + "FROM spawn_events WHERE id=%d", event_id); if (database.RunQuery(query, len, errbuf, &result)) { safe_delete_array(query); if((row = mysql_fetch_row(result))) { @@ -813,8 +813,8 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in //load spawn events SpawnEvent event; len = MakeAnyLenString(&query, - "SELECT id,cond_id,period,next_minute,next_hour,next_day,next_month,next_year,enabled,action,argument " - "FROM spawn_events WHERE zone='%s'", zone_name); + "SELECT id,cond_id,period,next_minute,next_hour,next_day,next_month,next_year,enabled,action,argument " + "FROM spawn_events WHERE zone='%s'", zone_name); if (database.RunQuery(query, len, errbuf, &result)) { safe_delete_array(query); while((row = mysql_fetch_row(result))) { @@ -847,7 +847,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in return false; } - //now we need to catch up on events that happened while we were away + //now we need to catch up on events that happened while we were away //and use them to alter just the condition variables. //each spawn2 will then use its correct condition value when @@ -1121,7 +1121,7 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool rese //advance the next time by our period EQTime::AddMinutes(e.period, &e.next); } else { - _log(SPAWNS__CONDITIONS, "Spawn event %d is in zone %s. State changed. Notifying world.", event_id, zone_short_name.c_str(), e.period); + _log(SPAWNS__CONDITIONS, "Spawn event %d is in zone %s. State changed. Notifying world.", event_id, zone_short_name.c_str(), e.period); } //save the event in the DB UpdateDBEvent(e); @@ -1195,12 +1195,3 @@ bool SpawnConditionManager::Check(uint16 condition, int16 min_value) { return(cond.value >= min_value); } - - - - - - - - - diff --git a/zone/spawn2.h b/zone/spawn2.h index 6a12f50cf..375f624ce 100644 --- a/zone/spawn2.h +++ b/zone/spawn2.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef SPAWN2_H #define SPAWN2_H @@ -91,7 +91,7 @@ private: uint16 condition_id; int16 condition_min_value; bool enabled; - EmuAppearance anim; + EmuAppearance anim; bool IsDespawned; uint32 killcount; }; @@ -112,7 +112,7 @@ public: uint16 condition_id; int16 value; - OnChange on_change; + OnChange on_change; }; class SpawnEvent { diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp index 20eca6eb9..d31d53bae 100644 --- a/zone/spawngroup.cpp +++ b/zone/spawngroup.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "spawngroup.h" @@ -92,7 +92,7 @@ uint32 SpawnGroup::GetNPCType() { roll -= se->chance; } } - //CODER implement random table + //CODER implement random table return npcType; } diff --git a/zone/spawngroup.h b/zone/spawngroup.h index 6c36c0b11..bc80b7877 100644 --- a/zone/spawngroup.h +++ b/zone/spawngroup.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef SPAWNGROUP_H #define SPAWNGROUP_H @@ -45,14 +45,14 @@ public: uint32 GetNPCType(); void AddSpawnEntry( SpawnEntry* newEntry ); uint32 id; - float roamdist; - float roambox[4]; + float roamdist; + float roambox[4]; int delay; int despawn; uint32 despawn_timer; private: char name_[120]; - list list_; + list list_; uint8 group_spawn_limit; //max # of this entry which can be spawned by this group }; @@ -66,7 +66,7 @@ public: SpawnGroup* GetSpawnGroup(uint32 id); bool RemoveSpawnGroup(uint32 in_id); private: -// LinkedList list_; + //LinkedList list_; map groups; }; diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 9c2e83ef6..4950e3b35 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -33,14 +33,8 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.net) int Mob::GetKickDamage() { int multiple=(GetLevel()*100/5); multiple += 100; - int32 dmg=( - ( - (GetSkill(KICK) + GetSTR() + GetLevel())*100 / 9000 - ) * multiple - ) - + 600; //Set a base of 6 damage, 1 seemed too low at the sub level 30 level. - if(GetClass() == WARRIOR || GetClass() == WARRIORGM - ||GetClass() == BERSERKER || GetClass() == BERSERKERGM) { + int32 dmg=(((GetSkill(KICK) + GetSTR() + GetLevel())*100 / 9000) * multiple) + 600; //Set a base of 6 damage, 1 seemed too low at the sub level 30 level. + if(GetClass() == WARRIOR || GetClass() == WARRIORGM ||GetClass() == BERSERKER || GetClass() == BERSERKERGM) { dmg*=12/10;//small increase for warriors } dmg /= 100; @@ -58,12 +52,7 @@ int Mob::GetBashDamage() { multiple += 100; //this is complete shite - int32 dmg=( - ( - ((GetSkill(BASH) + GetSTR())*100 + GetLevel()*100/2) / 10000 - ) * multiple - ) - + 600; //Set a base of 6 damage, 1 seemed too low at the sub level 30 level. + int32 dmg=((((GetSkill(BASH) + GetSTR())*100 + GetLevel()*100/2) / 10000) * multiple) + 600; //Set a base of 6 damage, 1 seemed too low at the sub level 30 level. dmg /= 100; int32 mindmg = 1; @@ -239,8 +228,7 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { int32 skill_reduction = this->GetSkillReuseTime(ca_atk->m_skill); - if ((ca_atk->m_atk == 100) - && (ca_atk->m_skill == BASH)) { // SLAM - Bash without a shield equipped + if ((ca_atk->m_atk == 100) && (ca_atk->m_skill == BASH)) { // SLAM - Bash without a shield equipped if (GetTarget() != this) { CheckIncreaseSkill(BASH, GetTarget(), 10); @@ -281,7 +269,7 @@ void Client::OPCombatAbility(const EQApplicationPacket *app) { CheckIncreaseSkill(FRENZY, GetTarget(), 10); int AtkRounds = 3; int skillmod = 100*GetSkill(FRENZY)/MaxSkill(FRENZY); - int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); + int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); int32 min_dmg = 0; DoAnim(anim2HSlashing); @@ -412,64 +400,64 @@ int Mob::MonkSpecialAttack(Mob* other, uint8 unchecked_type) switch(unchecked_type) { - case FLYING_KICK:{ - skill_type = FLYING_KICK; - max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, FlyingKickBonus) / 100) + 35; - min_dmg = ((level*8)/10); - ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); - DoAnim(animFlyingKick); - reuse = FlyingKickReuseTime; - break; + case FLYING_KICK:{ + skill_type = FLYING_KICK; + max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, FlyingKickBonus) / 100) + 35; + min_dmg = ((level*8)/10); + ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); + DoAnim(animFlyingKick); + reuse = FlyingKickReuseTime; + break; } - case DRAGON_PUNCH:{ - skill_type = DRAGON_PUNCH; - max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, DragonPunchBonus) / 100) + 26; - itemslot = SLOT_HANDS; - ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); - DoAnim(animTailRake); - reuse = TailRakeReuseTime; - break; + case DRAGON_PUNCH:{ + skill_type = DRAGON_PUNCH; + max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, DragonPunchBonus) / 100) + 26; + itemslot = SLOT_HANDS; + ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); + DoAnim(animTailRake); + reuse = TailRakeReuseTime; + break; } - case EAGLE_STRIKE:{ - skill_type = EAGLE_STRIKE; - max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, EagleStrikeBonus) / 100) + 19; - itemslot = SLOT_HANDS; - ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); - DoAnim(animEagleStrike); - reuse = EagleStrikeReuseTime; - break; + case EAGLE_STRIKE:{ + skill_type = EAGLE_STRIKE; + max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, EagleStrikeBonus) / 100) + 19; + itemslot = SLOT_HANDS; + ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); + DoAnim(animEagleStrike); + reuse = EagleStrikeReuseTime; + break; } - case TIGER_CLAW:{ - skill_type = TIGER_CLAW; - max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, TigerClawBonus) / 100) + 12; - itemslot = SLOT_HANDS; - ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); - DoAnim(animTigerClaw); - reuse = TigerClawReuseTime; - break; + case TIGER_CLAW:{ + skill_type = TIGER_CLAW; + max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, TigerClawBonus) / 100) + 12; + itemslot = SLOT_HANDS; + ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); + DoAnim(animTigerClaw); + reuse = TigerClawReuseTime; + break; } - case ROUND_KICK:{ - skill_type = ROUND_KICK; - max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, RoundKickBonus) / 100) + 10; - ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); - DoAnim(animRoundKick); - reuse = RoundKickReuseTime; - break; + case ROUND_KICK:{ + skill_type = ROUND_KICK; + max_dmg = ((GetSTR()+GetSkill(skill_type)) * RuleI(Combat, RoundKickBonus) / 100) + 10; + ApplySpecialAttackMod(skill_type, max_dmg, min_dmg); + DoAnim(animRoundKick); + reuse = RoundKickReuseTime; + break; } - case KICK:{ - skill_type = KICK; - max_dmg = GetKickDamage(); - DoAnim(animKick); - reuse = KickReuseTime; - break; - } - default: - mlog(CLIENT__ERROR, "Invalid special attack type %d attempted", unchecked_type); - return(1000); /* nice long delay for them, the caller depends on this! */ + case KICK:{ + skill_type = KICK; + max_dmg = GetKickDamage(); + DoAnim(animKick); + reuse = KickReuseTime; + break; + } + default: + mlog(CLIENT__ERROR, "Invalid special attack type %d attempted", unchecked_type); + return(1000); /* nice long delay for them, the caller depends on this! */ } if(IsClient()){ @@ -629,7 +617,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) if(primaryweapondamage > 0){ if(level > 25){ - max_hit = (((2*backstab_dmg) * GetDamageTable(BACKSTAB) / 100) * 10 * GetSkill(BACKSTAB) / 355) + ((level-25)/3) + 1; + max_hit = (((2*backstab_dmg) * GetDamageTable(BACKSTAB) / 100) * 10 * GetSkill(BACKSTAB) / 355) + ((level-25)/3) + 1; hate = 20 * backstab_dmg * GetSkill(BACKSTAB) / 355; } else{ @@ -644,7 +632,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) } else { - // Trumpcard: Replaced switch statement with formula calc. This will give minhit increases all the way to 65. + // Trumpcard: Replaced switch statement with formula calc. This will give minhit increases all the way to 65. min_hit = (level * ( level*5 - 105)) / 100; } @@ -1340,10 +1328,10 @@ void Mob::ProjectileAnimation(Mob* to, uint16 item_id, bool IsArrow, float speed uint8 item_type = 0; if(!item_id) { - item = database.GetItem(8005); // Arrow will be default + item = database.GetItem(8005); // Arrow will be default } else { - item = database.GetItem(item_id); // Use the item input into the command + item = database.GetItem(item_id); // Use the item input into the command } if(!item) { @@ -1431,7 +1419,7 @@ void NPC::DoClassAttacks(Mob *target) { //general stuff, for all classes.... //only gets used when their primary ability get used too if (taunting && HasOwner() && target->IsNPC() && target->GetBodyType() != BT_Undead && taunt_time) { - this->GetOwner()->Message_StringID(MT_PetResponse, PET_TAUNTING); + this->GetOwner()->Message_StringID(MT_PetResponse, PET_TAUNTING); Taunt(target->CastToNPC(), false); } @@ -1528,7 +1516,7 @@ void NPC::DoClassAttacks(Mob *target) { case BERSERKER: case BERSERKERGM: { int AtkRounds = 3; - int32 max_dmg = 26 + ((GetLevel()-6) * 2); + int32 max_dmg = 26 + ((GetLevel()-6) * 2); int32 min_dmg = 0; DoAnim(anim2HSlashing); @@ -1740,7 +1728,7 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte) CheckIncreaseSkill(FRENZY, GetTarget(), 10); int AtkRounds = 3; int skillmod = 100*GetSkill(FRENZY)/MaxSkill(FRENZY); - int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); + int32 max_dmg = (26 + ((((GetLevel()-6) * 2)*skillmod)/100)) * ((100+RuleI(Combat, FrenzyBonus))/100); int32 min_dmg = 0; DoAnim(anim2HSlashing); @@ -2150,7 +2138,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob* other, uint16 weapon_damage, SkillType skil } } - if (damage == -3) { + if (damage == -3) { DoRiposte(other); if (HasDied()) return; diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 831193f86..58954ffe7 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/spdat.h" @@ -143,7 +143,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) { if(parse->SpellHasQuestSub(spell_id, "EVENT_SPELL_EFFECT_NPC")) { - parse->EventSpell(EVENT_SPELL_EFFECT_NPC, CastToNPC(), nullptr, spell_id, caster ? caster->GetID() : 0); + parse->EventSpell(EVENT_SPELL_EFFECT_NPC, CastToNPC(), nullptr, spell_id, caster ? caster->GetID() : 0); CalcBonuses(); return true; } @@ -152,7 +152,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) { if(parse->SpellHasQuestSub(spell_id, "EVENT_SPELL_EFFECT_CLIENT")) { - parse->EventSpell(EVENT_SPELL_EFFECT_CLIENT, nullptr, CastToClient(), spell_id, caster ? caster->GetID() : 0); + parse->EventSpell(EVENT_SPELL_EFFECT_CLIENT, nullptr, CastToClient(), spell_id, caster ? caster->GetID() : 0); CalcBonuses(); return true; } @@ -644,7 +644,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if (max_level == 0) max_level = RuleI(Spells, BaseImmunityLevel); // NPCs get to ignore max_level for their spells. - if(SpecAttacks[UNSTUNABLE] || + if(SpecAttacks[UNSTUNABLE] || ((GetLevel() > max_level) && caster && (!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))) { @@ -998,7 +998,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) spells[buffs[slot].spellid].buffdurationformula != DF_Permanent && spells[buffs[slot].spellid].dispel_flag < 1 && !IsDiscipline(buffs[slot].spellid)) - { + { BuffFadeBySlot(slot); slot = buff_count; } @@ -1020,9 +1020,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) for(int slot = 0; slot < buff_count; slot++) { if (buffs[slot].spellid != SPELL_UNKNOWN && spells[buffs[slot].spellid].buffdurationformula != DF_Permanent && - IsDetrimentalSpell(buffs[slot].spellid) && + IsDetrimentalSpell(buffs[slot].spellid) && spells[buffs[slot].spellid].dispel_flag < 1) - { + { BuffFadeBySlot(slot); slot = buff_count; } @@ -1044,9 +1044,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) for(int slot = 0; slot < buff_count; slot++) { if (buffs[slot].spellid != SPELL_UNKNOWN && spells[buffs[slot].spellid].buffdurationformula != DF_Permanent && - IsBeneficialSpell(buffs[slot].spellid) && + IsBeneficialSpell(buffs[slot].spellid) && spells[buffs[slot].spellid].dispel_flag < 1) - { + { BuffFadeBySlot(slot); slot = buff_count; } @@ -1072,11 +1072,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #endif if(!item) { - Message(13, "Unable to summon item %d. Item not found.", spell.base[i]); + Message(13, "Unable to summon item %d. Item not found.", spell.base[i]); } else if(IsClient()){ Client *c=CastToClient(); - if (c->CheckLoreConflict(item)) { + if (c->CheckLoreConflict(item)) { c->DuplicateLoreMessage(spell.base[i]); } else { int charges; @@ -1114,7 +1114,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } else if ((slot=SummonedItem->FirstOpenSlot())==0xff) { if(caster) caster->Message(13,"SE_SummonItemIntoBag but no room in summoned bag!"); } else if (IsClient()) { - if (CastToClient()->CheckLoreConflict(item)) { + if (CastToClient()->CheckLoreConflict(item)) { CastToClient()->DuplicateLoreMessage(spell.base[i]); } else { int charges; @@ -1375,7 +1375,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) max_level = RuleI(Spells, BaseImmunityLevel); // Default max is 55 level limit // NPCs ignore level limits in their spells - if(SpecAttacks[UNSTUNABLE] || + if(SpecAttacks[UNSTUNABLE] || ((GetLevel() > max_level) && caster && (!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))) { @@ -1454,7 +1454,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) snprintf(effect_desc, _EDLEN, "Feign Death"); #endif //todo, look up spell ID in DB - if(spell_id == 2488) //Dook- Lifeburn fix + if(spell_id == 2488) //Dook- Lifeburn fix break; if(IsClient()) @@ -1505,7 +1505,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if(caster) mlog(SPELLS__REZ, " corpse being rezzed using spell %i by %s", - spell_id, caster->GetName()); + spell_id, caster->GetName()); CastToCorpse()->CastRezz(spell_id, caster); } @@ -1532,8 +1532,8 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) if (caster){ rooted_mod = caster->aabonuses.RootBreakChance + - caster->itembonuses.RootBreakChance + - caster->spellbonuses.RootBreakChance; + caster->itembonuses.RootBreakChance + + caster->spellbonuses.RootBreakChance; } break; @@ -1679,7 +1679,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) break; } - case SE_DisarmLDoNTrap: + case SE_DisarmLDoNTrap: { if(IsNPC()) { @@ -2020,7 +2020,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) } - case SE_TemporaryPets: //Dook- swarms and wards: + case SE_TemporaryPets: //Dook- swarms and wards: { // EverHood - this makes necro epic 1.5/2.0 proc work properly if((spell_id != 6882) && (spell_id != 6884)) // Chaotic Jester/Steadfast Servant @@ -2039,13 +2039,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) #ifdef SPELL_EFFECT_SPAM snprintf(effect_desc, _EDLEN, "Fading Memories"); #endif - if(caster && caster->IsClient()) - caster->CastToClient()->Escape(); - else - { - entity_list.RemoveFromTargets(caster); - SetInvisible(1); - } + if(caster && caster->IsClient()) + caster->CastToClient()->Escape(); + else + { + entity_list.RemoveFromTargets(caster); + SetInvisible(1); + } break; } @@ -2103,7 +2103,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) /* Weapon Damage = spells[spell_id].base[i] Chance to Hit Bonus = spells[spell_id].base2[i] - ???? = spells[spell_id].max[i] - MOST of the effects have this value. + ???? = spells[spell_id].max[i] - MOST of the effects have this value. *Max is lower value then Weapon base, possibly min hit vs Weapon Damage range ie. MakeRandInt(max,base) */ int16 focus = 0; @@ -2294,9 +2294,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) uint8 BonusChance = 0; if(caster) { - BonusChance = caster->aabonuses.UnfailingDivinity + - caster->itembonuses.UnfailingDivinity + - caster->spellbonuses.UnfailingDivinity; + BonusChance = caster->aabonuses.UnfailingDivinity + + caster->itembonuses.UnfailingDivinity + + caster->spellbonuses.UnfailingDivinity; } #ifdef SPELL_EFFECT_SPAM @@ -2513,7 +2513,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) case SE_Taunt: { if (IsNPC()) - caster->Taunt(this->CastToNPC(), false, spell.base[i]); + caster->Taunt(this->CastToNPC(), false, spell.base[i]); } case SE_Purify: @@ -2715,8 +2715,8 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) case SE_SecondaryDmgInc: case SE_ArcheryDamageModifier: case SE_ConsumeProjectile: - case SE_ForageAdditionalItems: - case SE_Salvage: + case SE_ForageAdditionalItems: + case SE_Salvage: case SE_FrontalBackstabChance: case SE_FrontalBackstabMinDmg: case SE_TripleBackstab: @@ -2841,7 +2841,7 @@ neotokyo: i need those formulas checked!!!! 205 = stacking issues ? 105 - 0x77 = min + level / 8 +0x77 = min + level / 8 */ int result = 0, updownsign = 1, ubase = base; @@ -2853,7 +2853,7 @@ neotokyo: i need those formulas checked!!!! // the max is actually less than the base, hence they grow downward /* This seems to mainly catch spells where both base and max are negative. -Strangely, damage spells have a negative base and positive max, but +Strangely, damage spells have a negative base and positive max, but snare has both of them negative, yet their range should work the same: (meaning they both start at a negative value and the value gets lower) */ @@ -2876,7 +2876,7 @@ snare has both of them negative, yet their range should work the same: case 60: //used in stun spells..? case 70: result = ubase/100; break; - case 0: + case 0: case 100: // confirmed 2/6/04 result = ubase; break; case 101: // confirmed 2/6/04 @@ -2911,7 +2911,7 @@ snare has both of them negative, yet their range should work the same: case 114: result = updownsign * (ubase + 15 * (caster_level - GetMinLevel(spell_id))); break; - //these formula were updated according to lucy 10/16/04 + //these formula were updated according to lucy 10/16/04 case 115: // this is only in symbol of transal result = ubase + 6 * (caster_level - GetMinLevel(spell_id)); break; case 116: // this is only in symbol of ryltan @@ -3070,7 +3070,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M { if(parse->SpellHasQuestSub(spell_id, "EVENT_SPELL_EFFECT_BUFF_TIC_NPC")) { - parse->EventSpell(EVENT_SPELL_EFFECT_BUFF_TIC_NPC, CastToNPC(), nullptr, spell_id, caster ? caster->GetID() : 0); + parse->EventSpell(EVENT_SPELL_EFFECT_BUFF_TIC_NPC, CastToNPC(), nullptr, spell_id, caster ? caster->GetID() : 0); return; } } @@ -3078,7 +3078,7 @@ void Mob::DoBuffTic(uint16 spell_id, uint32 ticsremaining, uint8 caster_level, M { if(parse->SpellHasQuestSub(spell_id, "EVENT_SPELL_EFFECT_BUFF_TIC_CLIENT")) { - parse->EventSpell(EVENT_SPELL_EFFECT_BUFF_TIC_CLIENT, nullptr, CastToClient(), spell_id, caster ? caster->GetID() : 0); + parse->EventSpell(EVENT_SPELL_EFFECT_BUFF_TIC_CLIENT, nullptr, CastToClient(), spell_id, caster ? caster->GetID() : 0); return; } } @@ -3678,14 +3678,14 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) SendPetBuffsToClient(); } if((IsClient() && !CastToClient()->GetPVP()) || (IsPet() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP()) || - (IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP())) + (IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP())) { EQApplicationPacket *outapp = MakeBuffsPacket(); entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, BIT_SoDAndLater); - if(GetTarget() == this) { - CastToClient()->QueuePacket(outapp); - } + if(GetTarget() == this) { + CastToClient()->QueuePacket(outapp); + } safe_delete(outapp); } @@ -4289,7 +4289,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo return 0; break; default: - LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); + LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]); } break; @@ -4622,7 +4622,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo //this spits up a lot of garbage when calculating spell focuses //since they have all kinds of extra effects on them. default: - LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); + LogFile->write(EQEMuLog::Normal, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]); #endif } } @@ -4698,7 +4698,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { //Spell Focus if (spellbonuses.FocusEffects[type]){ int buff_slot = 0; - uint16 focusspellid = 0; + uint16 focusspellid = 0; uint32 buff_max = GetMaxTotalSlots(); for (buff_slot = 0; buff_slot < buff_max; buff_slot++) { @@ -4884,8 +4884,8 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { int buff_tracker = -1; int buff_slot = 0; - uint16 focusspellid = 0; - uint16 focusspell_tracker = 0; + uint16 focusspellid = 0; + uint16 focusspell_tracker = 0; uint32 buff_max = GetMaxTotalSlots(); for (buff_slot = 0; buff_slot < buff_max; buff_slot++) { focusspellid = buffs[buff_slot].spellid; @@ -5052,7 +5052,7 @@ bool Mob::CheckHitsRemaining(uint32 buff_slot, bool when_spell_done, bool negate // For lowering numhits when we already know the effects buff_slot // Effects: SE_SpellVulnerability,SE_MitigateMeleeDamage,SE_NegateAttacks,SE_MitigateSpellDamage,SE_ManaAbsorbPercentDamage - if(spells[buffs[buff_slot].spellid].numhits > 0 || negate) { + if(spells[buffs[buff_slot].spellid].numhits > 0 || negate) { if(buffs[buff_slot].numhits > 1) { buffs[buff_slot].numhits--; return true; @@ -5349,8 +5349,8 @@ bool Mob::PassLimitClass(uint32 Classes_, uint16 Class_) for (int CurrentClass = 1; CurrentClass <= PLAYER_CLASS_COUNT; ++CurrentClass){ if (Classes_ % 2 == 1){ - if (CurrentClass == Class_) - return true; + if (CurrentClass == Class_) + return true; } Classes_ >>= 1; } diff --git a/zone/spells.cpp b/zone/spells.cpp index 2c1908414..cf37971dd 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator +Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -22,11 +22,11 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) General outline of spell casting process 1. - a) Client clicks a spell bar gem, ability, or item. client_process.cpp + a) Client clicks a spell bar gem, ability, or item. client_process.cpp gets the op and calls CastSpell() with all the relevant info including cast time. - b) NPC does CastSpell() from AI + b) NPC does CastSpell() from AI 2. a) CastSpell() determines there is a cast time and sets some state keeping @@ -41,7 +41,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) 4. CastedSpellFinished() checks some timed spell specific things, like - wether to interrupt or not, due to movement or melee. If successful + wether to interrupt or not, due to movement or melee. If successful SpellFinished() is called. 5. @@ -141,7 +141,7 @@ void NPC::SpellProcess() Mob *targMob = entity_list.GetMob(GetSwarmInfo()->target); if(GetSwarmInfo()->target != 0) - { + { if(!targMob || (targMob && targMob->IsCorpse())) Depop(); } @@ -154,9 +154,9 @@ void NPC::SpellProcess() // // only CastSpell and DoCastSpell should be setting casting_spell_id. // basically casting_spell_id is only set when casting a triggered spell from -// the spell bar gems, an ability, or an item. note that it's actually set +// the spell bar gems, an ability, or an item. note that it's actually set // even if it's a 0 cast time, but then the spell is finished right after and -// it's unset. this is ok, since the 0 cast time spell is still a triggered +// it's unset. this is ok, since the 0 cast time spell is still a triggered // one. // the rule is you can cast one triggered (usually timed) spell at a time // but things like SpellFinished() can run concurrent with a triggered cast @@ -244,11 +244,11 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, return(false); } - if (HasActiveSong() && IsBardSong(spell_id)) { - mlog(SPELLS__BARDS, "Casting a new song while singing a song. Killing old song %d.", bardsong); - //Note: this does NOT tell the client - _StopSong(); - } + if (HasActiveSong() && IsBardSong(spell_id)) { + mlog(SPELLS__BARDS, "Casting a new song while singing a song. Killing old song %d.", bardsong); + //Note: this does NOT tell the client + _StopSong(); + } //Added to prevent MQ2 exploitation of equipping normally-unequippable/clickable items with effects and clicking them for benefits. if(item_slot && IsClient() && ((slot == USE_ITEM_SPELL_SLOT) || (slot == POTION_BELT_SPELL_SLOT))) @@ -306,7 +306,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, } // -// the order of things here is intentional and important. make sure you +// the order of things here is intentional and important. make sure you // understand the whole spell casting process and the flags that are passed // around if you're gonna modify this // @@ -314,7 +314,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, uint16 slot, // to repeat a spell for bard songs // bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, uint16 slot, - int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, + int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 timer, uint32 timer_duration, uint32 type, int16 resist_adjust) { @@ -622,8 +622,8 @@ bool Client::CheckFizzle(uint16 spell_id) } // == 0 --> on par - // > 0 --> skill is lower, higher chance of fizzle - // < 0 --> skill is better, lower chance of fizzle + // > 0 --> skill is lower, higher chance of fizzle + // < 0 --> skill is better, lower chance of fizzle // the max that diff can be is +- 235 float diff = par_skill + spells[spell_id].basediff - act_skill; @@ -695,25 +695,25 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid) { EQApplicationPacket *outapp; uint16 message_other; - bool bard_song_mode = false; //has the bard song gone to auto repeat mode + bool bard_song_mode = false; //has the bard song gone to auto repeat mode if (spellid == SPELL_UNKNOWN) { if(bardsong) { - spellid = bardsong; - bard_song_mode = true; - } else { - spellid = casting_spell_id; - } - } + spellid = bardsong; + bard_song_mode = true; + } else { + spellid = casting_spell_id; + } + } if(casting_spell_id && IsNPC()) { CastToNPC()->AI_Event_SpellCastFinished(false, casting_spell_slot); } - if(casting_spell_type == 1 && IsClient()) { //Rest AA Timer on failed cast - CastToClient()->SendAATimer(casting_spell_timer - pTimerAAStart, 0, 0xFFFFFF); - CastToClient()->Message_StringID(15,ABILITY_FAILED); - CastToClient()->GetPTimers().Clear(&database, casting_spell_timer); - } + if(casting_spell_type == 1 && IsClient()) { //Rest AA Timer on failed cast + CastToClient()->SendAATimer(casting_spell_timer - pTimerAAStart, 0, 0xFFFFFF); + CastToClient()->Message_StringID(15,ABILITY_FAILED); + CastToClient()->GetPTimers().Clear(&database, casting_spell_timer); + } ZeroCastingVars(); // resets all the state keeping stuff @@ -725,9 +725,9 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid) if (bardsong || IsBardSong(casting_spell_id)) _StopSong(); - if(bard_song_mode) { - return; - } + if(bard_song_mode) { + return; + } if(!message) message = IsBardSong(spellid) ? SONG_ENDS_ABRUPTLY : INTERRUPT_SPELL; @@ -780,13 +780,13 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid) } // this is called after the timer is up and the spell is finished -// casting. everything goes through here, including items with zero cast time +// casting. everything goes through here, including items with zero cast time // only to be used from SpellProcess -// NOTE: do not put range checking, etc into this function. this should +// NOTE: do not put range checking, etc into this function. this should // just check timed spell specific things before passing off to SpellFinished // which figures out proper targets etc void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, - uint16 mana_used, uint32 inventory_slot, int16 resist_adjust) + uint16 mana_used, uint32 inventory_slot, int16 resist_adjust) { _ZP(Mob_CastedSpellFinished); @@ -794,7 +794,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, if(IsClient() && slot != USE_ITEM_SPELL_SLOT && slot != POTION_BELT_SPELL_SLOT && spells[spell_id].recast_time > 1000) { // 10 is item if(!CastToClient()->GetPTimers().Expired(&database, pTimerSpellStart + spell_id, false)) { - //should we issue a message or send them a spell gem packet? + //should we issue a message or send them a spell gem packet? Message_StringID(13, SPELL_RECAST); mlog(SPELLS__CASTING_ERR, "Casting of %d canceled: spell reuse timer not expired", spell_id); InterruptSpell(); @@ -900,7 +900,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, // max 93% chance at 252 skill channelchance = 30 + GetSkill(CHANNELING) / 400.0f * 100; channelchance -= attacked_count * 2; - channelchance += channelchance * channelbonuses / 100.0f; + channelchance += channelchance * channelbonuses / 100.0f; } #ifdef BOTS else if(IsBot()) { @@ -914,7 +914,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, // max 93% chance at 252 skill channelchance = 30 + GetSkill(CHANNELING) / 400.0f * 100; channelchance -= attacked_count * 2; - channelchance += channelchance * channelbonuses / 100.0f; + channelchance += channelchance * channelbonuses / 100.0f; } #endif //BOTS else { @@ -1018,7 +1018,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, } break; - default: // some non-instrument component. Let it go, but record it in the log + default: // some non-instrument component. Let it go, but record it in the log mlog(SPELLS__CASTING_ERR, "Something odd happened: Song %d required component %s", spell_id, component); } @@ -1199,8 +1199,8 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, if(this->IsClient()) { if(parse->PlayerHasQuestSub("EVENT_CAST") ) { char temp[64]; - sprintf(temp, "%d", spell_id); - parse->EventPlayer(EVENT_CAST, CastToClient(), temp, 0); + sprintf(temp, "%d", spell_id); + parse->EventPlayer(EVENT_CAST, CastToClient(), temp, 0); } } @@ -1241,7 +1241,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, c->CheckSpecializeIncrease(spell_id); } } - } + } // there should be no casting going on now ZeroCastingVars(); @@ -1270,14 +1270,14 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce AE on location - this is a tricky one that is cast on a mob target but has a special AE duration that keeps it recasting every 2.5 sec on the - same location. These work the same as AE around target spells, except + same location. These work the same as AE around target spells, except the target is a special beacon that's created when the spell is cast Group - the caster is always affected, but there's more targetgroupbuffs on - these affect the target and the target's group. targetgroupbuffs off - no target, affects the caster's group. - Group Teleport - the caster plus his group are affected. these cannot + Group Teleport - the caster plus his group are affected. these cannot be targeted. I think the string ID SPELL_NEED_TAR is wrong, it dosent seem to show up. @@ -1354,10 +1354,10 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce { uint8 body_type = spell_target ? spell_target->GetBodyType() : 0; if(!spell_target || (spell_target != GetPet()) || - (body_type != BT_Summoned && body_type != BT_Summoned2 && body_type != BT_Summoned3 && body_type != BT_Animal)) + (body_type != BT_Summoned && body_type != BT_Summoned2 && body_type != BT_Summoned3 && body_type != BT_Animal)) { mlog(SPELLS__CASTING_ERR, "Spell %d canceled: invalid target of body type %d (summoned pet)", - spell_id, body_type); + spell_id, body_type); Message_StringID(13, SPELL_NEED_TAR); @@ -1712,7 +1712,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 if ( this->IsClient() && - (zone->GetZoneID() == 183 || zone->GetZoneID() == 184) && // load + (zone->GetZoneID() == 183 || zone->GetZoneID() == 184) && // load CastToClient()->Admin() < 80 ) { @@ -1737,12 +1737,12 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 mlog(SPELLS__CASTING, "Spell %d: target type %d, target %s, AE center %s", spell_id, CastAction, spell_target?spell_target->GetName():"NONE", ae_center?ae_center->GetName():"NONE"); // if a spell has the AEDuration flag, it becomes an AE on target - // spell that's recast every 2500 msec for AEDuration msec. There are + // spell that's recast every 2500 msec for AEDuration msec. There are // spells of all kinds of target types that do this, strangely enough // TODO: finish this if(IsAEDurationSpell(spell_id)) { // the spells are AE target, but we aim them on a beacon - Mob *beacon_loc = spell_target ? spell_target : this; + Mob *beacon_loc = spell_target ? spell_target : this; Beacon *beacon = new Beacon(beacon_loc, spells[spell_id].AEDuration); entity_list.AddBeacon(beacon); mlog(SPELLS__CASTING, "Spell %d: AE duration beacon created, entity id %d", spell_id, beacon->GetName()); @@ -2004,7 +2004,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 // if this was a spell slot or an ability use up the mana for it // CastSpell already reduced the cost for it if we're a client with focus - if(slot != USE_ITEM_SPELL_SLOT && slot != POTION_BELT_SPELL_SLOT && mana_used > 0) + if(slot != USE_ITEM_SPELL_SLOT && slot != POTION_BELT_SPELL_SLOT && mana_used > 0) { mlog(SPELLS__CASTING, "Spell %d: consuming %d mana", spell_id, mana_used); if (!DoHPToManaCovert(mana_used)) @@ -2056,9 +2056,9 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16 * handle bard song pulses... * * we make several assumptions that SpellFinished does not: - * - there are no AEDuration (beacon) bard songs - * - there are no recourse spells on bard songs - * - there is no long recast delay on bard songs + * - there are no AEDuration (beacon) bard songs + * - there are no recourse spells on bard songs + * - there is no long recast delay on bard songs * * return false to stop the song */ @@ -2611,21 +2611,21 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, if(effect1 != effect2) continue; - /* - Skip check if effect is SE_Limit* - skip checking effect2 since we know they are equal - */ - if(effect1 == SE_LimitMaxLevel || - effect1 == SE_LimitResist || - effect1 == SE_LimitTarget || - effect1 == SE_LimitEffect || - effect1 == SE_LimitSpellType || - effect1 == SE_LimitSpell || - effect1 == SE_LimitMinDur || - effect1 == SE_LimitInstant || - effect1 == SE_LimitMinLevel || - effect1 == SE_LimitCastTime) - continue; + /* + Skip check if effect is SE_Limit* + skip checking effect2 since we know they are equal + */ + if(effect1 == SE_LimitMaxLevel || + effect1 == SE_LimitResist || + effect1 == SE_LimitTarget || + effect1 == SE_LimitEffect || + effect1 == SE_LimitSpellType || + effect1 == SE_LimitSpell || + effect1 == SE_LimitMinDur || + effect1 == SE_LimitInstant || + effect1 == SE_LimitMinLevel || + effect1 == SE_LimitCastTime) + continue; /* If target is a npc and caster1 and caster2 exist @@ -2667,7 +2667,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, sp1_value = CalcSpellEffectValue(spellid1, i, caster_level1); sp2_value = CalcSpellEffectValue(spellid2, i, caster_level2); - // some spells are hard to compare just on value. attack speed spells + // some spells are hard to compare just on value. attack speed spells // have a value that's a percentage for instance if ( @@ -2743,9 +2743,9 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid spell_id, caster?caster->GetName():"UNKNOWN", caster_level, duration); // first we loop through everything checking that the spell - // can stack with everything. this is to avoid stripping the spells + // can stack with everything. this is to avoid stripping the spells // it would overwrite, and then hitting a buff we can't stack with. - // we also check if overwriting will occur. this is so after this loop + // we also check if overwriting will occur. this is so after this loop // we can determine if there will be room for this buff uint32 buff_count = GetMaxTotalSlots(); uint32 start_slot = 0; @@ -2798,32 +2798,32 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid // we didn't find an empty slot to put it in, and it's not overwriting // anything so there must not be any room left. - if(emptyslot == -1 && !will_overwrite) - // return -1; - { - if(IsDetrimentalSpell(spell_id)) //Sucks to be you, bye bye one of your buffs - { - for(buffslot = 0; buffslot < buff_count; buffslot++) - { - const Buffs_Struct &curbuf = buffs[buffslot]; - if(IsBeneficialSpell(curbuf.spellid)) - { - mlog(SPELLS__BUFFS, "No slot for detrimental buff %d, so we are overwriting a beneficial buff %d in slot %d", spell_id, curbuf.spellid, buffslot); - BuffFadeBySlot(buffslot,false); - emptyslot = buffslot; + if(emptyslot == -1 && !will_overwrite) + // return -1; + { + if(IsDetrimentalSpell(spell_id)) //Sucks to be you, bye bye one of your buffs + { + for(buffslot = 0; buffslot < buff_count; buffslot++) + { + const Buffs_Struct &curbuf = buffs[buffslot]; + if(IsBeneficialSpell(curbuf.spellid)) + { + mlog(SPELLS__BUFFS, "No slot for detrimental buff %d, so we are overwriting a beneficial buff %d in slot %d", spell_id, curbuf.spellid, buffslot); + BuffFadeBySlot(buffslot,false); + emptyslot = buffslot; break; - } - } - if(emptyslot == -1) { - mlog(SPELLS__BUFFS, "Unable to find a buff slot for detrimental buff %d", spell_id); + } + } + if(emptyslot == -1) { + mlog(SPELLS__BUFFS, "Unable to find a buff slot for detrimental buff %d", spell_id); return(-1); - } - } - else { - mlog(SPELLS__BUFFS, "Unable to find a buff slot for beneficial buff %d", spell_id); - return -1; - } - } + } + } + else { + mlog(SPELLS__BUFFS, "Unable to find a buff slot for beneficial buff %d", spell_id); + return -1; + } + } // at this point we know that this buff will stick, but we have // to remove some other buffs already worn if will_overwrite is true @@ -2848,19 +2848,19 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid buffs[emptyslot].spellid = spell_id; buffs[emptyslot].casterlevel = caster_level; - if(caster && caster->IsClient()) { - strcpy(buffs[emptyslot].caster_name, caster->GetName()); - } else { - memset(buffs[emptyslot].caster_name, 0, 64); - } + if(caster && caster->IsClient()) { + strcpy(buffs[emptyslot].caster_name, caster->GetName()); + } else { + memset(buffs[emptyslot].caster_name, 0, 64); + } buffs[emptyslot].casterid = caster ? caster->GetID() : 0; buffs[emptyslot].ticsremaining = duration; - buffs[emptyslot].counters = CalculateCounters(spell_id); + buffs[emptyslot].counters = CalculateCounters(spell_id); buffs[emptyslot].numhits = spells[spell_id].numhits; buffs[emptyslot].client = caster ? caster->IsClient() : 0; - buffs[emptyslot].persistant_buff = 0; - buffs[emptyslot].deathsaveCasterAARank = 0; - buffs[emptyslot].deathSaveSuccessChance = 0; + buffs[emptyslot].persistant_buff = 0; + buffs[emptyslot].deathsaveCasterAARank = 0; + buffs[emptyslot].deathSaveSuccessChance = 0; if(level_override > 0) { @@ -2878,15 +2878,15 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid if((IsClient() && !CastToClient()->GetPVP()) || (IsPet() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP()) || - (IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP())) + (IsMerc() && GetOwner() && GetOwner()->IsClient() && !GetOwner()->CastToClient()->GetPVP())) { EQApplicationPacket *outapp = MakeBuffsPacket(); entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, BIT_SoDAndLater); - if(GetTarget() == this) { - CastToClient()->QueuePacket(outapp); - } + if(GetTarget() == this) { + CastToClient()->QueuePacket(outapp); + } safe_delete(outapp); } @@ -2960,7 +2960,7 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite) // Group::CastGroupSpell (called by Mob::SpellFinished) // // also note you can't interrupt the spell here. at this point it's going -// and if you don't want effects just return false. interrupting here will +// and if you don't want effects just return false. interrupting here will // break stuff // bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_resist_adjust, int16 resist_adjust, bool isproc) @@ -2977,12 +2977,12 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r if(spelltar->IsClient() && spelltar->CastToClient()->IsHoveringForRespawn()) return false; - if(IsDetrimentalSpell(spell_id) && !IsAttackAllowed(spelltar) && !IsResurrectionEffects(spell_id)) { - if(!IsClient() || !CastToClient()->GetGM()) { - Message_StringID(MT_Shout, SPELL_NO_HOLD); - return false; - } - } + if(IsDetrimentalSpell(spell_id) && !IsAttackAllowed(spelltar) && !IsResurrectionEffects(spell_id)) { + if(!IsClient() || !CastToClient()->GetGM()) { + Message_StringID(MT_Shout, SPELL_NO_HOLD); + return false; + } + } if(RuleB(Spells, EnableBlockedBuffs)) { @@ -2995,7 +2995,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r if(spelltar->IsPet() && spelltar->GetOwner() && spelltar->GetOwner()->IsBlockedPetBuff(spell_id)) { mlog(SPELLS__BUFFS, "Spell %i not applied to %s (%s's pet) as it is a Pet Blocked Buff.", spell_id, spelltar->GetName(), - spelltar->GetOwner()->GetName()); + spelltar->GetOwner()->GetName()); return false; } } @@ -3043,8 +3043,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r // select target if // Bind Sight line of spells ( - spell_id == 500 || // bind sight - spell_id == 407 // cast sight + spell_id == 500 || // bind sight + spell_id == 407 // cast sight ) { action->target = GetID(); @@ -3069,12 +3069,13 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r entity_list.QueueCloseClients(spelltar, action_packet, true, 200, this, true, spelltar->IsClient() ? FilterPCSpells : FilterNPCSpells); - /* Send the EVENT_CAST_ON event */ - if(spelltar->IsNPC()) - { char temp1[100]; - sprintf(temp1, "%d", spell_id); - parse->EventNPC(EVENT_CAST_ON, spelltar->CastToNPC(), this, temp1, 0); - } + /* Send the EVENT_CAST_ON event */ + if(spelltar->IsNPC()) + { + char temp1[100]; + sprintf(temp1, "%d", spell_id); + parse->EventNPC(EVENT_CAST_ON, spelltar->CastToNPC(), this, temp1, 0); + } // now check if the spell is allowed to land @@ -3489,7 +3490,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob* spelltar, bool reflect, bool use_r if(!spelltar->SpellEffect(this, spell_id, spell_effectiveness)) { // if SpellEffect returned false there's a problem applying the - // spell. It's most likely a buff that can't stack. + // spell. It's most likely a buff that can't stack. mlog(SPELLS__CASTING_ERR, "Spell %d could not apply its effects %s -> %s\n", spell_id, GetName(), spelltar->GetName()); Message_StringID(MT_Shout, SPELL_NO_HOLD); safe_delete(action_packet); @@ -3592,11 +3593,11 @@ void Corpse::CastRezz(uint16 spellid, Mob* Caster) _log(SPELLS__REZ, "Corpse::CastRezz spellid %i, Rezzed() is %i, rezzexp is %i", spellid,Rezzed(),rezzexp); if(Rezzed()){ - if(Caster && Caster->IsClient()) + if(Caster && Caster->IsClient()) Caster->Message(13,"This character has already been resurrected."); - return; - } + return; + } /* if(!can_rez) { if(Caster && Caster->IsClient()) @@ -3753,7 +3754,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster) if(!IsValidSpell(spell_id)) return true; - if(IsBeneficialSpell(spell_id) && (caster->GetNPCTypeID())) //then skip the rest, stop NPCs aggroing each other with buff spells. 2013-03-05 + if(IsBeneficialSpell(spell_id) && (caster->GetNPCTypeID())) //then skip the rest, stop NPCs aggroing each other with buff spells. 2013-03-05 return false; if(IsMezSpell(spell_id)) @@ -3916,7 +3917,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster) // // Spell resists: -// returns an effectiveness index from 0 to 100. for most spells, 100 means +// returns an effectiveness index from 0 to 100. for most spells, 100 means // it landed, and anything else means it was resisted; however there are some // spells that can be partially effective, and this value can be used there. // TODO: we need to figure out how the following pvp values work and implement them @@ -4406,7 +4407,7 @@ void Mob::Mesmerize() stunon->duration = 0xFFFF; this->CastToClient()->QueuePacket(outapp); safe_delete(outapp); - } else { + } else { SetRunAnimSpeed(0); } */ @@ -4617,7 +4618,7 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { mysql_free_result(result); - if (Spell_Global_Name.empty()) { // If the entry in the spell_globals table has nothing set for the qglobal name + if (Spell_Global_Name.empty()) { // If the entry in the spell_globals table has nothing set for the qglobal name return true; } else if (database.RunQuery(query,MakeAnyLenString(&query, "SELECT value FROM quest_globals WHERE charid=%i AND name='%s'", Char_ID, Spell_Global_Name.c_str()), errbuf, &result)) { @@ -4628,13 +4629,13 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { Global_Value = atoi(row[0]); mysql_free_result(result); - if (Global_Value == Spell_Global_Value) { // If the values match from both tables, allow the spell to be scribed + if (Global_Value == Spell_Global_Value) { // If the values match from both tables, allow the spell to be scribed return true; } - else if (Global_Value > Spell_Global_Value) { // Check if the qglobal value is greater than the require spellglobal value + else if (Global_Value > Spell_Global_Value) { // Check if the qglobal value is greater than the require spellglobal value return true; } - else // If no matching result found in qglobals, don't scribe this spell + else // If no matching result found in qglobals, don't scribe this spell { LogFile->write(EQEMuLog::Error, "Char ID: %i Spell_globals Name: '%s' Value: '%i' did not match QGlobal Value: '%i' for Spell ID %i", Char_ID, Spell_Global_Name.c_str(), Spell_Global_Value, Global_Value, Spell_ID); return false; @@ -4648,16 +4649,16 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { LogFile->write(EQEMuLog::Error, "Spell ID %i query of spell_globals with Name: '%s' Value: '%i' failed", Spell_ID, Spell_Global_Name.c_str(), Spell_Global_Value); } else { - return true; // Spell ID isn't listed in the spells_global table, so it is not restricted from scribing + return true; // Spell ID isn't listed in the spells_global table, so it is not restricted from scribing } mysql_free_result(result); } else { - LogFile->write(EQEMuLog::Error, "Error while querying Spell ID %i spell_globals table query '%s': %s", Spell_ID, query, errbuf); + LogFile->write(EQEMuLog::Error, "Error while querying Spell ID %i spell_globals table query '%s': %s", Spell_ID, query, errbuf); safe_delete_array(query); - return false; // Query failed, so prevent spell from scribing just in case + return false; // Query failed, so prevent spell from scribing just in case } - return false; // Default is false + return false; // Default is false } //this is one nasty function... FindType and FindSpell are rather complex operations... @@ -4668,14 +4669,14 @@ bool Client::SpellGlobalCheck(uint16 Spell_ID, uint16 Char_ID) { CheckPet(); uint8 newtype[15] = { SE_ArmorClass, SE_STR, SE_DEX, SE_AGI, SE_WIS, - SE_INT, SE_CHA, SE_AttackSpeed, SE_MovementSpeed, - SE_DamageShield, SE_ResistFire, SE_ResistCold, - SE_ResistMagic, SE_ResistPoison, SE_ResistDisease }; + SE_INT, SE_CHA, SE_AttackSpeed, SE_MovementSpeed, + SE_DamageShield, SE_ResistFire, SE_ResistCold, + SE_ResistMagic, SE_ResistPoison, SE_ResistDisease }; for (int h=0; h<15; h++) { if (!this->FindType(newtype[h])) { uint16 buffid = FindSpell(this->class_, this->level, - newtype[h], SPELLTYPE_SELF, 0, - GetMana()); + newtype[h], SPELLTYPE_SELF, 0, + GetMana()); if (buffid != 0) { this->CastSpell(buffid, this->GetID()); } @@ -4691,12 +4692,12 @@ void Mob::CheckPet() { if ((GetClass() == NECROMANCER || GetClass() == MAGICIAN)) { if (this->GetClass() == MAGICIAN) { buffid = FindSpell(class_, level, - SE_SummonPet, SPELLTYPE_OTHER, 0, - GetMana()); - } else if (GetClass() == NECROMANCER) { + SE_SummonPet, SPELLTYPE_OTHER, 0, + GetMana()); + } else if (GetClass() == NECROMANCER) { buffid = FindSpell(class_, level, - SE_NecPet, SPELLTYPE_OTHER, 0, - GetMana()); + SE_NecPet, SPELLTYPE_OTHER, 0, + GetMana()); } if (buffid != 0) { CastSpell(buffid, GetID()); @@ -4705,154 +4706,154 @@ void Mob::CheckPet() { } uint16 Mob::FindSpell(uint16 classp, uint16 level, int type, - FindSpellType spelltype, float distance, - int32 mana_avail) { - int i,j; + FindSpellType spelltype, float distance, + int32 mana_avail) { + int i,j; - int bestvalue = -1; - int bestid = 0; + int bestvalue = -1; + int bestid = 0; - if (classp < 1) - return 0; - if (level < 1) - return 0; + if (classp < 1) + return 0; + if (level < 1) + return 0; classp = GetEQArrayEQClass(classp); - // purpose: find a suited spell for a class and level and type - // the if's are here to filter out anything which isnt normal. - // its possible that we miss some valid spells, but who cares. + // purpose: find a suited spell for a class and level and type + // the if's are here to filter out anything which isnt normal. + // its possible that we miss some valid spells, but who cares. for (i = 0; i < SPDAT_RECORDS; i++) { if(!IsValidSpell(i)) continue; - // Filter all spells that should never be used - if (spells[i].effectid[0] == SE_NegateIfCombat) - continue; - if (spells[i].targettype == ST_Group) - continue; - if (i == 2632) // fix for obsolete BST pet summon spell - continue; - if (i == 1576) // fix for torpor - continue; - if (spells[i].cast_time < 11) - continue; - if (spells[i].mana == 0) - continue; + // Filter all spells that should never be used + if (spells[i].effectid[0] == SE_NegateIfCombat) + continue; + if (spells[i].targettype == ST_Group) + continue; + if (i == 2632) // fix for obsolete BST pet summon spell + continue; + if (i == 1576) // fix for torpor + continue; + if (spells[i].cast_time < 11) + continue; + if (spells[i].mana == 0) + continue; - // now for closer checks - if (spelltype == SPELLTYPE_SELF) { - if ( i == 357) // fix for dark empathy - continue; - // check buffs 12 would be max, but 90% of all effects are in the first 4 slots - for (j = 0; j < 5; j++) { - // fix for pets - if ( spells[i].effectid[j] == SE_Illusion && - type != SE_Illusion) // only let illusions thru if explicitly requested - continue; - if ( spells[i].effectid[j] == type && - spells[i].goodEffect != 0 && - spells[i].classes[classp] <= level && - spells[i].classes[classp] <= 65 && - (spells[i].recast_time < 10000 || - type == SE_SummonPet || - type == SE_SummonBSTPet) && // fix for druid pets - (type == SE_AbsorbMagicAtt || type == SE_Rune || - type == SE_NecPet || type == SE_SummonPet || - spells[i].components[0] == -1 ) && - spells[i].targettype != ST_Undead && // for necro mend series - spells[i].targettype != ST_Group && // fix for group spells - spells[i].targettype != ST_Pet && // fix for beastlords casting pet heals on self - spells[i].targettype != ST_Summoned && // fix for vs. summoned spells on normal npcs - spells[i].targettype != ST_AETarget && // dont let em cast AEtarget spells - spells[i].mana <= mana_avail && - spells[i].range >= distance) { - int32 spellvalue; + // now for closer checks + if (spelltype == SPELLTYPE_SELF) { + if ( i == 357) // fix for dark empathy + continue; + // check buffs 12 would be max, but 90% of all effects are in the first 4 slots + for (j = 0; j < 5; j++) { + // fix for pets + if ( spells[i].effectid[j] == SE_Illusion && + type != SE_Illusion) // only let illusions thru if explicitly requested + continue; + if (spells[i].effectid[j] == type && + spells[i].goodEffect != 0 && + spells[i].classes[classp] <= level && + spells[i].classes[classp] <= 65 && + (spells[i].recast_time < 10000 || + type == SE_SummonPet || + type == SE_SummonBSTPet) && // fix for druid pets + (type == SE_AbsorbMagicAtt || type == SE_Rune || + type == SE_NecPet || type == SE_SummonPet || + spells[i].components[0] == -1 ) && + spells[i].targettype != ST_Undead && // for necro mend series + spells[i].targettype != ST_Group && // fix for group spells + spells[i].targettype != ST_Pet && // fix for beastlords casting pet heals on self + spells[i].targettype != ST_Summoned && // fix for vs. summoned spells on normal npcs + spells[i].targettype != ST_AETarget && // dont let em cast AEtarget spells + spells[i].mana <= mana_avail && + spells[i].range >= distance) { + int32 spellvalue; - // lets assume pet is always better if higher, so no formula needed - if (type == SE_NecPet || - type == SE_SummonPet || - type == SE_SummonBSTPet) { - spellvalue = spells[i].classes[classp]; - } else { + // lets assume pet is always better if higher, so no formula needed + if (type == SE_NecPet || + type == SE_SummonPet || + type == SE_SummonBSTPet) { + spellvalue = spells[i].classes[classp]; + } else { spellvalue = CalcSpellEffectValue_formula(spells[i].formula[j], - spells[i].base[j], - spells[i].max[j], - level, i); - } + spells[i].base[j], + spells[i].max[j], + level, i); + } - if (abs(spellvalue) > bestvalue) { - bestvalue = abs(spellvalue); - bestid = i; - } - } - } - } else if (spelltype == SPELLTYPE_OFFENSIVE) { - // check offensive spells - for (j = 0; j < 5; j++) { - if (spells[i].effectid[j] == SE_Illusion && - type != SE_Illusion) // only let illusions thru if explicitly requested - continue; - if (spells[i].effectid[j] == type && - spells[i].goodEffect == 0 && - spells[i].classes[classp] <= level && - spells[i].classes[classp] <= 65 && - spells[i].recast_time < 10000 && - spells[i].components[0] == -1 && - spells[i].mana <= mana_avail && - spells[i].targettype != ST_Undead && // thats for the necro mend series - spells[i].targettype != ST_Group && // fix for group spells - spells[i].targettype != ST_Pet && // fix for beastlords casting pet heals on self - spells[i].targettype != ST_Summoned && // fix for vs. summoned spells on normal npcs - spells[i].targettype != ST_AETarget && // dont let em cast AEtarget spells - spells[i].range >= distance) { - int32 spellvalue = CalcSpellEffectValue_formula(spells[i].formula[j], - spells[i].base[j], - spells[i].max[j], - level, i); - if ( abs(spellvalue) > bestvalue ) { - bestvalue = abs(spellvalue); - bestid = i; - } - } - } - } else if (spelltype == SPELLTYPE_OTHER) { - if ( i == 357) // fix for dark empathy - continue; - // healing and such - for (j = 0; j < 5; j++) { - if (spells[i].effectid[j] == SE_Illusion && - type != SE_Illusion) // only let illusions thru if explicitly requested - continue; - if (spells[i].effectid[j] == type && - spells[i].targettype != ST_Self && - spells[i].goodEffect != 0 && - spells[i].classes[classp] <= level && - spells[i].classes[classp] <= 65 && - spells[i].recast_time < 10000 && - spells[i].components[0] == -1 && - spells[i].targettype != ST_Undead && // thats for the necro mend series - spells[i].targettype != ST_Group && // fix for group spells - spells[i].targettype != ST_Pet && // fix for beastlords casting pet heals on self - spells[i].targettype != ST_Summoned && // fix for vs. summoned spells on normal npcs - spells[i].targettype != ST_AETarget && // dont let em cast AEtarget spells - spells[i].mana <= mana_avail && - spells[i].range >= distance) { - int32 spellvalue = CalcSpellEffectValue_formula(spells[i].formula[j], - spells[i].base[j], - spells[i].max[j], - level, i); - if ( abs(spellvalue) > bestvalue ) { - bestvalue = abs(spellvalue); - bestid = i; - } - } - } - } - } // for i + if (abs(spellvalue) > bestvalue) { + bestvalue = abs(spellvalue); + bestid = i; + } + } + } + } else if (spelltype == SPELLTYPE_OFFENSIVE) { + // check offensive spells + for (j = 0; j < 5; j++) { + if (spells[i].effectid[j] == SE_Illusion && + type != SE_Illusion) // only let illusions thru if explicitly requested + continue; + if (spells[i].effectid[j] == type && + spells[i].goodEffect == 0 && + spells[i].classes[classp] <= level && + spells[i].classes[classp] <= 65 && + spells[i].recast_time < 10000 && + spells[i].components[0] == -1 && + spells[i].mana <= mana_avail && + spells[i].targettype != ST_Undead && // thats for the necro mend series + spells[i].targettype != ST_Group && // fix for group spells + spells[i].targettype != ST_Pet && // fix for beastlords casting pet heals on self + spells[i].targettype != ST_Summoned && // fix for vs. summoned spells on normal npcs + spells[i].targettype != ST_AETarget && // dont let em cast AEtarget spells + spells[i].range >= distance) { + int32 spellvalue = CalcSpellEffectValue_formula(spells[i].formula[j], + spells[i].base[j], + spells[i].max[j], + level, i); + if ( abs(spellvalue) > bestvalue ) { + bestvalue = abs(spellvalue); + bestid = i; + } + } + } + } else if (spelltype == SPELLTYPE_OTHER) { + if ( i == 357) // fix for dark empathy + continue; + // healing and such + for (j = 0; j < 5; j++) { + if (spells[i].effectid[j] == SE_Illusion && + type != SE_Illusion) // only let illusions thru if explicitly requested + continue; + if (spells[i].effectid[j] == type && + spells[i].targettype != ST_Self && + spells[i].goodEffect != 0 && + spells[i].classes[classp] <= level && + spells[i].classes[classp] <= 65 && + spells[i].recast_time < 10000 && + spells[i].components[0] == -1 && + spells[i].targettype != ST_Undead && // thats for the necro mend series + spells[i].targettype != ST_Group && // fix for group spells + spells[i].targettype != ST_Pet && // fix for beastlords casting pet heals on self + spells[i].targettype != ST_Summoned && // fix for vs. summoned spells on normal npcs + spells[i].targettype != ST_AETarget && // dont let em cast AEtarget spells + spells[i].mana <= mana_avail && + spells[i].range >= distance) { + int32 spellvalue = CalcSpellEffectValue_formula(spells[i].formula[j], + spells[i].base[j], + spells[i].max[j], + level, i); + if ( abs(spellvalue) > bestvalue ) { + bestvalue = abs(spellvalue); + bestid = i; + } + } + } + } + } // for i -// g_LogFile.write("for combination [class %02d][level %02d][SE_type %02d][type %02d] i selected the spell: %s", -// classp, level, (uint16)type, uint16(spelltype), spells[bestid].name); - return bestid; +// g_LogFile.write("for combination [class %02d][level %02d][SE_type %02d][type %02d] i selected the spell: %s", +// classp, level, (uint16)type, uint16(spelltype), spells[bestid].name); + return bestid; } #if 0 @@ -5027,14 +5028,14 @@ int16 Mob::GetBuffSlotFromType(uint16 type) { } } } - return -1; + return -1; } uint16 Mob::GetSpellIDFromSlot(uint8 slot) { if (buffs[slot].spellid != SPELL_UNKNOWN) return buffs[slot].spellid; - return 0; + return 0; } @@ -5044,24 +5045,24 @@ bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) { if (buffs[i].spellid != SPELL_UNKNOWN) { for (int j = 0; j < EFFECT_COUNT; j++) { - // adjustments necessary for offensive npc casting behavior - if (bOffensive) { - if (spells[buffs[i].spellid].effectid[j] == type) { - int16 value = - CalcSpellEffectValue_formula(spells[buffs[i].spellid].buffdurationformula, - spells[buffs[i].spellid].base[j], - spells[buffs[i].spellid].max[j], - buffs[i].casterlevel, buffs[i].spellid); - LogFile->write(EQEMuLog::Normal, - "FindType: type = %d; value = %d; threshold = %d", - type, value, threshold); - if (value < threshold) - return true; - } - } else { - if (spells[buffs[i].spellid].effectid[j] == type ) - return true; - } + // adjustments necessary for offensive npc casting behavior + if (bOffensive) { + if (spells[buffs[i].spellid].effectid[j] == type) { + int16 value = + CalcSpellEffectValue_formula(spells[buffs[i].spellid].buffdurationformula, + spells[buffs[i].spellid].base[j], + spells[buffs[i].spellid].max[j], + buffs[i].casterlevel, buffs[i].spellid); + LogFile->write(EQEMuLog::Normal, + "FindType: type = %d; value = %d; threshold = %d", + type, value, threshold); + if (value < threshold) + return true; + } + } else { + if (spells[buffs[i].spellid].effectid[j] == type ) + return true; + } } } } @@ -5074,7 +5075,7 @@ bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance) { int i; if (bPerma) { - for (i = 0; i < MAX_PROCS; i++) { + for (i = 0; i < MAX_PROCS; i++) { if (PermaProcs[i].spellID == SPELL_UNKNOWN) { PermaProcs[i].spellID = spell_id; PermaProcs[i].chance = iChance; @@ -5085,7 +5086,7 @@ bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance) { } } mlog(SPELLS__PROCS, "Too many perma procs for %s", GetName()); - } else { + } else { for (i = 0; i < MAX_PROCS; i++) { if (SpellProcs[i].spellID == SPELL_UNKNOWN) { SpellProcs[i].spellID = spell_id; @@ -5097,7 +5098,7 @@ bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance) { } mlog(SPELLS__PROCS, "Too many procs for %s", GetName()); } - return false; + return false; } bool Mob::RemoveProcFromWeapon(uint16 spell_id, bool bAll) { @@ -5109,7 +5110,7 @@ bool Mob::RemoveProcFromWeapon(uint16 spell_id, bool bAll) { mlog(SPELLS__PROCS, "Removed proc %d from slot %d", spell_id, i); } } - return true; + return true; } bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) @@ -5128,7 +5129,7 @@ bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id } } - return false; + return false; } bool Mob::RemoveDefensiveProc(uint16 spell_id, bool bAll) @@ -5141,7 +5142,7 @@ bool Mob::RemoveDefensiveProc(uint16 spell_id, bool bAll) mlog(SPELLS__PROCS, "Removed defensive proc %d from slot %d", spell_id, i); } } - return true; + return true; } bool Mob::AddSkillProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) @@ -5159,7 +5160,7 @@ bool Mob::AddSkillProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) return true; } } - return false; + return false; } bool Mob::RemoveSkillProc(uint16 spell_id, bool bAll) @@ -5172,7 +5173,7 @@ bool Mob::RemoveSkillProc(uint16 spell_id, bool bAll) mlog(SPELLS__PROCS, "Removed Skill proc %d from slot %d", spell_id, i); } } - return true; + return true; } bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) @@ -5191,7 +5192,7 @@ bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id) } } - return false; + return false; } bool Mob::RemoveRangedProc(uint16 spell_id, bool bAll) @@ -5204,7 +5205,7 @@ bool Mob::RemoveRangedProc(uint16 spell_id, bool bAll) mlog(SPELLS__PROCS, "Removed ranged proc %d from slot %d", spell_id, i); } } - return true; + return true; } // this is checked in a few places to decide wether special bard @@ -5467,3 +5468,4 @@ void NPC::UninitializeBuffSlots() { safe_delete_array(buffs); } + diff --git a/zone/tasks.cpp b/zone/tasks.cpp index 73a2a8004..172f3d18c 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -1,20 +1,20 @@ -/* EQEMu: Everquest Server Emulator +/* EQEMu: Everquest Server Emulator Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -63,7 +63,7 @@ bool TaskManager::LoadTaskSets() { const char *TaskSetQuery = "SELECT `id`, `taskid` from `tasksets` WHERE `id` > 0 AND `id` < %i " - "AND `taskid` >= 0 AND `taskid` < %i ORDER BY `id`, `taskid` ASC"; + "AND `taskid` >= 0 AND `taskid` < %i ORDER BY `id`, `taskid` ASC"; const char *ERR_MYSQLERROR = "[TASKS]Error in TaskManager::LoadTaskSets: %s"; @@ -134,27 +134,27 @@ bool TaskManager::LoadTasks(int SingleTask) { // If TaskID !=0, then just load the task specified. const char *AllTaskQuery = "SELECT `id`, `duration`, `title`, `description`, `reward`, `rewardid`," - "`cashreward`, `xpreward`, `rewardmethod`, `startzone`, `minlevel`, `maxlevel`, `repeatable` " - "from `tasks` WHERE `id` < %i"; + "`cashreward`, `xpreward`, `rewardmethod`, `startzone`, `minlevel`, `maxlevel`, `repeatable` " + "from `tasks` WHERE `id` < %i"; const char *SingleTaskQuery = "SELECT `id`, `duration`, `title`, `description`, `reward`, `rewardid`," - "`cashreward`, `xpreward`, `rewardmethod`, `startzone`, `minlevel`, `maxlevel`, `repeatable` " - "from `tasks` WHERE `id` = %i"; + "`cashreward`, `xpreward`, `rewardmethod`, `startzone`, `minlevel`, `maxlevel`, `repeatable` " + "from `tasks` WHERE `id` = %i"; const char *AllActivityQuery = "SELECT `taskid`, `step`, `activityid`, `activitytype`, `text1`, `text2`," - "`text3`, `goalid`, `goalmethod`, `goalcount`, `delivertonpc`, " - "`zoneid`, `optional` from `activities` WHERE " - "`taskid` < %i AND `activityid` < %i ORDER BY taskid, activityid ASC"; + "`text3`, `goalid`, `goalmethod`, `goalcount`, `delivertonpc`, " + "`zoneid`, `optional` from `activities` WHERE " + "`taskid` < %i AND `activityid` < %i ORDER BY taskid, activityid ASC"; const char *SingleTaskActivityQuery = "SELECT `taskid`, `step`, `activityid`, `activitytype`, `text1`, `text2`," - "`text3`, `goalid`, `goalmethod`, `goalcount`, `delivertonpc`, " - "`zoneid`, `optional` from `activities` WHERE " - "`taskid` = %i AND `activityid` < %i ORDER BY taskid, activityid ASC"; + "`text3`, `goalid`, `goalmethod`, `goalcount`, `delivertonpc`, " + "`zoneid`, `optional` from `activities` WHERE " + "`taskid` = %i AND `activityid` < %i ORDER BY taskid, activityid ASC"; const char *ERR_TASK_OOR = "[TASKS]Task ID %i out of range while loading tasks from database"; const char *ERR_TASK_OR_ACTIVITY_OOR = "[TASKS]Task or Activity ID (%i, %i) out of range while loading" - "activities from database"; + "activities from database"; const char *ERR_NOTASK = "[TASKS]Activity for non-existent task (%i, %i) while loading activities from database"; @@ -212,9 +212,9 @@ bool TaskManager::LoadTasks(int SingleTask) { Tasks[TaskID]->LastStep = 0; _log(TASKS__GLOBALLOAD,"TaskID: %5i, Duration: %8i, StartZone: %3i Reward: %s MinLevel %i MaxLevel %i Repeatable: %s", - TaskID, Tasks[TaskID]->Duration, Tasks[TaskID]->StartZone, Tasks[TaskID]->Reward, - Tasks[TaskID]->MinLevel, Tasks[TaskID]->MaxLevel, - Tasks[TaskID]->Repeatable ? "Yes" : "No"); + TaskID, Tasks[TaskID]->Duration, Tasks[TaskID]->StartZone, Tasks[TaskID]->Reward, + Tasks[TaskID]->MinLevel, Tasks[TaskID]->MaxLevel, + Tasks[TaskID]->Repeatable ? "Yes" : "No"); _log(TASKS__GLOBALLOAD,"Title: %s ", Tasks[TaskID]->Title); //_log(TASKS__GLOBALLOAD,"Description: %s ", Tasks[TaskID]->Description); @@ -299,20 +299,20 @@ bool TaskManager::LoadTasks(int SingleTask) { Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Optional = atoi(row[12]); _log(TASKS__GLOBALLOAD, "Activity Slot %2i: ID %i for Task %5i. Type: %3i, GoalID: %8i, " - "GoalMethod: %i, GoalCount: %3i, ZoneID:%3i", - Tasks[TaskID]->ActivityCount, ActivityID, TaskID, - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Type, - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalID, - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalMethod, - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalCount, - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].ZoneID); + "GoalMethod: %i, GoalCount: %3i, ZoneID:%3i", + Tasks[TaskID]->ActivityCount, ActivityID, TaskID, + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Type, + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalID, + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalMethod, + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].GoalCount, + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].ZoneID); _log(TASKS__GLOBALLOAD, " Text1: %s", - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text1); + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text1); _log(TASKS__GLOBALLOAD, " Text2: %s", - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text2); + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text2); _log(TASKS__GLOBALLOAD, " Text3: %s", - Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text3); + Tasks[TaskID]->Activity[Tasks[TaskID]->ActivityCount].Text3); Tasks[TaskID]->ActivityCount++; @@ -337,13 +337,13 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { // duration of a session will overcome this. // const char *TaskQuery="REPLACE INTO character_tasks (charid, taskid, slot, acceptedtime) " - "VALUES (%i, %i, %i, %i)"; + "VALUES (%i, %i, %i, %i)"; const char *ActivityQuery="REPLACE INTO character_activities (charid, taskid, activityid, donecount, completed) " - "VALUES "; + "VALUES "; const char *CompletedTaskQuery="REPLACE INTO completed_tasks (charid, completedtime, taskid, activityid) " - "VALUES (%i, %i, %i, %i)"; + "VALUES (%i, %i, %i, %i)"; const char *ERR_MYSQLERROR = "[TASKS]Error in TaskManager::SaveClientState %s"; @@ -364,13 +364,13 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(state->ActiveTasks[Task].Updated) { _log(TASKS__CLIENTSAVE, "TaskManager::SaveClientState for character ID %d, Updating TaskIndex %i TaskID %i", - CharacterID, Task, TaskID); + CharacterID, Task, TaskID); if(!database.RunQuery(query,MakeAnyLenString(&query, TaskQuery, - CharacterID, - TaskID, - Task, - state->ActiveTasks[Task].AcceptedTime), errbuf)) { + CharacterID, + TaskID, + Task, + state->ActiveTasks[Task].AcceptedTime), errbuf)) { LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR, errbuf); } @@ -389,22 +389,22 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(state->ActiveTasks[Task].Activity[Activity].Updated) { _log(TASKS__CLIENTSAVE, "TaskManager::SaveClientSate for character ID %d, " - "Updating Activity %i, %i", - CharacterID, Task, Activity); + "Updating Activity %i, %i", + CharacterID, Task, Activity); if(UpdatedActivityCount==0) { MakeAnyLenString(&buf, "(%i, %i, %i, %i, %i)", CharacterID, TaskID, - Activity, - state->ActiveTasks[Task].Activity[Activity].DoneCount, - state->ActiveTasks[Task].Activity[Activity].State == - ActivityCompleted); + Activity, + state->ActiveTasks[Task].Activity[Activity].DoneCount, + state->ActiveTasks[Task].Activity[Activity].State == + ActivityCompleted); } else { MakeAnyLenString(&buf, ", (%i, %i, %i, %i, %i)", CharacterID, TaskID, - Activity, - state->ActiveTasks[Task].Activity[Activity].DoneCount, - state->ActiveTasks[Task].Activity[Activity].State == - ActivityCompleted); + Activity, + state->ActiveTasks[Task].Activity[Activity].DoneCount, + state->ActiveTasks[Task].Activity[Activity].State == + ActivityCompleted); } UpdateActivityQuery = UpdateActivityQuery + buf; safe_delete_array(buf); @@ -415,7 +415,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(UpdatedActivityCount > 0) { _log(TASKS__CLIENTSAVE, "Executing query %s", UpdateActivityQuery.c_str()); if(!database.RunQuery(query,MakeAnyLenString(&query, UpdateActivityQuery.c_str()), - errbuf)) { + errbuf)) { LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR, errbuf); } @@ -432,7 +432,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { } if(RuleB(TaskSystem, RecordCompletedTasks) && - (state->CompletedTasks.size() > (unsigned int)state->LastCompletedTaskLoaded)) { + (state->CompletedTasks.size() > (unsigned int)state->LastCompletedTaskLoaded)) { for(unsigned int i=state->LastCompletedTaskLoaded; iCompletedTasks.size(); i++) { @@ -440,14 +440,14 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { int TaskID = state->CompletedTasks[i].TaskID; if((TaskID<=0) || (TaskID>=MAXTASKS) || (Tasks[TaskID]==nullptr)) continue; - // First we save a record with an ActivityID of -1. + // First we save a record with an ActivityID of -1. // This indicates this task was completed at the given time. We infer that all // none optional activities were completed. // if(!database.RunQuery(query,MakeAnyLenString(&query, CompletedTaskQuery, - CharacterID, - state->CompletedTasks[i].CompletedTime, - TaskID, -1), errbuf)) { + CharacterID, + state->CompletedTasks[i].CompletedTime, + TaskID, -1), errbuf)) { LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR, errbuf); continue; @@ -463,9 +463,9 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { if(Tasks[TaskID]->Activity[j].Optional && state->CompletedTasks[i].ActivityDone[j]) { if(!database.RunQuery(query,MakeAnyLenString(&query, CompletedTaskQuery, - CharacterID, - state->CompletedTasks[i].CompletedTime, - TaskID, j), errbuf)) { + CharacterID, + state->CompletedTasks[i].CompletedTime, + TaskID, j), errbuf)) { LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR, errbuf); } @@ -509,7 +509,7 @@ void Client::RemoveClientTaskState() { bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { const char *TaskQuery = "SELECT `taskid`, `slot`, `acceptedtime` from `character_tasks` " - "WHERE `charid` = %i ORDER BY acceptedtime"; + "WHERE `charid` = %i ORDER BY acceptedtime"; const char *ERR_TASK_OOR1 = "[TASKS]Task ID %i out of range while loading character tasks from database"; @@ -521,8 +521,8 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; if(!c || !state) return false; @@ -575,8 +575,8 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { state->ActiveTaskCount++; _log(TASKS__CLIENTLOAD, "TaskManager::LoadClientState. Char: %i Task ID %i, " - "Accepted Time: %8X", - CharacterID, TaskID,acceptedtime); + "Accepted Time: %8X", + CharacterID, TaskID,acceptedtime); } mysql_free_result(result); safe_delete_array(query); @@ -591,8 +591,8 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { // Load Activities const char *ActivityQuery = "SELECT `taskid`, `activityid`, `donecount`, `completed` " - " from `character_activities` WHERE `charid` = %i " - "ORDER BY `taskid` ASC, `activityid` ASC"; + " from `character_activities` WHERE `charid` = %i " + "ORDER BY `taskid` ASC, `activityid` ASC"; const char *ERR_TASK_OOR2 = "[TASKS]Task ID %i out of range while loading character activities from database"; @@ -607,7 +607,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { if(database.RunQuery(query,MakeAnyLenString(&query, ActivityQuery, - CharacterID), errbuf, &result)) { + CharacterID), errbuf, &result)) { while((row = mysql_fetch_row(result))) { @@ -633,7 +633,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { } if(ActiveTaskIndex == -1) { - LogFile->write(EQEMuLog::Error, ERR_NOTASK, ActivityID, TaskID); + LogFile->write(EQEMuLog::Error, ERR_NOTASK, ActivityID, TaskID); continue; } @@ -648,8 +648,8 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { state->ActiveTasks[ActiveTaskIndex].Activity[ActivityID].Updated = false; _log(TASKS__CLIENTLOAD, "TaskManager::LoadClientState. Char: %i Task ID %i, ActivityID: %i, " - "DoneCount: %i, Completed: %i", - CharacterID, TaskID, ActivityID, DoneCount, Completed); + "DoneCount: %i, Completed: %i", + CharacterID, TaskID, ActivityID, DoneCount, Completed); } mysql_free_result(result); @@ -663,7 +663,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { } const char *CompletedTaskQuery = "SELECT `taskid`, `activityid`, `completedtime` from `completed_tasks` " - "WHERE `charid` = %i ORDER BY completedtime, taskid, activityid"; + "WHERE `charid` = %i ORDER BY completedtime, taskid, activityid"; const char *ERR_TASK_OOR3 = "[TASKS]Task ID %i out of range while loading completed tasks from database"; @@ -675,7 +675,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { if(RuleB(TaskSystem, RecordCompletedTasks)) { if(database.RunQuery(query,MakeAnyLenString(&query, CompletedTaskQuery, - CharacterID), errbuf, &result)) { + CharacterID), errbuf, &result)) { CompletedTaskInformation cti; @@ -704,7 +704,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { int CompletedTime = atoi(row[2]); if((PreviousTaskID != -1) && ((TaskID != PreviousTaskID) || - (CompletedTime != PreviousCompletedTime))) { + (CompletedTime != PreviousCompletedTime))) { state->CompletedTasks.push_back(cti); for(int i=0; i0 AND `taskid` < %i ORDER BY `taskid` ASC"; + "AND `taskid` >0 AND `taskid` < %i ORDER BY `taskid` ASC"; const char *ERR_MYSQLERROR4 = "[TASKS]Error in TaskManager::LoadClientState load enabled tasks: %s"; if(database.RunQuery(query,MakeAnyLenString(&query, EnabledTaskQuery, - CharacterID, MAXTASKS), errbuf, &result)) { + CharacterID, MAXTASKS), errbuf, &result)) { while((row = mysql_fetch_row(result))) { int TaskID = atoi(row[0]); @@ -771,14 +771,14 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { const char *ERR_NOTASK2 = "[TASKS]Character %i has task %i which does not exist."; const char *ERR_INCONSISTENT = "[TASKS]Fatal error in character %i task state. Activity %i for " - "Task %i either missing from client state or from task."; + "Task %i either missing from client state or from task."; for(int i=0; iActiveTasks[i].TaskID; if(TaskID==TASKSLOTEMPTY) continue; if(!Tasks[TaskID]) { c->Message(13, "Active Task Slot %i, references a task (%i), that does not exist. " - "Removing from memory. Contact a GM to resolve this.",i, TaskID); + "Removing from memory. Contact a GM to resolve this.",i, TaskID); LogFile->write(EQEMuLog::Error, ERR_NOTASK2, CharacterID, TaskID); state->ActiveTasks[i].TaskID=TASKSLOTEMPTY; @@ -789,8 +789,8 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { if(state->ActiveTasks[i].Activity[j].ActivityID != j) { c->Message(13, "Active Task %i, %s. Activity count does not match expected value." - "Removing from memory. Contact a GM to resolve this.", - TaskID, Tasks[TaskID]->Title); + "Removing from memory. Contact a GM to resolve this.", + TaskID, Tasks[TaskID]->Title); LogFile->write(EQEMuLog::Error, ERR_INCONSISTENT, CharacterID, j, TaskID); state->ActiveTasks[i].TaskID=TASKSLOTEMPTY; @@ -1069,7 +1069,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i int PlayerLevel = c->GetLevel(); _log(TASKS__UPDATE, "TaskSetSelector called for taskset %i. EnableTaskSize is %i", TaskSetID, - state->EnabledTasks.size()); + state->EnabledTasks.size()); if((TaskSetID<=0) || (TaskSetID>=MAXTASKSETS)) return; if(TaskSets[TaskSetID].size() > 0) { @@ -1083,7 +1083,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i while((Iterator != TaskSets[TaskSetID].end()) && (TaskListIndex < MAXCHOOSERENTRIES)) { if(AppropriateLevel((*Iterator), PlayerLevel) && !state->IsTaskActive((*Iterator)) && - (IsTaskRepeatable((*Iterator)) || !state->IsTaskCompleted((*Iterator)))) + (IsTaskRepeatable((*Iterator)) || !state->IsTaskCompleted((*Iterator)))) TaskList[TaskListIndex++] = (*Iterator); Iterator++; @@ -1099,19 +1099,19 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i while((EnabledTaskIndex < state->EnabledTasks.size()) && (TaskSetIndex < TaskSets[TaskSetID].size()) && - (TaskListIndex < MAXCHOOSERENTRIES)) { + (TaskListIndex < MAXCHOOSERENTRIES)) { _log(TASKS__UPDATE, "Comparing EnabledTasks[%i] (%i) with TaskSets[%i][%i] (%i)", - EnabledTaskIndex, state->EnabledTasks[EnabledTaskIndex], TaskSetID, TaskSetIndex, - TaskSets[TaskSetID][TaskSetIndex]); + EnabledTaskIndex, state->EnabledTasks[EnabledTaskIndex], TaskSetID, TaskSetIndex, + TaskSets[TaskSetID][TaskSetIndex]); if((TaskSets[TaskSetID][TaskSetIndex] > 0) && - (state->EnabledTasks[EnabledTaskIndex] == TaskSets[TaskSetID][TaskSetIndex])) { + (state->EnabledTasks[EnabledTaskIndex] == TaskSets[TaskSetID][TaskSetIndex])) { if(AppropriateLevel(TaskSets[TaskSetID][TaskSetIndex], PlayerLevel) && - !state->IsTaskActive(TaskSets[TaskSetID][TaskSetIndex]) && - (IsTaskRepeatable(TaskSets[TaskSetID][TaskSetIndex]) || - !state->IsTaskCompleted(TaskSets[TaskSetID][TaskSetIndex]))) { + !state->IsTaskActive(TaskSets[TaskSetID][TaskSetIndex]) && + (IsTaskRepeatable(TaskSets[TaskSetID][TaskSetIndex]) || + !state->IsTaskCompleted(TaskSets[TaskSetID][TaskSetIndex]))) { TaskList[TaskListIndex++] = TaskSets[TaskSetID][TaskSetIndex]; @@ -1146,11 +1146,11 @@ void TaskManager::SendTaskSelector(Client *c, Mob *mob, int TaskCount, int *Task int PlayerLevel = c->GetLevel(); AvailableTaskHeader_Struct* AvailableTaskHeader; - AvailableTaskData1_Struct* AvailableTaskData1; - AvailableTaskData2_Struct* AvailableTaskData2; - AvailableTaskTrailer_Struct* AvailableTaskTrailer; + AvailableTaskData1_Struct* AvailableTaskData1; + AvailableTaskData2_Struct* AvailableTaskData2; + AvailableTaskTrailer_Struct* AvailableTaskTrailer; - // Check if any of the tasks exist + // Check if any of the tasks exist for(int i=0; iTitle) + 1 + - strlen(Tasks[TaskList[i]]->Description) + 1 + sizeof(AvailableTaskData2_Struct) + 10 + - sizeof(AvailableTaskTrailer_Struct) + 5; + strlen(Tasks[TaskList[i]]->Description) + 1 + sizeof(AvailableTaskData2_Struct) + 10 + + sizeof(AvailableTaskTrailer_Struct) + 5; } if(ValidTasks == 0) return; @@ -1270,7 +1270,7 @@ void TaskManager::SendTaskSelectorNew(Client *c, Mob *mob, int TaskCount, int *T int PlayerLevel = c->GetLevel(); - // Check if any of the tasks exist + // Check if any of the tasks exist for(int i=0; iSequenceMode); + CharID, ActiveTasks[TaskIndex].TaskID, Task->SequenceMode); if(Task->SequenceMode == ActivitiesSequential) { if(ActiveTasks[TaskIndex].Activity[0].State != ActivityCompleted) @@ -1474,7 +1474,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { // Enable the next Hidden task. for(int i=0; iActivityCount; i++) { if((ActiveTasks[TaskIndex].Activity[i].State == ActivityActive) && - (!Task->Activity[i].Optional)) { + (!Task->Activity[i].Optional)) { AllActivitiesComplete = false; break; } @@ -1531,7 +1531,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { for(int i=0; iActivityCount; i++) { if((Task->Activity[i].StepNumber == 0) && - (ActiveTasks[TaskIndex].Activity[i].State == ActivityHidden)) { + (ActiveTasks[TaskIndex].Activity[i].State == ActivityHidden)) { ActiveTasks[TaskIndex].Activity[i].State = ActivityActive; //ActiveTasks[TaskIndex].Activity[i].Updated=true; } @@ -1543,7 +1543,7 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { for(int Activity=0; ActivityActivityCount; Activity++) { if(Task->Activity[Activity].StepNumber == (int)ActiveTasks[TaskIndex].CurrentStep) { if((ActiveTasks[TaskIndex].Activity[Activity].State != ActivityCompleted) && - (!Task->Activity[Activity].Optional)) { + (!Task->Activity[Activity].Optional)) { CurrentStepComplete = false; AllActivitiesComplete = false; break; @@ -1594,8 +1594,8 @@ bool ClientTaskState::UnlockActivities(int CharID, int TaskIndex) { // for(int Activity=0; ActivityActivityCount; Activity++) { if((Task->Activity[Activity].StepNumber == (int)ActiveTasks[TaskIndex].CurrentStep) && - (ActiveTasks[TaskIndex].Activity[Activity].State == ActivityHidden)) { - ActiveTasks[TaskIndex].Activity[Activity].State = ActivityActive; + (ActiveTasks[TaskIndex].Activity[Activity].State == ActivityHidden)) { + ActiveTasks[TaskIndex].Activity[Activity].State = ActivityActive; ActiveTasks[TaskIndex].Activity[Activity].Updated=true; } } @@ -1644,7 +1644,7 @@ bool ClientTaskState::UpdateTasksByNPC(Client *c, int ActivityType, int NPCTypeI // Is there a zone restriction on the activity ? if((Task->Activity[j].ZoneID >0) && (Task->Activity[j].ZoneID != (int)zone->GetZoneID())) { _log(TASKS__UPDATE, "Char: %s Task: %i, Activity %i, Activity type %i for NPC %i failed zone check", - c->GetName(), ActiveTasks[i].TaskID, j, ActivityType, NPCTypeID); + c->GetName(), ActiveTasks[i].TaskID, j, ActivityType, NPCTypeID); continue; } // Is the activity to kill this type of NPC ? @@ -1697,7 +1697,7 @@ int ClientTaskState::ActiveSpeakTask(int NPCTypeID) { } // Is the activity to speak with this type of NPC ? if((Task->Activity[j].GoalMethod == METHODQUEST) && - (Task->Activity[j].GoalID == NPCTypeID)) return ActiveTasks[i].TaskID; + (Task->Activity[j].GoalID == NPCTypeID)) return ActiveTasks[i].TaskID; } } return 0; @@ -1728,7 +1728,7 @@ int ClientTaskState::ActiveSpeakActivity(int NPCTypeID, int TaskID) { } // Is the activity to speak with this type of NPC ? if((Task->Activity[j].GoalMethod == METHODQUEST) && - (Task->Activity[j].GoalID == NPCTypeID)) return j; + (Task->Activity[j].GoalID == NPCTypeID)) return j; } return 0; } @@ -1764,7 +1764,7 @@ void ClientTaskState::UpdateTasksForItem(Client *c, ActivityType Type, int ItemI // Is there a zone restriction on the activity ? if((Task->Activity[j].ZoneID >0) && (Task->Activity[j].ZoneID != (int)zone->GetZoneID())) { _log(TASKS__UPDATE, "Char: %s Activity type %i for Item %i failed zone check", - c->GetName(), Type, ItemID); + c->GetName(), Type, ItemID); continue; } // Is the activity related to this item ? @@ -1815,7 +1815,7 @@ void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) { if(Task->Activity[j].Type != ActivityExplore) continue; if((Task->Activity[j].ZoneID >0) && (Task->Activity[j].ZoneID != (int)zone->GetZoneID())) { _log(TASKS__UPDATE, "Char: %s Explore exploreid %i failed zone check", - c->GetName(), ExploreID); + c->GetName(), ExploreID); continue; } // Is the activity to explore this area id ? @@ -1838,7 +1838,7 @@ void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) { // (Only a goal count of 1 makes sense for explore activities?) _log(TASKS__UPDATE, "Increment on explore"); IncrementDoneCount(c, Task, i, j, - Task->Activity[j].GoalCount - ActiveTasks[i].Activity[j].DoneCount); + Task->Activity[j].GoalCount - ActiveTasks[i].Activity[j].DoneCount); } } @@ -1868,11 +1868,11 @@ bool ClientTaskState::UpdateTasksOnDeliver(Client *c, uint32 *Items, int Cash, i if(ActiveTasks[i].Activity[j].State != ActivityActive) continue; // We are only interested in Deliver activities if((Task->Activity[j].Type != ActivityDeliver) && - (Task->Activity[j].Type != ActivityGiveCash)) continue; + (Task->Activity[j].Type != ActivityGiveCash)) continue; // Is there a zone restriction on the activity ? if((Task->Activity[j].ZoneID >0) && (Task->Activity[j].ZoneID != (int)zone->GetZoneID())) { _log(TASKS__UPDATE, "Char: %s Deliver activity failed zone check (current zone %i, need zone %i", - c->GetName(), zone->GetZoneID(), Task->Activity[j].ZoneID); + c->GetName(), zone->GetZoneID(), Task->Activity[j].ZoneID); continue; } // Is the activity to deliver to this NPCTypeID ? @@ -1895,7 +1895,7 @@ bool ClientTaskState::UpdateTasksOnDeliver(Client *c, uint32 *Items, int Cash, i case METHODLIST: if(!taskmanager->GoalListManager.IsInList(Task->Activity[j].GoalID, - Items[k])) + Items[k])) continue; break; @@ -1939,14 +1939,14 @@ void ClientTaskState::UpdateTasksOnTouch(Client *c, int ZoneID) { if(Task->Activity[j].GoalMethod != METHODSINGLEID) continue; if(Task->Activity[j].ZoneID != ZoneID) { _log(TASKS__UPDATE, "Char: %s Touch activity failed zone check", - c->GetName()); + c->GetName()); continue; } // We found an active task to zone into this zone, so set done count to goal count // (Only a goal count of 1 makes sense for touch activities?) _log(TASKS__UPDATE, "Increment on Touch"); IncrementDoneCount(c, Task, i, j, - Task->Activity[j].GoalCount - ActiveTasks[i].Activity[j].DoneCount); + Task->Activity[j].GoalCount - ActiveTasks[i].Activity[j].DoneCount); } } @@ -1970,16 +1970,16 @@ void ClientTaskState::IncrementDoneCount(Client *c, TaskInformation* Task, int T // Have we reached the goal count for this activity ? if(ActiveTasks[TaskIndex].Activity[ActivityID].DoneCount >= Task->Activity[ActivityID].GoalCount) { _log(TASKS__UPDATE, "Done (%i) = Goal (%i) for Activity %i", - ActiveTasks[TaskIndex].Activity[ActivityID].DoneCount, - Task->Activity[ActivityID].GoalCount, - ActivityID); + ActiveTasks[TaskIndex].Activity[ActivityID].DoneCount, + Task->Activity[ActivityID].GoalCount, + ActivityID); if(Task->Activity[ActivityID].GoalMethod != METHODQUEST) { char buf[24]; snprintf(buf, 23, "%d %d", ActiveTasks[TaskIndex].TaskID, ActiveTasks[TaskIndex].Activity[ActivityID].ActivityID); buf[23] = '\0'; - parse->EventPlayer(EVENT_TASK_STAGE_COMPLETE, c, buf, 0); + parse->EventPlayer(EVENT_TASK_STAGE_COMPLETE, c, buf, 0); } // Flag the activity as complete @@ -2185,7 +2185,7 @@ bool ClientTaskState::IsTaskActivityActive(int TaskID, int ActivityID) { if(ActivityID >= Task->ActivityCount) return false; _log(TASKS__UPDATE, "ClientTaskState IsTaskActivityActive(%i, %i). State is %i ", TaskID, ActivityID, - ActiveTasks[ActiveTaskIndex].Activity[ActivityID].State); + ActiveTasks[ActiveTaskIndex].Activity[ActivityID].State); return (ActiveTasks[ActiveTaskIndex].Activity[ActivityID].State == ActivityActive); @@ -2267,7 +2267,7 @@ void ClientTaskState::ResetTaskActivity(Client *c, int TaskID, int ActivityID) { ActiveTaskIndex, Task->Activity[ActivityID].Optional); } -void ClientTaskState::ShowClientTasks(Client *c) { +void ClientTaskState::ShowClientTasks(Client *c) { c->Message(0, "Task Information:"); //for(int i=0; iMessage(0, " Description: [%s]\n", taskmanager->Tasks[ActiveTasks[i].TaskID]->Description); for(int j=0; jGetActivityCount(ActiveTasks[i].TaskID); j++) { c->Message(0, " Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)", - ActiveTasks[i].Activity[j].ActivityID, - ActiveTasks[i].Activity[j].DoneCount, - ActiveTasks[i].Activity[j].State); + ActiveTasks[i].Activity[j].ActivityID, + ActiveTasks[i].Activity[j].DoneCount, + ActiveTasks[i].Activity[j].State); } } @@ -2316,8 +2316,8 @@ int ClientTaskState::TaskTimeLeft(int TaskID) { int ClientTaskState::IsTaskCompleted(int TaskID) { // Returns: -1 if RecordCompletedTasks is not true - // +1 if the task has been completed - // 0 if the task has not been completed + // +1 if the task has been completed + // 0 if the task has not been completed if(!(RuleB(TaskSystem, RecordCompletedTasks))) return -1; @@ -2329,7 +2329,7 @@ int ClientTaskState::IsTaskCompleted(int TaskID) { return 0; } -bool TaskManager::IsTaskRepeatable(int TaskID) { +bool TaskManager::IsTaskRepeatable(int TaskID) { if((TaskID <= 0) || (TaskID >= MAXTASKS)) return false; @@ -2457,10 +2457,10 @@ void ClientTaskState::SendTaskHistory(Client *c, int TaskIndex) { if(CompletedTasks[AdjustedTaskIndex].ActivityDone[i]) { CompletedActivityCount++; PacketLength = PacketLength + sizeof(TaskHistoryReplyData1_Struct) + - strlen(Task->Activity[i].Text1) + 1 + - strlen(Task->Activity[i].Text2) + 1 + - sizeof(TaskHistoryReplyData2_Struct) + - strlen(Task->Activity[i].Text3) + 1; + strlen(Task->Activity[i].Text1) + 1 + + strlen(Task->Activity[i].Text2) + 1 + + sizeof(TaskHistoryReplyData2_Struct) + + strlen(Task->Activity[i].Text3) + 1; } } @@ -2581,7 +2581,7 @@ void TaskManager::SendCompletedTasksToClient(Client *c, ClientTaskState *State) FirstTaskToSend = State->CompletedTasks.size() - 50; _log(TASKS__UPDATE, "Completed Task Count: %i, First Task to send is %i, Last is %i", - State->CompletedTasks.size(), FirstTaskToSend, LastTaskToSend); + State->CompletedTasks.size(), FirstTaskToSend, LastTaskToSend); /* for(iterator=State->CompletedTasks.begin(); iterator!=State->CompletedTasks.end(); iterator++) { int TaskID = (*iterator).TaskID; @@ -2682,8 +2682,8 @@ void TaskManager::SendTaskActivityLong(Client *c, int TaskID, int ActivityID, in long PacketLength = sizeof(TaskActivityHeader_Struct) + +sizeof(TaskActivityData1_Struct) + sizeof(TaskActivityTrailer_Struct); PacketLength = PacketLength + strlen(Tasks[TaskID]->Activity[ActivityID].Text1) + 1 + - strlen(Tasks[TaskID]->Activity[ActivityID].Text2) + 1 + - strlen(Tasks[TaskID]->Activity[ActivityID].Text3) + 1; + strlen(Tasks[TaskID]->Activity[ActivityID].Text2) + 1 + + strlen(Tasks[TaskID]->Activity[ActivityID].Text3) + 1; EQApplicationPacket* outapp = new EQApplicationPacket(OP_TaskActivity, PacketLength); @@ -2697,7 +2697,7 @@ void TaskManager::SendTaskActivityLong(Client *c, int TaskID, int ActivityID, in // We send our 'internal' types as ActivityUse1. text3 should be set to the activity description, so it makes // no difference to the client. All activity updates will be done based on our interal activity types. - if((Tasks[TaskID]->Activity[ActivityID].Type > 0) && Tasks[TaskID]->Activity[ActivityID].Type < 100) + if((Tasks[TaskID]->Activity[ActivityID].Type > 0) && Tasks[TaskID]->Activity[ActivityID].Type < 100) tah->ActivityType = Tasks[TaskID]->Activity[ActivityID].Type; else tah->ActivityType = ActivityUse1; @@ -2762,10 +2762,10 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int long PacketLength = 29 + 4 + 8 + 4 + 4 + 5; PacketLength = PacketLength + strlen(Tasks[TaskID]->Activity[ActivityID].Text1) + 1 + - strlen(Tasks[TaskID]->Activity[ActivityID].Text2) + 1 + - strlen(Tasks[TaskID]->Activity[ActivityID].Text3) + 1 + - ((strlen(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID)) + 1) * 2) + - 3 + String2Len; + strlen(Tasks[TaskID]->Activity[ActivityID].Text2) + 1 + + strlen(Tasks[TaskID]->Activity[ActivityID].Text3) + 1 + + ((strlen(itoa(Tasks[TaskID]->Activity[ActivityID].ZoneID)) + 1) * 2) + + 3 + String2Len; EQApplicationPacket* outapp = new EQApplicationPacket(OP_TaskActivity, PacketLength); @@ -2777,7 +2777,7 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int // We send our 'internal' types as ActivityUse1. text3 should be set to the activity description, so it makes // no difference to the client. All activity updates will be done based on our interal activity types. - if((Tasks[TaskID]->Activity[ActivityID].Type > 0) && Tasks[TaskID]->Activity[ActivityID].Type < 100) + if((Tasks[TaskID]->Activity[ActivityID].Type > 0) && Tasks[TaskID]->Activity[ActivityID].Type < 100) outapp->WriteUInt32(Tasks[TaskID]->Activity[ActivityID].Type); else outapp->WriteUInt32(ActivityUse1); @@ -2837,7 +2837,7 @@ void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) { //for(int TaskIndex=0; TaskIndexGetActiveTaskCount(); TaskIndex++) { for(int TaskIndex=0; TaskIndexGetActiveTaskID(TaskIndex); - if((TaskID==0) || (Tasks[TaskID] ==0)) continue; + if((TaskID==0) || (Tasks[TaskID] ==0)) continue; int StartTime = c->GetTaskStartTime(TaskIndex); SendActiveTaskDescription(c, TaskID, TaskIndex, StartTime, Tasks[TaskID]->Duration, false); @@ -2849,11 +2849,11 @@ void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) { _log(TASKS__UPDATE, " Long: %i, %i, %i Complete=%i", TaskID, Activity, TaskIndex, TaskComplete); if(Activity==GetActivityCount(TaskID)-1) SendTaskActivityLong(c, TaskID, Activity, TaskIndex, - Tasks[TaskID]->Activity[Activity].Optional, - TaskComplete); + Tasks[TaskID]->Activity[Activity].Optional, + TaskComplete); else SendTaskActivityLong(c, TaskID, Activity, TaskIndex, - Tasks[TaskID]->Activity[Activity].Optional, 0); + Tasks[TaskID]->Activity[Activity].Optional, 0); } else { _log(TASKS__UPDATE, " Short: %i, %i, %i", TaskID, Activity, TaskIndex); @@ -2873,7 +2873,7 @@ void TaskManager::SendSingleActiveTaskToClient(Client *c, int TaskIndex, bool Ta int TaskID = c->GetActiveTaskID(TaskIndex); - if((TaskID==0) || (Tasks[TaskID] ==0)) return; + if((TaskID==0) || (Tasks[TaskID] ==0)) return; int StartTime = c->GetTaskStartTime(TaskIndex); SendActiveTaskDescription(c, TaskID, TaskIndex, StartTime, Tasks[TaskID]->Duration, BringUpTaskJournal); @@ -2886,10 +2886,10 @@ void TaskManager::SendSingleActiveTaskToClient(Client *c, int TaskIndex, bool Ta _log(TASKS__UPDATE, " Long: %i, %i, %i Complete=%i", TaskID, Activity, TaskIndex, TaskComplete); if(Activity==GetActivityCount(TaskID)-1) SendTaskActivityLong(c, TaskID, Activity, TaskIndex, - Tasks[TaskID]->Activity[Activity].Optional, TaskComplete); + Tasks[TaskID]->Activity[Activity].Optional, TaskComplete); else SendTaskActivityLong(c, TaskID, Activity, TaskIndex, - Tasks[TaskID]->Activity[Activity].Optional, 0); + Tasks[TaskID]->Activity[Activity].Optional, 0); } else { _log(TASKS__UPDATE, " Short: %i, %i, %i", TaskID, Activity, TaskIndex); @@ -2905,8 +2905,8 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN if((TaskID<1) || (TaskID>=MAXTASKS) || !Tasks[TaskID]) return; int PacketLength = sizeof(TaskDescriptionHeader_Struct) + strlen(Tasks[TaskID]->Title) + 1 - + sizeof(TaskDescriptionData1_Struct) + strlen(Tasks[TaskID]->Description) + 1 - + sizeof(TaskDescriptionData2_Struct) + 1 + sizeof(TaskDescriptionTrailer_Struct); + + sizeof(TaskDescriptionData1_Struct) + strlen(Tasks[TaskID]->Description) + 1 + + sizeof(TaskDescriptionData2_Struct) + 1 + sizeof(TaskDescriptionTrailer_Struct); string RewardText; int ItemID = 0; @@ -2933,26 +2933,26 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN case EQClient62: { MakeAnyLenString(&RewardTmp, "%c%07i-00001-00001-00001-00001-000013E0ABA6B%s%c", - 0x12, ItemID, Tasks[TaskID]->Reward,0x12); + 0x12, ItemID, Tasks[TaskID]->Reward,0x12); break; } case EQClientTitanium: { MakeAnyLenString(&RewardTmp, "%c%06X000000000000000000000000000000014505DC2%s%c", - 0x12, ItemID, Tasks[TaskID]->Reward,0x12); + 0x12, ItemID, Tasks[TaskID]->Reward,0x12); break; } case EQClientRoF: { MakeAnyLenString(&RewardTmp, "%c%06X0000000000000000000000000000000000000000014505DC2%s%c", - 0x12, ItemID, Tasks[TaskID]->Reward,0x12); + 0x12, ItemID, Tasks[TaskID]->Reward,0x12); break; } default: { // All clients after Titanium MakeAnyLenString(&RewardTmp, "%c%06X00000000000000000000000000000000000014505DC2%s%c", - 0x12, ItemID, Tasks[TaskID]->Reward,0x12); + 0x12, ItemID, Tasks[TaskID]->Reward,0x12); } } @@ -2967,26 +2967,26 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN case EQClient62: { MakeAnyLenString(&RewardTmp, "%c%07i-00001-00001-00001-00001-000013E0ABA6B%s%c", - 0x12, ItemID, Item->Name,0x12); + 0x12, ItemID, Item->Name,0x12); break; } case EQClientTitanium: { MakeAnyLenString(&RewardTmp, "%c%06X000000000000000000000000000000014505DC2%s%c", - 0x12, ItemID, Item->Name ,0x12); + 0x12, ItemID, Item->Name ,0x12); break; } case EQClientRoF: { MakeAnyLenString(&RewardTmp, "%c%06X0000000000000000000000000000000000000000014505DC2%s%c", - 0x12, ItemID, Item->Name ,0x12); + 0x12, ItemID, Item->Name ,0x12); break; } default: { // All clients after Titanium MakeAnyLenString(&RewardTmp, "%c%06X00000000000000000000000000000000000014505DC2%s%c", - 0x12, ItemID, Item->Name ,0x12); + 0x12, ItemID, Item->Name ,0x12); } } } @@ -3047,7 +3047,7 @@ void TaskManager::SendActiveTaskDescription(Client *c, int TaskID, int SequenceN tdd2 = (TaskDescriptionData2_Struct*)Ptr; // This next field may not be a reward count. It is always 1 in the packets I have seen. Setting it to 2 and trying - // to include multiple item links has so far proven futile. Setting it to 0 ends the packet after the next byte. + // to include multiple item links has so far proven futile. Setting it to 0 ends the packet after the next byte. tdd2->RewardCount = 1; if(Tasks[TaskID]->XPReward) @@ -3152,8 +3152,8 @@ void ClientTaskState::RemoveTask(Client *c, int SequenceNumber) { _log(TASKS__UPDATE, "ClientTaskState Cancel Task %i ", SequenceNumber); if(!database.RunQuery(query,MakeAnyLenString(&query, ActivityQuery, - CharacterID, - ActiveTasks[SequenceNumber].TaskID), errbuf)) { + CharacterID, + ActiveTasks[SequenceNumber].TaskID), errbuf)) { LogFile->write(EQEMuLog::Error, "[TASKS]Error in CientTaskState::CancelTask %s", errbuf); safe_delete_array(query); @@ -3162,8 +3162,8 @@ void ClientTaskState::RemoveTask(Client *c, int SequenceNumber) { _log(TASKS__UPDATE, "CancelTask: %s", query); safe_delete_array(query); if(!database.RunQuery(query,MakeAnyLenString(&query, TaskQuery, - CharacterID, - ActiveTasks[SequenceNumber].TaskID), errbuf)) { + CharacterID, + ActiveTasks[SequenceNumber].TaskID), errbuf)) { LogFile->write(EQEMuLog::Error, "[TASKS]Error in CientTaskState::CancelTask %s", errbuf); } @@ -3211,7 +3211,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID) { int FreeSlot = -1; for(int i=0; iSaveClientState(c, this); - parse->EventNPC(EVENT_TASKACCEPTED, npc, c, buf, 0); + parse->EventNPC(EVENT_TASKACCEPTED, npc, c, buf, 0); safe_delete_array(buf); } @@ -3299,10 +3299,10 @@ bool TaskGoalListManager::LoadLists() { const char *CountQuery = "SELECT `listid`, COUNT(`entry`) FROM `goallists` GROUP by `listid` " - "ORDER BY `listid`"; + "ORDER BY `listid`"; const char *ListQuery = "SELECT `entry` from `goallists` WHERE `listid`=%i " - "ORDER BY `entry` ASC LIMIT %i"; + "ORDER BY `entry` ASC LIMIT %i"; const char *ERR_MYSQLERROR = "Error in TaskGoalListManager::LoadLists: %s %s"; @@ -3332,7 +3332,7 @@ bool TaskGoalListManager::LoadLists() { int ListIndex = 0; while((row = mysql_fetch_row(result))) { - int ListID = atoi(row[0]); + int ListID = atoi(row[0]); int ListSize = atoi(row[1]); TaskGoalLists[ListIndex].ListID = ListID; @@ -3452,9 +3452,8 @@ bool TaskGoalListManager::IsInList(int ListID, int Entry) { if((ListIndex<0) || (ListIndex >= NumberOfLists)) return false; - if((Entry < TaskGoalLists[ListIndex].Min) || - (Entry > TaskGoalLists[ListIndex].Max)) - return false; + if((Entry < TaskGoalLists[ListIndex].Min) || (Entry > TaskGoalLists[ListIndex].Max)) + return false; int FirstEntry = 0; int LastEntry = TaskGoalLists[ListIndex].Size - 1; @@ -3490,8 +3489,8 @@ TaskProximityManager::~TaskProximityManager() { bool TaskProximityManager::LoadProximities(int ZoneID) { const char *ProximityQuery = "SELECT `exploreid`, `minx`, `maxx`, `miny`, `maxy`, " - "`minz`, `maxz` from `proximities` WHERE `zoneid`=%i " - "ORDER BY `zoneid` ASC"; + "`minz`, `maxz` from `proximities` WHERE `zoneid`=%i " + "ORDER BY `zoneid` ASC"; const char *ERR_MYSQLERROR = "Error in TaskProximityManager::LoadProximities %s %s"; @@ -3540,10 +3539,10 @@ int TaskProximityManager::CheckProximities(float X, float Y, float Z) { TaskProximity* P = &TaskProximities[i]; _log(TASKS__PROXIMITY, "Checking %8.3f, %8.3f, %8.3f against %8.3f, %8.3f, %8.3f, %8.3f, %8.3f, %8.3f", - X, Y, Z, P->MinX, P->MaxX, P->MinY, P->MaxY, P->MinZ, P->MaxZ); + X, Y, Z, P->MinX, P->MaxX, P->MinY, P->MaxY, P->MinZ, P->MaxZ); if(X < P->MinX || X > P->MaxX || Y < P->MinY || Y > P->MaxY || - Z < P->MinZ || Z > P->MaxZ) continue; + Z < P->MinZ || Z > P->MaxZ) continue; return P->ExploreID; @@ -3552,4 +3551,3 @@ int TaskProximityManager::CheckProximities(float X, float Y, float Z) { return 0; } - diff --git a/zone/tasks.h b/zone/tasks.h index 77da598f5..25d3872fa 100644 --- a/zone/tasks.h +++ b/zone/tasks.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator +Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -97,26 +97,26 @@ private: typedef enum { METHODSINGLEID = 0, METHODLIST = 1, METHODQUEST = 2 } TaskMethodType; struct ActivityInformation { - int StepNumber; - int Type; - char *Text1; - char *Text2; - char *Text3; - int GoalID; + int StepNumber; + int Type; + char *Text1; + char *Text2; + char *Text3; + int GoalID; TaskMethodType GoalMethod; - int GoalCount; - int DeliverToNPC; - int ZoneID; - bool Optional; + int GoalCount; + int DeliverToNPC; + int ZoneID; + bool Optional; }; typedef enum { ActivitiesSequential = 0, ActivitiesStepped = 1 } SequenceType; struct TaskInformation { int Duration; - char *Title; - char *Description; - char *Reward; + char *Title; + char *Description; + char *Reward; int RewardID; int CashReward; // Expressed in copper int XPReward; @@ -126,7 +126,7 @@ struct TaskInformation { SequenceType SequenceMode; int LastStep; short MinLevel; - short MaxLevel; + short MaxLevel; bool Repeatable; ActivityInformation Activity[MAXACTIVITIESPERTASK]; }; @@ -134,8 +134,8 @@ struct TaskInformation { typedef enum { ActivityHidden = 0, ActivityActive = 1, ActivityCompleted = 2 } ActivityState; typedef enum { ActivityDeliver = 1, ActivityKill = 2, ActivityLoot = 3, ActivitySpeakWith = 4, ActivityExplore = 5, - ActivityTradeSkill = 6, ActivityFish = 7, ActivityForage = 8, ActivityUse1 = 9, ActivityUse2 = 10, - ActivityTouch = 11, ActivityGiveCash = 100 } ActivityType; + ActivityTradeSkill = 6, ActivityFish = 7, ActivityForage = 8, ActivityUse1 = 9, ActivityUse2 = 10, + ActivityTouch = 11, ActivityGiveCash = 100 } ActivityType; struct ClientActivityInformation { @@ -147,7 +147,7 @@ struct ClientActivityInformation { struct ClientTaskInformation { int TaskID; - int CurrentStep; + int CurrentStep; int AcceptedTime; bool Updated; ClientActivityInformation Activity[MAXACTIVITIESPERTASK]; @@ -222,7 +222,7 @@ class TaskManager { public: TaskManager(); ~TaskManager(); - int GetActivityCount(int TaskID); + int GetActivityCount(int TaskID); bool LoadSingleTask(int TaskID); bool LoadTasks(int SingleTask=0); void ReloadGoalLists(); @@ -238,9 +238,9 @@ public: void SendSingleActiveTaskToClient(Client *c, int TaskIndex, bool TaskComplete, bool BringUpTaskJournal=false); void SendTaskActivityShort(Client *c, int TaskID, int ActivityID, int ClientTaskIndex); void SendTaskActivityLong(Client *c, int TaskID, int ActivityID, int ClientTaskIndex, - bool Optional, bool TaskComplete=false); + bool Optional, bool TaskComplete=false); void SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int ClientTaskIndex, - bool Optional, bool TaskComplete=false); + bool Optional, bool TaskComplete=false); void SendCompletedTasksToClient(Client *c, ClientTaskState *state); void ExplainTask(Client *c, int TaskID); int FirstTaskInSet(int TaskSet); diff --git a/zone/titles.cpp b/zone/titles.cpp index e6a2e5f61..1e73da26a 100644 --- a/zone/titles.cpp +++ b/zone/titles.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/eq_packet_structs.h" @@ -193,12 +193,10 @@ bool TitleManager::IsClientEligibleForTitle(Client *c, vector::itera if(Title->SkillID >= 0) { - if((Title->MinSkillValue >= 0) - && (c->GetRawSkill(static_cast(Title->SkillID)) < static_cast(Title->MinSkillValue))) + if((Title->MinSkillValue >= 0) && (c->GetRawSkill(static_cast(Title->SkillID)) < static_cast(Title->MinSkillValue))) return false; - if((Title->MaxSkillValue >= 0) - && (c->GetRawSkill(static_cast(Title->SkillID)) > static_cast(Title->MaxSkillValue))) + if((Title->MaxSkillValue >= 0) && (c->GetRawSkill(static_cast(Title->SkillID)) > static_cast(Title->MaxSkillValue))) return false; } @@ -206,8 +204,8 @@ bool TitleManager::IsClientEligibleForTitle(Client *c, vector::itera if((Title->ItemID >= 1) && (c->GetInv().HasItem(Title->ItemID, 0, 0xFF) == SLOT_INVALID)) return false; - if((Title->TitleSet > 0) && (!c->CheckTitle(Title->TitleSet))) - return false; + if((Title->TitleSet > 0) && (!c->CheckTitle(Title->TitleSet))) + return false; return true; } @@ -277,7 +275,7 @@ void TitleManager::CreateNewPlayerTitle(Client *c, const char *Title) safe_delete_array(query); if(!database.RunQuery(query,MakeAnyLenString(&query, "INSERT into titles (`char_id`, `prefix`) VALUES(%i, '%s')", - c->CharacterID(), EscTitle), errbuf)) + c->CharacterID(), EscTitle), errbuf)) LogFile->write(EQEMuLog::Error, "Error adding title: %s %s", query, errbuf); else { @@ -321,7 +319,7 @@ void TitleManager::CreateNewPlayerSuffix(Client *c, const char *Suffix) safe_delete_array(query); if(!database.RunQuery(query,MakeAnyLenString(&query, "INSERT into titles (`char_id`, `suffix`) VALUES(%i, '%s')", - c->CharacterID(), EscSuffix), errbuf)) + c->CharacterID(), EscSuffix), errbuf)) LogFile->write(EQEMuLog::Error, "Error adding title suffix: %s %s", query, errbuf); else { @@ -372,65 +370,65 @@ void Client::SetTitleSuffix(const char *Suffix) void Client::EnableTitle(int titleset) { - if (CheckTitle(titleset)) { - return; - } + if (CheckTitle(titleset)) { + return; + } - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; - if(!database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO player_titlesets (char_id, title_set) VALUES (%i, %i)", CharacterID(), titleset), errbuf)) { - LogFile->write(EQEMuLog::Error, "Error in EnableTitle query for titleset %i and charid %i", titleset, CharacterID()); - safe_delete_array(query); - return; - } - else { - safe_delete_array(query); - return; - } + if(!database.RunQuery(query,MakeAnyLenString(&query, "INSERT INTO player_titlesets (char_id, title_set) VALUES (%i, %i)", CharacterID(), titleset), errbuf)) { + LogFile->write(EQEMuLog::Error, "Error in EnableTitle query for titleset %i and charid %i", titleset, CharacterID()); + safe_delete_array(query); + return; + } + else { + safe_delete_array(query); + return; + } } bool Client::CheckTitle(int titleset) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; - if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT `id` FROM player_titlesets WHERE `title_set`=%i AND `char_id`=%i LIMIT 1", titleset, CharacterID()), errbuf, &result)) { - safe_delete_array(query); - if (mysql_num_rows(result) >= 1) { - mysql_free_result(result); - return(true); - } - mysql_free_result(result); - } + if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT `id` FROM player_titlesets WHERE `title_set`=%i AND `char_id`=%i LIMIT 1", titleset, CharacterID()), errbuf, &result)) { + safe_delete_array(query); + if (mysql_num_rows(result) >= 1) { + mysql_free_result(result); + return(true); + } + mysql_free_result(result); + } - else { - LogFile->write(EQEMuLog::Error, "Error in CheckTitle query '%s': %s", query, errbuf); - safe_delete_array(query); - } + else { + LogFile->write(EQEMuLog::Error, "Error in CheckTitle query '%s': %s", query, errbuf); + safe_delete_array(query); + } - return(false); + return(false); } void Client::RemoveTitle(int titleset) { - if (!CheckTitle(titleset)) { - return; - } + if (!CheckTitle(titleset)) { + return; + } - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; - if (database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM player_titlesets WHERE `title_set`=%i AND `char_id`=%i", titleset, CharacterID()), errbuf)) { - safe_delete_array(query); - } + if (database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM player_titlesets WHERE `title_set`=%i AND `char_id`=%i", titleset, CharacterID()), errbuf)) { + safe_delete_array(query); + } - else { - LogFile->write(EQEMuLog::Error, "Error in RemoveTitle query '%s': %s", query, errbuf); - safe_delete_array(query); - } + else { + LogFile->write(EQEMuLog::Error, "Error in RemoveTitle query '%s': %s", query, errbuf); + safe_delete_array(query); + } - return; + return; } diff --git a/zone/titles.h b/zone/titles.h index 190b2f445..923cb6390 100644 --- a/zone/titles.h +++ b/zone/titles.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef TITLES_H #define TITLES_H diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 1d4e7664d..cd7edc38b 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -78,7 +78,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme if (itemsFound != 2) { - user->Message(13, "Error: Too many/few items in augmentation container."); + user->Message(13, "Error: Too many/few items in augmentation container."); return; } } @@ -217,8 +217,8 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob PlayerProfile_Struct& user_pp = user->GetPP(); ItemInst* container = nullptr; ItemInst* inst = nullptr; - uint8 c_type = 0xE8; - uint32 some_id = 0; + uint8 c_type = 0xE8; + uint32 some_id = 0; bool worldcontainer=false; if (in_combine->container_slot == SLOT_TRADESKILL) { @@ -235,8 +235,8 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob if (inst) { const Item_Struct* item = inst->GetItem(); if (item && inst->IsType(ItemClassContainer)) { - c_type = item->BagType; - some_id = item->ID; + c_type = item->BagType; + some_id = item->ID; } } } @@ -248,29 +248,29 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob container = inst; - DBTradeskillRecipe_Struct spec; - if (!database.GetTradeRecipe(container, c_type, some_id, user->CharacterID(), &spec)) { - user->Message_StringID(MT_Emote,TRADESKILL_NOCOMBINE); - EQApplicationPacket* outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0); - user->QueuePacket(outapp); - safe_delete(outapp); - return; - } + DBTradeskillRecipe_Struct spec; + if (!database.GetTradeRecipe(container, c_type, some_id, user->CharacterID(), &spec)) { + user->Message_StringID(MT_Emote,TRADESKILL_NOCOMBINE); + EQApplicationPacket* outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0); + user->QueuePacket(outapp); + safe_delete(outapp); + return; + } - // Character hasn't learnt the recipe yet. - // must_learn: - // bit 1 (0x01): recipe can't be experimented - // bit 2 (0x02): can try to experiment but not useable for auto-combine until learnt - // bit 5 (0x10): no learn message, use unlisted flag to prevent it showing up on search - // bit 6 (0x20): unlisted recipe flag - if ((spec.must_learn&0xF) == 1 && !spec.has_learnt) { - // Made up message for the client. Just giving a DNC is the other option. - user->Message(4, "You need to learn how to combine these first."); - EQApplicationPacket* outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0); - user->QueuePacket(outapp); - safe_delete(outapp); - return; - } + // Character hasn't learnt the recipe yet. + // must_learn: + // bit 1 (0x01): recipe can't be experimented + // bit 2 (0x02): can try to experiment but not useable for auto-combine until learnt + // bit 5 (0x10): no learn message, use unlisted flag to prevent it showing up on search + // bit 6 (0x20): unlisted recipe flag + if ((spec.must_learn&0xF) == 1 && !spec.has_learnt) { + // Made up message for the client. Just giving a DNC is the other option. + user->Message(4, "You need to learn how to combine these first."); + EQApplicationPacket* outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0); + user->QueuePacket(outapp); + safe_delete(outapp); + return; + } // Character does not have the required skill. if(spec.skill_needed > 0 && user->GetSkill(spec.tradeskill) < spec.skill_needed ) { // Notify client. @@ -283,7 +283,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob //changing from a switch to string of if's since we don't need to iterate through all of the skills in the SkillType enum if (spec.tradeskill == ALCHEMY) { - if (user_pp.class_ != SHAMAN) { + if (user_pp.class_ != SHAMAN) { user->Message(13, "This tradeskill can only be performed by a shaman."); return; } @@ -293,13 +293,13 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob } } else if (spec.tradeskill == TINKERING) { - if (user_pp.race != GNOME) { + if (user_pp.race != GNOME) { user->Message(13, "Only gnomes can tinker."); return; } } else if (spec.tradeskill == MAKE_POISON) { - if (user_pp.class_ != ROGUE) { + if (user_pp.class_ != ROGUE) { user->Message(13, "Only rogues can mix poisons."); return; } @@ -390,9 +390,9 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + char *query = 0; uint32 qlen = 0; uint8 qcount = 0; @@ -559,7 +559,7 @@ SkillType Object::TypeToSkill(uint32 type) { case OT_OGGOKFORGE: case OT_FIERDALFFORGE: case OT_STORMGUARDF: - case OT_VALEFORGE: { + case OT_VALEFORGE: { tradeskill = BLACKSMITHING; break; } @@ -607,12 +607,11 @@ SkillType Object::TypeToSkill(uint32 type) { return(tradeskill); } -void Client::TradeskillSearchResults(const char *query, unsigned long qlen, - unsigned long objtype, unsigned long someid) { +void Client::TradeskillSearchResults(const char *query, unsigned long qlen, unsigned long objtype, unsigned long someid) { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; if (!database.RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in TradeskillSearchResults query '%s': %s", query, errbuf); @@ -671,9 +670,9 @@ void Client::TradeskillSearchResults(const char *query, unsigned long qlen, void Client::SendTradeskillDetails(uint32 recipe_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + char *query = 0; uint32 qlen = 0; uint8 qcount = 0; @@ -789,7 +788,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { //returns true on success bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { - if(spec == nullptr) + if(spec == nullptr) return(false); uint16 user_skill = GetSkill(spec->tradeskill); @@ -804,13 +803,13 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { // 09/10/2006 v0.1 (eq4me) // 09/11/2006 v0.2 (eq4me) // Todo: - // Implementing AAs - // Success modifiers based on recipes - // Skillup modifiers based on the rarity of the ingredients + // Implementing AAs + // Success modifiers based on recipes + // Skillup modifiers based on the rarity of the ingredients // Some tradeskills are more eqal then others. ;-) // If you want to customize the stage1 success rate do it here. - // Remember: skillup_modifier is (float). Lower is better + // Remember: skillup_modifier is (float). Lower is better switch(spec->tradeskill) { case FLETCHING: case ALCHEMY: @@ -833,7 +832,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { // Some tradeskills take the higher of one additional stat beside INT and WIS // to determine the skillup rate. Additionally these tradeskills do not have an // -15 modifier on their statbonus. - if (spec->tradeskill == FLETCHING || spec->tradeskill == MAKE_POISON) { + if (spec->tradeskill == FLETCHING || spec->tradeskill == MAKE_POISON) { thirdstat = GetDEX(); stat_modifier = 0; } else if (spec->tradeskill == BLACKSMITHING) { @@ -847,9 +846,9 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { vector< pair >::iterator itr; - //calculate the base success chance + //calculate the base success chance // For trivials over 68 the chance is (skill - 0.75*trivial) +51.5 - // For trivial up to 68 the chance is (skill - trivial) + 66 + // For trivial up to 68 the chance is (skill - trivial) + 66 if (spec->trivial >= 68) { chance = (user_skill - (0.75*spec->trivial)) + 51.5; } else { @@ -916,7 +915,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { break; } } - const Item_Struct* item = nullptr; + const Item_Struct* item = nullptr; if (spec->tradeskill == BLACKSMITHING) { switch(GetAA(aaBlacksmithingMastery)) { @@ -1032,7 +1031,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { while(itr != spec->onsuccess.end() && !spec->quest) { //should we check this crap? SummonItem(itr->first, itr->second); - item = database.GetItem(itr->first); + item = database.GetItem(itr->first); if (this->GetGroup()) { entity_list.MessageGroup(this,true,MT_Skills,"%s has successfully fashioned %s!",GetName(),item->Name); @@ -1051,7 +1050,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { Message_StringID(MT_Emote,TRADESKILL_FAILED); _log(TRADESKILLS__TRACE, "Tradeskill failed"); - if (this->GetGroup()) + if (this->GetGroup()) { entity_list.MessageGroup(this,true,MT_Skills,"%s was unsuccessful in %s tradeskill attempt.",GetName(),this->GetGender() == 0 ? "his" : this->GetGender() == 1 ? "her" : "its"); } @@ -1063,19 +1062,19 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { itr++; } - // Rolls on each item, is possible to return everything - int SalvageChance = aabonuses.SalvageChance + itembonuses.SalvageChance + spellbonuses.SalvageChance; - // Skip check if not a normal TS or if a quest recipe these should be nofail, but check amyways - if(SalvageChance && spec->tradeskill != 75 && !spec->quest) { - itr = spec->salvage.begin(); - uint8 sc = 0; - while(itr != spec->salvage.end()) { - for(sc = 0; sc < itr->second; sc++) - if(MakeRandomInt(0,99) < SalvageChance) - SummonItem(itr->first, 1); - itr++; - } - } + // Rolls on each item, is possible to return everything + int SalvageChance = aabonuses.SalvageChance + itembonuses.SalvageChance + spellbonuses.SalvageChance; + // Skip check if not a normal TS or if a quest recipe these should be nofail, but check amyways + if(SalvageChance && spec->tradeskill != 75 && !spec->quest) { + itr = spec->salvage.begin(); + uint8 sc = 0; + while(itr != spec->salvage.end()) { + for(sc = 0; sc < itr->second; sc++) + if(MakeRandomInt(0,99) < SalvageChance) + SummonItem(itr->first, 1); + itr++; + } + } } return(false); @@ -1121,17 +1120,17 @@ void Client::CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float } _log(TRADESKILLS__TRACE, "...skillup_modifier: %f , success_modifier: %d , stat modifier: %d", skillup_modifier , success_modifier , stat_modifier); - _log(TRADESKILLS__TRACE, "...Stage1 chance was: %f percent", chance_stage1); - _log(TRADESKILLS__TRACE, "...Stage2 chance was: %f percent. 0 percent means stage1 failed", chance_stage2); + _log(TRADESKILLS__TRACE, "...Stage1 chance was: %f percent", chance_stage1); + _log(TRADESKILLS__TRACE, "...Stage2 chance was: %f percent. 0 percent means stage1 failed", chance_stage2); } bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec) { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + char *query = 0; char buf2[4096]; uint32 sum = 0; @@ -1139,14 +1138,14 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 uint32 qcount = 0; uint32 qlen = 0; - // make where clause segment for container(s) - char containers[30]; - if (some_id == 0) { - // world combiner so no item number - snprintf(containers,29, "= %u", c_type); - } else { - // container in inventory - snprintf(containers,29, "in (%u,%u)", c_type, some_id); + // make where clause segment for container(s) + char containers[30]; + if (some_id == 0) { + // world combiner so no item number + snprintf(containers,29, "= %u", c_type); + } else { + // container in inventory + snprintf(containers,29, "in (%u,%u)", c_type, some_id); } buf2[0] = '\0'; @@ -1181,9 +1180,9 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 qlen = MakeAnyLenString(&query, "SELECT tre.recipe_id " " FROM tradeskill_recipe_entries AS tre" " WHERE ( tre.item_id IN(%s) AND tre.componentcount>0 )" - " OR ( tre.item_id %s AND tre.iscontainer=1 )" - " GROUP BY tre.recipe_id HAVING sum(tre.componentcount) = %u" - " AND sum(tre.item_id * tre.componentcount) = %u", buf2, containers, count, sum); + " OR ( tre.item_id %s AND tre.iscontainer=1 )" + " GROUP BY tre.recipe_id HAVING sum(tre.componentcount) = %u" + " AND sum(tre.item_id * tre.componentcount) = %u", buf2, containers, count, sum); if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecipe search, query: %s", query); @@ -1219,9 +1218,9 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 qlen = MakeAnyLenString(&query, "SELECT tre.recipe_id" " FROM tradeskill_recipe_entries AS tre" - " WHERE tre.recipe_id IN (%s)" - " GROUP BY tre.recipe_id HAVING sum(tre.componentcount) = %u" - " AND sum(tre.item_id * tre.componentcount) = %u", buf2, count, sum); + " WHERE tre.recipe_id IN (%s)" + " GROUP BY tre.recipe_id HAVING sum(tre.componentcount) = %u" + " AND sum(tre.item_id * tre.componentcount) = %u", buf2, count, sum); if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecipe, re-query: %s", query); @@ -1284,9 +1283,9 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 //This is here because something's up with the query above.. it needs to be rethought out bool has_components = true; char TSerrbuf[MYSQL_ERRMSG_SIZE]; - char *TSquery = 0; - MYSQL_RES *TSresult; - MYSQL_ROW TSrow; + char *TSquery = 0; + MYSQL_RES *TSresult; + MYSQL_ROW TSrow; if (RunQuery(TSquery, MakeAnyLenString(&TSquery, "SELECT item_id, componentcount from tradeskill_recipe_entries where recipe_id=%i AND componentcount > 0", recipe_id), TSerrbuf, &TSresult)) { while((TSrow = mysql_fetch_row(TSresult))!=nullptr) { int ccnt = 0; @@ -1321,31 +1320,31 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id uint32 char_id, DBTradeskillRecipe_Struct *spec) { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; - char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + char *query = 0; uint32 qcount = 0; uint32 qlen; - // make where clause segment for container(s) - char containers[30]; - if (some_id == 0) { - // world combiner so no item number - snprintf(containers,29, "= %u", c_type); - } else { - // container in inventory - snprintf(containers,29, "in (%u,%u)", c_type, some_id); - } + // make where clause segment for container(s) + char containers[30]; + if (some_id == 0) { + // world combiner so no item number + snprintf(containers,29, "= %u", c_type); + } else { + // container in inventory + snprintf(containers,29, "in (%u,%u)", c_type, some_id); + } - qlen = MakeAnyLenString(&query, "SELECT tr.id, tr.tradeskill, tr.skillneeded," - " tr.trivial, tr.nofail, tr.replace_container, tr.name, tr.must_learn, tr.quest, crl.madecount" - " FROM tradeskill_recipe AS tr inner join tradeskill_recipe_entries as tre" - " ON tr.id = tre.recipe_id" - " LEFT JOIN (SELECT recipe_id, madecount from char_recipe_list WHERE char_id = %u) AS crl " - " ON tr.id = crl.recipe_id " - " WHERE tr.id = %lu AND tre.item_id %s" - " GROUP BY tr.id", char_id, (unsigned long)recipe_id, containers); + qlen = MakeAnyLenString(&query, "SELECT tr.id, tr.tradeskill, tr.skillneeded," + " tr.trivial, tr.nofail, tr.replace_container, tr.name, tr.must_learn, tr.quest, crl.madecount" + " FROM tradeskill_recipe AS tr inner join tradeskill_recipe_entries as tre" + " ON tr.id = tre.recipe_id" + " LEFT JOIN (SELECT recipe_id, madecount from char_recipe_list WHERE char_id = %u) AS crl " + " ON tr.id = crl.recipe_id " + " WHERE tr.id = %lu AND tre.item_id %s" + " GROUP BY tr.id", char_id, (unsigned long)recipe_id, containers); if (!RunQuery(query, qlen, errbuf, &result)) { LogFile->write(EQEMuLog::Error, "Error in GetTradeRecipe, query: %s", query); @@ -1362,11 +1361,11 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id } row = mysql_fetch_row(result); - spec->tradeskill = (SkillType)atoi(row[1]); - spec->skill_needed = (int16)atoi(row[2]); - spec->trivial = (uint16)atoi(row[3]); - spec->nofail = atoi(row[4]) ? true : false; - spec->replace_container = atoi(row[5]) ? true : false; + spec->tradeskill = (SkillType)atoi(row[1]); + spec->skill_needed = (int16)atoi(row[2]); + spec->trivial = (uint16)atoi(row[3]); + spec->nofail = atoi(row[4]) ? true : false; + spec->replace_container = atoi(row[5]) ? true : false; spec->name = row[6]; spec->must_learn = (uint8)atoi(row[7]); spec->quest = atoi(row[8]) ? true : false; @@ -1424,25 +1423,24 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id mysql_free_result(result); } - // Pull the salvage list - qlen = MakeAnyLenString(&query, "SELECT item_id,salvagecount FROM tradeskill_recipe_entries" - " WHERE salvagecount>0 AND recipe_id=%u", recipe_id); + // Pull the salvage list + qlen = MakeAnyLenString(&query, "SELECT item_id,salvagecount FROM tradeskill_recipe_entries WHERE salvagecount>0 AND recipe_id=%u", recipe_id); - spec->salvage.clear(); - // Don't bother with the query if TS is nofail - if (!spec->nofail && RunQuery(query, qlen, errbuf, &result)) { - qcount = mysql_num_rows(result); - uint8 r; - for(r = 0; r < qcount; r++) { - row = mysql_fetch_row(result); - uint32 item = (uint32)atoi(row[0]); - uint8 num = (uint8)atoi(row[1]); - spec->salvage.push_back(pair(item, num)); - } - mysql_free_result(result); - } + spec->salvage.clear(); + // Don't bother with the query if TS is nofail + if (!spec->nofail && RunQuery(query, qlen, errbuf, &result)) { + qcount = mysql_num_rows(result); + uint8 r; + for(r = 0; r < qcount; r++) { + row = mysql_fetch_row(result); + uint32 item = (uint32)atoi(row[0]); + uint8 num = (uint8)atoi(row[1]); + spec->salvage.push_back(pair(item, num)); + } + mysql_free_result(result); + } - safe_delete_array(query); + safe_delete_array(query); return(true); } @@ -1476,7 +1474,7 @@ void Client::LearnRecipe(uint32 recipeID) qlen = MakeAnyLenString(&query, "SELECT tr.name, crl.madecount " " FROM tradeskill_recipe as tr " " LEFT JOIN (SELECT recipe_id, madecount FROM char_recipe_list WHERE char_id = %u) AS crl " - " ON tr.id = crl.recipe_id " + " ON tr.id = crl.recipe_id " " WHERE tr.id = %u ;", CharacterID(), recipeID); if (!database.RunQuery(query, qlen, errbuf, &result)) { @@ -1524,15 +1522,15 @@ bool Client::CanIncreaseTradeskill(SkillType tradeskill) { if (rawskill >= maxskill) //Max skill sanity check return false; - uint8 Baking = (GetRawSkill(BAKING) > 200) ? 1 : 0; - uint8 Smithing = (GetRawSkill(BLACKSMITHING) > 200) ? 1 : 0; - uint8 Brewing = (GetRawSkill(BREWING) > 200) ? 1 : 0; - uint8 Fletching = (GetRawSkill(FLETCHING) > 200) ? 1 : 0; - uint8 Jewelry = (GetRawSkill(JEWELRY_MAKING) > 200) ? 1 : 0; - uint8 Pottery = (GetRawSkill(POTTERY) > 200) ? 1 : 0; - uint8 Tailoring = (GetRawSkill(TAILORING) > 200) ? 1 : 0; + uint8 Baking = (GetRawSkill(BAKING) > 200) ? 1 : 0; + uint8 Smithing = (GetRawSkill(BLACKSMITHING) > 200) ? 1 : 0; + uint8 Brewing = (GetRawSkill(BREWING) > 200) ? 1 : 0; + uint8 Fletching = (GetRawSkill(FLETCHING) > 200) ? 1 : 0; + uint8 Jewelry = (GetRawSkill(JEWELRY_MAKING) > 200) ? 1 : 0; + uint8 Pottery = (GetRawSkill(POTTERY) > 200) ? 1 : 0; + uint8 Tailoring = (GetRawSkill(TAILORING) > 200) ? 1 : 0; uint8 SkillTotal = Baking + Smithing + Brewing + Fletching + Jewelry + Pottery + Tailoring; //Tradeskills above 200 - uint32 aaLevel = GetAA(aaNewTanaanCraftingMastery); //New Tanaan AA: Each level allows an additional tradeskill above 200 (first one is free) + uint32 aaLevel = GetAA(aaNewTanaanCraftingMastery); //New Tanaan AA: Each level allows an additional tradeskill above 200 (first one is free) switch (tradeskill) { case BAKING: diff --git a/zone/trading.cpp b/zone/trading.cpp index 14b81173d..aae28d0e8 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "masterentity.h" @@ -341,9 +341,9 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) mlog(TRADING__CLIENT, "Finishing trade with client %s", other->GetName()); int16 slot_id; - const Item_Struct* item = nullptr; - QSPlayerLogTrade_Struct* qsaudit = nullptr; - bool QSPLT = false; + const Item_Struct* item = nullptr; + QSPlayerLogTrade_Struct* qsaudit = nullptr; + bool QSPLT = false; // QS code if(qspack && RuleB(QueryServ, PlayerLogTrades)) { @@ -351,12 +351,12 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) QSPLT = true; if(finalizer) { qsaudit->char2_id = this->character_id; } - else { qsaudit->char1_id = this->character_id; } + else { qsaudit->char1_id = this->character_id; } } // Move each trade slot into free inventory slot for(int16 i = 3000; i <= 3007; i++){ - const ItemInst* inst = m_inv[i]; + const ItemInst* inst = m_inv[i]; uint16 parent_offset = 0; if(inst == nullptr) { continue; } @@ -365,23 +365,23 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) /// Log Player Trades through QueryServ if Rule Enabled if(QSPLT) { - uint16 item_count = qsaudit->char1_count + qsaudit->char2_count; - parent_offset = item_count; + uint16 item_count = qsaudit->char1_count + qsaudit->char2_count; + parent_offset = item_count; - qsaudit->items[item_count].from_id = this->character_id; - qsaudit->items[item_count].from_slot = i; - qsaudit->items[item_count].to_id = other->CharacterID(); - qsaudit->items[item_count].to_slot = 0; - qsaudit->items[item_count].item_id = inst->GetID(); - qsaudit->items[item_count].charges = inst->GetCharges(); - qsaudit->items[item_count].aug_1 = inst->GetAugmentItemID(1); - qsaudit->items[item_count].aug_2 = inst->GetAugmentItemID(2); - qsaudit->items[item_count].aug_3 = inst->GetAugmentItemID(3); - qsaudit->items[item_count].aug_4 = inst->GetAugmentItemID(4); - qsaudit->items[item_count].aug_5 = inst->GetAugmentItemID(5); + qsaudit->items[item_count].from_id = this->character_id; + qsaudit->items[item_count].from_slot = i; + qsaudit->items[item_count].to_id = other->CharacterID(); + qsaudit->items[item_count].to_slot = 0; + qsaudit->items[item_count].item_id = inst->GetID(); + qsaudit->items[item_count].charges = inst->GetCharges(); + qsaudit->items[item_count].aug_1 = inst->GetAugmentItemID(1); + qsaudit->items[item_count].aug_2 = inst->GetAugmentItemID(2); + qsaudit->items[item_count].aug_3 = inst->GetAugmentItemID(3); + qsaudit->items[item_count].aug_4 = inst->GetAugmentItemID(4); + qsaudit->items[item_count].aug_5 = inst->GetAugmentItemID(5); if(finalizer) { qsaudit->char2_count++; } - else { qsaudit->char1_count++; } + else { qsaudit->char1_count++; } if(inst->IsType(ItemClassContainer)) { // Pseudo-Slot ID's are generated based on how the db saves bag items... @@ -393,20 +393,20 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) int16 k=Inventory::CalcSlotId(i, j); item_count = qsaudit->char1_count + qsaudit->char2_count; - qsaudit->items[item_count].from_id = this->character_id; - qsaudit->items[item_count].from_slot = k; - qsaudit->items[item_count].to_id = other->CharacterID(); - qsaudit->items[item_count].to_slot = 0; - qsaudit->items[item_count].item_id = baginst->GetID(); - qsaudit->items[item_count].charges = baginst->GetCharges(); - qsaudit->items[item_count].aug_1 = baginst->GetAugmentItemID(1); - qsaudit->items[item_count].aug_2 = baginst->GetAugmentItemID(2); - qsaudit->items[item_count].aug_3 = baginst->GetAugmentItemID(3); - qsaudit->items[item_count].aug_4 = baginst->GetAugmentItemID(4); - qsaudit->items[item_count].aug_5 = baginst->GetAugmentItemID(5); + qsaudit->items[item_count].from_id = this->character_id; + qsaudit->items[item_count].from_slot = k; + qsaudit->items[item_count].to_id = other->CharacterID(); + qsaudit->items[item_count].to_slot = 0; + qsaudit->items[item_count].item_id = baginst->GetID(); + qsaudit->items[item_count].charges = baginst->GetCharges(); + qsaudit->items[item_count].aug_1 = baginst->GetAugmentItemID(1); + qsaudit->items[item_count].aug_2 = baginst->GetAugmentItemID(2); + qsaudit->items[item_count].aug_3 = baginst->GetAugmentItemID(3); + qsaudit->items[item_count].aug_4 = baginst->GetAugmentItemID(4); + qsaudit->items[item_count].aug_5 = baginst->GetAugmentItemID(5); if(finalizer) { qsaudit->char2_count++; } - else { qsaudit->char1_count++; } + else { qsaudit->char1_count++; } } } } @@ -418,7 +418,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) mlog(TRADING__CLIENT, "Trying to put %s (%d) into slot %d", inst->GetItem()->Name, inst->GetItem()->ID, slot_id); if(other->PutItemInInventory(slot_id, *inst, true)) { - mlog(TRADING__CLIENT, "Item %s (%d) successfully transfered, deleting from trade slot.", inst->GetItem()->Name, inst->GetItem()->ID); + mlog(TRADING__CLIENT, "Item %s (%d) successfully transfered, deleting from trade slot.", inst->GetItem()->Name, inst->GetItem()->ID); if(QSPLT) { qsaudit->items[parent_offset].to_slot = slot_id; @@ -488,16 +488,16 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) // This is currently setup to show character offers, not receipts if(QSPLT) { if(finalizer) { - qsaudit->char2_money.platinum = this->trade->pp; - qsaudit->char2_money.gold = this->trade->gp; - qsaudit->char2_money.silver = this->trade->sp; - qsaudit->char2_money.copper = this->trade->cp; + qsaudit->char2_money.platinum = this->trade->pp; + qsaudit->char2_money.gold = this->trade->gp; + qsaudit->char2_money.silver = this->trade->sp; + qsaudit->char2_money.copper = this->trade->cp; } else { qsaudit->char1_money.platinum = this->trade->pp; - qsaudit->char1_money.gold = this->trade->gp; - qsaudit->char1_money.silver = this->trade->sp; - qsaudit->char1_money.copper = this->trade->cp; + qsaudit->char1_money.gold = this->trade->gp; + qsaudit->char1_money.silver = this->trade->sp; + qsaudit->char1_money.copper = this->trade->cp; } } @@ -506,7 +506,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) } else if(tradingWith && tradingWith->IsNPC()) { QSPlayerLogHandin_Struct* qsaudit = nullptr; - bool QSPLH = false; + bool QSPLH = false; // QS code if(qspack && RuleB(QueryServ, PlayerLogTrades)) { @@ -515,19 +515,19 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) qsaudit = (QSPlayerLogHandin_Struct*) qspack->pBuffer; QSPLH = true; - qsaudit->quest_id = 0; - qsaudit->char_id = character_id; - qsaudit->char_money.platinum = trade->pp; - qsaudit->char_money.gold = trade->gp; - qsaudit->char_money.silver = trade->sp; - qsaudit->char_money.copper = trade->cp; - qsaudit->char_count = 0; - qsaudit->npc_id = tradingWith->GetNPCTypeID(); - qsaudit->npc_money.platinum = 0; - qsaudit->npc_money.gold = 0; - qsaudit->npc_money.silver = 0; - qsaudit->npc_money.copper = 0; - qsaudit->npc_count = 0; + qsaudit->quest_id = 0; + qsaudit->char_id = character_id; + qsaudit->char_money.platinum = trade->pp; + qsaudit->char_money.gold = trade->gp; + qsaudit->char_money.silver = trade->sp; + qsaudit->char_money.copper = trade->cp; + qsaudit->char_count = 0; + qsaudit->npc_id = tradingWith->GetNPCTypeID(); + qsaudit->npc_money.platinum = 0; + qsaudit->npc_money.gold = 0; + qsaudit->npc_money.silver = 0; + qsaudit->npc_money.copper = 0; + qsaudit->npc_count = 0; } if(QSPLH) { // This can be incoporated below when revisions are made -U @@ -537,14 +537,14 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(trade_inst) { strcpy(qsaudit->items[qsaudit->char_count].action_type, "HANDIN"); - qsaudit->items[qsaudit->char_count].char_slot = slot_id; - qsaudit->items[qsaudit->char_count].item_id = trade_inst->GetID(); - qsaudit->items[qsaudit->char_count].charges = trade_inst->GetCharges(); - qsaudit->items[qsaudit->char_count].aug_1 = trade_inst->GetAugmentItemID(1); - qsaudit->items[qsaudit->char_count].aug_2 = trade_inst->GetAugmentItemID(2); - qsaudit->items[qsaudit->char_count].aug_3 = trade_inst->GetAugmentItemID(3); - qsaudit->items[qsaudit->char_count].aug_4 = trade_inst->GetAugmentItemID(4); - qsaudit->items[qsaudit->char_count++].aug_5 = trade_inst->GetAugmentItemID(5); + qsaudit->items[qsaudit->char_count].char_slot = slot_id; + qsaudit->items[qsaudit->char_count].item_id = trade_inst->GetID(); + qsaudit->items[qsaudit->char_count].charges = trade_inst->GetCharges(); + qsaudit->items[qsaudit->char_count].aug_1 = trade_inst->GetAugmentItemID(1); + qsaudit->items[qsaudit->char_count].aug_2 = trade_inst->GetAugmentItemID(2); + qsaudit->items[qsaudit->char_count].aug_3 = trade_inst->GetAugmentItemID(3); + qsaudit->items[qsaudit->char_count].aug_4 = trade_inst->GetAugmentItemID(4); + qsaudit->items[qsaudit->char_count++].aug_5 = trade_inst->GetAugmentItemID(5); if(trade_inst->IsType(ItemClassContainer)) { for(uint8 bag_idx = 0; bag_idx < trade_inst->GetItem()->BagSlots; bag_idx++) { @@ -553,14 +553,14 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(trade_baginst) { strcpy(qsaudit->items[qsaudit->char_count].action_type, "HANDIN"); - qsaudit->items[qsaudit->char_count].char_slot = Inventory::CalcSlotId(slot_id, bag_idx); - qsaudit->items[qsaudit->char_count].item_id = trade_baginst->GetID(); - qsaudit->items[qsaudit->char_count].charges = trade_baginst->GetCharges(); - qsaudit->items[qsaudit->char_count].aug_1 = trade_baginst->GetAugmentItemID(1); - qsaudit->items[qsaudit->char_count].aug_2 = trade_baginst->GetAugmentItemID(2); - qsaudit->items[qsaudit->char_count].aug_3 = trade_baginst->GetAugmentItemID(3); - qsaudit->items[qsaudit->char_count].aug_4 = trade_baginst->GetAugmentItemID(4); - qsaudit->items[qsaudit->char_count++].aug_5 = trade_baginst->GetAugmentItemID(5); + qsaudit->items[qsaudit->char_count].char_slot = Inventory::CalcSlotId(slot_id, bag_idx); + qsaudit->items[qsaudit->char_count].item_id = trade_baginst->GetID(); + qsaudit->items[qsaudit->char_count].charges = trade_baginst->GetCharges(); + qsaudit->items[qsaudit->char_count].aug_1 = trade_baginst->GetAugmentItemID(1); + qsaudit->items[qsaudit->char_count].aug_2 = trade_baginst->GetAugmentItemID(2); + qsaudit->items[qsaudit->char_count].aug_3 = trade_baginst->GetAugmentItemID(3); + qsaudit->items[qsaudit->char_count].aug_4 = trade_baginst->GetAugmentItemID(4); + qsaudit->items[qsaudit->char_count++].aug_5 = trade_baginst->GetAugmentItemID(5); } } } @@ -639,40 +639,40 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) snprintf(temp1, 100, "item%d.%d", z+1,tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%d",items[z]); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); snprintf(temp1, 100, "item%d.charges.%d", z+1,tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%d",charges[z]); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); snprintf(temp1, 100, "item%d.attuned.%d", z+1,tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%d",attuned[z]); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); } snprintf(temp1, 100, "copper.%d",tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%i",trade->cp); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); snprintf(temp1, 100, "silver.%d",tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%i",trade->sp); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); snprintf(temp1, 100, "gold.%d",tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%i",trade->gp); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); snprintf(temp1, 100, "platinum.%d",tradingWith->GetNPCTypeID()); snprintf(temp2, 100, "%i",trade->pp); parse->AddVar(temp1,temp2); - // memset(temp1,0x0,100); - // memset(temp2,0x0,100); - parse->EventNPC(EVENT_ITEM, tradingWith->CastToNPC(), this, "", 0); + // memset(temp1,0x0,100); + // memset(temp2,0x0,100); + parse->EventNPC(EVENT_ITEM, tradingWith->CastToNPC(), this, "", 0); } } } @@ -999,7 +999,7 @@ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){ item = this->GetInv().GetItem(SlotID); if(item && item->GetSerialNumber() == SerialNumber && - (item->GetCharges() >= Quantity || (item->GetCharges() <= 0 && Quantity == 1))){ + (item->GetCharges() >= Quantity || (item->GetCharges() <= 0 && Quantity == 1))){ return SlotID; } @@ -1007,7 +1007,7 @@ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){ } } _log(TRADING__CLIENT, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n", - SerialNumber , Quantity, this->GetName()); + SerialNumber , Quantity, this->GetName()); return 0; } @@ -1136,7 +1136,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client* } } _log(TRADING__CLIENT, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n",SerialNumber, - Quantity,this->GetName()); + Quantity,this->GetName()); } void Client::ReturnTraderReq(const EQApplicationPacket* app, int16 TraderItemCharges){ @@ -1145,7 +1145,7 @@ void Client::ReturnTraderReq(const EQApplicationPacket* app, int16 TraderItemCha EQApplicationPacket* outapp = new EQApplicationPacket(OP_TraderBuy, sizeof(TraderBuy_Struct)); - TraderBuy_Struct* outtbs = (TraderBuy_Struct*)outapp->pBuffer; + TraderBuy_Struct* outtbs = (TraderBuy_Struct*)outapp->pBuffer; memcpy(outtbs, tbs, app->size); @@ -1185,7 +1185,7 @@ void Client::TradeRequestFailed(const EQApplicationPacket* app) { static void BazaarAuditTrail(const char *Seller, const char *Buyer, const char *ItemName, int Quantity, int TotalCost, int TranType) { const char *AuditQuery="INSERT INTO `trader_audit` (`time`, `seller`, `buyer`, `itemname`, `quantity`, `totalcost`, `trantype`) " - "VALUES (NOW(), '%s', '%s', '%s', %i, %i, %i)"; + "VALUES (NOW(), '%s', '%s', '%s', %i, %i, %i)"; char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; @@ -1209,7 +1209,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs,Client* Trader,const EQApplicat EQApplicationPacket* outapp = new EQApplicationPacket(OP_Trader,sizeof(TraderBuy_Struct)); - TraderBuy_Struct* outtbs = (TraderBuy_Struct*)outapp->pBuffer; + TraderBuy_Struct* outtbs = (TraderBuy_Struct*)outapp->pBuffer; outtbs->ItemID = tbs->ItemID; @@ -1223,10 +1223,10 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs,Client* Trader,const EQApplicat } _log(TRADING__CLIENT, "Buyitem: Name: %s, IsStackable: %i, Requested Quantity: %i, Charges on Item %i", - BuyItem->GetItem()->Name, BuyItem->IsStackable(), tbs->Quantity, BuyItem->GetCharges()); + BuyItem->GetItem()->Name, BuyItem->IsStackable(), tbs->Quantity, BuyItem->GetCharges()); // If the item is not stackable, then we can only be buying one of them. if(!BuyItem->IsStackable()) - outtbs->Quantity = tbs->Quantity; + outtbs->Quantity = tbs->Quantity; else { // Stackable items, arrows, diamonds, etc int ItemCharges = BuyItem->GetCharges(); @@ -1371,8 +1371,8 @@ void Client::SendBazaarWelcome(){ row = mysql_fetch_row(result); - Message(10, "There are %i Buyers waiting to purchase your loot. Type /barter to search for them," - " or use /buyer to set up your own Buy Lines.", atoi(row[0])); + Message(10, "There are %i Buyers waiting to purchase your loot. Type /barter to search for them," + " or use /buyer to set up your own Buy Lines.", atoi(row[0])); } mysql_free_result(result); } @@ -1380,7 +1380,7 @@ void Client::SendBazaarWelcome(){ } void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint32 ItemStat, uint32 Slot, uint32 Type, - char Name[64], uint32 MinPrice, uint32 MaxPrice) { + char Name[64], uint32 MinPrice, uint32 MaxPrice) { char errbuf[MYSQL_ERRMSG_SIZE]; char* Query = 0; @@ -1419,16 +1419,16 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint Search.append(Tmp); } if(Class_ != 0xFFFFFFFF){ - sprintf(Tmp, " and mid(reverse(bin(items.classes)),%i,1)=1", Class_); - Search.append(Tmp); + sprintf(Tmp, " and mid(reverse(bin(items.classes)),%i,1)=1", Class_); + Search.append(Tmp); } if(Race!=0xFFFFFFFF){ - sprintf(Tmp, " and mid(reverse(bin(items.races)),%i,1)=1", Race); - Search.append(Tmp); + sprintf(Tmp, " and mid(reverse(bin(items.races)),%i,1)=1", Race); + Search.append(Tmp); } if(Slot!=0xFFFFFFFF){ - sprintf(Tmp, " and mid(reverse(bin(items.slots)),%i,1)=1", Slot + 1); - Search.append(Tmp); + sprintf(Tmp, " and mid(reverse(bin(items.slots)),%i,1)=1", Slot + 1); + Search.append(Tmp); } if(Type!=0xFFFFFFFF){ @@ -1574,7 +1574,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint Values.append(",sum(charges), items.stackable "); if (database.RunQuery(Query,MakeAnyLenString(&Query, "select %s from trader,items %s group by items.id,charges,char_id limit %i", - Values.c_str(),Search.c_str(), RuleI(Bazaar, MaxSearchResults)),errbuf,&Result)){ + Values.c_str(),Search.c_str(), RuleI(Bazaar, MaxSearchResults)),errbuf,&Result)){ _log(TRADING__CLIENT, "SRCH: %s", Query); safe_delete_array(Query); @@ -1584,7 +1584,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint if(mysql_num_rows(Result) == static_cast(RuleI(Bazaar, MaxSearchResults))) Message(15, "Your search reached the limit of %i results. Please narrow your search down by selecting more options.", - RuleI(Bazaar, MaxSearchResults)); + RuleI(Bazaar, MaxSearchResults)); if(mysql_num_rows(Result) == 0){ EQApplicationPacket* outapp2 = new EQApplicationPacket(OP_BazaarSearch, sizeof(BazaarReturnDone_Struct)); @@ -1692,7 +1692,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint } } -static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Struct* gis, uint32 ItemID) { +static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Struct* gis, uint32 ItemID) { // Send Item packets to the customer to update the Merchant window with the // new items for sale, and give them a message in their chat window. @@ -1727,7 +1727,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Str inst->SetMerchantCount(gis->Charges[i]); _log(TRADING__CLIENT, "Sending price update for %s, Serial No. %i with %i charges", - item->Name, gis->SerialNumber[i], gis->Charges[i]); + item->Name, gis->SerialNumber[i], gis->Charges[i]); Customer->SendItemPacket(30, inst, ItemPacketMerchant); } @@ -1736,7 +1736,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Str safe_delete(inst); } -static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_Struct* gis, uint32 ItemID, int32 Charges, uint32 NewPrice) { +static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_Struct* gis, uint32 ItemID, int32 Charges, uint32 NewPrice) { // Send ItemPackets to update the customer's Merchant window with the new price (or remove the item if // the new price is 0) and inform them with a chat message. @@ -1762,10 +1762,9 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_S for(int i = 0; i < 80; i++) { if(gis->ItemID[i] == ItemID) { - tdis->ItemID = gis->SerialNumber[i]; _log(TRADING__CLIENT, "Telling customer to remove item %i with %i charges and S/N %i", - ItemID, Charges, gis->SerialNumber[i]); + ItemID, Charges, gis->SerialNumber[i]); _pkt(TRADING__PACKETS, outapp); @@ -1796,7 +1795,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_S for(int i = 0; i < 80; i++) { if((gis->ItemID[i] != ItemID) || - ((!item->Stackable) && (gis->Charges[i] != Charges))) + ((!item->Stackable) && (gis->Charges[i] != Charges))) continue; inst->SetSerialNumber(gis->SerialNumber[i]); @@ -1804,7 +1803,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_S inst->SetMerchantSlot(gis->SerialNumber[i]); _log(TRADING__CLIENT, "Sending price update for %s, Serial No. %i with %i charges", - item->Name, gis->SerialNumber[i], gis->Charges[i]); + item->Name, gis->SerialNumber[i], gis->Charges[i]); Customer->SendItemPacket(30, inst, ItemPacketMerchant); } @@ -1820,7 +1819,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { TraderPriceUpdate_Struct* tpus = (TraderPriceUpdate_Struct*)app->pBuffer; _log(TRADING__CLIENT, "Received Price Update for %s, Item Serial No. %i, New Price %i", - GetName(), tpus->SerialNumber, tpus->NewPrice); + GetName(), tpus->SerialNumber, tpus->NewPrice); // Pull the items this Trader currently has for sale from the trader table. // @@ -1887,7 +1886,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { if((newgis->Items[i] > 0) && (newgis->SerialNumber[i] == tpus->SerialNumber)) { _log(TRADING__CLIENT, "Found new Item to Add, ItemID is %i, Charges is %i", newgis->Items[i], - newgis->Charges[i]); + newgis->Charges[i]); IDOfItemToAdd = newgis->Items[i]; ChargesOnItemToAdd = newgis->Charges[i]; @@ -1932,7 +1931,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { if(SameItemWithDifferingCharges) Message(13, "Warning: You have more than one %s with different charges. They have all been added for sale " - "at the same price.", item->Name); + "at the same price.", item->Name); } // Now put all Items with a matching ItemID up for trade. @@ -1950,15 +1949,15 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) { gis->ItemCost[i] = tpus->NewPrice; _log(TRADING__CLIENT, "Adding new item for %s. ItemID %i, SerialNumber %i, Charges %i, Price: %i, Slot %i", - GetName(), newgis->Items[i], newgis->SerialNumber[i], newgis->Charges[i], - tpus->NewPrice, i); + GetName(), newgis->Items[i], newgis->SerialNumber[i], newgis->Charges[i], + tpus->NewPrice, i); } } // If we have a customer currently browsing, update them with the new items. // if(CustomerID) - UpdateTraderCustomerItemsAdded(CustomerID, gis, IDOfItemToAdd); + UpdateTraderCustomerItemsAdded(CustomerID, gis, IDOfItemToAdd); safe_delete(gis); safe_delete(newgis); @@ -2029,7 +2028,7 @@ void Client::SendBuyerResults(char* SearchString, uint32 SearchID) { database.DoEscapeString(EscSearchString, SearchString, strlen(SearchString)); if (database.RunQuery(Query,MakeAnyLenString(&Query, "select * from buyer where itemname like '%%%s%%' order by charid limit %i", - EscSearchString, RuleI(Bazaar, MaxBarterSearchResults)), errbuf, &Result)) { + EscSearchString, RuleI(Bazaar, MaxBarterSearchResults)), errbuf, &Result)) { int NumberOfRows = mysql_num_rows(Result); @@ -2040,7 +2039,7 @@ void Client::SendBuyerResults(char* SearchString, uint32 SearchID) { Message(10, "There are %i Buy Lines.", NumberOfRows); else Message(10, "There are %i Buy Lines that match the search string '%s'.", - NumberOfRows, SearchString); + NumberOfRows, SearchString); } if(NumberOfRows == 0) { @@ -2082,19 +2081,19 @@ void Client::SendBuyerResults(char* SearchString, uint32 SearchID) { if(!Buyer) continue; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerSearchResults); // Command - VARSTRUCT_ENCODE_TYPE(uint32, Buf, SearchID); // Match up results with the request - VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); // Slot in this Buyer's list - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); // Unknown - probably a flag field - VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); // ItemID - VARSTRUCT_ENCODE_STRING( Buf, ItemName); // Itemname - VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); // Icon - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); // Quantity - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); // Unknown - probably a flag field - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); // Price - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Buyer->GetID()); // Entity ID - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Flag for + Items , probably ItemCount - VARSTRUCT_ENCODE_STRING( Buf, Buyer->GetName()); // Seller Name + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerSearchResults); // Command + VARSTRUCT_ENCODE_TYPE(uint32, Buf, SearchID); // Match up results with the request + VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); // Slot in this Buyer's list + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); // Unknown - probably a flag field + VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); // ItemID + VARSTRUCT_ENCODE_STRING(Buf, ItemName); // Itemname + VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); // Icon + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); // Quantity + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); // Unknown - probably a flag field + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); // Price + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Buyer->GetID()); // Entity ID + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Flag for + Items , probably ItemCount + VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); // Seller Name _pkt(TRADING__BARTER, outapp); @@ -2159,7 +2158,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) { MYSQL_ROW Row; if (database.RunQuery(Query,MakeAnyLenString(&Query, "select * from buyer where charid = %i", - Buyer->CharacterID()),errbuf,&Result)){ + Buyer->CharacterID()),errbuf,&Result)){ if(mysql_num_rows(Result) == 0) { @@ -2186,18 +2185,18 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) { if(!item) continue; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerInspectWindow); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // Flag - VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); - VARSTRUCT_ENCODE_STRING( Buf, ItemName); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // Flag - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Buyer->GetID()); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); - VARSTRUCT_ENCODE_STRING( Buf, Buyer->GetName()); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerInspectWindow); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // Flag + VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); + VARSTRUCT_ENCODE_STRING(Buf, ItemName); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // Flag + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Buyer->GetID()); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); + VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); _pkt(TRADING__BARTER, outapp); QueuePacket(outapp); @@ -2219,7 +2218,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { uint32 BuySlot = VARSTRUCT_DECODE_TYPE(uint32, Buf); uint32 UnknownByte = VARSTRUCT_DECODE_TYPE(uint8, Buf); uint32 ItemID = VARSTRUCT_DECODE_TYPE(uint32, Buf); - /* ItemName */ VARSTRUCT_DECODE_STRING(ItemName, Buf); + /* ItemName */ VARSTRUCT_DECODE_STRING(ItemName, Buf); /*uint32 Unknown2 =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused uint32 QtyBuyerWants = VARSTRUCT_DECODE_TYPE(uint32, Buf); UnknownByte = VARSTRUCT_DECODE_TYPE(uint8, Buf); @@ -2232,9 +2231,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(!item || !Quantity || !Price || !QtyBuyerWants) return; if(m_inv.HasItem(ItemID, Quantity, invWhereWorn|invWherePersonal|invWhereCursor) == SLOT_INVALID) { - Message(13, "You do not have %i %s on you.", Quantity, item->Name); - return; } @@ -2249,9 +2246,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { // For Stackable items, HasSpaceForItem will try check if there is space to stack with existing stacks in // the buyer inventory. if(!(Buyer->GetInv().HasSpaceForItem(item, Quantity))) { - - Message(13, "The Buyer does not have space for %i %s", Quantity, item->Name); - + Message(13, "The Buyer does not have space for %i %s", Quantity, item->Name); return; } @@ -2269,7 +2264,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(Buyer->CheckLoreConflict(item)) { Message(13, "That item is LORE and the Buyer already has one."); Buyer->Message(13, "%s tried to sell you %s but this item is LORE and you already have one.", - GetName(), item->Name); + GetName(), item->Name); return; } @@ -2293,7 +2288,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { break; } _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); - Message(13, "Internal error while processing transaction."); + Message(13, "Internal error while processing transaction."); return; } @@ -2301,7 +2296,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(!ItemToTransfer || !Buyer->MoveItemToInventory(ItemToTransfer, true)) { _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); - Message(13, "Internal error while processing transaction."); + Message(13, "Internal error while processing transaction."); if(ItemToTransfer) safe_delete(ItemToTransfer); @@ -2339,7 +2334,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(SellerSlot == SLOT_INVALID) { _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); - Message(13, "Internal error while processing transaction."); + Message(13, "Internal error while processing transaction."); return; } @@ -2347,7 +2342,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(!ItemToTransfer) { _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); - Message(13, "Internal error while processing transaction."); + Message(13, "Internal error while processing transaction."); return; } @@ -2359,7 +2354,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(!Buyer->MoveItemToInventory(ItemToTransfer, true)) { _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); - Message(13, "Internal error while processing transaction."); + Message(13, "Internal error while processing transaction."); safe_delete(ItemToTransfer); return; } @@ -2394,7 +2389,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { if(!Buyer->MoveItemToInventory(ItemToTransfer, true)) { _log(TRADING__BARTER, "Unexpected error while moving item from seller to buyer."); - Message(13, "Internal error while processing transaction."); + Message(13, "Internal error while processing transaction."); safe_delete(ItemToTransfer); return; } @@ -2404,9 +2399,9 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { EQApplicationPacket* outapp2 = new EQApplicationPacket(OP_DeleteItem,sizeof(MoveItem_Struct)); MoveItem_Struct* mis = (MoveItem_Struct*)outapp2->pBuffer; - mis->from_slot = SellerSlot; - mis->to_slot = 0xFFFFFFFF; - mis->number_in_stack = 0xFFFFFFFF; + mis->from_slot = SellerSlot; + mis->to_slot = 0xFFFFFFFF; + mis->number_in_stack = 0xFFFFFFFF; for(int i = 0; i < QuantityToRemoveFromStack; i++) QueuePacket(outapp2); @@ -2439,20 +2434,20 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { Buf = (char *)outapp->pBuffer; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_SellerTransactionComplete); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity * Price); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_SellerTransactionComplete); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity * Price); if(GetClientVersion() >= EQClientSoD) { - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Think this is the upper 32 bits of a 64 bit price + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Think this is the upper 32 bits of a 64 bit price } sprintf(Buf, "%s", Buyer->GetName()); Buf += 64; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); sprintf(Buf, "%s", ItemName); Buf += 64; @@ -2465,19 +2460,19 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { Buf = (char *)outapp->pBuffer; VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerTransactionComplete); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity * Price); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity * Price); if(Buyer->GetClientVersion() >= EQClientSoD) { - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Think this is the upper 32 bits of a 64 bit price + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); // Think this is the upper 32 bits of a 64 bit price } sprintf(Buf, "%s", GetName()); Buf += 64; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0x01); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x00); sprintf(Buf, "%s", ItemName); Buf += 64; @@ -2495,29 +2490,29 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { Buf = (char *)outapp3->pBuffer; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerInspectWindow); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // Unknown - VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); - VARSTRUCT_ENCODE_STRING( Buf, ItemName); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, QtyBuyerWants - Quantity); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerInspectWindow); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // Unknown + VARSTRUCT_ENCODE_TYPE(uint32, Buf,ItemID); + VARSTRUCT_ENCODE_STRING(Buf, ItemName); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, QtyBuyerWants - Quantity); // If the amount we have just sold completely satisfies the quantity the Buyer was looking for, // setting the next byte to 0 will remove the item from the Barter Window. // if(QtyBuyerWants - Quantity > 0) { - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // 0 = Toggle Off, 1 = Toggle On + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // 0 = Toggle Off, 1 = Toggle On } else { - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0); // 0 = Toggle Off, 1 = Toggle On + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0); // 0 = Toggle Off, 1 = Toggle On } - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Buyer->GetID()); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Buyer->GetID()); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); - VARSTRUCT_ENCODE_STRING( Buf, Buyer->GetName()); + VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); _pkt(TRADING__BARTER, outapp3); QueuePacket(outapp3); @@ -2530,26 +2525,26 @@ void Client::SellToBuyer(const EQApplicationPacket *app) { Buf = (char*)outapp4->pBuffer; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerItemUpdate); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); - VARSTRUCT_ENCODE_STRING( Buf, ItemName); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, QtyBuyerWants - Quantity); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerItemUpdate); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); + VARSTRUCT_ENCODE_STRING(Buf, ItemName); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, item->Icon); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, QtyBuyerWants - Quantity); if((QtyBuyerWants - Quantity) > 0) { - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // 0 = Toggle Off, 1 = Toggle On + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 1); // 0 = Toggle Off, 1 = Toggle On } else { - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0); // 0 = Toggle Off, 1 = Toggle On + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0); // 0 = Toggle Off, 1 = Toggle On } - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x08f4); // Unknown - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); - VARSTRUCT_ENCODE_STRING( Buf, Buyer->GetName()); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x08f4); // Unknown + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); + VARSTRUCT_ENCODE_STRING(Buf, Buyer->GetName()); _pkt(TRADING__BARTER, outapp4); Buyer->QueuePacket(outapp4); @@ -2616,12 +2611,12 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) { /*uint32 Action =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused uint32 BuySlot = VARSTRUCT_DECODE_TYPE(uint32, Buf); - uint8 Unknown009 = VARSTRUCT_DECODE_TYPE(uint8, Buf); + uint8 Unknown009 = VARSTRUCT_DECODE_TYPE(uint8, Buf); uint32 ItemID = VARSTRUCT_DECODE_TYPE(uint32, Buf); - /* ItemName */ VARSTRUCT_DECODE_STRING(ItemName, Buf); + /* ItemName */ VARSTRUCT_DECODE_STRING(ItemName, Buf); uint32 Icon = VARSTRUCT_DECODE_TYPE(uint32, Buf); uint32 Quantity = VARSTRUCT_DECODE_TYPE(uint32, Buf); - uint8 ToggleOnOff = VARSTRUCT_DECODE_TYPE(uint8, Buf); + uint8 ToggleOnOff = VARSTRUCT_DECODE_TYPE(uint8, Buf); uint32 Price = VARSTRUCT_DECODE_TYPE(uint32, Buf); /*uint32 UnknownZ =*/ VARSTRUCT_SKIP_TYPE(uint32, Buf); //unused uint32 ItemCount = VARSTRUCT_DECODE_TYPE(uint32, Buf); @@ -2633,7 +2628,7 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) { bool LoreConflict = CheckLoreConflict(item); _log(TRADING__BARTER, "UpdateBuyLine: Char: %s BuySlot: %i ItemID %i %s Quantity %i Toggle: %i Price %i ItemCount %i LoreConflict %i", - GetName(), BuySlot, ItemID, item->Name, Quantity, ToggleOnOff, Price, ItemCount, LoreConflict); + GetName(), BuySlot, ItemID, item->Name, Quantity, ToggleOnOff, Price, ItemCount, LoreConflict); if((item->NoDrop != 0) && !LoreConflict && (Quantity > 0) && HasMoney(Quantity * Price) && ToggleOnOff && (ItemCount == 0)) { _log(TRADING__BARTER, "Adding to database"); @@ -2663,18 +2658,18 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) { Buf = (char*)outapp->pBuffer; - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerItemUpdate); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, Unknown009); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); - VARSTRUCT_ENCODE_STRING( Buf, ItemName); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Icon); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); - VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0); // Toggle the Buy Line off in the client - VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x08f4); // Unknown - VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); - VARSTRUCT_ENCODE_STRING( Buf, GetName()); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerItemUpdate); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, BuySlot); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, Unknown009); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, ItemID); + VARSTRUCT_ENCODE_STRING(Buf, ItemName); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Icon); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Quantity); + VARSTRUCT_ENCODE_TYPE(uint8, Buf, 0); // Toggle the Buy Line off in the client + VARSTRUCT_ENCODE_TYPE(uint32, Buf, Price); + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0x08f4); // Unknown + VARSTRUCT_ENCODE_TYPE(uint32, Buf, 0); + VARSTRUCT_ENCODE_STRING(Buf, GetName()); _pkt(TRADING__BARTER, outapp); QueuePacket(outapp); @@ -2726,7 +2721,7 @@ void Client::BuyerItemSearch(const EQApplicationPacket *app) { } if (Count == MAX_BUYER_ITEMSEARCH_RESULTS) Message(15, "Your search returned more than %i results. Only the first %i are displayed.", - MAX_BUYER_ITEMSEARCH_RESULTS, MAX_BUYER_ITEMSEARCH_RESULTS); + MAX_BUYER_ITEMSEARCH_RESULTS, MAX_BUYER_ITEMSEARCH_RESULTS); bisr->Action = Barter_BuyerSearch; bisr->ResultCount = Count; diff --git a/zone/trap.cpp b/zone/trap.cpp index db118dca0..45f67e94c 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/types.h" @@ -26,21 +26,21 @@ Schema: CREATE TABLE traps ( - id int(11) NOT nullptr auto_increment, - zone varchar(16) NOT nullptr default '', - x int(11) NOT nullptr default '0', - y int(11) NOT nullptr default '0', - z int(11) NOT nullptr default '0', - chance tinyint NOT nullptr default '0', - maxzdiff float NOT nullptr default '0', - radius float NOT nullptr default '0', - effect int(11) NOT nullptr default '0', - effectvalue int(11) NOT nullptr default '0', - effectvalue2 int(11) NOT nullptr default '0', - message varcahr(200) NOT nullptr; - skill int(11) NOT nullptr default '0', - spawnchance int(11) NOT nullptr default '0', - PRIMARY KEY (id) + id int(11) NOT nullptr auto_increment, + zone varchar(16) NOT nullptr default '', + x int(11) NOT nullptr default '0', + y int(11) NOT nullptr default '0', + z int(11) NOT nullptr default '0', + chance tinyint NOT nullptr default '0', + maxzdiff float NOT nullptr default '0', + radius float NOT nullptr default '0', + effect int(11) NOT nullptr default '0', + effectvalue int(11) NOT nullptr default '0', + effectvalue2 int(11) NOT nullptr default '0', + message varcahr(200) NOT nullptr; + skill int(11) NOT nullptr default '0', + spawnchance int(11) NOT nullptr default '0', + PRIMARY KEY (id) ) TYPE=MyISAM; @@ -143,7 +143,7 @@ void Trap::Trigger(Mob* trigger) { if ((tmp = database.GetNPCType(effectvalue))) { - NPC* new_npc = new NPC(tmp, 0, x-5+MakeRandomInt(0, 10), y-5+MakeRandomInt(0, 10), z-5+MakeRandomInt(0, 10), MakeRandomInt(0, 249), FlyMode3); + NPC* new_npc = new NPC(tmp, 0, x-5+MakeRandomInt(0, 10), y-5+MakeRandomInt(0, 10), z-5+MakeRandomInt(0, 10), MakeRandomInt(0, 249), FlyMode3); new_npc->AddLootTable(); entity_list.AddNPC(new_npc); new_npc->AddToHateList(trigger,1); @@ -164,7 +164,7 @@ void Trap::Trigger(Mob* trigger) { if ((tmp = database.GetNPCType(effectvalue))) { - NPC* new_npc = new NPC(tmp, 0, x-2+MakeRandomInt(0, 5), y-2+MakeRandomInt(0, 5), z-2+MakeRandomInt(0, 5), MakeRandomInt(0, 249), FlyMode3); + NPC* new_npc = new NPC(tmp, 0, x-2+MakeRandomInt(0, 5), y-2+MakeRandomInt(0, 5), z-2+MakeRandomInt(0, 5), MakeRandomInt(0, 249), FlyMode3); new_npc->AddLootTable(); entity_list.AddNPC(new_npc); new_npc->AddToHateList(trigger,1); @@ -266,9 +266,9 @@ Mob* EntityList::GetTrapTrigger(Trap* trap) { //todo: rewrite this to not need direct access to trap members. bool ZoneDatabase::LoadTraps(const char* zonename, int16 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; // int char_num = 0; unsigned long* lengths; @@ -327,7 +327,7 @@ void Trap::CreateHiddenTrigger() make_npc->npc_spells_id = 0; make_npc->d_meele_texture1 = 0; make_npc->d_meele_texture2 = 0; - make_npc->trackable = 0; + make_npc->trackable = 0; make_npc->level = level; strcpy(make_npc->npc_attacks, "ABHG"); NPC* npca = new NPC(make_npc, 0, x, y, z, 0, FlyMode3); diff --git a/zone/trap.h b/zone/trap.h index b5de69748..ad2e2171a 100644 --- a/zone/trap.h +++ b/zone/trap.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _TRAP_H #define _TRAP_H @@ -40,7 +40,7 @@ public: Trap(); virtual ~Trap(); virtual bool Process(); - virtual bool IsTrap() const { return true; } + virtual bool IsTrap() const { return true; } void Trigger(Mob* trigger); void SpellOnTarget(Mob* trigger, uint32 spell_id); diff --git a/zone/tribute.cpp b/zone/tribute.cpp index 45f9bffac..9d864a72d 100644 --- a/zone/tribute.cpp +++ b/zone/tribute.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/eq_packet_structs.h" @@ -36,7 +36,7 @@ using namespace std; #define vsnprintf _vsnprintf #endif #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #else #include #include @@ -384,8 +384,8 @@ void Client::SendGuildTributes() { bool ZoneDatabase::LoadTributes() { char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; TributeData t; memset(&t.tiers, 0, sizeof(t.tiers)); diff --git a/zone/updatemgr.cpp b/zone/updatemgr.cpp index 106a51978..bc155ed04 100644 --- a/zone/updatemgr.cpp +++ b/zone/updatemgr.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/features.h" @@ -31,13 +31,12 @@ const float UpdateManager::level_distances2[UPDATE_LEVELS] //delay between sending packets in each level, in ms //its best if they are all multiples of UPDATE_RESOLUTION //these values are pulled out of my ass, should be tuned some day -const uint32 UpdateManager::level_timers[UPDATE_LEVELS+1] - = { UPDATE_RESOLUTION, //.3s - 2*UPDATE_RESOLUTION, //.6s +const uint32 UpdateManager::level_timers[UPDATE_LEVELS+1] = { UPDATE_RESOLUTION, //.3s + 2*UPDATE_RESOLUTION, //.6s 3*UPDATE_RESOLUTION, //.9s 9*UPDATE_RESOLUTION, //~2s 34*UPDATE_RESOLUTION //~10s - }; + }; /* @@ -186,9 +185,3 @@ if(level > 0) #endif //PACKET_UPDATE_MANAGER - - - - - - diff --git a/zone/updatemgr.h b/zone/updatemgr.h index df6a7c375..b024e5db6 100644 --- a/zone/updatemgr.h +++ b/zone/updatemgr.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef UPDATE_MANAGER_H #define UPDATE_MANAGER_H diff --git a/zone/watermap.cpp b/zone/watermap.cpp index d42bc21de..4eafe30fb 100644 --- a/zone/watermap.cpp +++ b/zone/watermap.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2008 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2008 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -25,7 +25,7 @@ #include "watermap.h" #include "../common/MiscFunctions.h" #ifdef _WINDOWS -#define snprintf _snprintf +#define snprintf _snprintf #endif @@ -49,8 +49,8 @@ WaterRegionType WaterMap::BSPReturnRegionType(int32 node_number, float y, float // Are we at a leaf - if((current_node->left==0)&& - (current_node->right==0)) { + if ((current_node->left==0) && + (current_node->right==0)) { return (WaterRegionType) current_node->special; } @@ -59,30 +59,28 @@ WaterRegionType WaterMap::BSPReturnRegionType(int32 node_number, float y, float // distance = (x * current_node->normal[0]) + - (y * current_node->normal[1]) + - (z * current_node->normal[2]) + - current_node->splitdistance; + (y * current_node->normal[1]) + + (z * current_node->normal[2]) + + current_node->splitdistance; // If we are exactly on the split plane, I don't know what should happen. // if(distance == 0.0f) { - return(RegionTypeNormal); + return(RegionTypeNormal); } if(distance >0.0f) { - if(current_node->left==0) { - // This shouldn't happen - return(RegionTypeNormal); - } - return BSPReturnRegionType( current_node->left, - y, x, z); + if(current_node->left==0) { + // This shouldn't happen + return(RegionTypeNormal); + } + return BSPReturnRegionType(current_node->left, y, x, z); } if(current_node->right==0) { - // This should't happen - return(RegionTypeNormal); + // This should't happen + return(RegionTypeNormal); } - return BSPReturnRegionType(current_node->right, - y, x, z); + return BSPReturnRegionType(current_node->right, y, x, z); } bool WaterMap::InWater(float y, float x, float z) const { @@ -158,7 +156,7 @@ bool WaterMap::loadWaterMap(FILE *fp) { return(false); } if(strncmp(EQWMagic,"EQEMUWATER",10)) { - printf("Bad header in Water region map.\n"); + printf("Bad header in Water region map.\n"); return(false); } if(fread(&EQWVersion, sizeof(EQWVersion), 1, fp)!=1) { diff --git a/zone/watermap.h b/zone/watermap.h index dc8b56d8b..c3b36483b 100644 --- a/zone/watermap.h +++ b/zone/watermap.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2008 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2008 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which - are required to give you total support for your newly bought product; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which + are required to give you total support for your newly bought product; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WATERMAP_H #define WATERMAP_H @@ -22,23 +22,23 @@ #pragma pack(1) typedef struct ZBSP_Node { - int32 node_number; - float normal[3], splitdistance; - int32 region; - int32 special; - int32 left, right; + int32 node_number; + float normal[3], splitdistance; + int32 region; + int32 special; + int32 left, right; } ZBSP_Node; #pragma pack() typedef enum { RegionTypeUnsupported = -2, RegionTypeUntagged = -1, - RegionTypeNormal = 0, - RegionTypeWater = 1, - RegionTypeLava = 2, + RegionTypeNormal = 0, + RegionTypeWater = 1, + RegionTypeLava = 2, RegionTypeZoneLine = 3, RegionTypePVP = 4, - RegionTypeSlime = 5, + RegionTypeSlime = 5, RegionTypeIce = 6, RegionTypeVWater =7 } WaterRegionType; @@ -46,11 +46,11 @@ typedef enum { class WaterMap { public: - static WaterMap* LoadWaterMapfile(const char* in_zonename, const char *directory = nullptr); - WaterRegionType BSPReturnRegionType(int32 node_number, float y, float x, float z) const; - bool InWater(float y, float x, float z) const; - bool InVWater(float y, float x, float z) const; - bool InLava(float y, float x, float z) const; + static WaterMap* LoadWaterMapfile(const char* in_zonename, const char *directory = nullptr); + WaterRegionType BSPReturnRegionType(int32 node_number, float y, float x, float z) const; + bool InWater(float y, float x, float z) const; + bool InVWater(float y, float x, float z) const; + bool InLava(float y, float x, float z) const; bool InLiquid(float y, float x, float z) const; WaterMap(); diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp index 1d40bef8c..42dd23007 100644 --- a/zone/waypoints.cpp +++ b/zone/waypoints.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #ifdef _EQDEBUG @@ -127,7 +127,7 @@ void NPC::ResumeWandering() char temp[100]; itoa(cur_wp,temp,10); //do this before updating to next waypoint CalculateNewWaypoint(); - SetAppearance(eaStanding, false); + SetAppearance(eaStanding, false); parse->EventNPC(EVENT_WAYPOINT_DEPART, this, nullptr, temp, 0); } // if not currently at a waypoint, we continue on to the one we were headed to before the stop } @@ -206,9 +206,9 @@ void NPC::MoveTo(float mtx, float mty, float mtz, float mth, bool saveguardspot) cur_wp_z = mtz; cur_wp_pause = 0; cur_wp_heading = mth; - pLastFightingDelayMoving = 0; - if(AIwalking_timer->Enabled()) - AIwalking_timer->Start(100); + pLastFightingDelayMoving = 0; + if(AIwalking_timer->Enabled()) + AIwalking_timer->Start(100); } void NPC::UpdateWaypoint(int wp_index) @@ -233,7 +233,7 @@ void NPC::UpdateWaypoint(int wp_index) { if(!RuleB(Watermap, CheckForWaterAtWaypoints) || !zone->HasWaterMap() || - (zone->HasWaterMap() && !zone->watermap->InWater(cur_wp_x, cur_wp_y, cur_wp_z))) + (zone->HasWaterMap() && !zone->watermap->InWater(cur_wp_x, cur_wp_y, cur_wp_z))) { VERTEX dest(cur_wp_x, cur_wp_y, cur_wp_z); @@ -413,27 +413,27 @@ void NPC::GetClosestWaypoint(list &wp_list, int count, float m_x, float void NPC::SetWaypointPause() { - //Declare time to wait on current WP + //Declare time to wait on current WP - if (cur_wp_pause == 0) { - AIwalking_timer->Start(100); - } - else - { + if (cur_wp_pause == 0) { + AIwalking_timer->Start(100); + } + else + { - switch (pausetype) - { - case 0: //Random Half - AIwalking_timer->Start((cur_wp_pause - MakeRandomInt(0, cur_wp_pause-1)/2)*1000); - break; - case 1: //Full - AIwalking_timer->Start(cur_wp_pause*1000); - break; - case 2: //Random Full - AIwalking_timer->Start(MakeRandomInt(0, cur_wp_pause-1)*1000); - break; - } - } + switch (pausetype) + { + case 0: //Random Half + AIwalking_timer->Start((cur_wp_pause - MakeRandomInt(0, cur_wp_pause-1)/2)*1000); + break; + case 1: //Full + AIwalking_timer->Start(cur_wp_pause*1000); + break; + case 2: //Random Full + AIwalking_timer->Start(MakeRandomInt(0, cur_wp_pause-1)*1000); + break; + } + } } void NPC::SaveGuardSpot(bool iClearGuardSpot) { @@ -474,26 +474,26 @@ void NPC::NextGuardPosition() { /* // we need this for charmed NPCs void Mob::SaveSpawnSpot() { - spawn_x = x_pos; - spawn_y = y_pos; - spawn_z = z_pos; - spawn_heading = heading; + spawn_x = x_pos; + spawn_y = y_pos; + spawn_z = z_pos; + spawn_heading = heading; }*/ /*float Mob::CalculateDistanceToNextWaypoint() { - return CalculateDistance(cur_wp_x, cur_wp_y, cur_wp_z); + return CalculateDistance(cur_wp_x, cur_wp_y, cur_wp_z); }*/ float Mob::CalculateDistance(float x, float y, float z) { - return (float)sqrtf( ((x_pos-x)*(x_pos-x)) + ((y_pos-y)*(y_pos-y)) + ((z_pos-z)*(z_pos-z)) ); + return (float)sqrtf( ((x_pos-x)*(x_pos-x)) + ((y_pos-y)*(y_pos-y)) + ((z_pos-z)*(z_pos-z)) ); } /* uint8 NPC::CalculateHeadingToNextWaypoint() { - return CalculateHeadingToTarget(cur_wp_x, cur_wp_y); + return CalculateHeadingToTarget(cur_wp_x, cur_wp_y); } */ float Mob::CalculateHeadingToTarget(float in_x, float in_y) { @@ -541,7 +541,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b return true; } - int compare_steps = IsBoat() ? 1 : 20; + int compare_steps = IsBoat() ? 1 : 20; if(tar_ndx < compare_steps && tarx==x && tary==y){ x_pos = x_pos + tar_vx*tar_vector; y_pos = y_pos + tar_vy*tar_vector; @@ -560,7 +560,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b if(!NPCFlyMode && checkZ && zone->HasMap() && RuleB(Map, FixPathingZWhenMoving)) { if(!RuleB(Watermap, CheckForWaterWhenMoving) || !zone->HasWaterMap() || - (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) + (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) { VERTEX dest(x_pos, y_pos, z_pos); @@ -598,8 +598,8 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b tarz=z; float nx = this->x_pos; - float ny = this->y_pos; - float nz = this->z_pos; + float ny = this->y_pos; + float nz = this->z_pos; // float nh = this->heading; tar_vx = x - nx; @@ -638,7 +638,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b heading = CalculateHeadingToTarget(x, y); mlog(AI__WAYPOINTS, "Next position2 (%.3f, %.3f, %.3f) (%d steps)", x_pos, y_pos, z_pos, numsteps); } - else + else { x_pos = x; y_pos = y; @@ -669,7 +669,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b if(!NPCFlyMode && checkZ && zone->HasMap() && RuleB(Map, FixPathingZWhenMoving)) { if(!RuleB(Watermap, CheckForWaterWhenMoving) || !zone->HasWaterMap() || - (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) + (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) { VERTEX dest(x_pos, y_pos, z_pos); @@ -688,7 +688,7 @@ bool Mob::MakeNewPositionAndSendUpdate(float x, float y, float z, float speed, b } else z_pos = newz+1; - } + } } } @@ -725,14 +725,14 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec _ZP(Mob_CalculateNewPosition); - float nx = x_pos; - float ny = y_pos; - float nz = z_pos; + float nx = x_pos; + float ny = y_pos; + float nz = z_pos; // float nh = heading; - // if NPC is rooted - if (speed == 0.0) { - SetHeading(CalculateHeadingToTarget(x, y)); + // if NPC is rooted + if (speed == 0.0) { + SetHeading(CalculateHeadingToTarget(x, y)); if(moved){ SendPosition(); SetMoving(false); @@ -740,8 +740,8 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec } SetRunAnimSpeed(0); mlog(AI__WAYPOINTS, "Rooted while calculating new position to (%.3f, %.3f, %.3f)", x, y, z); - return true; - } + return true; + } float old_test_vector=test_vector; tar_vx = x - nx; @@ -786,7 +786,7 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec if(!NPCFlyMode && checkZ && zone->HasMap() && RuleB(Map, FixPathingZWhenMoving)) { if(!RuleB(Watermap, CheckForWaterWhenMoving) || !zone->HasWaterMap() || - (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) + (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) { VERTEX dest(x_pos, y_pos, z_pos); @@ -822,10 +822,10 @@ bool Mob::CalculateNewPosition(float x, float y, float z, float speed, bool chec } tar_ndx++; - // now get new heading + // now get new heading SetAppearance(eaStanding, false); // make sure they're standing - pLastChange = Timer::GetCurrentTime(); - return true; + pLastChange = Timer::GetCurrentTime(); + return true; } void NPC::AssignWaypoints(int32 grid) { @@ -841,7 +841,7 @@ void NPC::AssignWaypoints(int32 grid) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; bool GridErr = false, WPErr = false; Waypoints.clear(); @@ -850,19 +850,19 @@ void NPC::AssignWaypoints(int32 grid) { if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT `type`,`type2` FROM `grid` WHERE `id`=%i AND `zoneid`=%i",grid,zone->GetZoneID()),errbuf, &result)) { if((row = mysql_fetch_row(result))) - { - if(row[0] != 0) - wandertype = atoi(row[0]); + { + if(row[0] != 0) + wandertype = atoi(row[0]); else wandertype = 0; if(row[1] != 0) pausetype = atoi(row[1]); else pausetype = 0; - } - else // No grid record found in this zone for the given ID + } + else // No grid record found in this zone for the given ID GridErr = true; - mysql_free_result(result); + mysql_free_result(result); } else // DB query error! { @@ -873,21 +873,21 @@ void NPC::AssignWaypoints(int32 grid) { if(!GridErr) { - this->CastToNPC()->SetGrid(grid); // Assign grid number - adverrorinfo = 7561; + this->CastToNPC()->SetGrid(grid); // Assign grid number + adverrorinfo = 7561; - // Retrieve all waypoints for this grid - if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT `x`,`y`,`z`,`pause`,`heading` FROM grid_entries WHERE `gridid`=%i AND `zoneid`=%i ORDER BY `number`",grid,zone->GetZoneID()),errbuf,&result)) - { - roamer = true; + // Retrieve all waypoints for this grid + if(database.RunQuery(query,MakeAnyLenString(&query,"SELECT `x`,`y`,`z`,`pause`,`heading` FROM grid_entries WHERE `gridid`=%i AND `zoneid`=%i ORDER BY `number`",grid,zone->GetZoneID()),errbuf,&result)) + { + roamer = true; max_wp = -1; // Initialize it; will increment it for each waypoint successfully added to the list adverrorinfo = 7564; while((row = mysql_fetch_row(result))) { - if(row[0] != 0 && row[1] != 0 && row[2] != 0 && row[3] != 0) - { - wplist newwp; + if(row[0] != 0 && row[1] != 0 && row[2] != 0 && row[3] != 0) + { + wplist newwp; newwp.index = ++max_wp; newwp.x = atof(row[0]); newwp.y = atof(row[1]); @@ -910,23 +910,23 @@ void NPC::AssignWaypoints(int32 grid) { newwp.pause = atoi(row[3]); newwp.heading = atof(row[4]); Waypoints.push_back(newwp); - } + } } mysql_free_result(result); - } - else // DB query error! - { - WPErr = true; + } + else // DB query error! + { + WPErr = true; LogFile->write(EQEMuLog::Error, "MySQL Error while trying to assign waypoints from grid %u to mob %s: %s", grid, name, errbuf); - } - safe_delete_array(query); + } + safe_delete_array(query); } // end if (!GridErr) if(Waypoints.size() < 2) { roamer = false; } else if(!GridErr && !WPErr) { - UpdateWaypoint(0); - SetWaypointPause(); - if (wandertype == 1 || wandertype == 2 || wandertype == 5) + UpdateWaypoint(0); + SetWaypointPause(); + if (wandertype == 1 || wandertype == 2 || wandertype == 5) CalculateNewWaypoint(); } else { roamer = false; @@ -947,7 +947,7 @@ void Mob::SendTo(float new_x, float new_y, float new_z) { if(zone->HasMap() && RuleB(Map, FixPathingZOnSendTo) ) { if(!RuleB(Watermap, CheckForWaterOnSendTo) || !zone->HasWaterMap() || - (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) + (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) { VERTEX dest(x_pos, y_pos, z_pos); @@ -974,7 +974,7 @@ void Mob::SendToFixZ(float new_x, float new_y, float new_z) { if(zone->HasMap() && RuleB(Map, FixPathingZOnSendTo)) { if(!RuleB(Watermap, CheckForWaterOnSendTo) || !zone->HasWaterMap() || - (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) + (zone->HasWaterMap() && !zone->watermap->InWater(x_pos, y_pos, z_pos))) { VERTEX dest(x_pos, y_pos, z_pos); @@ -1225,7 +1225,7 @@ void ZoneDatabase::AddWP(Client *c, uint32 gridid, uint32 wpnum, float xpos, flo /********** -* ModifyWP() has been obsoleted. The #wp command either uses AddWP() or DeleteWaypoint() +* ModifyWP() has been obsoleted. The #wp command either uses AddWP() or DeleteWaypoint() ***********/ /****************** @@ -1253,32 +1253,32 @@ void ZoneDatabase::DeleteWaypoint(Client *c, uint32 grid_num, uint32 wp_num, uin * AddWPForSpawn - Used by the #wpadd command - for a given spawn, this will add a new waypoint to whatever grid that spawn is assigned to. * If there is currently no grid assigned to the spawn, a new grid will be created using the next available Grid ID number for the zone * the spawn is in. -* Returns 0 if the function didn't have to create a new grid. If the function had to create a new grid for the spawn, then the ID of +* Returns 0 if the function didn't have to create a new grid. If the function had to create a new grid for the spawn, then the ID of * the created grid is returned. */ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float ypos, float zpos, uint32 pause, int type1, int type2, uint16 zoneid, float heading) { char *query = 0; - uint32 grid_num, // The grid number the spawn is assigned to (if spawn has no grid, will be the grid number we end up creating) + uint32 grid_num, // The grid number the spawn is assigned to (if spawn has no grid, will be the grid number we end up creating) next_wp_num; // The waypoint number we should be assigning to the new waypoint - bool CreatedNewGrid; // Did we create a new grid in this function? - MYSQL_RES *result; - MYSQL_ROW row; + bool CreatedNewGrid; // Did we create a new grid in this function? + MYSQL_RES *result; + MYSQL_ROW row; char errbuf[MYSQL_ERRMSG_SIZE]; // See what grid number our spawn is assigned if(RunQuery(query, MakeAnyLenString(&query,"SELECT pathgrid FROM spawn2 WHERE id=%i",spawn2id),errbuf,&result)) { - safe_delete_array(query); - if(mysql_num_rows(result) > 0) - { + safe_delete_array(query); + if(mysql_num_rows(result) > 0) + { row = mysql_fetch_row(result); grid_num = atoi(row[0]); - } - else // This spawn ID was not found in the `spawn2` table + } + else // This spawn ID was not found in the `spawn2` table return 0; - mysql_free_result(result); + mysql_free_result(result); } else { // Query error LogFile->write(EQEMuLog::Error, "Error setting pathgrid '%s': '%s'", query, errbuf); @@ -1287,21 +1287,21 @@ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float if (grid_num == 0) // Our spawn doesn't have a grid assigned to it -- we need to create a new grid and assign it to the spawn { - CreatedNewGrid = true; - if((grid_num = GetFreeGrid(zoneid)) == 0) // There are no grids for the current zone -- create Grid #1 + CreatedNewGrid = true; + if((grid_num = GetFreeGrid(zoneid)) == 0) // There are no grids for the current zone -- create Grid #1 grid_num = 1; - if(!RunQuery(query, MakeAnyLenString(&query,"insert into grid set id='%i',zoneid= %i, type='%i', type2='%i'",grid_num,zoneid,type1,type2), errbuf)) { + if(!RunQuery(query, MakeAnyLenString(&query,"insert into grid set id='%i',zoneid= %i, type='%i', type2='%i'",grid_num,zoneid,type1,type2), errbuf)) { LogFile->write(EQEMuLog::Error, "Error adding grid '%s': '%s'", query, errbuf); - } else { + } else { if(c) c->LogSQL(query); } - safe_delete_array(query); + safe_delete_array(query); - query = 0; - if(!RunQuery(query, MakeAnyLenString(&query,"update spawn2 set pathgrid='%i' where id='%i'",grid_num,spawn2id), errbuf)) { + query = 0; + if(!RunQuery(query, MakeAnyLenString(&query,"update spawn2 set pathgrid='%i' where id='%i'",grid_num,spawn2id), errbuf)) { LogFile->write(EQEMuLog::Error, "Error updating spawn2 pathing '%s': '%s'", query, errbuf); - } else { + } else { if(c) c->LogSQL(query); } safe_delete_array(query); @@ -1314,14 +1314,14 @@ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float query = 0; if(RunQuery(query, MakeAnyLenString(&query,"SELECT max(`number`) FROM grid_entries WHERE zoneid='%i' AND gridid='%i'",zoneid,grid_num),errbuf,&result)) { - safe_delete_array(query); - row = mysql_fetch_row(result); - if(row[0] != 0) + safe_delete_array(query); + row = mysql_fetch_row(result); + if(row[0] != 0) next_wp_num = atoi(row[0]) + 1; - else // No waypoints in this grid yet + else // No waypoints in this grid yet next_wp_num = 1; - mysql_free_result(result); + mysql_free_result(result); } else { // Query error LogFile->write(EQEMuLog::Error, "Error getting next waypoint id '%s': '%s'", query, errbuf); @@ -1344,10 +1344,10 @@ uint32 ZoneDatabase::AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float uint32 ZoneDatabase::GetFreeGrid(uint16 zoneid) { - char *query = 0; + char *query = 0; char errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query,"SELECT max(id) from grid where zoneid = %i",zoneid),errbuf,&result)) { safe_delete_array(query); if (mysql_num_rows(result) == 1) { diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index abafb6ae4..3e77a093a 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator -Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -57,7 +57,7 @@ using namespace std; #include "QGlobals.h" -extern EntityList entity_list; +extern EntityList entity_list; extern Zone* zone; extern volatile bool ZoneLoaded; extern void CatchSignal(int); @@ -126,7 +126,7 @@ void WorldServer::OnConnected() { this->SetZone(zone->GetZoneID(), zone->GetInstanceID()); entity_list.UpdateWho(true); this->SendEmoteMessage(0, 0, 15, "Zone connect: %s", zone->GetLongName()); - zone->GetTimeSync(); + zone->GetTimeSync(); } else { this->SetZone(0); } @@ -389,8 +389,8 @@ void WorldServer::Process() { } else { #ifdef _EQDEBUG - _log(ZONE__WORLD, "Error: WhoAllReturnStruct did not point to a valid client! " - "id=%i, playerineqstring=%i, playersinzonestring=%i. Dumping WhoAllReturnStruct:", + _log(ZONE__WORLD, "Error: WhoAllReturnStruct did not point to a valid client! " + "id=%i, playerineqstring=%i, playersinzonestring=%i. Dumping WhoAllReturnStruct:", wars->id, wars->playerineqstring, wars->playersinzonestring); #endif } @@ -683,10 +683,10 @@ void WorldServer::Process() { //pendingrezexp is the amount of XP on the corpse. Setting it to a value >= 0 //also serves to inform Client::OPRezzAnswer to expect a packet. client->SetPendingRezzData(srs->exp, srs->dbid, srs->rez.spellid, srs->rez.corpse_name); - _log(SPELLS__REZ, "OP_RezzRequest in zone %s for %s, spellid:%i", - zone->GetShortName(), client->GetName(), srs->rez.spellid); + _log(SPELLS__REZ, "OP_RezzRequest in zone %s for %s, spellid:%i", + zone->GetShortName(), client->GetName(), srs->rez.spellid); EQApplicationPacket* outapp = new EQApplicationPacket(OP_RezzRequest, - sizeof(Resurrect_Struct)); + sizeof(Resurrect_Struct)); memcpy(outapp->pBuffer, &srs->rez, sizeof(Resurrect_Struct)); client->QueuePacket(outapp); _pkt(SPELLS__REZ, outapp); @@ -700,7 +700,7 @@ void WorldServer::Process() { Corpse* corpse = entity_list.GetCorpseByName(srs->rez.corpse_name); if (corpse && corpse->IsCorpse()) { _log(SPELLS__REZ, "OP_RezzComplete received in zone %s for corpse %s", - zone->GetShortName(), srs->rez.corpse_name); + zone->GetShortName(), srs->rez.corpse_name); _log(SPELLS__REZ, "Found corpse. Marking corpse as rezzed."); // I don't know why Rezzed is not set to true in CompleteRezz(). @@ -829,7 +829,7 @@ void WorldServer::Process() { } break; } - case ServerOP_GroupInvite: { + case ServerOP_GroupInvite: { // A player in another zone invited a player in this zone to join their group. // GroupInvite_Struct* gis = (GroupInvite_Struct*)pack->pBuffer; @@ -877,25 +877,25 @@ void WorldServer::Process() { group->UpdateGroupAAs(); - if(Inviter->CastToClient()->GetClientVersion() < EQClientSoD) - { - EQApplicationPacket* outapp=new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); - GroupJoin_Struct* outgj=(GroupJoin_Struct*)outapp->pBuffer; - strcpy(outgj->membername, Inviter->GetName()); - strcpy(outgj->yourname, Inviter->GetName()); - outgj->action = groupActInviteInitial; // 'You have formed the group'. - group->GetGroupAAs(&outgj->leader_aas); - Inviter->CastToClient()->QueuePacket(outapp); - safe_delete(outapp); - } - else - { - // SoD and later - // - Inviter->CastToClient()->SendGroupCreatePacket(); - Inviter->CastToClient()->SendGroupLeaderChangePacket(Inviter->GetName()); - Inviter->CastToClient()->SendGroupJoinAcknowledge(); - } + if(Inviter->CastToClient()->GetClientVersion() < EQClientSoD) + { + EQApplicationPacket* outapp=new EQApplicationPacket(OP_GroupUpdate,sizeof(GroupJoin_Struct)); + GroupJoin_Struct* outgj=(GroupJoin_Struct*)outapp->pBuffer; + strcpy(outgj->membername, Inviter->GetName()); + strcpy(outgj->yourname, Inviter->GetName()); + outgj->action = groupActInviteInitial; // 'You have formed the group'. + group->GetGroupAAs(&outgj->leader_aas); + Inviter->CastToClient()->QueuePacket(outapp); + safe_delete(outapp); + } + else + { + // SoD and later + // + Inviter->CastToClient()->SendGroupCreatePacket(); + Inviter->CastToClient()->SendGroupLeaderChangePacket(Inviter->GetName()); + Inviter->CastToClient()->SendGroupJoinAcknowledge(); + } } if(!group) break; @@ -1040,7 +1040,7 @@ void WorldServer::Process() { if(gj->zoneid == zone->GetZoneID() && gj->instance_id == zone->GetInstanceID()) break; - Group* g = entity_list.GetGroupByID(gj->gid); + Group* g = entity_list.GetGroupByID(gj->gid); if(g) g->AddMember(gj->member_name); @@ -1382,7 +1382,7 @@ void WorldServer::Process() { break; } - case ServerOP_Consent: { + case ServerOP_Consent: { ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer; Client* client = entity_list.GetClientByName(s->grantname); if(client) { @@ -2053,7 +2053,7 @@ uint32 WorldServer::NextGroupID() { } void WorldServer::UpdateLFP(uint32 LeaderID, uint8 Action, uint8 MatchFilter, uint32 FromLevel, uint32 ToLevel, uint32 Classes, - const char *Comments, GroupLFPMemberEntry *LFPMembers) { + const char *Comments, GroupLFPMemberEntry *LFPMembers) { ServerPacket* pack = new ServerPacket(ServerOP_LFPUpdate, sizeof(ServerLFPUpdate_Struct)); ServerLFPUpdate_Struct* sus = (ServerLFPUpdate_Struct*) pack->pBuffer; diff --git a/zone/worldserver.h b/zone/worldserver.h index 4d14459fe..3c2e03fa6 100644 --- a/zone/worldserver.h +++ b/zone/worldserver.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef WORLDSERVER_H #define WORLDSERVER_H @@ -30,7 +30,7 @@ class Database; class WorldServer : public WorldConnection { public: WorldServer(); - virtual ~WorldServer(); + virtual ~WorldServer(); virtual void Process(); @@ -51,7 +51,7 @@ public: void SendReloadTasks(int Command, int TaskID=0); void HandleReloadTasks(ServerPacket *pack); void UpdateLFP(uint32 LeaderID, uint8 Action, uint8 MatchFilter, uint32 FromLevel, uint32 ToLevel, uint32 Classes, const char *Comments, - GroupLFPMemberEntry *LFPMembers); + GroupLFPMemberEntry *LFPMembers); void UpdateLFP(uint32 LeaderID, GroupLFPMemberEntry *LFPMembers); void StopLFP(uint32 LeaderID); void HandleLFGMatches(ServerPacket *pack); diff --git a/zone/zone.cpp b/zone/zone.cpp index c49f66751..707317012 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include @@ -27,8 +27,8 @@ using namespace std; #ifdef _WINDOWS #include -#define snprintf _snprintf -#define vsnprintf _vsnprintf +#define snprintf _snprintf +#define vsnprintf _vsnprintf #else #include #include "../common/unix.h" @@ -64,7 +64,7 @@ using namespace std; #ifdef _WINDOWS #define snprintf _snprintf #define strncasecmp _strnicmp -#define strcasecmp _stricmp +#define strcasecmp _stricmp #endif @@ -136,7 +136,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { LogFile->write(EQEMuLog::Status, "Loot logging level: %i", zone->lootvar); } else { - zone->loglevelvar = uint8(atoi(tmp)); //continue supporting only command logging (for now) + zone->loglevelvar = uint8(atoi(tmp)); //continue supporting only command logging (for now) zone->merchantvar = 0; zone->tradevar = 0; zone->lootvar = 0; @@ -424,7 +424,7 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg uint32 Zone::GetTempMerchantQuantity(uint32 NPCID, uint32 Slot) { - std::list TmpMerchantList = tmpmerchanttable[NPCID]; + std::list TmpMerchantList = tmpmerchanttable[NPCID]; std::list::const_iterator Iterator; for(Iterator = TmpMerchantList.begin(); Iterator != TmpMerchantList.end(); Iterator++) @@ -459,9 +459,9 @@ void Zone::LoadTempMerchantData(){ return; } /* char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; std::list merlist; if (database.RunQuery(query, MakeAnyLenString(&query, "select ml.npcid,ml.slot,ml.itemid,ml.charges from merchantlist_temp ml, npc_types nt, spawnentry se, spawn2 s2 where nt.id=ml.npcid and nt.id=se.npcid and se.spawngroupid=s2.spawngroupid and s2.zone='%s' group by ml.npcid,slot order by npcid,slot asc", GetShortName()), errbuf, &result)) { uint32 npcid = 0; @@ -491,7 +491,7 @@ void Zone::LoadTempMerchantData(){ } void Zone::LoadTempMerchantData_result(MYSQL_RES* result) { - MYSQL_ROW row; + MYSQL_ROW row; std::map >::iterator cur; uint32 npcid = 0; while((row = mysql_fetch_row(result))) { @@ -519,9 +519,9 @@ void Zone::LoadTempMerchantData_result(MYSQL_RES* result) { //there should prolly be a temp counterpart of this... void Zone::LoadNewMerchantData(uint32 merchantid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; std::list merlist; if (database.RunQuery(query, MakeAnyLenString(&query, "SELECT item, slot, faction_required, level_required, alt_currency_cost FROM merchantlist WHERE merchantid=%d", merchantid), errbuf, &result)) { while((row = mysql_fetch_row(result))) { @@ -529,9 +529,9 @@ void Zone::LoadNewMerchantData(uint32 merchantid){ ml.id = merchantid; ml.item = atoul(row[0]); ml.slot = atoul(row[1]); - ml.faction_required = atoul(row[2]); - ml.level_required = atoul(row[3]); - ml.alt_currency_cost = atoul(row[3]); + ml.faction_required = atoul(row[2]); + ml.level_required = atoul(row[3]); + ml.alt_currency_cost = atoul(row[3]); merlist.push_back(ml); } merchanttable[merchantid] = merlist; @@ -543,7 +543,7 @@ void Zone::LoadNewMerchantData(uint32 merchantid){ } void Zone::LoadMerchantData_result(MYSQL_RES* result) { - MYSQL_ROW row; + MYSQL_ROW row; std::map >::iterator cur; uint32 npcid = 0; while((row = mysql_fetch_row(result))) { @@ -559,25 +559,25 @@ void Zone::LoadMerchantData_result(MYSQL_RES* result) { npcid = ml.id; } - std::list::iterator iter = cur->second.begin(); - bool found = false; - while(iter != cur->second.end()) { - if((*iter).item == ml.id) { - found = true; - break; - } - iter++; - } + std::list::iterator iter = cur->second.begin(); + bool found = false; + while(iter != cur->second.end()) { + if((*iter).item == ml.id) { + found = true; + break; + } + iter++; + } - if(found) { - continue; - } + if(found) { + continue; + } ml.slot = atoul(row[1]); ml.item = atoul(row[2]); - ml.faction_required = atoul(row[3]); - ml.level_required = atoul(row[4]); - ml.alt_currency_cost = atoul(row[5]); + ml.faction_required = atoul(row[3]); + ml.level_required = atoul(row[4]); + ml.alt_currency_cost = atoul(row[5]); cur->second.push_back(ml); } } @@ -603,9 +603,9 @@ void Zone::GetMerchantDataForZoneLoad(){ return; } /* char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; std::list merlist; if (database.RunQuery(query, MakeAnyLenString(&query, "select ml.merchantid,ml.slot,ml.item from merchantlist ml, npc_types nt, spawnentry se, spawn2 s2 where nt.merchant_id=ml.merchantid and nt.id=se.npcid and se.spawngroupid=s2.spawngroupid and s2.zone='%s' group by ml.merchantid,slot order by merchantid,slot asc", GetShortName()), errbuf, &result)) { uint32 npcid = 0; @@ -880,7 +880,7 @@ void Zone::Shutdown(bool quite) zone->ResetAuth(); safe_delete(zone); dbasync->CommitWrites(); - if(parse) { parse->ReloadQuests(true); } + if(parse) { parse->ReloadQuests(true); } UpdateWindowTitle(); } @@ -976,7 +976,7 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name) totalBS = 0; aas = nullptr; totalAAs = 0; - gottime = false; + gottime = false; Instance_Shutdown_Timer = nullptr; bool is_perma = false; @@ -1120,7 +1120,7 @@ bool Zone::Init(bool iStaticZone) { zone->LoadLDoNTraps(); zone->LoadLDoNTrapEntries(); zone->LoadVeteranRewards(); - zone->LoadAlternateCurrencies(); + zone->LoadAlternateCurrencies(); zone->LoadNPCEmotes(&NPCEmoteList); //Load AA information @@ -1208,7 +1208,7 @@ void Zone::ReloadStaticData() { entity_list.RespawnAllDoors(); zone->LoadVeteranRewards(); - zone->LoadAlternateCurrencies(); + zone->LoadAlternateCurrencies(); NPCEmoteList.Clear(); zone->LoadNPCEmotes(&NPCEmoteList); @@ -1490,7 +1490,7 @@ bool Zone::Process() { } } - if(hotzone_timer.Check()) { UpdateHotzone(); } + if(hotzone_timer.Check()) { UpdateHotzone(); } return true; } @@ -1511,12 +1511,12 @@ bool Zone::Depop(bool StartSpawnTimer) { std::map::iterator itr; entity_list.Depop(StartSpawnTimer); - // Refresh npctable, getting current info from database. - while(npctable.size()) { + // Refresh npctable, getting current info from database. + while(npctable.size()) { itr=npctable.begin(); delete itr->second; npctable.erase(itr); - } + } return true; } @@ -1626,7 +1626,7 @@ ZonePoint* Zone::GetClosestZonePoint(float x, float y, float z, uint32 to, Clien if(client) client->CheatDetected(MQZoneUnknownDest, x, y, z); // Someone is trying to use /zone LogFile->write(EQEMuLog::Status, "WARNING: Closest zone point for zone id %d is %f, you might need to update your zone_points table if you dont arrive at the right spot.", to, closest_dist); - LogFile->write(EQEMuLog::Status, ". %f x %f y %f z ", x, y, z); + LogFile->write(EQEMuLog::Status, ". %f x %f y %f z ", x, y, z); } if(closest_dist > max_distance2) @@ -1728,7 +1728,7 @@ return true; bool ZoneDatabase::DumpZoneState() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM zone_state_dump WHERE zonename='%s'", zone->GetShortName()), errbuf)) { cerr << "Error in DumpZoneState query '" << query << "' " << errbuf << endl; @@ -1775,46 +1775,46 @@ bool ZoneDatabase::DumpZoneState() { } entity_list.DoZoneDump(spawn2_dump, npc_dump, npcloot_dump, gmspawntype_dump); - query = new char[512 + ((sizeof(ZSDump_Spawn2) * spawn2_count + sizeof(ZSDump_NPC) * npc_count + sizeof(ZSDump_NPC_Loot) * npcloot_count + sizeof(NPCType) * gmspawntype_count) * 2)]; + query = new char[512 + ((sizeof(ZSDump_Spawn2) * spawn2_count + sizeof(ZSDump_NPC) * npc_count + sizeof(ZSDump_NPC_Loot) * npcloot_count + sizeof(NPCType) * gmspawntype_count) * 2)]; char* end = query; - end += sprintf(end, "Insert Into zone_state_dump (zonename, spawn2_count, npc_count, npcloot_count, gmspawntype_count, spawn2, npcs, npc_loot, gmspawntype) values ('%s', %i, %i, %i, %i, ", zone->GetShortName(), spawn2_count, npc_count, npcloot_count, gmspawntype_count); - *end++ = '\''; + end += sprintf(end, "Insert Into zone_state_dump (zonename, spawn2_count, npc_count, npcloot_count, gmspawntype_count, spawn2, npcs, npc_loot, gmspawntype) values ('%s', %i, %i, %i, %i, ", zone->GetShortName(), spawn2_count, npc_count, npcloot_count, gmspawntype_count); + *end++ = '\''; if (spawn2_dump != 0) { end += DoEscapeString(end, (char*)spawn2_dump, sizeof(ZSDump_Spawn2) * spawn2_count); safe_delete_array(spawn2_dump); } - *end++ = '\''; - end += sprintf(end, ", "); - *end++ = '\''; + *end++ = '\''; + end += sprintf(end, ", "); + *end++ = '\''; if (npc_dump != 0) { end += DoEscapeString(end, (char*)npc_dump, sizeof(ZSDump_NPC) * npc_count); safe_delete_array(npc_dump); } - *end++ = '\''; - end += sprintf(end, ", "); - *end++ = '\''; + *end++ = '\''; + end += sprintf(end, ", "); + *end++ = '\''; if (npcloot_dump != 0) { end += DoEscapeString(end, (char*)npcloot_dump, sizeof(ZSDump_NPC_Loot) * npcloot_count); safe_delete_array(npcloot_dump); } - *end++ = '\''; - end += sprintf(end, ", "); - *end++ = '\''; + *end++ = '\''; + end += sprintf(end, ", "); + *end++ = '\''; if (gmspawntype_dump != 0) { end += DoEscapeString(end, (char*)gmspawntype_dump, sizeof(NPCType) * gmspawntype_count); safe_delete_array(gmspawntype_dump); } - *end++ = '\''; - end += sprintf(end, ")"); + *end++ = '\''; + end += sprintf(end, ")"); uint32 affected_rows = 0; if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { - // if (DoEscapeString(query, (unsigned int) (end - query))) { + // if (DoEscapeString(query, (unsigned int) (end - query))) { safe_delete_array(query); - cerr << "Error in ZoneDump query " << errbuf << endl; + cerr << "Error in ZoneDump query " << errbuf << endl; return false; - } + } safe_delete_array(query); if (affected_rows == 0) { @@ -1826,9 +1826,9 @@ bool ZoneDatabase::DumpZoneState() { int8 ZoneDatabase::LoadZoneState(const char* zonename, LinkedList& spawn2_list) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint32 i; unsigned long* lengths; @@ -2026,9 +2026,9 @@ void Zone::SpawnStatus(Mob* client) { while(iterator.MoreElements()) { if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF) - client->Message(0, " %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ()); + client->Message(0, " %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ()); else - client->Message(0, " %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000); + client->Message(0, " %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000); x++; iterator.Advance(); @@ -2048,7 +2048,7 @@ void Zone::ShowEnabledSpawnStatus(Mob* client) { if (iterator.GetData()->timer.GetRemainingTime() != 0xFFFFFFFF) { - client->Message(0, " %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000); + client->Message(0, " %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000); iEnabledCount++; } @@ -2071,7 +2071,7 @@ void Zone::ShowDisabledSpawnStatus(Mob* client) { if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF) { - client->Message(0, " %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ()); + client->Message(0, " %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ()); iDisabledCount++; } @@ -2095,9 +2095,9 @@ void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid) if (iterator.GetData()->GetID() == spawnid) { if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF) - client->Message(0, " %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ()); + client->Message(0, " %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ()); else - client->Message(0, " %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000); + client->Message(0, " %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000); iSpawnIDCount++; @@ -2506,9 +2506,9 @@ void Zone::LoadAlternateCurrencies() { while((row = mysql_fetch_row(result))) { - current_currency.id = atoi(row[0]); - current_currency.item_id = atoi(row[1]); - AlternateCurrencies.push_back(current_currency); + current_currency.id = atoi(row[0]); + current_currency.item_id = atoi(row[1]); + AlternateCurrencies.push_back(current_currency); } mysql_free_result(result); @@ -2672,17 +2672,17 @@ void Zone::ReloadWorld(uint32 Option){ void Zone::LoadTickItems() { - char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES *result; - MYSQL_ROW row; - tick_items.clear(); + char errbuf[MYSQL_ERRMSG_SIZE]; + char* query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + tick_items.clear(); - if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT it_itemid, it_chance, it_level, it_qglobal, it_bagslot FROM item_tick"), errbuf, &result)) - { - while((row = mysql_fetch_row(result))) - { - if(atoi(row[0]) >= 1) + if(database.RunQuery(query, MakeAnyLenString(&query, "SELECT it_itemid, it_chance, it_level, it_qglobal, it_bagslot FROM item_tick"), errbuf, &result)) + { + while((row = mysql_fetch_row(result))) + { + if(atoi(row[0]) >= 1) { item_tick_struct ti_tmp; ti_tmp.itemid = atoi(row[0]); @@ -2692,52 +2692,52 @@ void Zone::LoadTickItems() ti_tmp.qglobal = std::string(row[3]); tick_items[atoi(row[0])] = ti_tmp; } - } - mysql_free_result(result); - safe_delete_array(query); - } - else - { - LogFile->write(EQEMuLog::Error, "Error in Zone::LoadTickItems: %s (%s)", query, errbuf); - safe_delete_array(query); - } + } + mysql_free_result(result); + safe_delete_array(query); + } + else + { + LogFile->write(EQEMuLog::Error, "Error in Zone::LoadTickItems: %s (%s)", query, errbuf); + safe_delete_array(query); + } } uint32 Zone::GetSpawnKillCount(uint32 in_spawnid) { - LinkedListIterator iterator(spawn2_list); + LinkedListIterator iterator(spawn2_list); - iterator.Reset(); - while(iterator.MoreElements()) - { - if(iterator.GetData()->GetID() == in_spawnid) - { - return(iterator.GetData()->killcount); - } - iterator.Advance(); - } + iterator.Reset(); + while(iterator.MoreElements()) + { + if(iterator.GetData()->GetID() == in_spawnid) + { + return(iterator.GetData()->killcount); + } + iterator.Advance(); + } return 0; } void Zone::UpdateHotzone() { - char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; - MYSQL_RES *result; - MYSQL_ROW row; - bool updh; + char errbuf[MYSQL_ERRMSG_SIZE]; + char* query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + bool updh; - if(database.RunQuery(query, MakeAnyLenString(&query,"SELECT hotzone FROM zone WHERE short_name = '%s'", GetShortName()), errbuf, &result) ) - { - if( (row = mysql_fetch_row(result)) ) - { - updh = atoi(row[0]) == 0 ? false:true; - //Hotzone status has changed - if(is_hotzone != updh) - { - is_hotzone = updh; - } - } - mysql_free_result(result); - } - safe_delete_array(query); + if(database.RunQuery(query, MakeAnyLenString(&query,"SELECT hotzone FROM zone WHERE short_name = '%s'", GetShortName()), errbuf, &result) ) + { + if( (row = mysql_fetch_row(result)) ) + { + updh = atoi(row[0]) == 0 ? false:true; + //Hotzone status has changed + if(is_hotzone != updh) + { + is_hotzone = updh; + } + } + mysql_free_result(result); + } + safe_delete_array(query); } diff --git a/zone/zone.h b/zone/zone.h index 58f969780..5db6a78b5 100644 --- a/zone/zone.h +++ b/zone/zone.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ZONE_H #define ZONE_H @@ -147,8 +147,8 @@ public: void Repop(uint32 delay = 0); void SpawnStatus(Mob* client); void ShowEnabledSpawnStatus(Mob* client); - void ShowDisabledSpawnStatus(Mob* client); - void ShowSpawnStatusByID(Mob* client, uint32 spawnid); + void ShowDisabledSpawnStatus(Mob* client); + void ShowSpawnStatusByID(Mob* client, uint32 spawnid); void StartShutdownTimer(uint32 set_time = (RuleI(Zone, AutoShutdownDelay))); void AddAuth(ServerZoneIncommingClient_Struct* szic); void RemoveAuth(const char* iCharName); @@ -197,7 +197,7 @@ public: map > merc_spells_list; map level_exp_mod; list VeteranRewards; - list AlternateCurrencies; + list AlternateCurrencies; char *adv_data; bool did_adventure_actions; @@ -205,7 +205,7 @@ public: void DoAdventureAssassinationCountIncrease(); void DoAdventureActions(); void LoadVeteranRewards(); - void LoadAlternateCurrencies(); + void LoadAlternateCurrencies(); void LoadNPCEmotes(LinkedList* NPCEmoteList); void ReloadWorld(uint32 Option); @@ -227,7 +227,7 @@ public: bool IsCity() const { return(is_city); } bool CanDoCombat() const { return(can_combat); } bool CanLevitate() const {return(can_levitate); } // Magoth78 - bool CanCastOutdoor() const {return(can_castoutdoor);} //qadar + bool CanCastOutdoor() const {return(can_castoutdoor);} //qadar bool AllowMercs() const {return(allow_mercs);} bool IsHotzone() const { return(is_hotzone); } inline bool BuffTimersSuspended() const { return newzone_data.SuspendBuffs != 0; }; @@ -285,13 +285,13 @@ private: bool can_bind; bool is_city; bool can_combat; - bool can_castoutdoor; + bool can_castoutdoor; bool can_levitate; bool is_hotzone; bool allow_mercs; uint32 pgraveyard_id, pgraveyard_zoneid; float pgraveyard_x, pgraveyard_y, pgraveyard_z, pgraveyard_heading; - int default_ruleset; + int default_ruleset; int totalBS; ZoneSpellsBlocked *blocked_spells; @@ -316,10 +316,10 @@ private: Timer clientauth_timer; Timer spawn2_timer; Timer qglobal_purge_timer; - Timer* Weather_Timer; + Timer* Weather_Timer; Timer* Instance_Timer; Timer* Instance_Shutdown_Timer; - Timer* Instance_Warning_timer; + Timer* Instance_Warning_timer; LinkedList client_auth_list; QGlobalCache *qGlobals; diff --git a/zone/zone_logsys.cpp b/zone/zone_logsys.cpp index da901d288..3ecf9ec6b 100644 --- a/zone/zone_logsys.cpp +++ b/zone/zone_logsys.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -65,14 +65,3 @@ void log_packet_mob(LogType type, Mob *who, const BasePacket *p) { log_hex(type,(const char *)p->pBuffer,p->size); } - - - - - - - - - - - diff --git a/zone/zone_profile.cpp b/zone/zone_profile.cpp index 3347f4b57..9646587a1 100644 --- a/zone/zone_profile.cpp +++ b/zone/zone_profile.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" #include "../common/features.h" @@ -32,7 +32,7 @@ #define snprintf _snprintf #define vsnprintf _vsnprintf #define strncasecmp _strnicmp - #define strcasecmp _stricmp + #define strcasecmp _stricmp #else #include #include @@ -239,16 +239,16 @@ const char *__zp_names[ZoneProfiler::MaxZoneProfilerId] = { void DumpZoneProfile() { __DZP_timer.stop(); - time_t aclock; - struct tm *newtime; + time_t aclock; + struct tm *newtime; - time( &aclock ); /* Get time in seconds */ - newtime = localtime( &aclock ); /* Convert time to struct */ - LogFile->write(EQEMuLog::Debug, "Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", - newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, - __DZP_timer.getTotalDuration()); + time( &aclock ); /* Get time in seconds */ + newtime = localtime( &aclock ); /* Convert time to struct */ + LogFile->write(EQEMuLog::Debug, "Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", + newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, + __DZP_timer.getTotalDuration()); - vector<_DZP_Data> data; + vector<_DZP_Data> data; int r; @@ -279,9 +279,9 @@ void DumpZoneProfile() { LogFile->write(EQEMuLog::Debug, "..%s: %llu calls, %.4fms", cur->str, (unsigned long long)cur->count, cur->dur); } - LogFile->write(EQEMuLog::Debug, "End Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", - newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, - __DZP_timer.getTotalDuration()); + LogFile->write(EQEMuLog::Debug, "End Profiling dump at: [%02d/%02d - %02d:%02d:%02d] (%.2f ms of data)", + newtime->tm_mon+1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec, + __DZP_timer.getTotalDuration()); __DZP_timer.start(); } @@ -299,5 +299,3 @@ void ResetZoneProfile() { #endif //EQPROFILE - - diff --git a/zone/zone_profile.h b/zone/zone_profile.h index 2ec1d6f78..071612d65 100644 --- a/zone/zone_profile.h +++ b/zone/zone_profile.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ZONE_PROFILE_H #define ZONE_PROFILE_H diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 0fe590a15..b93104924 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -62,7 +62,7 @@ ZoneDatabase::~ZoneDatabase() { bool ZoneDatabase::SaveZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct* zd){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "update zone set underworld=%f,minclip=%f," "maxclip=%f,fog_minclip=%f,fog_maxclip=%f,fog_blue=%i,fog_red=%i,fog_green=%i,sky=%i," "ztype=%i,zone_exp_multiplier=%f,safe_x=%f,safe_y=%f,safe_z=%f " @@ -171,7 +171,7 @@ void ZoneDatabase::UpdateSpawn2Timeleft(uint32 id, uint16 instance_id, uint32 ti uint32 cur = tv.tv_sec; char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; //if we pass timeleft as 0 that means we clear from respawn time //otherwise we update with a REPLACE INTO @@ -250,7 +250,7 @@ uint32 ZoneDatabase::GetSpawnTimeLeft(uint32 id, uint16 instance_id) void ZoneDatabase::UpdateSpawn2Status(uint32 id, uint8 new_status) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if(!RunQuery(query, MakeAnyLenString(&query, "UPDATE spawn2 SET enabled=%i WHERE id=%lu", new_status, (unsigned long)id),errbuf)) { @@ -262,7 +262,7 @@ void ZoneDatabase::UpdateSpawn2Status(uint32 id, uint8 new_status) bool ZoneDatabase::logevents(const char* accountname,uint32 accountid,uint8 status,const char* charname, const char* target,const char* descriptiontype, const char* description,int event_nid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 len = strlen(description); uint32 len2 = strlen(target); char* descriptiontext = new char[2*len+1]; @@ -330,7 +330,7 @@ void ZoneDatabase::UpdateBug(BugStruct* bug){ void ZoneDatabase::UpdateBug(PetitionBug_Struct* bug){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 len = strlen(bug->text); char* bugtext = new char[2*len+1]; memset(bugtext, 0, 2*len+1); @@ -344,7 +344,7 @@ void ZoneDatabase::UpdateBug(PetitionBug_Struct* bug){ bool ZoneDatabase::GetAccountInfoForLogin_result(MYSQL_RES* result, int16* admin, char* account_name, uint32* lsaccountid, uint8* gmspeed, bool* revoked,bool* gmhideme, uint32* account_creation) { - MYSQL_ROW row; + MYSQL_ROW row; if (mysql_num_rows(result) == 1) { row = mysql_fetch_row(result); if (admin) @@ -379,7 +379,7 @@ bool ZoneDatabase::GetAccountInfoForLogin_result(MYSQL_RES* result, int16* admin bool ZoneDatabase::SetSpecialAttkFlag(uint8 id, const char* flag) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE npc_types SET npcspecialattks='%s' WHERE id=%i;",flag,id), errbuf, 0, &affected_rows)) { @@ -415,9 +415,9 @@ void ZoneDatabase::SetDoorPlace(uint8 value,uint8 door_id,const char* zone_name) void ZoneDatabase::GetEventLogs(const char* name,char* target,uint32 account_id,uint8 eventid,char* detail,char* timestamp, CharacterEventLog_Struct* cel) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; uint32 count = 0; char modifications[200]; @@ -478,13 +478,13 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) } char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; MYSQL_RES *result; MYSQL_ROW row; //const Item_Struct* item = nullptr; //ItemInst* inst = nullptr; - uint32 len_query = MakeAnyLenString(&query, "select " + uint32 len_query = MakeAnyLenString(&query, "select " "bagidx,itemid,charges,augslot1,augslot2,augslot3,augslot4,augslot5 from object_contents where parentid=%i", parentid); if (RunQuery(query, len_query, errbuf, &result)) { @@ -526,7 +526,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const ItemInst* container) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; // Since state is not saved for each world container action, we'll just delete // all and save from scratch .. we may come back later to optimize @@ -567,7 +567,7 @@ void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const It void ZoneDatabase::DeleteWorldContainer(uint32 parent_id,uint32 zone_id) { char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; uint32 len_query = MakeAnyLenString(&query, "delete from object_contents where parentid=%i and zoneid=%i", parent_id,zone_id); @@ -641,7 +641,7 @@ ItemInst* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int SerialNumber) { MYSQL_ROW row; if (RunQuery(query,MakeAnyLenString(&query, "select * from trader where char_id=%i and serialnumber=%i order by slot_id limit 80", - CharID, SerialNumber),errbuf,&result)){ + CharID, SerialNumber),errbuf,&result)){ safe_delete_array(query); if (mysql_num_rows(result) != 1) { @@ -688,7 +688,7 @@ void ZoneDatabase::SaveTraderItem(uint32 CharID, uint32 ItemID, uint32 SerialNum char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; if (!(RunQuery(query,MakeAnyLenString(&query, "replace INTO trader VALUES(%i,%i,%i,%i,%i,%i)", - CharID, ItemID, SerialNumber, Charges, ItemCost, Slot),errbuf))) + CharID, ItemID, SerialNumber, Charges, ItemCost, Slot),errbuf))) _log(TRADING__CLIENT, "Failed to save trader item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, errbuf); safe_delete_array(query); @@ -700,9 +700,9 @@ void ZoneDatabase::UpdateTraderItemCharges(int CharID, uint32 SerialNumber, int3 char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; if (!(RunQuery(query,MakeAnyLenString(&query, "update trader set charges=%i where char_id=%i and serialnumber=%i", - Charges, CharID, SerialNumber),errbuf))) - _log(TRADING__CLIENT, "Failed to update charges for trader item: %i for char_id: %i, the error was: %s\n", - SerialNumber, CharID, errbuf); + Charges, CharID, SerialNumber),errbuf))) + _log(TRADING__CLIENT, "Failed to update charges for trader item: %i for char_id: %i, the error was: %s\n", + SerialNumber, CharID, errbuf); safe_delete_array(query); @@ -725,10 +725,10 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg _log(TRADING__CLIENT, "Removing Trader items from the DB for CharID %i, ItemID %i", CharID, ItemID); if (!(RunQuery(Query,MakeAnyLenString(&Query, "delete from trader where char_id=%i and item_id=%i", - CharID, ItemID),errbuf))) + CharID, ItemID),errbuf))) _log(TRADING__CLIENT, "Failed to remove trader item(s): %i for char_id: %i, the error was: %s\n", - ItemID, CharID, errbuf); + ItemID, CharID, errbuf); safe_delete_array(Query); @@ -737,17 +737,17 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg else { if(!item->Stackable) { if (!(RunQuery(Query,MakeAnyLenString(&Query, "update trader set item_cost=%i where char_id=%i and item_id=%i" - " and charges=%i", NewPrice, CharID, ItemID, Charges),errbuf))) + " and charges=%i", NewPrice, CharID, ItemID, Charges),errbuf))) - _log(TRADING__CLIENT, "Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", - ItemID, CharID, errbuf); + _log(TRADING__CLIENT, "Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", + ItemID, CharID, errbuf); } else { if (!(RunQuery(Query,MakeAnyLenString(&Query, "update trader set item_cost=%i where char_id=%i and item_id=%i", - NewPrice, CharID, ItemID),errbuf))) + NewPrice, CharID, ItemID),errbuf))) - _log(TRADING__CLIENT, "Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", - ItemID, CharID, errbuf); + _log(TRADING__CLIENT, "Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", + ItemID, CharID, errbuf); } safe_delete_array(Query); @@ -757,7 +757,7 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg void ZoneDatabase::DeleteTraderItem(uint32 char_id){ char errbuf[MYSQL_ERRMSG_SIZE]; - char* query = 0; + char* query = 0; if(char_id==0){ if (!(RunQuery(query,MakeAnyLenString(&query, "delete from trader"),errbuf))) _log(TRADING__CLIENT, "Failed to delete all trader items data, the error was: %s\n",errbuf); @@ -796,7 +796,7 @@ void ZoneDatabase::AddBuyLine(uint32 CharID, uint32 BuySlot, uint32 ItemID, cons char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; if (!(RunQuery(query,MakeAnyLenString(&query, "replace INTO buyer VALUES(%i,%i, %i,\"%s\",%i,%i)", - CharID, BuySlot, ItemID, ItemName, Quantity, Price),errbuf))) + CharID, BuySlot, ItemID, ItemName, Quantity, Price),errbuf))) _log(TRADING__CLIENT, "Failed to save buline item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, errbuf); safe_delete_array(query); @@ -824,7 +824,7 @@ void ZoneDatabase::UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity) char* query = 0; if (!(RunQuery(query,MakeAnyLenString(&query, "update buyer set quantity=%i where charid=%i and buyslot=%i", - Quantity, CharID, BuySlot), errbuf))) + Quantity, CharID, BuySlot), errbuf))) _log(TRADING__CLIENT, "Failed to update quantity in buyslot %i for charid: %i, the error was: %s\n", BuySlot, CharID, errbuf); safe_delete_array(query); @@ -837,9 +837,9 @@ uint32* pplen, uint32* guilddbid, uint8* guildrank, uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8 *firstlogon) { _CP(Database_GetCharacterInfoForLogin); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 querylen; - MYSQL_RES *result; + MYSQL_RES *result; bool ret = false; @@ -875,7 +875,7 @@ bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, uint8 *class_, uint8 *level, bool *LFP, bool *LFG, uint8 *NumXTargets, uint8* firstlogon) { _CP(Database_GetCharacterInfoForLogin_result); - MYSQL_ROW row; + MYSQL_ROW row; unsigned long* lengths; if (mysql_num_rows(result) == 1) { @@ -967,7 +967,7 @@ bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, bool ZoneDatabase::NoRentExpired(const char* name){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; MYSQL_RES *result; MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "Select (UNIX_TIMESTAMP(NOW())-timelaston) from character_ where name='%s'", name), errbuf, &result)) { @@ -990,73 +990,73 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { const NPCType *npc=nullptr; map::iterator itr; - // If NPC is already in tree, return it. + // If NPC is already in tree, return it. if((itr = zone->npctable.find(id)) != zone->npctable.end()) return itr->second; - // Otherwise, get NPCs from database. + // Otherwise, get NPCs from database. char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - // If id is 0, load all npc_types for the current zone, - // according to spawn2. - const char *basic_query = "SELECT " + // If id is 0, load all npc_types for the current zone, + // according to spawn2. + const char *basic_query = "SELECT " "npc_types.id," "npc_types.name," "npc_types.level," - "npc_types.race," + "npc_types.race," "npc_types.class," "npc_types.hp," - "npc_types.mana," - "npc_types.gender," + "npc_types.mana," + "npc_types.gender," "npc_types.texture," "npc_types.helmtexture," - "npc_types.size," + "npc_types.size," "npc_types.loottable_id," - "npc_types.merchant_id," - "npc_types.alt_currency_id," + "npc_types.merchant_id," + "npc_types.alt_currency_id," "npc_types.adventure_template_id," "npc_types.trap_template," "npc_types.attack_speed," - "npc_types.STR," + "npc_types.STR," "npc_types.STA," "npc_types.DEX," "npc_types.AGI," - "npc_types._INT," + "npc_types._INT," "npc_types.WIS," "npc_types.CHA," - "npc_types.MR," + "npc_types.MR," "npc_types.CR," "npc_types.DR," "npc_types.FR," "npc_types.PR," "npc_types.Corrup," - "npc_types.mindmg," - "npc_types.maxdmg," - "npc_types.attack_count," + "npc_types.mindmg," + "npc_types.maxdmg," + "npc_types.attack_count," "npc_types.npcspecialattks," - "npc_types.npc_spells_id," + "npc_types.npc_spells_id," "npc_types.d_meele_texture1," - "npc_types.d_meele_texture2," + "npc_types.d_meele_texture2," "npc_types.prim_melee_type," "npc_types.sec_melee_type," - "npc_types.runspeed," + "npc_types.runspeed," "npc_types.findable," "npc_types.trackable," - "npc_types.hp_regen_rate," + "npc_types.hp_regen_rate," "npc_types.mana_regen_rate," - "npc_types.aggroradius," + "npc_types.aggroradius," "npc_types.bodytype," - "npc_types.npc_faction_id," + "npc_types.npc_faction_id," "npc_types.face," - "npc_types.luclin_hairstyle," + "npc_types.luclin_hairstyle," "npc_types.luclin_haircolor," - "npc_types.luclin_eyecolor," + "npc_types.luclin_eyecolor," "npc_types.luclin_eyecolor2," - "npc_types.luclin_beardcolor," + "npc_types.luclin_beardcolor," "npc_types.luclin_beard," "npc_types.drakkin_heritage," "npc_types.drakkin_tattoo," @@ -1065,12 +1065,12 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { "npc_types.armortint_red," "npc_types.armortint_green," "npc_types.armortint_blue," - "npc_types.see_invis," + "npc_types.see_invis," "npc_types.see_invis_undead," - "npc_types.lastname," + "npc_types.lastname," "npc_types.qglobal," "npc_types.AC," - "npc_types.npc_aggro," + "npc_types.npc_aggro," "npc_types.spawn_limit," "npc_types.see_hide," "npc_types.see_improved_hide," @@ -1080,8 +1080,8 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { "npc_types.maxlevel," "npc_types.scalerate," "npc_types.private_corpse," - "npc_types.unique_spawn_by_name," - "npc_types.underwater," + "npc_types.unique_spawn_by_name," + "npc_types.underwater," "npc_types.emoteid," "npc_types.spellscale," "npc_types.healscale"; @@ -1089,7 +1089,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { MakeAnyLenString(&query, "%s FROM npc_types WHERE id=%d", basic_query, id); if (RunQuery(query, strlen(query), errbuf, &result)) { - // Process each row returned. + // Process each row returned. while((row = mysql_fetch_row(result))) { NPCType *tmpNPCType; tmpNPCType = new NPCType; @@ -1105,14 +1105,14 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { tmpNPCType->class_ = atoi(row[r++]); tmpNPCType->max_hp = atoi(row[r++]); tmpNPCType->cur_hp = tmpNPCType->max_hp; - tmpNPCType->Mana = atoi(row[r++]); + tmpNPCType->Mana = atoi(row[r++]); tmpNPCType->gender = atoi(row[r++]); tmpNPCType->texture = atoi(row[r++]); tmpNPCType->helmtexture = atoi(row[r++]); tmpNPCType->size = atof(row[r++]); tmpNPCType->loottable_id = atoi(row[r++]); tmpNPCType->merchanttype = atoi(row[r++]); - tmpNPCType->alt_currency_type = atoi(row[r++]); + tmpNPCType->alt_currency_type = atoi(row[r++]); tmpNPCType->adventure_template = atoi(row[r++]); tmpNPCType->trap_template = atoi(row[r++]); tmpNPCType->attack_speed = atof(row[r++]); @@ -1131,7 +1131,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { tmpNPCType->Corrup = atoi(row[r++]); tmpNPCType->min_dmg = atoi(row[r++]); tmpNPCType->max_dmg = atoi(row[r++]); - tmpNPCType->attack_count = atoi(row[r++]); + tmpNPCType->attack_count = atoi(row[r++]); strcpy(tmpNPCType->npc_attacks,row[r++]); tmpNPCType->npc_spells_id = atoi(row[r++]); tmpNPCType->d_meele_texture1 = atoi(row[r++]); @@ -1258,7 +1258,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { tmpNPCType->scalerate = atoi(row[r++]); tmpNPCType->private_corpse = atoi(row[r++]) == 1 ? true : false; tmpNPCType->unique_spawn_by_name = atoi(row[r++]) == 1 ? true : false; - tmpNPCType->underwater = atoi(row[r++]) == 1 ? true : false; + tmpNPCType->underwater = atoi(row[r++]) == 1 ? true : false; tmpNPCType->emoteid = atoi(row[r++]); tmpNPCType->spellscale = atoi(row[r++]); tmpNPCType->healscale = atoi(row[r++]); @@ -1283,9 +1283,9 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { } } else cerr << "Error loading NPCs from database. Bad query: " << errbuf << endl; - safe_delete_array(query); + safe_delete_array(query); - return npc; + return npc; } @@ -1296,77 +1296,77 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client //need to save based on merc_npc_type & client level uint32 merc_type_id = id * 100 + clientlevel; - // If NPC is already in tree, return it. + // If NPC is already in tree, return it. if((itr = zone->merctable.find(merc_type_id)) != zone->merctable.end()) return itr->second; //If the NPC type is 0, return nullptr. (sanity check) if(id == 0) return nullptr; - // Otherwise, get NPCs from database. + // Otherwise, get NPCs from database. char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; MYSQL_ROW row; - // If id is 0, load all npc_types for the current zone, - // according to spawn2. - const char *basic_query = "SELECT " + // If id is 0, load all npc_types for the current zone, + // according to spawn2. + const char *basic_query = "SELECT " "vwMercNpcTypes.merc_npc_type_id," "vwMercNpcTypes.name," //"vwMercNpcTypes.clientlevel," "vwMercNpcTypes.level," - "vwMercNpcTypes.race_id," + "vwMercNpcTypes.race_id," "vwMercNpcTypes.class_id," "vwMercNpcTypes.hp," - "vwMercNpcTypes.mana," - "vwMercNpcTypes.gender," + "vwMercNpcTypes.mana," + "vwMercNpcTypes.gender," "vwMercNpcTypes.texture," "vwMercNpcTypes.helmtexture," - //"vwMercNpcTypes.size," + //"vwMercNpcTypes.size," // "vwMercNpcTypes.loottable_id," - // "vwMercNpcTypes.merchant_id," - // "vwMercNpcTypes.alt_currency_id," + // "vwMercNpcTypes.merchant_id," + // "vwMercNpcTypes.alt_currency_id," // "vwMercNpcTypes.adventure_template_id," // "vwMercNpcTypes.trap_template," "vwMercNpcTypes.attack_speed," - "vwMercNpcTypes.STR," + "vwMercNpcTypes.STR," "vwMercNpcTypes.STA," "vwMercNpcTypes.DEX," "vwMercNpcTypes.AGI," - "vwMercNpcTypes._INT," + "vwMercNpcTypes._INT," "vwMercNpcTypes.WIS," "vwMercNpcTypes.CHA," - "vwMercNpcTypes.MR," + "vwMercNpcTypes.MR," "vwMercNpcTypes.CR," "vwMercNpcTypes.DR," "vwMercNpcTypes.FR," "vwMercNpcTypes.PR," "vwMercNpcTypes.Corrup," - "vwMercNpcTypes.mindmg," - "vwMercNpcTypes.maxdmg," - "vwMercNpcTypes.attack_count," + "vwMercNpcTypes.mindmg," + "vwMercNpcTypes.maxdmg," + "vwMercNpcTypes.attack_count," "vwMercNpcTypes.npcspecialattks," - // "vwMercNpcTypes.npc_spells_id," + // "vwMercNpcTypes.npc_spells_id," "vwMercNpcTypes.d_meele_texture1," - "vwMercNpcTypes.d_meele_texture2," + "vwMercNpcTypes.d_meele_texture2," "vwMercNpcTypes.prim_melee_type," "vwMercNpcTypes.sec_melee_type," - "vwMercNpcTypes.runspeed," + "vwMercNpcTypes.runspeed," // "vwMercNpcTypes.findable," // "vwMercNpcTypes.trackable," - "vwMercNpcTypes.hp_regen_rate," + "vwMercNpcTypes.hp_regen_rate," "vwMercNpcTypes.mana_regen_rate," - // "vwMercNpcTypes.aggroradius," + // "vwMercNpcTypes.aggroradius," "vwMercNpcTypes.bodytype," - // "vwMercNpcTypes.npc_faction_id," + // "vwMercNpcTypes.npc_faction_id," //"vwMercNpcTypes.face," - //"vwMercNpcTypes.luclin_hairstyle," + //"vwMercNpcTypes.luclin_hairstyle," //"vwMercNpcTypes.luclin_haircolor," - //"vwMercNpcTypes.luclin_eyecolor," + //"vwMercNpcTypes.luclin_eyecolor," //"vwMercNpcTypes.luclin_eyecolor2," - //"vwMercNpcTypes.luclin_beardcolor," + //"vwMercNpcTypes.luclin_beardcolor," //"vwMercNpcTypes.luclin_beard," //"vwMercNpcTypes.drakkin_heritage," //"vwMercNpcTypes.drakkin_tattoo," @@ -1375,12 +1375,12 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client "vwMercNpcTypes.armortint_red," "vwMercNpcTypes.armortint_green," "vwMercNpcTypes.armortint_blue," - // "vwMercNpcTypes.see_invis," + // "vwMercNpcTypes.see_invis," // "vwMercNpcTypes.see_invis_undead," - // "vwMercNpcTypes.lastname," + // "vwMercNpcTypes.lastname," // "vwMercNpcTypes.qglobal," "vwMercNpcTypes.AC," - // "vwMercNpcTypes.npc_aggro," + // "vwMercNpcTypes.npc_aggro," // "vwMercNpcTypes.spawn_limit," // "vwMercNpcTypes.see_hide," // "vwMercNpcTypes.see_improved_hide," @@ -1392,14 +1392,14 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client // "vwMercNpcTypes.maxlevel," // "vwMercNpcTypes.scalerate," // "vwMercNpcTypes.private_corpse," - // "vwMercNpcTypes.unique_spawn_by_name," - // "vwMercNpcTypes.underwater," + // "vwMercNpcTypes.unique_spawn_by_name," + // "vwMercNpcTypes.underwater," // "vwMercNpcTypes.emoteid"; MakeAnyLenString(&query, "%s FROM vwMercNpcTypes WHERE merc_npc_type_id=%d AND clientlevel=%d AND race_id = %d", basic_query, id, clientlevel, raceid); //dual primary keys. one is ID, one is level. if (RunQuery(query, strlen(query), errbuf, &result)) { - // Process each row returned. + // Process each row returned. while((row = mysql_fetch_row(result))) { NPCType *tmpNPCType; tmpNPCType = new NPCType; @@ -1415,14 +1415,14 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client tmpNPCType->class_ = atoi(row[r++]); tmpNPCType->max_hp = atoi(row[r++]); tmpNPCType->cur_hp = tmpNPCType->max_hp; - tmpNPCType->Mana = atoi(row[r++]); + tmpNPCType->Mana = atoi(row[r++]); tmpNPCType->gender = atoi(row[r++]); tmpNPCType->texture = atoi(row[r++]); tmpNPCType->helmtexture = atoi(row[r++]); //tmpNPCType->size = atof(row[r++]); //tmpNPCType->loottable_id = atoi(row[r++]); //tmpNPCType->merchanttype = atoi(row[r++]); - //tmpNPCType->alt_currency_type = atoi(row[r++]); + //tmpNPCType->alt_currency_type = atoi(row[r++]); //tmpNPCType->adventure_template = atoi(row[r++]); //tmpNPCType->trap_template = atoi(row[r++]); tmpNPCType->attack_speed = atof(row[r++]); @@ -1441,7 +1441,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client tmpNPCType->Corrup = atoi(row[r++]); tmpNPCType->min_dmg = atoi(row[r++]); tmpNPCType->max_dmg = atoi(row[r++]); - tmpNPCType->attack_count = atoi(row[r++]); + tmpNPCType->attack_count = atoi(row[r++]); strcpy(tmpNPCType->npc_attacks,row[r++]); //tmpNPCType->npc_spells_id = atoi(row[r++]); tmpNPCType->d_meele_texture1 = atoi(row[r++]); @@ -1569,7 +1569,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client tmpNPCType->scalerate = RuleI(Mercs, ScaleRate); //tmpNPCType->private_corpse = atoi(row[r++]) == 1 ? true : false; //tmpNPCType->unique_spawn_by_name = atoi(row[r++]) == 1 ? true : false; - //tmpNPCType->underwater = atoi(row[r++]) == 1 ? true : false; + //tmpNPCType->underwater = atoi(row[r++]) == 1 ? true : false; //tmpNPCType->emoteid = atoi(row[r++]); tmpNPCType->spellscale = atoi(row[r++]); tmpNPCType->healscale = atoi(row[r++]); @@ -1593,9 +1593,9 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client } } else cerr << "Error loading NPCs from database. Bad query: " << errbuf << endl; - safe_delete_array(query); + safe_delete_array(query); - return npc; + return npc; } bool ZoneDatabase::LoadMercInfo(Client *c) { @@ -1619,7 +1619,7 @@ bool ZoneDatabase::LoadMercInfo(Client *c) { uint8 slot = atoi(DataRow[1]); if(slot >= MAXMERCS) { - continue; + continue; } c->GetMercInfo(slot).mercid = atoi(DataRow[0]); @@ -1739,7 +1739,7 @@ bool ZoneDatabase::SaveMerc(Merc *merc) { } else { // Update existing merc record - if(!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE mercs SET OwnerCharacterID = '%u', Slot = '%u', Name = '%s', TemplateID = '%u', SuspendedTime = '%u', IsSuspended = '%u', TimerRemaining = '%u', Gender = '%u', StanceID = '%u', HP = '%u', Mana = '%u', Endurance = '%u', Face = '%i', LuclinHairStyle = '%i', LuclinHairColor = '%i', LuclinEyeColor = '%i', LuclinEyeColor2 = '%i', LuclinBeardColor = '%i', LuclinBeard = '%i', DrakkinHeritage = '%i', DrakkinTattoo = '%i', DrakkinDetails = '%i' WHERE MercID = '%u'", merc->GetMercCharacterID(), owner->GetMercSlot(), merc->GetCleanName(), merc->GetMercTemplateID(), owner->GetMercInfo().SuspendedTime, merc->IsSuspended(), owner->GetMercInfo().MercTimerRemaining, merc->GetGender(), merc->GetStance(), merc->GetHP(), merc->GetMana(), merc->GetEndurance(), merc->GetLuclinFace(), merc->GetHairStyle(), merc->GetHairColor(), merc->GetEyeColor1(), merc->GetEyeColor2(), merc->GetBeardColor(), merc->GetBeard(), merc->GetDrakkinHeritage(), merc->GetDrakkinTattoo(), merc->GetDrakkinDetails(), merc->GetMercID()), TempErrorMessageBuffer, 0, &affectedRows)) { + if(!database.RunQuery(Query, MakeAnyLenString(&Query, "UPDATE mercs SET OwnerCharacterID = '%u', Slot = '%u', Name = '%s', TemplateID = '%u', SuspendedTime = '%u', IsSuspended = '%u', TimerRemaining = '%u', Gender = '%u', StanceID = '%u', HP = '%u', Mana = '%u', Endurance = '%u', Face = '%i', LuclinHairStyle = '%i', LuclinHairColor = '%i', LuclinEyeColor = '%i', LuclinEyeColor2 = '%i', LuclinBeardColor = '%i', LuclinBeard = '%i', DrakkinHeritage = '%i', DrakkinTattoo = '%i', DrakkinDetails = '%i' WHERE MercID = '%u'", merc->GetMercCharacterID(), owner->GetMercSlot(), merc->GetCleanName(), merc->GetMercTemplateID(), owner->GetMercInfo().SuspendedTime, merc->IsSuspended(), owner->GetMercInfo().MercTimerRemaining, merc->GetGender(), merc->GetStance(), merc->GetHP(), merc->GetMana(), merc->GetEndurance(), merc->GetLuclinFace(), merc->GetHairStyle(), merc->GetHairColor(), merc->GetEyeColor1(), merc->GetEyeColor2(), merc->GetBeardColor(), merc->GetBeard(), merc->GetDrakkinHeritage(), merc->GetDrakkinTattoo(), merc->GetDrakkinDetails(), merc->GetMercID()), TempErrorMessageBuffer, 0, &affectedRows)) { errorMessage = std::string(TempErrorMessageBuffer); } else { @@ -1797,17 +1797,17 @@ void ZoneDatabase::SaveMercBuffs(Merc *merc) { IsPersistent = 0; if(!database.RunQuery(Query, MakeAnyLenString(&Query, "INSERT INTO merc_buffs (MercId, SpellId, CasterLevel, DurationFormula, " - "TicsRemaining, PoisonCounters, DiseaseCounters, CurseCounters, CorruptionCounters, HitCount, MeleeRune, MagicRune, " - "DeathSaveSuccessChance, CasterAARank, Persistent) VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u);", - merc->GetMercID(), buffs[BuffCount].spellid, buffs[BuffCount].casterlevel, spells[buffs[BuffCount].spellid].buffdurationformula, - buffs[BuffCount].ticsremaining, - CalculatePoisonCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - CalculateCurseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, - buffs[BuffCount].numhits, buffs[BuffCount].melee_rune, buffs[BuffCount].magic_rune, - buffs[BuffCount].deathSaveSuccessChance, - buffs[BuffCount].deathsaveCasterAARank, IsPersistent), TempErrorMessageBuffer)) { + "TicsRemaining, PoisonCounters, DiseaseCounters, CurseCounters, CorruptionCounters, HitCount, MeleeRune, MagicRune, " + "DeathSaveSuccessChance, CasterAARank, Persistent) VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u);", + merc->GetMercID(), buffs[BuffCount].spellid, buffs[BuffCount].casterlevel, spells[buffs[BuffCount].spellid].buffdurationformula, + buffs[BuffCount].ticsremaining, + CalculatePoisonCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + CalculateCurseCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0 ? buffs[BuffCount].counters : 0, + buffs[BuffCount].numhits, buffs[BuffCount].melee_rune, buffs[BuffCount].magic_rune, + buffs[BuffCount].deathSaveSuccessChance, + buffs[BuffCount].deathsaveCasterAARank, IsPersistent), TempErrorMessageBuffer)) { errorMessage = std::string(TempErrorMessageBuffer); safe_delete(Query); Query = 0; @@ -1830,7 +1830,7 @@ void ZoneDatabase::SaveMercBuffs(Merc *merc) { void ZoneDatabase::LoadMercBuffs(Merc *merc) { Buffs_Struct *buffs = merc->GetBuffs(); - uint32 max_slots = merc->GetMaxBuffSlots(); + uint32 max_slots = merc->GetMaxBuffSlots(); std::string errorMessage; char* Query = 0; char TempErrorMessageBuffer[MYSQL_ERRMSG_SIZE]; @@ -1853,15 +1853,15 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) { buffs[BuffCount].casterlevel = atoi(DataRow[1]); buffs[BuffCount].ticsremaining = atoi(DataRow[3]); - if(CalculatePoisonCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[4]); - } else if(CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[5]); - } else if(CalculateCurseCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[6]); - } else if(CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0) { - buffs[BuffCount].counters = atoi(DataRow[7]); - } + if(CalculatePoisonCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[4]); + } else if(CalculateDiseaseCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[5]); + } else if(CalculateCurseCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[6]); + } else if(CalculateCorruptionCounters(buffs[BuffCount].spellid) > 0) { + buffs[BuffCount].counters = atoi(DataRow[7]); + } buffs[BuffCount].numhits = atoi(DataRow[8]); buffs[BuffCount].melee_rune = atoi(DataRow[9]); buffs[BuffCount].magic_rune = atoi(DataRow[10]); @@ -1899,7 +1899,7 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) { } bool ZoneDatabase::DeleteMerc(uint32 merc_id) { - std::string errorMessage; + std::string errorMessage; bool Result = false; int TempCounter = 0; @@ -1930,8 +1930,8 @@ bool ZoneDatabase::DeleteMerc(uint32 merc_id) { } if(!errorMessage.empty()) { - LogFile->write(EQEMuLog::Error, "Error Deleting Merc: %s", errorMessage.c_str()); - } + LogFile->write(EQEMuLog::Error, "Error Deleting Merc: %s", errorMessage.c_str()); + } return Result; } @@ -1953,11 +1953,11 @@ void ZoneDatabase::LoadMercEquipment(Merc *merc) { if(itemCount == MAX_WORN_INVENTORY) break; - if(atoi(DataRow[0]) > 0) { - merc->AddItem(itemCount, atoi(DataRow[0])); + if(atoi(DataRow[0]) > 0) { + merc->AddItem(itemCount, atoi(DataRow[0])); - itemCount++; - } + itemCount++; + } } mysql_free_result(DatasetResult); @@ -1995,7 +1995,7 @@ uint8 ZoneDatabase::GetGridType(uint32 grid, uint32 zoneid ) { void ZoneDatabase::SaveMerchantTemp(uint32 npcid, uint32 slot, uint32 item, uint32 charges){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "replace into merchantlist_temp (npcid,slot,itemid,charges) values(%d,%d,%d,%d)", npcid, slot, item, charges), errbuf)) { cerr << "Error in SaveMerchantTemp query '" << query << "' " << errbuf << endl; @@ -2004,7 +2004,7 @@ void ZoneDatabase::SaveMerchantTemp(uint32 npcid, uint32 slot, uint32 item, uint } void ZoneDatabase::DeleteMerchantTemp(uint32 npcid, uint32 slot){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "delete from merchantlist_temp where npcid=%d and slot=%d", npcid, slot), errbuf)) { cerr << "Error in DeleteMerchantTemp query '" << query << "' " << errbuf << endl; @@ -2015,7 +2015,7 @@ void ZoneDatabase::DeleteMerchantTemp(uint32 npcid, uint32 slot){ bool ZoneDatabase::UpdateZoneSafeCoords(const char* zonename, float x=0, float y=0, float z=0) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (!RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET safe_x='%f', safe_y='%f', safe_z='%f' WHERE short_name='%s';", x, y, z, zonename), errbuf, 0, &affected_rows)) { @@ -2071,10 +2071,10 @@ uint8 ZoneDatabase::GetUseCFGSafeCoords() uint32 ZoneDatabase::GetServerFilters(char* name, ServerSideFilters_Struct *ssfs) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_ROW row; unsigned long* lengths; @@ -2113,7 +2113,7 @@ uint32 ZoneDatabase::GetServerFilters(char* name, ServerSideFilters_Struct *ssfs bool ZoneDatabase::SetServerFilters(char* name, ServerSideFilters_Struct *ssfs) { char errbuf[MYSQL_ERRMSG_SIZE]; - char query[256+sizeof(ServerSideFilters_Struct)*2+1]; + char query[256+sizeof(ServerSideFilters_Struct)*2+1]; char* end = query; //if (strlen(name) > 15) @@ -2130,15 +2130,15 @@ bool ZoneDatabase::SetServerFilters(char* name, ServerSideFilters_Struct *ssfs) end += sprintf(end, "UPDATE account SET serverfilters="); *end++ = '\''; - end += DoEscapeString(end, (char*)ssfs, sizeof(ServerSideFilters_Struct)); - *end++ = '\''; - end += sprintf(end," WHERE name='%s'", name); + end += DoEscapeString(end, (char*)ssfs, sizeof(ServerSideFilters_Struct)); + *end++ = '\''; + end += sprintf(end," WHERE name='%s'", name); uint32 affected_rows = 0; - if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { - cerr << "Error in SetServerSideFilters query " << errbuf << endl; + if (!RunQuery(query, (uint32) (end - query), errbuf, 0, &affected_rows)) { + cerr << "Error in SetServerSideFilters query " << errbuf << endl; return false; - } + } if (affected_rows == 0) { return false; @@ -2151,9 +2151,9 @@ bool ZoneDatabase::SetServerFilters(char* name, ServerSideFilters_Struct *ssfs) //New functions for timezone uint32 ZoneDatabase::GetZoneTZ(uint32 zoneid, uint32 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT timezone FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneid, version), errbuf, &result)) { @@ -2175,7 +2175,7 @@ uint32 ZoneDatabase::GetZoneTZ(uint32 zoneid, uint32 version) { bool ZoneDatabase::SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET timezone=%i WHERE zoneidnumber=%i AND version=%i", tz, zoneid, version), errbuf, 0, &affected_rows)) { @@ -2200,9 +2200,9 @@ bool ZoneDatabase::SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz) { //Functions for weather uint8 ZoneDatabase::GetZoneWeather(uint32 zoneid, uint32 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT weather FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneid, version), errbuf, &result)) { @@ -2225,7 +2225,7 @@ uint8 ZoneDatabase::GetZoneWeather(uint32 zoneid, uint32 version) { bool ZoneDatabase::SetZoneWeather(uint32 zoneid, uint32 version, uint8 w) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (RunQuery(query, MakeAnyLenString(&query, "UPDATE zone SET weather=%i WHERE zoneidnumber=%i AND version=%i", w, zoneid, version), errbuf, 0, &affected_rows)) { @@ -2251,8 +2251,8 @@ bool ZoneDatabase::SetZoneWeather(uint32 zoneid, uint32 version, uint8 w) { */ bool ZoneDatabase::GetAccountInfoForLogin(uint32 account_id, int16* admin, char* account_name, uint32* lsaccountid, uint8* gmspeed, bool* revoked,bool* gmhideme) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; if (RunQuery(query, MakeAnyLenString(&query, "SELECT status, name, lsaccount_id, gmspeed, revoked, hideme FROM account WHERE id=%i", account_id), errbuf, &result)) { safe_delete_array(query); @@ -2331,9 +2331,9 @@ void ZoneDatabase::RefreshGroupFromDB(Client *c){ uint8 ZoneDatabase::GroupCount(uint32 groupid){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; uint8 count=0; if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(charid) FROM group_id WHERE groupid=%d", groupid), errbuf, &result)) { if((row = mysql_fetch_row(result))!=nullptr) @@ -2348,29 +2348,29 @@ uint8 ZoneDatabase::GroupCount(uint32 groupid){ uint8 ZoneDatabase::RaidGroupCount(uint32 raidid, uint32 groupid) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; - uint8 count=0; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(charid) FROM raid_members WHERE raidid=%d AND groupid=%d;", raidid, groupid), errbuf, &result)) { - if((row = mysql_fetch_row(result))!=nullptr) - count = atoi(row[0]); - mysql_free_result(result); - } else { - LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::RaidGroupCount query '%s': %s", query, errbuf); - } - safe_delete_array(query); - return count; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + uint8 count=0; + if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(charid) FROM raid_members WHERE raidid=%d AND groupid=%d;", raidid, groupid), errbuf, &result)) { + if((row = mysql_fetch_row(result))!=nullptr) + count = atoi(row[0]); + mysql_free_result(result); + } else { + LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::RaidGroupCount query '%s': %s", query, errbuf); + } + safe_delete_array(query); + return count; } int32 ZoneDatabase::GetBlockedSpellsCount(uint32 zoneid) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; sprintf(query, "SELECT count(*) FROM blocked_spells WHERE zoneid=%d", zoneid); if (RunQuery(query, strlen(query), errbuf, &result)) { @@ -2397,9 +2397,9 @@ bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked LogFile->write(EQEMuLog::Status, "Loading Blocked Spells from database..."); char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; MakeAnyLenString(&query, "SELECT id, spellid, type, x, y, z, x_diff, y_diff, z_diff, message " "FROM blocked_spells WHERE zoneid=%d ORDER BY id asc", zoneid); @@ -2438,9 +2438,9 @@ bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked int ZoneDatabase::getZoneShutDownDelay(uint32 zoneID, uint32 version) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT shutdowndelay FROM zone WHERE zoneidnumber=%i AND (version=%i OR version=0) ORDER BY version DESC", zoneID, version), errbuf, &result)) { @@ -2494,7 +2494,7 @@ uint32 ZoneDatabase::GetKarma(uint32 acct_id) void ZoneDatabase::UpdateKarma(uint32 acct_id, uint32 amount) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (RunQuery(query, MakeAnyLenString(&query, "UPDATE account set karma=%i where id=%i", amount, acct_id), errbuf, 0, &affected_rows)){ @@ -2550,7 +2550,7 @@ void ZoneDatabase::QGlobalPurge() void ZoneDatabase::InsertDoor(uint32 ddoordbid, uint16 ddoorid, const char* ddoor_name, float dxpos, float dypos, float dzpos, float dheading, uint8 dopentype, uint16 dguildid, uint32 dlockpick, uint32 dkeyitem, uint8 ddoor_param, uint8 dinvert, int dincline, uint16 dsize){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "replace into doors (id, doorid,zone,version,name,pos_x,pos_y,pos_z,heading,opentype,guild,lockpick,keyitem,door_param,invert_state,incline,size) values('%i','%i','%s','%i', '%s','%f','%f','%f','%f','%i','%i','%i', '%i','%i','%i','%i','%i')", ddoordbid ,ddoorid ,zone->GetShortName(), zone->GetInstanceVersion(), ddoor_name, dxpos, dypos, dzpos, dheading, dopentype, dguildid, dlockpick, dkeyitem, ddoor_param, dinvert, dincline, dsize), errbuf)) { cerr << "Error in InsertDoor" << query << "' " << errbuf << endl; } @@ -2558,10 +2558,10 @@ void ZoneDatabase::InsertDoor(uint32 ddoordbid, uint16 ddoorid, const char* ddoo } void ZoneDatabase::LoadAltCurrencyValues(uint32 char_id, std::map ¤cy) { - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; if (RunQuery(query, MakeAnyLenString(&query, "SELECT currency_id, amount FROM character_alt_currency where char_id='%u'", char_id), errbuf, &result)) { safe_delete_array(query); @@ -2578,112 +2578,112 @@ void ZoneDatabase::LoadAltCurrencyValues(uint32 char_id, std::mapCharacterID()), + database.RunQuery(query, MakeAnyLenString(&query, "DELETE FROM `character_buffs` WHERE `character_id`='%u'", c->CharacterID()), errbuf); - uint32 buff_count = c->GetMaxBuffSlots(); - Buffs_Struct *buffs = c->GetBuffs(); - for (int i = 0; i < buff_count; i++) { - if(buffs[i].spellid != SPELL_UNKNOWN) { - if(!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO `character_buffs` (character_id, slot_id, spell_id, " - "caster_level, caster_name, ticsremaining, counters, numhits, melee_rune, magic_rune, persistent, death_save_chance, " - "death_save_aa_chance) VALUES('%u', '%u', '%u', '%u', '%s', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", - c->CharacterID(), i, buffs[i].spellid, buffs[i].casterlevel, buffs[i].caster_name, buffs[i].ticsremaining, - buffs[i].counters, buffs[i].numhits, buffs[i].melee_rune, buffs[i].magic_rune, buffs[i].persistant_buff, - buffs[i].deathSaveSuccessChance, buffs[i].deathsaveCasterAARank), - errbuf)) { - LogFile->write(EQEMuLog::Error, "Error in SaveBuffs query '%s': %s", query, errbuf); - } - } - } - safe_delete_array(query); + uint32 buff_count = c->GetMaxBuffSlots(); + Buffs_Struct *buffs = c->GetBuffs(); + for (int i = 0; i < buff_count; i++) { + if(buffs[i].spellid != SPELL_UNKNOWN) { + if(!database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO `character_buffs` (character_id, slot_id, spell_id, " + "caster_level, caster_name, ticsremaining, counters, numhits, melee_rune, magic_rune, persistent, death_save_chance, " + "death_save_aa_chance) VALUES('%u', '%u', '%u', '%u', '%s', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", + c->CharacterID(), i, buffs[i].spellid, buffs[i].casterlevel, buffs[i].caster_name, buffs[i].ticsremaining, + buffs[i].counters, buffs[i].numhits, buffs[i].melee_rune, buffs[i].magic_rune, buffs[i].persistant_buff, + buffs[i].deathSaveSuccessChance, buffs[i].deathsaveCasterAARank), + errbuf)) { + LogFile->write(EQEMuLog::Error, "Error in SaveBuffs query '%s': %s", query, errbuf); + } + } + } + safe_delete_array(query); } void ZoneDatabase::LoadBuffs(Client *c) { - Buffs_Struct *buffs = c->GetBuffs(); - uint32 max_slots = c->GetMaxBuffSlots(); - for(int i = 0; i < max_slots; ++i) { - buffs[i].spellid = SPELL_UNKNOWN; - } + Buffs_Struct *buffs = c->GetBuffs(); + uint32 max_slots = c->GetMaxBuffSlots(); + for(int i = 0; i < max_slots; ++i) { + buffs[i].spellid = SPELL_UNKNOWN; + } - char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; - if (RunQuery(query, MakeAnyLenString(&query, "SELECT spell_id, slot_id, caster_level, caster_name, ticsremaining, counters, " - "numhits, melee_rune, magic_rune, persistent, death_save_chance, death_save_aa_chance FROM `character_buffs` WHERE " - "`character_id`='%u'", - c->CharacterID()), errbuf, &result)) - { + char errbuf[MYSQL_ERRMSG_SIZE]; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; + if (RunQuery(query, MakeAnyLenString(&query, "SELECT spell_id, slot_id, caster_level, caster_name, ticsremaining, counters, " + "numhits, melee_rune, magic_rune, persistent, death_save_chance, death_save_aa_chance FROM `character_buffs` WHERE " + "`character_id`='%u'", + c->CharacterID()), errbuf, &result)) + { safe_delete_array(query); while ((row = mysql_fetch_row(result))) { - uint32 slot_id = atoul(row[1]); - if(slot_id >= c->GetMaxBuffSlots()) { - continue; - } + uint32 slot_id = atoul(row[1]); + if(slot_id >= c->GetMaxBuffSlots()) { + continue; + } uint32 spell_id = atoul(row[0]); - if(!IsValidSpell(spell_id)) { - continue; - } + if(!IsValidSpell(spell_id)) { + continue; + } - Client *caster = entity_list.GetClientByName(row[3]); - uint32 caster_level = atoi(row[2]); - uint32 ticsremaining = atoul(row[4]); - uint32 counters = atoul(row[5]); - uint32 numhits = atoul(row[6]); - uint32 melee_rune = atoul(row[7]); - uint32 magic_rune = atoul(row[8]); - uint8 persistent = atoul(row[9]); - uint32 death_save_chance = atoul(row[10]); - uint32 death_save_aa_chance = atoul(row[11]); + Client *caster = entity_list.GetClientByName(row[3]); + uint32 caster_level = atoi(row[2]); + uint32 ticsremaining = atoul(row[4]); + uint32 counters = atoul(row[5]); + uint32 numhits = atoul(row[6]); + uint32 melee_rune = atoul(row[7]); + uint32 magic_rune = atoul(row[8]); + uint8 persistent = atoul(row[9]); + uint32 death_save_chance = atoul(row[10]); + uint32 death_save_aa_chance = atoul(row[11]); - buffs[slot_id].spellid = spell_id; - buffs[slot_id].casterlevel = caster_level; - if(caster) { - buffs[slot_id].casterid = caster->GetID(); - strcpy(buffs[slot_id].caster_name, caster->GetName()); - buffs[slot_id].client = true; - } else { - buffs[slot_id].casterid = 0; - strcpy(buffs[slot_id].caster_name, ""); - buffs[slot_id].client = false; - } + buffs[slot_id].spellid = spell_id; + buffs[slot_id].casterlevel = caster_level; + if(caster) { + buffs[slot_id].casterid = caster->GetID(); + strcpy(buffs[slot_id].caster_name, caster->GetName()); + buffs[slot_id].client = true; + } else { + buffs[slot_id].casterid = 0; + strcpy(buffs[slot_id].caster_name, ""); + buffs[slot_id].client = false; + } - buffs[slot_id].ticsremaining = ticsremaining; - buffs[slot_id].counters = counters; - buffs[slot_id].numhits = numhits; - buffs[slot_id].melee_rune = melee_rune; - buffs[slot_id].magic_rune = magic_rune; - buffs[slot_id].persistant_buff = persistent ? true : false; - buffs[slot_id].deathSaveSuccessChance = death_save_chance; - buffs[slot_id].deathsaveCasterAARank = death_save_aa_chance; - buffs[slot_id].UpdateClient = false; - if(IsRuneSpell(spell_id)) { - c->SetHasRune(true); - } - else if(IsMagicRuneSpell(spell_id)) { - c->SetHasSpellRune(true); - } + buffs[slot_id].ticsremaining = ticsremaining; + buffs[slot_id].counters = counters; + buffs[slot_id].numhits = numhits; + buffs[slot_id].melee_rune = melee_rune; + buffs[slot_id].magic_rune = magic_rune; + buffs[slot_id].persistant_buff = persistent ? true : false; + buffs[slot_id].deathSaveSuccessChance = death_save_chance; + buffs[slot_id].deathsaveCasterAARank = death_save_aa_chance; + buffs[slot_id].UpdateClient = false; + if(IsRuneSpell(spell_id)) { + c->SetHasRune(true); + } + else if(IsMagicRuneSpell(spell_id)) { + c->SetHasSpellRune(true); + } /* - if(IsDeathSaveSpell(spell_id)) { - c->SetDeathSaveChance(true); - } + if(IsDeathSaveSpell(spell_id)) { + c->SetDeathSaveChance(true); + } */ } mysql_free_result(result); @@ -2691,35 +2691,35 @@ void ZoneDatabase::LoadBuffs(Client *c) { else { LogFile->write(EQEMuLog::Error, "Error in LoadBuffs query '%s': %s", query, errbuf); safe_delete_array(query); - return; + return; } - max_slots = c->GetMaxBuffSlots(); - for(int i = 0; i < max_slots; ++i) { - if(!IsValidSpell(buffs[i].spellid)) { - continue; - } + max_slots = c->GetMaxBuffSlots(); + for(int i = 0; i < max_slots; ++i) { + if(!IsValidSpell(buffs[i].spellid)) { + continue; + } - for(int j = 0; j < 12; ++j) { - bool cont = false; - switch(spells[buffs[i].spellid].effectid[j]) { - case SE_Charm: - buffs[i].spellid = SPELL_UNKNOWN; - cont = true; - break; - case SE_Illusion: - if(!buffs[i].persistant_buff) { - buffs[i].spellid = SPELL_UNKNOWN; - cont = true; - } - break; - } + for(int j = 0; j < 12; ++j) { + bool cont = false; + switch(spells[buffs[i].spellid].effectid[j]) { + case SE_Charm: + buffs[i].spellid = SPELL_UNKNOWN; + cont = true; + break; + case SE_Illusion: + if(!buffs[i].persistant_buff) { + buffs[i].spellid = SPELL_UNKNOWN; + cont = true; + } + break; + } - if(cont) { - break; - } - } - } + if(cont) { + break; + } + } + } } void ZoneDatabase::SavePetInfo(Client *c) { @@ -2817,7 +2817,7 @@ void ZoneDatabase::SavePetInfo(Client *c) { void ZoneDatabase::RemoveTempFactions(Client *c){ char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; if (!RunQuery(query, MakeAnyLenString(&query, "DELETE FROM faction_values WHERE temp = 1 AND char_id=%u", c->CharacterID()), errbuf)) { cerr << "Error in RemoveTempFactions query '" << query << "' " << errbuf << endl; @@ -2829,8 +2829,8 @@ void ZoneDatabase::LoadPetInfo(Client *c) { // Load current pet and suspended pet char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + MYSQL_RES *result; + MYSQL_ROW row; PetInfo *petinfo = c->GetPetInfo(0); PetInfo *suspended = c->GetPetInfo(1); @@ -2870,12 +2870,12 @@ void ZoneDatabase::LoadPetInfo(Client *c) { } - if (RunQuery(query, MakeAnyLenString(&query, + if (RunQuery(query, MakeAnyLenString(&query, "SELECT `pet`, `slot`, `spell_id`, `caster_level`, `castername`, " "`ticsremaining`, `counters` FROM `character_pet_buffs` " "WHERE `char_id`=%u", - c->CharacterID()), errbuf, &result)) - { + c->CharacterID()), errbuf, &result)) + { safe_delete_array(query); while ((row = mysql_fetch_row(result))) { @@ -2917,7 +2917,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) { else { LogFile->write(EQEMuLog::Error, "Error in LoadPetInfo query '%s': %s", query, errbuf); safe_delete_array(query); - return; + return; } if (database.RunQuery(query, MakeAnyLenString(&query, @@ -2945,7 +2945,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) { else { LogFile->write(EQEMuLog::Error, "Error in LoadPetInfo query '%s': %s", query, errbuf); safe_delete_array(query); - return; + return; } } @@ -2953,61 +2953,61 @@ bool ZoneDatabase::GetFactionData(FactionMods* fm, uint32 class_mod, uint32 race if (faction_id <= 0 || faction_id > (int32) max_faction) return false; - if (faction_array[faction_id] == 0){ + if (faction_array[faction_id] == 0){ return false; } - fm->base = faction_array[faction_id]->base; + fm->base = faction_array[faction_id]->base; - if(class_mod > 0) { - char str[32]; - sprintf(str, "c%u", class_mod); + if(class_mod > 0) { + char str[32]; + sprintf(str, "c%u", class_mod); - std::map::const_iterator iter = faction_array[faction_id]->mods.find(str); - if(iter != faction_array[faction_id]->mods.end()) { - fm->class_mod = iter->second; - } else { - fm->class_mod = 0; - } - } else { - fm->class_mod = 0; - } + std::map::const_iterator iter = faction_array[faction_id]->mods.find(str); + if(iter != faction_array[faction_id]->mods.end()) { + fm->class_mod = iter->second; + } else { + fm->class_mod = 0; + } + } else { + fm->class_mod = 0; + } - if(race_mod > 0) { - char str[32]; - sprintf(str, "r%u", race_mod); + if(race_mod > 0) { + char str[32]; + sprintf(str, "r%u", race_mod); - std::map::iterator iter = faction_array[faction_id]->mods.find(str); - if(iter != faction_array[faction_id]->mods.end()) { - fm->race_mod = iter->second; - } else { - fm->race_mod = 0; - } - } else { - fm->race_mod = 0; - } + std::map::iterator iter = faction_array[faction_id]->mods.find(str); + if(iter != faction_array[faction_id]->mods.end()) { + fm->race_mod = iter->second; + } else { + fm->race_mod = 0; + } + } else { + fm->race_mod = 0; + } - if(deity_mod > 0) { - char str[32]; - sprintf(str, "d%u", deity_mod); + if(deity_mod > 0) { + char str[32]; + sprintf(str, "d%u", deity_mod); - std::map::iterator iter = faction_array[faction_id]->mods.find(str); - if(iter != faction_array[faction_id]->mods.end()) { - fm->deity_mod = iter->second; - } else { - fm->deity_mod = 0; - } - } else { - fm->deity_mod = 0; - } + std::map::iterator iter = faction_array[faction_id]->mods.find(str); + if(iter != faction_array[faction_id]->mods.end()) { + fm->deity_mod = iter->second; + } else { + fm->deity_mod = 0; + } + } else { + fm->deity_mod = 0; + } return true; } bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map & val_list) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; + char *query = 0; + MYSQL_RES *result; if (RunQuery(query, MakeAnyLenString(&query, "SELECT faction_id,current_value FROM faction_values WHERE char_id = %i",char_id), errbuf, &result)) { safe_delete_array(query); bool ret = LoadFactionValues_result(result, val_list); @@ -3022,7 +3022,7 @@ bool ZoneDatabase::LoadFactionValues(uint32 char_id, faction_map & val_list) { } bool ZoneDatabase::LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list) { - MYSQL_ROW row; + MYSQL_ROW row; while((row = mysql_fetch_row(result))) { val_list[atoi(row[0])] = atoi(row[1]); } @@ -3032,8 +3032,7 @@ bool ZoneDatabase::LoadFactionValues_result(MYSQL_RES* result, faction_map & val //o-------------------------------------------------------------- //| Name: GetFactionName; rembrant, Dec. 16 //o-------------------------------------------------------------- -//| Notes: Retrieves the name of the specified faction -//| Returns false on failure. +//| Notes: Retrieves the name of the specified faction .Returns false on failure. //o-------------------------------------------------------------- bool ZoneDatabase::GetFactionName(int32 faction_id, char* name, uint32 buflen) { if ((faction_id <= 0) || faction_id > int32(max_faction) ||(faction_array[faction_id] == 0)) @@ -3049,9 +3048,7 @@ bool ZoneDatabase::GetFactionName(int32 faction_id, char* name, uint32 buflen) { //o-------------------------------------------------------------- //| Name: GetNPCFactionList; rembrant, Dec. 16, 2001 //o-------------------------------------------------------------- -//| Purpose: Gets a list of faction_id's and values bound to -//| the npc_id. -//| Returns false on failure. +//| Purpose: Gets a list of faction_id's and values bound to the npc_id. Returns false on failure. //o-------------------------------------------------------------- bool ZoneDatabase::GetNPCFactionList(uint32 npcfaction_id, int32* faction_id, int32* value, uint8* temp, int32* primary_faction) { if (npcfaction_id <= 0) { @@ -3075,14 +3072,12 @@ bool ZoneDatabase::GetNPCFactionList(uint32 npcfaction_id, int32* faction_id, in //o-------------------------------------------------------------- //| Name: SetCharacterFactionLevel; rembrant, Dec. 20, 2001 //o-------------------------------------------------------------- -//| Purpose: Update characters faction level with specified -//| faction_id to specified value. -//| Returns false on failure. +//| Purpose: Update characters faction level with specified faction_id to specified value. Returns false on failure. //o-------------------------------------------------------------- bool ZoneDatabase::SetCharacterFactionLevel(uint32 char_id, int32 faction_id, int32 value, uint8 temp, faction_map &val_list) { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; + char *query = 0; uint32 affected_rows = 0; if (!RunQuery(query, MakeAnyLenString(&query, @@ -3127,9 +3122,9 @@ bool ZoneDatabase::SetCharacterFactionLevel(uint32 char_id, int32 faction_id, in bool ZoneDatabase::LoadFactionData() { char errbuf[MYSQL_ERRMSG_SIZE]; - char *query = 0; - MYSQL_RES *result; - MYSQL_ROW row; + char *query = 0; + MYSQL_RES *result; + MYSQL_ROW row; query = new char[256]; strcpy(query, "SELECT MAX(id) FROM faction_list"); @@ -3158,18 +3153,18 @@ bool ZoneDatabase::LoadFactionData() strn0cpy(faction_array[index]->name, row[1], 50); faction_array[index]->base = atoi(row[2]); - char sec_errbuf[MYSQL_ERRMSG_SIZE]; - MYSQL_RES *sec_result; - MYSQL_ROW sec_row; - MakeAnyLenString(&query, "SELECT `mod`, `mod_name` FROM `faction_list_mod` WHERE faction_id=%u", index); - if (RunQuery(query, strlen(query), sec_errbuf, &sec_result)) { - while((sec_row = mysql_fetch_row(sec_result))) - { - faction_array[index]->mods[sec_row[1]] = atoi(sec_row[0]); - } - mysql_free_result(sec_result); - } - safe_delete_array(query); + char sec_errbuf[MYSQL_ERRMSG_SIZE]; + MYSQL_RES *sec_result; + MYSQL_ROW sec_row; + MakeAnyLenString(&query, "SELECT `mod`, `mod_name` FROM `faction_list_mod` WHERE faction_id=%u", index); + if (RunQuery(query, strlen(query), sec_errbuf, &sec_result)) { + while((sec_row = mysql_fetch_row(sec_result))) + { + faction_array[index]->mods[sec_row[1]] = atoi(sec_row[0]); + } + mysql_free_result(sec_result); + } + safe_delete_array(query); } mysql_free_result(result); } diff --git a/zone/zonedb.h b/zone/zonedb.h index daf035d68..e15ac4268 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -9,11 +9,11 @@ //#include "doors.h" struct wplist { - int index; + int index; float x; float y; float z; - int pause; + int pause; float heading; }; @@ -110,7 +110,7 @@ struct MercTemplate { uint32 MercSubType; // From dbstr_us.txt - 330020105^23^Race: Guktan
Type: Healer
Confidence: High
Proficiency: Apprentice, Tier V... uint16 RaceID; uint8 ClassID; - uint32 MercNPCID; + uint32 MercNPCID; uint8 ProficiencyID; uint8 TierID; uint8 CostFormula; // To determine cost to client @@ -122,10 +122,10 @@ struct MercTemplate { }; struct MercInfo { - uint32 mercid; + uint32 mercid; uint8 slot; char merc_name[64]; - uint32 MercTemplateID; + uint32 MercTemplateID; const MercTemplate* myTemplate; uint32 SuspendedTime; bool IsSuspended; @@ -156,7 +156,7 @@ struct MercSpellEntry { uint8 minlevel; uint8 maxlevel; int16 slot; - uint16 proc_chance; + uint16 proc_chance; uint32 time_cancast; // when we can cast this spell next }; @@ -172,15 +172,15 @@ struct LootTable_Struct; class ZoneDatabase : public SharedDatabase { - typedef list ItemList; + typedef list ItemList; public: ZoneDatabase(); ZoneDatabase(const char* host, const char* user, const char* passwd, const char* database,uint32 port); virtual ~ZoneDatabase(); /* - * Objects and World Containers - */ + * Objects and World Containers + */ void LoadWorldContainer(uint32 parentid, ItemInst* container); void SaveWorldContainer(uint32 zone_id, uint32 parent_id, const ItemInst* container); void DeleteWorldContainer(uint32 parent_id,uint32 zone_id); @@ -190,11 +190,11 @@ public: Ground_Spawns* LoadGroundSpawns(uint32 zone_id, int16 version, Ground_Spawns* gs); /* - * Traders - */ + * Traders + */ - void SaveTraderItem(uint32 char_id,uint32 itemid,uint32 uniqueid, int32 charges,uint32 itemcost,uint8 slot); - void UpdateTraderItemCharges(int char_id, uint32 ItemInstID, int32 charges); + void SaveTraderItem(uint32 char_id,uint32 itemid,uint32 uniqueid, int32 charges,uint32 itemcost,uint8 slot); + void UpdateTraderItemCharges(int char_id, uint32 ItemInstID, int32 charges); void UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charges, uint32 NewPrice); ItemInst* LoadSingleTraderItem(uint32 char_id, int uniqueid); void DeleteTraderItem(uint32 char_id); @@ -210,8 +210,8 @@ public: void UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity); /* - * General Character Related Stuff - */ + * General Character Related Stuff + */ bool SetServerFilters(char* name, ServerSideFilters_Struct *ssfs); uint32 GetServerFilters(char* name, ServerSideFilters_Struct *ssfs); bool GetAccountInfoForLogin(uint32 account_id, int16* admin = 0, char* account_name = 0, @@ -221,26 +221,26 @@ public: uint32* account_creation = 0); bool GetCharacterInfoForLogin_result(MYSQL_RES* result, uint32* character_id = 0, char* current_zone = 0, PlayerProfile_Struct* pp = 0, Inventory* inv = 0, ExtendedProfile_Struct *ext = 0, uint32* pplen = 0, - uint32* guilddbid = 0, uint8* guildrank = 0, uint8 *class_= 0, uint8 *level = 0, bool *LFP = 0, + uint32* guilddbid = 0, uint8* guildrank = 0, uint8 *class_= 0, uint8 *level = 0, bool *LFP = 0, bool *LFG = 0, uint8 *NumXTargets = 0, uint8* firstlogon = 0); bool GetCharacterInfoForLogin(const char* name, uint32* character_id = 0, char* current_zone = 0, PlayerProfile_Struct* pp = 0, Inventory* inv = 0, ExtendedProfile_Struct *ext = 0, uint32* pplen = 0, uint32* guilddbid = 0, uint8* guildrank = 0, uint8 *class_ = 0, uint8 *level = 0, bool *LFP = 0, bool *LFG = 0, uint8 *NumXTargets = 0, uint8* firstlogon = 0); void SaveBuffs(Client *c); - void LoadBuffs(Client *c); + void LoadBuffs(Client *c); void LoadPetInfo(Client *c); void SavePetInfo(Client *c); void RemoveTempFactions(Client *c); /* - * Character Inventory - */ + * Character Inventory + */ bool NoRentExpired(const char* name); /* - * Corpses - */ + * Corpses + */ bool GetDecayTimes(npcDecayTimes_Struct* npcCorpseDecayTimes); uint32 CreatePlayerCorpse(uint32 charid, const char* charname, uint32 zoneid, uint16 instanceid, uchar* data, uint32 datasize, float x, float y, float z, float heading); bool CreatePlayerCorpseBackup(uint32 dbid, uint32 charid, const char* charname, uint32 zoneid, uint16 instanceid, uchar* data, uint32 datasize, float x, float y, float z, float heading); @@ -260,15 +260,15 @@ public: uint32 NewGraveyardRecord(uint32 graveyard_zoneid, float graveyard_x, float graveyard_y, float graveyard_z, float graveyard_heading); uint32 AddGraveyardIDToZone(uint32 zone_id, uint32 graveyard_id); bool DeleteGraveyard(uint32 zone_id, uint32 graveyard_id); - uint32 GetFirstCorpseID(uint32 char_id); - uint32 GetPlayerCorpseCount(uint32 char_id); - uint32 GetPlayerCorpseID(uint32 char_id, uint8 corpse); - uint32 GetPlayerCorpseItemAt(uint32 corpse_id, uint16 slotid); + uint32 GetFirstCorpseID(uint32 char_id); + uint32 GetPlayerCorpseCount(uint32 char_id); + uint32 GetPlayerCorpseID(uint32 char_id, uint8 corpse); + uint32 GetPlayerCorpseItemAt(uint32 corpse_id, uint16 slotid); uint32 GetPlayerCorpseTimeLeft(uint8 corpse, uint8 type); /* - * Faction - */ + * Faction + */ bool GetNPCFactionList(uint32 npcfaction_id, int32* faction_id, int32* value, uint8* temp, int32* primary_faction = 0); bool GetFactionData(FactionMods* fd, uint32 class_mod, uint32 race_mod, uint32 deity_mod, int32 faction_id); //rembrant, needed for factions Dec, 16 2001 bool GetFactionName(int32 faction_id, char* name, uint32 buflen); // rembrant, needed for factions Dec, 16 2001 @@ -279,11 +279,11 @@ public: bool LoadFactionValues_result(MYSQL_RES* result, faction_map & val_list); /* - * AAs - */ - bool LoadAAEffects(); + * AAs + */ + bool LoadAAEffects(); bool LoadAAEffects2(); - bool LoadSwarmSpells(); + bool LoadSwarmSpells(); SendAA_Struct* GetAASkillVars(uint32 skill_id); uint8 GetTotalAALevels(uint32 skill_id); uint32 GetSizeAA(); @@ -293,8 +293,8 @@ public: void FillAAEffects(SendAA_Struct* aa_struct); /* - * Zone related - */ + * Zone related + */ bool GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct *data, bool &can_bind, bool &can_combat, bool &can_levitate, bool &can_castoutdoor, bool &is_city, bool &is_hotzone, bool &allow_mercs, int &ruleset, char **map_filename); bool SaveZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct* zd); bool DumpZoneState(); @@ -302,13 +302,13 @@ public: bool LoadStaticZonePoints(LinkedList* zone_point_list,const char* zonename, uint32 version); bool UpdateZoneSafeCoords(const char* zonename, float x, float y, float z); uint8 GetUseCFGSafeCoords(); - int getZoneShutDownDelay(uint32 zoneID, uint32 version); + int getZoneShutDownDelay(uint32 zoneID, uint32 version); /* - * Spawns and Spawn Points - */ + * Spawns and Spawn Points + */ bool LoadSpawnGroups(const char* zone_name, uint16 version, SpawnGroupList* spawn_group_list); - bool LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_group_list); + bool LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_group_list); bool PopulateZoneSpawnList(uint32 zoneid, LinkedList &spawn2_list, int16 version, uint32 repopdelay = 0); Spawn2* LoadSpawn2(LinkedList &spawn2_list, uint32 spawn2id, uint32 timeleft); bool CreateSpawn2(Client *c, uint32 spawngroup, const char* zone, float heading, float x, float y, float z, uint32 respawn, uint32 variance, uint16 condition, int16 cond_value); @@ -317,8 +317,8 @@ public: void UpdateSpawn2Status(uint32 id, uint8 new_status); /* - * Grids/Paths - */ + * Grids/Paths + */ uint32 GetFreeGrid(uint16 zoneid); void DeleteGrid(Client *c, uint32 sg2, uint32 grid_num, bool grid_too,uint16 zoneid); void DeleteWaypoint(Client *c, uint32 grid_num, uint32 wp_num,uint16 zoneid); @@ -326,17 +326,17 @@ public: void AddWP(Client *c, uint32 gridid, uint32 wpnum, float xpos, float ypos, float zpos, uint32 pause, uint16 zoneid, float heading); uint32 AddWPForSpawn(Client *c, uint32 spawn2id, float xpos, float ypos, float zpos, uint32 pause, int type1, int type2, uint16 zoneid, float heading); void ModifyGrid(Client *c, bool remove, uint32 id, uint8 type = 0, uint8 type2 = 0,uint16 zoneid = 0); - void ModifyWP(Client *c, uint32 grid_id, uint32 wp_num, float xpos, float ypos, float zpos, uint32 script=0,uint16 zoneid =0); - uint8 GetGridType(uint32 grid,uint32 zoneid); - uint8 GetGridType2(uint32 grid, uint16 zoneid); - bool GetWaypoints(uint32 grid, uint16 zoneid, uint32 num, wplist* wp); + void ModifyWP(Client *c, uint32 grid_id, uint32 wp_num, float xpos, float ypos, float zpos, uint32 script=0,uint16 zoneid =0); + uint8 GetGridType(uint32 grid,uint32 zoneid); + uint8 GetGridType2(uint32 grid, uint16 zoneid); + bool GetWaypoints(uint32 grid, uint16 zoneid, uint32 num, wplist* wp); void AssignGrid(Client *client, float x, float y, uint32 id); int GetHighestGrid(uint32 zoneid); int GetHighestWaypoint(uint32 zoneid, uint32 gridid); /* - * NPCs - */ + * NPCs + */ const NPCType* GetNPCType(uint32 id); uint32 NPCSpawnDB(uint8 command, const char* zone, uint32 zone_version, Client *c, NPC* spawn = 0, uint32 extra = 0); // 0 = Create 1 = Add; 2 = Update; 3 = Remove; 4 = Delete bool SetSpecialAttkFlag(uint8 id, const char* flag); @@ -349,12 +349,12 @@ public: DBnpcspells_Struct* GetNPCSpells(uint32 iDBSpellsID); /* - * Mercs - */ + * Mercs + */ const NPCType* GetMercType(uint32 id, uint16 raceid, uint32 clientlevel); - void LoadMercEquipment(Merc *merc); + void LoadMercEquipment(Merc *merc); void SaveMercBuffs(Merc *merc); - void LoadMercBuffs(Merc *merc); + void LoadMercBuffs(Merc *merc); bool LoadMercInfo(Client *c); bool LoadCurrentMerc(Client *c); bool SaveMerc(Merc *merc); @@ -363,8 +363,8 @@ public: //void LoadMercsForMercMerchant(NPC *merchant); /* - * Petitions - */ + * Petitions + */ void UpdateBug(BugStruct* bug); void UpdateBug(PetitionBug_Struct* bug); void DeletePetitionFromDB(Petition* wpet); @@ -374,28 +374,28 @@ public: /* - * Merchants - */ + * Merchants + */ void SaveMerchantTemp(uint32 npcid, uint32 slot, uint32 item, uint32 charges); void DeleteMerchantTemp(uint32 npcid, uint32 slot); /* - * Tradeskills - */ + * Tradeskills + */ bool GetTradeRecipe(const ItemInst* container, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec); bool GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id, uint32 char_id, DBTradeskillRecipe_Struct *spec); - uint32 GetZoneForage(uint32 ZoneID, uint8 skill); /* for foraging - BoB */ - uint32 GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint8 &npc_chance); + uint32 GetZoneForage(uint32 ZoneID, uint8 skill); /* for foraging - BoB */ + uint32 GetZoneFishing(uint32 ZoneID, uint8 skill, uint32 &npc_id, uint8 &npc_chance); void UpdateRecipeMadecount(uint32 recipe_id, uint32 char_id, uint32 madecount); /* - * Tribute - */ + * Tribute + */ bool LoadTributes(); /* - * Doors - */ + * Doors + */ bool DoorIsOpen(uint8 door_id,const char* zone_name); void SetDoorPlace(uint8 value,uint8 door_id,const char* zone_name); bool LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version); @@ -409,68 +409,68 @@ public: void InsertDoor(uint32 did, uint16 ddoorid, const char* ddoor_name, float dxpos, float dypos, float dzpos, float dheading, uint8 dopentype, uint16 dguildid, uint32 dlockpick, uint32 dkeyitem, uint8 ddoor_param, uint8 dinvert, int dincline, uint16 dsize); /* - * Blocked Spells - */ + * Blocked Spells + */ int32 GetBlockedSpellsCount(uint32 zoneid); bool LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked* into, uint32 zoneid); /* - * Traps - */ + * Traps + */ bool LoadTraps(const char* zonename, int16 version); char* GetTrapMessage(uint32 trap_id); /* - * Time - */ + * Time + */ uint32 GetZoneTZ(uint32 zoneid, uint32 version); bool SetZoneTZ(uint32 zoneid, uint32 version, uint32 tz); /* - * Weather - */ + * Weather + */ uint8 GetZoneWeather(uint32 zoneid, uint32 version); bool SetZoneWeather(uint32 zoneid, uint32 version, uint8 w); /* - * Group - */ + * Group + */ void RefreshGroupFromDB(Client *c); uint8 GroupCount(uint32 groupid); /* - * Raid - */ + * Raid + */ uint8 RaidGroupCount(uint32 raidid, uint32 groupid); /* - * Instancing - */ + * Instancing + */ void ListAllInstances(Client* c, uint32 charid); /* - * QGlobals - */ + * QGlobals + */ void QGlobalPurge(); - /* - * Alternate Currency - */ - void LoadAltCurrencyValues(uint32 char_id, std::map ¤cy); - void UpdateAltCurrencyValue(uint32 char_id, uint32 currency_id, uint32 value); + /* + * Alternate Currency + */ + void LoadAltCurrencyValues(uint32 char_id, std::map ¤cy); + void UpdateAltCurrencyValue(uint32 char_id, uint32 currency_id, uint32 value); /* - * Misc stuff. - * PLEASE DO NOT ADD TO THIS COLLECTION OF CRAP UNLESS YOUR METHOD - * REALLY HAS NO BETTER SECTION - */ - bool logevents(const char* accountname,uint32 accountid,uint8 status,const char* charname,const char* target, const char* descriptiontype, const char* description,int event_nid); + * Misc stuff. + * PLEASE DO NOT ADD TO THIS COLLECTION OF CRAP UNLESS YOUR METHOD + * REALLY HAS NO BETTER SECTION + */ + bool logevents(const char* accountname,uint32 accountid,uint8 status,const char* charname,const char* target, const char* descriptiontype, const char* description,int event_nid); void GetEventLogs(const char* name,char* target,uint32 account_id=0,uint8 eventid=0,char* detail=0,char* timestamp=0, CharacterEventLog_Struct* cel=0); uint32 GetKarma(uint32 acct_id); void UpdateKarma(uint32 acct_id, uint32 amount); /* - * Things which really dont belong here... - */ + * Things which really dont belong here... + */ int16 CommandRequirement(const char* commandname); protected: @@ -488,14 +488,3 @@ extern ZoneDatabase database; #endif /*ZONEDB_H_*/ - - - - - - - - - - - diff --git a/zone/zonedump.h b/zone/zonedump.h index a0f1ac793..815730f88 100644 --- a/zone/zonedump.h +++ b/zone/zonedump.h @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Below are the blob structures for zone state dumping to the database @@ -34,31 +34,31 @@ spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob, struct NPCType { - char name[64]; - char lastname[70]; + char name[64]; + char lastname[70]; - int32 cur_hp; - int32 max_hp; + int32 cur_hp; + int32 max_hp; float size; float runspeed; - uint8 gender; - uint16 race; - uint8 class_; - uint8 bodytype; // added for targettype support - uint8 deity; //not loaded from DB - uint8 level; - uint32 npc_id; + uint8 gender; + uint16 race; + uint8 class_; + uint8 bodytype; // added for targettype support + uint8 deity; //not loaded from DB + uint8 level; + uint32 npc_id; uint8 texture; uint8 helmtexture; uint32 loottable_id; uint32 npc_spells_id; int32 npc_faction_id; uint32 merchanttype; - uint32 alt_currency_type; + uint32 alt_currency_type; uint32 adventure_template; uint32 trap_template; - uint8 light; //not loaded from DB + uint8 light; //not loaded from DB uint16 AC; uint32 Mana; //not loaded from DB uint16 ATK; //not loaded from DB @@ -85,20 +85,20 @@ struct NPCType uint32 drakkin_heritage; uint32 drakkin_tattoo; uint32 drakkin_details; - uint32 armor_tint[MAX_MATERIALS]; + uint32 armor_tint[MAX_MATERIALS]; uint32 min_dmg; uint32 max_dmg; - int16 attack_count; + int16 attack_count; char npc_attacks[30]; - uint16 d_meele_texture1; + uint16 d_meele_texture1; uint16 d_meele_texture2; uint8 prim_melee_type; uint8 sec_melee_type; int32 hp_regen; - int32 mana_regen; + int32 mana_regen; int32 aggroradius; // added for AI improvement - neotokyo uint8 see_invis; // See Invis flag added - bool see_invis_undead; // See Invis vs. Undead flag added + bool see_invis_undead; // See Invis vs. Undead flag added bool see_hide; bool see_improved_hide; bool qglobal; @@ -106,7 +106,7 @@ struct NPCType uint8 spawn_limit; //only this many may be in zone at a time (0=no limit) uint8 mount_color; //only used by horse class float attack_speed; //%+- on attack delay of the mob. - int accuracy_rating; //10 = 1% accuracy + int accuracy_rating; //10 = 1% accuracy bool findable; //can be found with find command bool trackable; float slow_mitigation; // Slow mitigation % in decimal form. @@ -114,7 +114,7 @@ struct NPCType uint32 scalerate; bool private_corpse; bool unique_spawn_by_name; - bool underwater; + bool underwater; uint32 emoteid; float spellscale; float healscale; @@ -239,33 +239,33 @@ namespace classic_db } struct Door { - uint32 db_id; - uint8 door_id; - char zone_name[16]; - char door_name[32]; - float pos_x; - float pos_y; - float pos_z; - float heading; - int incline; - uint8 opentype; - uint32 guild_id; - uint16 lockpick; - uint32 keyitem; - uint8 nokeyring; - uint8 trigger_door; - uint8 trigger_type; - uint32 door_param; - int invert_state; - uint16 size; - char dest_zone[16]; - uint32 dest_instance_id; - float dest_x; - float dest_y; - float dest_z; - float dest_heading; - uint8 is_ldon_door; - uint32 client_version_mask; + uint32 db_id; + uint8 door_id; + char zone_name[16]; + char door_name[32]; + float pos_x; + float pos_y; + float pos_z; + float heading; + int incline; + uint8 opentype; + uint32 guild_id; + uint16 lockpick; + uint32 keyitem; + uint8 nokeyring; + uint8 trigger_door; + uint8 trigger_type; + uint32 door_param; + int invert_state; + uint16 size; + char dest_zone[16]; + uint32 dest_instance_id; + float dest_x; + float dest_y; + float dest_z; + float dest_heading; + uint8 is_ldon_door; + uint32 client_version_mask; }; #pragma pack() diff --git a/zone/zoning.cpp b/zone/zoning.cpp index eaaf680e2..86684187e 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -1,19 +1,19 @@ -/* EQEMu: Everquest Server Emulator - Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) +/* EQEMu: Everquest Server Emulator + Copyright (C) 2001-2005 EQEMu Development Team (http://eqemulator.net) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY except by those people which sell it, which + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY except by those people which sell it, which are required to give you total support for your newly bought product; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. + A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "../common/debug.h" @@ -72,10 +72,10 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { case ZoneToBindPoint: target_zone_id = m_pp.binds[0].zoneId; break; - case ZoneSolicited: //we told the client to zone somewhere, so we know where they are going. + case ZoneSolicited: //we told the client to zone somewhere, so we know where they are going. target_zone_id = zonesummon_id; break; - case ZoneUnsolicited: //client came up with this on its own. + case ZoneUnsolicited: //client came up with this on its own. zone_point = zone->GetClosestZonePointWithoutZone(GetX(), GetY(), GetZ(), this, ZONEPOINT_NOZONE_RANGE); if(zone_point) { //we found a zone point, which is a reasonable distance away @@ -170,7 +170,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { char buf[10]; snprintf(buf, 9, "%d", target_zone_id); buf[9] = '\0'; - parse->EventPlayer(EVENT_ZONE, this, buf, 0); + parse->EventPlayer(EVENT_ZONE, this, buf, 0); //handle circumvention of zone restrictions @@ -205,13 +205,13 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { dest_z = m_pp.binds[0].z; ignorerestrictions = 1; //can always get to our bind point? seems exploitable break; - case ZoneSolicited: //we told the client to zone somewhere, so we know where they are going. + case ZoneSolicited: //we told the client to zone somewhere, so we know where they are going. //recycle zonesummon variables dest_x = zonesummon_x; dest_y = zonesummon_y; dest_z = zonesummon_z; break; - case ZoneUnsolicited: //client came up with this on its own. + case ZoneUnsolicited: //client came up with this on its own. //client requested a zoning... what are the cases when this could happen? //Handle zone point case: @@ -728,10 +728,10 @@ void Client::SetZoneFlag(uint32 zone_id) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - // Retrieve all waypoints for this grid - if(!database.RunQuery(query,MakeAnyLenString(&query, - "INSERT INTO zone_flags (charID,zoneID) VALUES(%d,%d)", - CharacterID(),zone_id),errbuf)) { + // Retrieve all waypoints for this grid + if(!database.RunQuery(query,MakeAnyLenString(&query, + "INSERT INTO zone_flags (charID,zoneID) VALUES(%d,%d)", + CharacterID(),zone_id),errbuf)) { LogFile->write(EQEMuLog::Error, "MySQL Error while trying to set zone flag for %s: %s", GetName(), errbuf); } } @@ -746,10 +746,10 @@ void Client::ClearZoneFlag(uint32 zone_id) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - // Retrieve all waypoints for this grid - if(!database.RunQuery(query,MakeAnyLenString(&query, - "DELETE FROM zone_flags WHERE charID=%d AND zoneID=%d", - CharacterID(),zone_id),errbuf)) { + // Retrieve all waypoints for this grid + if(!database.RunQuery(query,MakeAnyLenString(&query, + "DELETE FROM zone_flags WHERE charID=%d AND zoneID=%d", + CharacterID(),zone_id),errbuf)) { LogFile->write(EQEMuLog::Error, "MySQL Error while trying to clear zone flag for %s: %s", GetName(), errbuf); } } @@ -760,21 +760,21 @@ void Client::LoadZoneFlags() { MYSQL_RES *result; MYSQL_ROW row; - // Retrieve all waypoints for this grid - if(database.RunQuery(query,MakeAnyLenString(&query, - "SELECT zoneID from zone_flags WHERE charID=%d", - CharacterID()),errbuf,&result)) - { + // Retrieve all waypoints for this grid + if(database.RunQuery(query,MakeAnyLenString(&query, + "SELECT zoneID from zone_flags WHERE charID=%d", + CharacterID()),errbuf,&result)) + { while((row = mysql_fetch_row(result))) { zone_flags.insert(atoi(row[0])); } mysql_free_result(result); - } - else // DB query error! - { + } + else // DB query error! + { LogFile->write(EQEMuLog::Error, "MySQL Error while trying to load zone flags for %s: %s", GetName(), errbuf); - } - safe_delete_array(query); + } + safe_delete_array(query); } bool Client::HasZoneFlag(uint32 zone_id) const { @@ -820,8 +820,8 @@ void Client::SendZoneFlagInfo(Client *to) const { bool Client::CanBeInZone() { //check some critial rules to see if this char needs to be booted from the zone - //only enforce rules here which are serious enough to warrant being kicked from - //the zone + //only enforce rules here which are serious enough to warrant being kicked from + //the zone if(Admin() >= RuleI(GM, MinStatusToZoneAnywhere)) return(true); From 73a4e8737913528569fecb72a21301c3b0dce254 Mon Sep 17 00:00:00 2001 From: Michael Cook Date: Sat, 11 May 2013 14:32:14 -0400 Subject: [PATCH 3/4] FreeBSD support and clean up of unnecessary ifdef FREEBSD --- CMakeLists.txt | 8 ++++++++ common/Mutex.cpp | 2 +- common/memory_mapped_file.cpp | 3 +++ eqlaunch/CMakeLists.txt | 4 +++- loginserver/CMakeLists.txt | 4 +++- queryserv/CMakeLists.txt | 4 +++- shared_memory/CMakeLists.txt | 4 +++- ucs/CMakeLists.txt | 4 +++- world/CMakeLists.txt | 4 +++- zone/CMakeLists.txt | 4 +++- zone/client_packet.cpp | 4 ---- 11 files changed, 33 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 312095f08..a5ab85d5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,14 @@ ELSE(MSVC) ADD_DEFINITIONS(-DHAS_UNION_SEMUN) ENDIF(MSVC) +#FreeBSD support +IF(UNIX) + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + ADD_DEFINITIONS(-DFREEBSD) + SET(FREEBSD TRUE) + ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +ENDIF(UNIX) + #use stdint.h types if they exist for this platform (we have to guess otherwise) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) IF(HAVE_STDINT_H) diff --git a/common/Mutex.cpp b/common/Mutex.cpp index a866c5530..e556b05d3 100644 --- a/common/Mutex.cpp +++ b/common/Mutex.cpp @@ -74,7 +74,7 @@ Mutex::Mutex() { #else pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); -#if defined(__CYGWIN__) || defined(__APPLE__) +#if defined(__CYGWIN__) || defined(__APPLE__) || defined(FREEBSD) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); #else pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); diff --git a/common/memory_mapped_file.cpp b/common/memory_mapped_file.cpp index ca2ae0c6d..28455d0bd 100644 --- a/common/memory_mapped_file.cpp +++ b/common/memory_mapped_file.cpp @@ -29,6 +29,9 @@ #include #endif #include "eqemu_exception.h" +#ifdef FREEBSD +#include +#endif namespace EQEmu { diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt index 14257fef9..66f68298f 100644 --- a/eqlaunch/CMakeLists.txt +++ b/eqlaunch/CMakeLists.txt @@ -26,7 +26,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(eqlaunch "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(eqlaunch "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(eqlaunch "z") TARGET_LINK_LIBRARIES(eqlaunch "m") TARGET_LINK_LIBRARIES(eqlaunch "rt") diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt index 5ded6a0c7..43b8b3076 100644 --- a/loginserver/CMakeLists.txt +++ b/loginserver/CMakeLists.txt @@ -53,7 +53,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(loginserver "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(loginserver "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(loginserver "z") TARGET_LINK_LIBRARIES(loginserver "m") TARGET_LINK_LIBRARIES(loginserver "rt") diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt index 4e319ddad..5108aa2f7 100644 --- a/queryserv/CMakeLists.txt +++ b/queryserv/CMakeLists.txt @@ -32,7 +32,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(queryserv "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(queryserv "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(queryserv "z") TARGET_LINK_LIBRARIES(queryserv "m") TARGET_LINK_LIBRARIES(queryserv "rt") diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt index 902ffb2ff..6003e61b3 100644 --- a/shared_memory/CMakeLists.txt +++ b/shared_memory/CMakeLists.txt @@ -31,7 +31,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(shared_memory "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(shared_memory "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(shared_memory "z") TARGET_LINK_LIBRARIES(shared_memory "m") TARGET_LINK_LIBRARIES(shared_memory "rt") diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt index 1218541a3..8649bcf10 100644 --- a/ucs/CMakeLists.txt +++ b/ucs/CMakeLists.txt @@ -34,7 +34,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(ucs "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(ucs "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(ucs "z") TARGET_LINK_LIBRARIES(ucs "m") TARGET_LINK_LIBRARIES(ucs "rt") diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt index 768072677..f974a671f 100644 --- a/world/CMakeLists.txt +++ b/world/CMakeLists.txt @@ -80,7 +80,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(world "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(world "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(world "z") TARGET_LINK_LIBRARIES(world "m") TARGET_LINK_LIBRARIES(world "rt") diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index 6f3ad68ee..4341b7435 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -168,7 +168,9 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - TARGET_LINK_LIBRARIES(zone "dl") + IF(NOT FREEBSD) + TARGET_LINK_LIBRARIES(zone "dl") + ENDIF(NOT FREEBSD) TARGET_LINK_LIBRARIES(zone "z") TARGET_LINK_LIBRARIES(zone "m") TARGET_LINK_LIBRARIES(zone "rt") diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 9724dec22..99582602b 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -12549,11 +12549,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app) // char *GuildName = (char *)app->pBuffer; -#ifdef FREEBSD - if(strlen(GuildName) > 60) -#else if(strnlen(GuildName, 64) > 60) -#endif { Message(clientMessageError, "Guild name too long."); return; From 312100e1c60c69e286f2ba99d8bf423f7e160787 Mon Sep 17 00:00:00 2001 From: KimLS Date: Wed, 15 May 2013 14:37:30 -0700 Subject: [PATCH 4/4] Azone fix for new compilers and possible fix for x64 --- utils/azone2/global.hpp | 8 ++------ utils/azone2/types.h | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/azone2/global.hpp b/utils/azone2/global.hpp index 968ac4825..9f099ddea 100644 --- a/utils/azone2/global.hpp +++ b/utils/azone2/global.hpp @@ -9,12 +9,8 @@ #include #endif -#ifndef nullptr -#define nullptr 0 -#endif - -typedef unsigned long uint32; -typedef long int32; +typedef unsigned int uint32; +typedef int int32; typedef unsigned short uint16; typedef short int16; diff --git a/utils/azone2/types.h b/utils/azone2/types.h index f3d6c3016..af02137af 100644 --- a/utils/azone2/types.h +++ b/utils/azone2/types.h @@ -1,8 +1,8 @@ #ifndef __EQCLIENT_TYPES_H_ #define __EQCLIENT_TYPES_H_ -typedef unsigned long uint32; -typedef long int32; +typedef unsigned int uint32; +typedef int int32; typedef unsigned short uint16; typedef short int16;
NameZoneXYZDate" - "RezzedBuried
 " - "
Buried
 " + "