This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp | |
index 0dcb5e6..73217e6 100644 | |
--- a/src/server/game/Spells/SpellEffects.cpp | |
+++ b/src/server/game/Spells/SpellEffects.cpp | |
@@ -4553,8 +4553,8 @@ void Spell::EffectLeapBack(SpellEffIndex /*effIndex*/) | |
if (!unitTarget) | |
return; | |
- float speedxy = float(effectInfo->MiscValue) / 10; | |
- float speedz = float(damage / 10); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp | |
index 15d08a9..362b5b0 100644 | |
--- a/src/server/worldserver/Main.cpp | |
+++ b/src/server/worldserver/Main.cpp | |
@@ -97,8 +97,7 @@ void ShutdownThreadPool(std::vector<std::thread>& threadPool); | |
bool LoadRealmInfo(); | |
variables_map GetConsoleArguments(int argc, char** argv, std::string& cfg_file, std::string& cfg_service); | |
-/// Launch the Trinity server | |
-extern int main(int argc, char** argv) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Server/Packets/PacketUtilities.h b/src/server/game/Server/Packets/PacketUtilities.h | |
index 25e6f27..518a57b 100644 | |
--- a/src/server/game/Server/Packets/PacketUtilities.h | |
+++ b/src/server/game/Server/Packets/PacketUtilities.h | |
@@ -36,6 +36,7 @@ namespace WorldPackets | |
{ | |
public: | |
uint32 GetMask() const { return _mask; } | |
+ void SetMask(uint32 mask) { _mask = mask; } | |
T const& operator[](size_t index) const { return _contents.at(index); } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp | |
index 257c279..a37ce41 100644 | |
--- a/src/server/game/Pools/PoolMgr.cpp | |
+++ b/src/server/game/Pools/PoolMgr.cpp | |
@@ -315,6 +315,11 @@ template <class T> | |
void PoolGroup<T>::SpawnObject(ActivePoolData& spawns, uint32 limit, uint64 triggerFrom) | |
{ | |
uint32 lastDespawned = 0; | |
+ | |
+ // If limit is 0 try to spawn everything |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import idaapi | |
id = idc.AddEnum(0, "UIError", idaapi.decflag()); | |
idc.AddConstEx(id, "ERR_INV_FULL", 0x0, -1); | |
idc.AddConstEx(id, "ERR_BANK_FULL", 0x1, -1); | |
idc.AddConstEx(id, "ERR_CANT_EQUIP_LEVEL_I", 0x2, -1); | |
idc.AddConstEx(id, "ERR_CANT_EQUIP_SKILL", 0x3, -1); | |
idc.AddConstEx(id, "ERR_CANT_EQUIP_EVER", 0x4, -1); | |
idc.AddConstEx(id, "ERR_CANT_EQUIP_RANK", 0x5, -1); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading opcodes from GitHub, build 19033... | |
Dumping SMSG opcodes... | |
+---------------+-------------+-------------+-------------+--------------------+ | |
| Opcode | Case offset | JAM Parser | Jam Handler | Group Name | | |
+---------------+-------------+-------------+-------------+--------------------+ | |
| 1 (0x0001) | 0x00CBA49A | 0x00CBE774 | 0x00CBDFC6 | ClientLFG | | |
| 2 (0x0002) | 0x00CBA49A | 0x00CBEEA4 | 0x00CBE042 | ClientLFG | | |
| 3 (0x0003) | 0x005D8126 | 0x005FD525 | 0x005F890A | Client | SMSG_NEW_WORLD | |
| 4 (0x0004) | 0x005DC8B6 | 0x006117C2 | 0x005F902A | Client | | |
| 5 (0x0005) | 0x00CBA49A | 0x00CBE833 | 0x00CBDED0 | ClientLFG | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-- phpMyAdmin SQL Dump | |
-- version 3.5.1 | |
-- http://www.phpmyadmin.net | |
-- | |
-- Host: localhost | |
-- Generation Time: Nov 15, 2014 at 09:12 PM | |
-- Server version: 5.6.9-rc | |
-- PHP Version: 5.4.0 | |
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
enum ParkingCardType { VIPCard, NormalCard } | |
sig ParkingCard { | |
type: one ParkingCardType | |
} | |
sig ManagementSystem { | |
Park: set ParkingCard, | |
} { | |
#VIPPark <= 2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ALTER TABLE waypoint_scripts ENGINE=InnoDB; | |
ALTER TABLE waypoint_data ENGINE=InnoDB; | |
ALTER TABLE waypoints ENGINE=InnoDB; | |
ALTER TABLE warden_checks ENGINE=InnoDB; | |
ALTER TABLE version ENGINE=InnoDB; | |
ALTER TABLE vehicle_template_accessory ENGINE=InnoDB; | |
ALTER TABLE vehicle_accessory ENGINE=InnoDB; | |
ALTER TABLE trinity_string ENGINE=InnoDB; | |
ALTER TABLE transports ENGINE=InnoDB; | |
ALTER TABLE spell_threat ENGINE=InnoDB; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake | |
index acd71e8..ca33bfc 100644 | |
--- a/cmake/compiler/gcc/settings.cmake | |
+++ b/cmake/compiler/gcc/settings.cmake | |
@@ -8,7 +8,7 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION) | |
endif() | |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | |
-message(STATUS "GCC: Enabled c++11 support") | |
+message(STATUS "GCC: Enabled C++11 support") |