diff options
author | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
commit | 26b5e033ffde3d161382fc9addbfa99738379641 (patch) | |
tree | a344f369ca32945f787a02dee35c3dbe342bed7e /src/game/NPCHandler.h | |
parent | f21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff) |
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget
--HG--
branch : trunk
Diffstat (limited to 'src/game/NPCHandler.h')
-rw-r--r-- | src/game/NPCHandler.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/game/NPCHandler.h b/src/game/NPCHandler.h index 4d0395a0c87..c959e9957e2 100644 --- a/src/game/NPCHandler.h +++ b/src/game/NPCHandler.h @@ -17,38 +17,31 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #ifndef __NPCHANDLER_H #define __NPCHANDLER_H - // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform #if defined( __GNUC__ ) #pragma pack(1) #else #pragma pack(push,1) #endif - struct PageText { uint32 Page_ID; char * Text; - uint32 Next_Page; }; - // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform #if defined( __GNUC__ ) #pragma pack() #else #pragma pack(pop) #endif - struct QEmote { uint32 _Emote; uint32 _Delay; }; - struct GossipTextOption { std::string Text_0; @@ -57,21 +50,17 @@ struct GossipTextOption float Probability; QEmote Emotes[3]; }; - struct GossipText { GossipTextOption Options[8]; }; - struct PageTextLocale { std::vector<std::string> Text; }; - struct NpcTextLocale { NpcTextLocale() { Text_0.resize(8); Text_1.resize(8); } - std::vector<std::vector<std::string> > Text_0; std::vector<std::vector<std::string> > Text_1; }; |