Commit Graph
100 Commits
Author SHA1 Message Date
Michael Cook (mackal) 3340d01902 Merge pull request #359 from KinglyKrab/master
Added new rule to make the UnmemSpellAll on death optional.
2015-02-01 19:40:15 -05:00
Michael Cook (mackal) 8649ed1dcb Add quest debugging to lua 2015-02-01 17:25:16 -05:00
Michael Cook (mackal) cced57f56a Fix lua events 2015-02-01 15:11:27 -05:00
Michael Cook (mackal) b590eb2dc4 Send item recast timestamps picking up ground spawns 2015-01-31 20:54:56 -05:00
Michael Cook (mackal) 5be1bd2ffb Make items with long reuse timers show the timer after zone
This adds a new table to store the timers in. This may seem
odd but the timers are associated with the player, not the
item, they're just included in the item header in the packet

Currently trading still needs to be handled
2015-01-31 17:53:50 -05:00
Michael Cook (mackal) b5d45effec Fix some zone/npc.cpp functions 2015-01-31 17:33:41 -05:00
Michael Cook (mackal) c06c69c420 Merge pull request #356 from clucksoft/rof_merchantlist
Rof merchantlist
2015-01-31 16:22:39 -05:00
Michael Cook (mackal) eb7d77bcac Shared Bank bug fix? 2015-01-31 03:48:59 -05:00
Michael Cook (mackal) 0bdbc5f5c9 More clang-formatting 2015-01-31 01:22:40 -05:00
Michael Cook (mackal) 0f1b504ed6 Some clang-formatting 2015-01-31 00:00:02 -05:00
Michael Cook (mackal) a18cb6f61e Another tell_queue leak fix 2015-01-30 22:00:39 -05:00
Michael Cook (mackal) 18fb507f24 Tell queue memleak fix 2015-01-30 20:23:17 -05:00
Michael Cook (mackal) b592d2e786 clang format some stuff in zone/command.cpp 2015-01-30 18:32:28 -05:00
Michael Cook (mackal) 769987ca33 unique_ptr is a better fit here 2015-01-30 02:34:33 -05:00
Michael Cook (mackal) 8086eecfe2 Fix db manifest 2015-01-30 01:38:26 -05:00
Michael Cook (mackal) 8ec1cb949a Fix merc attack delay 2015-01-30 01:33:55 -05:00
Michael Cook (mackal) 5f545df312 Remove const 2015-01-27 21:48:11 -05:00
Michael Cook (mackal) 99164fe3f9 Switch AI timers to smart pointers 2015-01-27 21:28:38 -05:00
Michael Cook (mackal) a12011ca1e Fix some bugs with starting AI in mercs
The vtable ptr is that of the current constructor the code is in ...
2015-01-27 19:53:13 -05:00
Michael Cook (mackal) 7dcd12fb9d clang-modernize use-nullptr on zone/mob_ai.cpp 2015-01-27 19:32:49 -05:00
Michael Cook (mackal) 62d1b0c2bd Merc NPCType memleak fix 2015-01-27 18:32:32 -05:00
Michael Cook (mackal) 03a27ca9ed Merge pull request #350 from addtheice/dead_code_removal
Dead code removal
2015-01-26 01:13:25 -05:00
Michael Cook (mackal) 6e295a1102 Rewrite StringFormat to take advantage of RVO
The standard stipulates that if RVO doesn't take place, that it should
return an rvalue anyways, so move semantics should take place without
the std::move, which were just forcing RVO to not be attempted.

Also removed duplicate code

The only thing that /might/ be slower is the output.clear() but that's
an edge case anyways.
2015-01-26 00:31:50 -05:00
Michael Cook (mackal) 06ff4823d3 Minor tweaking to new logsys 2015-01-23 15:48:20 -05:00
Michael Cook (mackal) f702e953e7 Some std::abs usage and a bit of clang-formatting 2015-01-22 22:59:52 -05:00
Michael Cook (mackal) 5c56929a23 Fix compile error with GCC 2015-01-20 00:04:22 -05:00
Michael Cook (mackal) f4224b296a We don't need to cast these anymore 2015-01-18 18:29:37 -05:00
Michael Cook (mackal) 7374313fd9 Fix overflow error in lua_create_npc 2015-01-18 14:41:23 -05:00
Michael Cook (mackal) 6e06110b75 Remove more extra and incorrect memsets 2015-01-17 19:03:13 -05:00
Michael Cook (mackal) fd77fbf163 Merge pull request #313 from addtheice/data_bundling
Data bundling
2015-01-17 17:30:14 -05:00
Michael Cook (mackal) f9a7da61b8 Switch NUMHIT_ enum to a strongly typed enum 2015-01-17 16:18:09 -05:00
Michael Cook (mackal) 7547d7610f Merge pull request #336 from RicardoCampos/master
Clean up of start zone overrides
2015-01-16 20:18:39 -05:00
Michael Cook (mackal) ba2b91a548 Fix loginserver 2015-01-16 02:56:14 -05:00
Michael Cook (mackal) 0c905226e1 Fix linux compile (partially) 2015-01-16 02:32:46 -05:00
Michael Cook (mackal) aa405df0e9 Fix clang compile 2015-01-14 15:32:42 -05:00
Michael Cook (mackal) e0602efca2 Fix out of bounds in Mob::ResourceTap 2015-01-13 00:36:25 -05:00
Michael Cook (mackal) 5cb2b14645 Fix issue with SharedDatabase::LoadCharacterInspectMessage 2015-01-12 17:00:55 -05:00
Michael Cook (mackal) 2c97d98963 Remove unnecessary and incorrect memset 2015-01-11 23:34:00 -05:00
Michael Cook (mackal) 5b78acc45e Make the AI stopping a little less silly on zone shutdown 2015-01-10 02:34:38 -05:00
Michael Cook (mackal) 7e72f10a3b clang-modernize -use-nullptr for ucs/worldserver.cpp 2015-01-09 13:18:49 -05:00
Michael Cook (mackal) b398d65eb8 clang-modernize -use-nullptr for ucs/ucs.cpp 2015-01-09 13:18:49 -05:00
Michael Cook (mackal) bf9b126eef clang-modernize -use-nullptr for ucs/clientlist.cpp 2015-01-09 13:18:49 -05:00
Michael Cook (mackal) f3f9997adf Packets are already memset to 0 2015-01-09 12:59:48 -05:00
Michael Cook (mackal) 1b8711bce9 Minor tweaking to zone/entity.cpp 2015-01-09 12:59:13 -05:00
Michael Cook (mackal) b0e59e112d clang-modernize -use-auto convert for world/zoneserver.cpp 2015-01-09 03:05:15 -05:00
Michael Cook (mackal) c6388d8c5d clang-modernize -use-auto convert for world/zonelist.cpp 2015-01-09 03:05:15 -05:00
Michael Cook (mackal) e87a3096f4 clang-modernize -use-auto convert for world/wguild_mgr.cpp 2015-01-09 03:05:15 -05:00
Michael Cook (mackal) ca0a8fd974 clang-modernize -use-auto convert for world/ucs.cpp 2015-01-09 03:05:15 -05:00
Michael Cook (mackal) c9a75dcf64 clang-modernize -use-auto convert for world/queryserv.cpp 2015-01-09 03:05:15 -05:00
Michael Cook (mackal) 7e2661bbc1 clang-modernize -use-auto convert for world/net.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) 8f18672690 clang-modernize -use-auto convert for world/login_server_list.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) 6b75e03d72 clang-modernize -use-auto convert for world/login_server.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) 1770862b10 clang-modernize -use-auto convert for world/lfplist.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) 3df27a9379 clang-modernize -use-auto convert for world/launcher_list.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) da13affebc clang-modernize -use-auto convert for world/launcher_link.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) 446b085d6c clang-modernize -use-auto convert for world/eqw_parser.cpp 2015-01-09 03:05:14 -05:00
Michael Cook (mackal) 0956575292 clang-modernize -use-auto convert for world/eqw_http_handler.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) 0ed10ec102 clang-modernize -use-auto convert for world/console.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) 81a48cac6c clang-modernize -use-auto convert for world/clientlist.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) bb37dd1b16 clang-modernize -use-auto convert for world/cliententry.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) c2936a893e clang-modernize -use-auto convert for world/client.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) 64be231fe6 clang-modernize -use-auto convert for world/adventure_manager.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) 28680a4695 clang-modernize -use-auto convert for world/adventure.cpp 2015-01-09 03:05:13 -05:00
Michael Cook (mackal) 502bb6ca79 clang-modernize -use-auto convert for ucs/worldserver.cpp 2015-01-09 02:57:00 -05:00
Michael Cook (mackal) 09f37323d1 clang-modernize -use-auto convert for ucs/database.cpp 2015-01-09 02:57:00 -05:00
Michael Cook (mackal) b34b26c423 clang-modernize -use-auto convert for ucs/clientlist.cpp 2015-01-09 02:57:00 -05:00
Michael Cook (mackal) 1873b1d739 Ranged-based for for ucs/clientlist.cpp 2015-01-09 02:50:13 -05:00
Michael Cook (mackal) c33973f20a Optimize EntityList::RemoveGroup/RemoveRaid
lambdas are cheating btw.
2015-01-09 02:44:20 -05:00
Michael Cook (mackal) 4808dcadcf Range-based for for world/zonelist.cpp 2015-01-08 22:01:37 -05:00
Michael Cook (mackal) 4fde4bba72 Range-based for for world/lfplist.cpp 2015-01-08 22:01:21 -05:00
Michael Cook (mackal) 4f643c7201 Range-based for for world/adventure_manager.cpp 2015-01-08 22:01:02 -05:00
Michael Cook (mackal) 784a6974d1 Range-based for for world/adventure.cpp 2015-01-08 22:00:36 -05:00
Michael Cook (mackal) c8278608a3 Merge pull request #331 from af4t/master
Work-around for "strange ADL issues" not needed if using Boost 1.57.0
2015-01-08 12:31:02 -05:00
Michael Cook (mackal) 85a27cdd74 Fix account_creation 2015-01-04 01:52:46 -05:00
Michael Cook (mackal) a75db63cbc Fix EVENT_CONNECT 2015-01-04 01:48:31 -05:00
Michael Cook (mackal) f8b6ee296c Fix memleak in Mob::TypesTemporaryPets 2015-01-03 18:48:38 -05:00
Michael Cook (mackal) 09d76605f5 Fix memleak in Mob::TemporaryPets 2015-01-03 18:42:28 -05:00
Michael Cook (mackal) 6897aef4b5 Need to set this to 1 again before the perl_destruct 2015-01-03 15:14:12 -05:00
Michael Cook (mackal) 77b8e9ec6e Perl memleak fix
This may need more test!!
2015-01-03 13:54:31 -05:00
Michael Cook (mackal) ea6ab5b10f Virtualize WaterMap's destructor (memleak fix) 2015-01-03 12:33:53 -05:00
Michael Cook (mackal) 9b8598c566 Group/raid memleaks 2015-01-03 02:57:55 -05:00
Michael Cook (mackal) 1b5db0684e Fix memleak in OP_RaidJoin 2015-01-03 02:39:44 -05:00
Michael Cook (mackal) 7cbefa4ec2 Fix memleak in OP_RaidUpdate 2015-01-03 01:52:24 -05:00
Michael Cook (mackal) 6a2260f106 Memleak in Map 2015-01-03 01:26:46 -05:00
Michael Cook (mackal) d93edd7393 Make NPCs less jumpy
We actually didn't want that +2.0f
2014-12-31 17:49:12 -05:00
Michael Cook (mackal) 5df65427b1 Merge pull request #330 from KinglyKrab/master
Made fifth argument of UpdateTaskActivity truly optional.
2014-12-29 17:30:17 -05:00
Michael Cook (mackal) 8522542ae2 Use lambdas in sort functions (for zone at least) 2014-12-24 18:29:23 -05:00
Michael Cook (mackal) 811872c17f Rework Bot::GetBotArcheryRange 2014-12-24 17:42:35 -05:00
Michael Cook (mackal) 7742892377 Fix issue with Mob::MakeNewPositionAndSendUpdate 2014-12-23 22:26:36 -05:00
Michael Cook (mackal) 5e34b06952 Merge pull request #326 from KinglyKrab/master
Bot Crash Fixes.
2014-12-23 22:15:58 -05:00
Michael Cook (mackal) 36c1f50e1b Use lambda expression for compare instead 2014-12-22 17:51:59 -05:00
Michael Cook (mackal) 62ae7ba1de Fix RoF2 rez response 2014-12-22 13:42:22 -05:00
Michael Cook (mackal) 18fb86a560 Force changing the timer_time for attack timers
Should fix issues with waiting for a slow timer after a cure
2014-12-22 01:58:54 -05:00
Michael Cook (mackal) a7cdb4c0af Add a few missing bonus recalcs 2014-12-21 23:53:02 -05:00
Michael Cook (mackal) de3f9f7276 Fix missing {} in SE_*Counter bonus processing 2014-12-21 23:48:18 -05:00
Michael Cook (mackal) cedec3d872 Revert "Cleared clientversions.h and eq_dictionary files of Client6.2 references"
This reverts commit d4506363b8.
2014-12-19 23:08:44 -05:00
Michael Cook (mackal) dabe550966 Fix eq_dictionary.cpp from 62 removal
Note: 62 references in clientversion.h need to be cleaned up
before we can remove them from other files
2014-12-19 17:22:05 -05:00
Michael Cook (mackal) 1261aac036 Check DivineAura in TryWeaponProc, should resolve #321 2014-12-18 18:50:38 -05:00
Michael Cook (mackal) ce9bcef620 std::deque is a much better fit, should have bit better performance 2014-12-18 02:20:03 -05:00
Michael Cook (mackal) a14f8058da Switch path stuff to vectors
This should be more CPU cache friendly compared to lists so should
be faster. (profiling looked promising)
2014-12-17 01:52:00 -05:00