Changeset 3193

Show
Ignore:
Timestamp:
03/02/2010 05:35:34 PM (6 months ago)
Author:
Paroxysm
Message:

MODIFIED : Modified Creature::TriggerScriptEvent? to take a uint16 rather than a string and CreatureAIScript::StringFunctionCall?() takes a uint16 as well. This is due to preparation to the change of how Lua passes functions to C.

Location:
trunk/src/arcemu-world
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/arcemu-world/Creature.cpp

    r3191 r3193  
    18831883} 
    18841884 
    1885 void Creature::TriggerScriptEvent(string func) 
     1885void Creature::TriggerScriptEvent(uint16 fRef) 
    18861886{ 
    18871887        if( _myScriptClass ) 
    1888                 _myScriptClass->StringFunctionCall( func.c_str() ); 
     1888                _myScriptClass->StringFunctionCall(fRef); 
    18891889} 
    18901890 

  • trunk/src/arcemu-world/Creature.h

    r3185 r3193  
    616616        void OnPushToWorld(); 
    617617        void Despawn(uint32 delay, uint32 respawntime); 
    618         void TriggerScriptEvent(string func); 
     618        void TriggerScriptEvent(uint16); 
    619619 
    620620        AuctionHouse * auctionHouse; 

  • trunk/src/arcemu-world/EventMgr.h

    r3170 r3193  
    220220    EVENT_REMOVE_ITEM, 
    221221    EVENT_REMOVE_ITEM_FROM_REFUNDABLE_MAP, 
    222         EVENT_LUA_TIMED 
     222        NUM_EVENT_TYPES 
    223223}; 
    224224 

  • trunk/src/arcemu-world/ScriptMgr.h

    r3132 r3193  
    254254        virtual void AIUpdate() {} 
    255255        virtual void OnEmote(Player * pPlayer, EmoteType Emote) {} 
    256         virtual void StringFunctionCall(const char * pFunc) {} 
     256        virtual void StringFunctionCall(uint16) {} 
    257257 
    258258        void RegisterAIUpdateEvent(uint32 frequency);