Show
Ignore:
Timestamp:
11/22/08 00:36:22 (17 years ago)
Author:
yumileroy
Message:

Merged commit 269 (5f0e38da128a).

Original author: gvcoman
Date: 2008-11-21 14:34:05-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/WaypointManager.h

    r272 r279  
    2626#include "Utilities/UnorderedMap.h" 
    2727 
     28#define MAX_WAYPOINT_TEXT 5 
    2829struct WaypointBehavior 
    2930{ 
    3031    uint32 emote; 
    3132    uint32 spell; 
    32     std::string text[5]; 
     33    int32  textid[MAX_WAYPOINT_TEXT]; 
    3334    uint32 model1; 
    3435    uint32 model2;