Changeset 41 for trunk

Show
Ignore:
Timestamp:
11/19/08 13:27:02 (17 years ago)
Author:
yumileroy
Message:

[svn] * Random changes/fixes...
* Some fixes to MangChat?, more coming.
* Cleaning up scripting part and preparing to merge it into the core.

Original author: XTZGZoReX
Date: 2008-10-12 17:35:16-05:00

Location:
trunk/src
Files:
14 removed
7 modified
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/bindings/scripts/Makefile.am

    r23 r41  
    3333-I$(top_srcdir)/src/game \ 
    3434-I$(srcdir)/include \ 
    35 $(TRINI_INCLUDES) \ 
    36 -D_TRINITY_SCRIPT_CONFIG='"$(sysconfdir)/trinityscript.conf"' 
     35$(TRINI_INCLUDES) 
    3736 
    3837libtrinityscript_la_SOURCES = \ 
     
    399398 
    400399## Additional files to install 
    401 sysconf_DATA = \ 
    402         trinityscript.conf.dist 
    403  
    404 EXTRA_DIST =  \ 
    405         trinityscript.conf.dist 
     400## sysconf_DATA =  
     401 
     402## EXTRA_DIST =  
    406403 
    407404## Prevend overwrite of the config file, if its already installed 
  • trunk/src/bindings/scripts/README

    r37 r41  
     1= Trinity Core -- Implementing scripts = 
     2 
    13To compile this properly, you need to get the scripts from: 
    24 
    35http://svn.assembla.com/svn/trinityscripts 
    46 
    5 and get them in a "scripts" folder inside this folder 
    6  
     7Simply put them in a folder called "scripts" in this folder. 
  • trunk/src/bindings/scripts/ScriptMgr.cpp

    r37 r41  
    1313#define _FULLVERSION "TrinityScript" 
    1414 
    15 #ifndef _TSCRIPTCONFVERSION 
    16 # define _TSCRIPTCONFVERSION 2008100201 
    17 #endif //_TSCRIPTCONFVERSION 
    18  
    1915#ifndef _TRINITY_SCRIPT_CONFIG 
    20 # define _TRINITY_SCRIPT_CONFIG  "trinityscript.conf" 
    21 #endif //_TRINITY_SCRIPT_CONFIG 
     16# define _TRINITY_SCRIPT_CONFIG  "trinitycore.conf" 
     17#endif _TRINITY_SCRIPT_CONFIG 
    2218 
    2319//*** Global data *** 
     
    597593    char const* dbstring = NULL; 
    598594 
    599     if( !TScriptConfig.GetString("TScriptDatabaseInfo", &dbstring) ) 
    600     { 
    601         error_log("TSCR: Missing Trinity Script database info from configuration file. Load database aborted."); 
     595    if( !TScriptConfig.GetString("WorldDatabaseInfo", &dbstring) ) 
     596    { 
     597        error_log("TSCR: Missing world database info from configuration file. Load database aborted."); 
    602598        return; 
    603599    } 
     
    12141210    } 
    12151211    else outstring_log("TSCR: Using configuration file %s",_TRINITY_SCRIPT_CONFIG); 
    1216  
    1217     //Check config file version 
    1218     if (TScriptConfig.GetIntDefault("ConfVersion", 0) != _TSCRIPTCONFVERSION) 
    1219         error_log("TSCR: Configuration file version doesn't match expected version. Some config variables may be wrong or missing."); 
    12201212 
    12211213    //Locale 
  • trunk/src/game/IRCConf.cpp

    r39 r41  
    2626        int ConfCnt = 0; 
    2727    sIRC._chan_count = 0; 
    28     if(MCConfig.GetIntDefault("irc.active", 1) == 1) 
     28    if(MCConfig.GetIntDefault("irc.active", 0) == 1) 
    2929        sIRC.Active = true; 
    3030    else 
    3131        sIRC.Active = false; 
    32     sIRC._Host = MCConfig.GetStringDefault("irc.host", "irc.freenode.net"); 
     32    sIRC._Host = MCConfig.GetStringDefault("irc.host", "irc.rizon.net"); 
    3333    if(sIRC._Host.size() > 0) 
    3434        ConfCnt++; 
    3535    sIRC._Mver = MCConfig.GetStringDefault("irc.mver", "Version 1.6.5"); 
    3636        sIRC._Port = MCConfig.GetIntDefault("irc.port", 6667); 
    37     sIRC._User = MCConfig.GetStringDefault("irc.user", "MangChat"); 
    38     sIRC._Pass = MCConfig.GetStringDefault("irc.pass", "MyDumbPass"); 
    39     sIRC._Nick = MCConfig.GetStringDefault("irc.nick", "MangChat"); 
     37    sIRC._User = MCConfig.GetStringDefault("irc.user", "TC"); 
     38    sIRC._Pass = MCConfig.GetStringDefault("irc.pass", ""); 
     39    sIRC._Nick = MCConfig.GetStringDefault("irc.nick", "TrinityCoreBot"); 
    4040    sIRC._Auth = MCConfig.GetIntDefault("irc.auth", 0); 
    41         sIRC._Auth_Nick = MCConfig.GetStringDefault("irc.auth.nick", "AuthNick"); 
     41        sIRC._Auth_Nick = MCConfig.GetStringDefault("irc.auth.nick", "TrinityCoreBot"); 
    4242    sIRC._ICC = MCConfig.GetStringDefault("irc.icc", "001"); 
    4343    sIRC._defchan = MCConfig.GetStringDefault("irc.defchan", "lobby"); 
     
    4545    sIRC._wct = MCConfig.GetIntDefault("irc.wct", 30000); 
    4646        sIRC.ajoin = MCConfig.GetIntDefault("irc.ajoin", 1); 
    47     sIRC.ajchan = MCConfig.GetStringDefault("irc.ajchan", "world"); 
     47    sIRC.ajchan = MCConfig.GetStringDefault("irc.ajchan", "World"); 
    4848    sIRC.onlrslt = MCConfig.GetIntDefault("irc.online.result", 10); 
    4949    sIRC.BOTMASK = MCConfig.GetIntDefault("Botmask", 0); 
    50     sIRC.logfile = MCConfig.GetStringDefault("irc.logfile.prefix", "IRC_"); 
     50    sIRC.logfile = MCConfig.GetStringDefault("irc.logfile.prefix", "irc_"); 
    5151        for(int i = 1; i < MAX_CONF_CHANNELS;i++) 
    5252    { 
     
    6363        } 
    6464    } 
    65     sIRC.JoinMsg = MCConfig.GetStringDefault("irc.joinmsg", "Whhaaazzzzaaaa, MangChat $Ver Baby!!"); 
    66     sIRC.RstMsg  = MCConfig.GetStringDefault("irc.rstmsg", "MangChat Is Restarting, I Will Be Right Back!"); 
    67     sIRC.kikmsg = MCConfig.GetStringDefault("irc.kickmsg", "Do Not Kick Me Again, Severe Actions Will Be Taken!"); 
     65    sIRC.JoinMsg = MCConfig.GetStringDefault("irc.joinmsg", "Trinity Core running. Command trigger is $Trigger."); 
     66    sIRC.RstMsg  = MCConfig.GetStringDefault("irc.rstmsg", "Trinity Core is restarting..."); 
     67    sIRC.kikmsg = MCConfig.GetStringDefault("irc.kickmsg", "Do not kick me."); 
    6868    // IRC LINES 
    6969    sIRC.ILINES[WOW_IRC] = MCConfig.GetStringDefault("chat.wow_irc", "\003<WoW>[\002$Name($Level)\002\003] $Msg"); 
     
    7777    sIRC._MCA = MCConfig.GetIntDefault("irc.maxattempt", 10); 
    7878    sIRC._autojoinkick = MCConfig.GetIntDefault("irc.autojoin_kick", 1); 
    79     sIRC._cmd_prefx = MCConfig.GetStringDefault("irc.command_prefix", "."); 
     79    sIRC._cmd_prefx = MCConfig.GetStringDefault("irc.command_prefix", "-"); 
    8080         
    8181        sIRC._op_gm = MCConfig.GetIntDefault("irc.op_gm_login", 0); 
  • trunk/src/game/World.cpp

    r39 r41  
    607607        uint32 val = sConfig.GetIntDefault("MaxPlayerLevel", 60); 
    608608        if(val!=m_configs[CONFIG_MAX_PLAYER_LEVEL]) 
    609             sLog.outError("MaxPlayerLevel option can't be changed at mangosd.conf reload, using current value (%u).",m_configs[CONFIG_MAX_PLAYER_LEVEL]); 
     609            sLog.outError("MaxPlayerLevel option can't be changed at config reload, using current value (%u).",m_configs[CONFIG_MAX_PLAYER_LEVEL]); 
    610610    } 
    611611    else 
     
    25072507    } 
    25082508    // print the console message here so it looks right 
    2509     p_zprintf("Trinity Core> "); 
     2509    p_zprintf("TC> "); 
    25102510} 
    25112511 
  • trunk/src/trinitycore/CliRunnable.cpp

    r39 r41  
    897897    } 
    898898    if (!bSuccess) 
    899         zprintf("mangos>"); 
     899        zprintf("TC>"); 
    900900} 
    901901 
     
    12391239    // print this here the first time 
    12401240    // later it will be printed after command queue updates 
    1241     printf("mangos>"); 
     1241    printf("TC>"); 
    12421242 
    12431243    ///- As long as the World is running (no World::m_stopEvent), get the command line and handle it 
  • trunk/src/trinitycore/RASocket.cpp

    r2 r41  
    205205                        Sendf("+Logged in.\r\n"); 
    206206                        sLog.outRALog("User %s has logged in.\n",szLogin.c_str()); 
    207                         Sendf("mangos>"); 
     207                        Sendf("TC>"); 
    208208                    } 
    209209                    else 
     
    224224                } 
    225225                else 
    226                     Sendf("mangos>"); 
     226                    Sendf("TC>"); 
    227227                break; 
    228228                ///</ul> 
  • trunk/src/trinitycore/trinitycore.conf.dist

    r39 r41  
    5252WorldServerPort = 8085 
    5353BindIP = "0.0.0.0" 
     54 
     55################################################################################################################### 
     56# SCRIPTING SETTINGS 
     57# 
     58# TScriptDatabaseInfo 
     59#     Database connection settings for the wor 
     60#          .;somenumber;username;password;database - use named pipes at Windows 
     61#                Named pipes: mySQL required adding "enable-named-pipe" to [mysqld] section my.ini 
     62#          .;/path/to/unix_socket;username;password;database - use Unix sockets at Unix/Linux 
     63#                Unix sockets: experimental, not tested 
     64# 
     65# Locale 
     66#     Setting for current (DBC) locale to use 
     67# 
     68# EventAI Error reporting 
     69# 0 - Only startup (Default) 
     70# 1 - Startup errors and Runtime event errors 
     71# 2 - Startup errors, Runtime event errors, and Creation errors 
     72################################################################################################################### 
     73 
     74Locale = 0 
     75EAIErrorLevel = 2 
    5476 
    5577################################################################################################################### 
     
    13521374irc.auto.announce = 30 
    13531375irc.autojoin_kick = 1 
    1354 irc.command_prefix = "." 
     1376irc.command_prefix = "-" 
    13551377irc.joinmsg = "Trinity Core running. Command trigger is $Trigger." 
    13561378irc.rstmsg  = "Trinity Core is restarting..." 
     
    13631385irc.op_gm_level = 3 
    13641386irc.ajoin = 1 
    1365 irc.ajchan = "world" 
     1387irc.ajchan = "World" 
    13661388irc.online.result = 30 
    1367 chat.wow_irc = "<WoW>$Name [$Level]: $Msg" 
    1368 chat.irc_wow = "<IRC>$Name: $Msg" 
     1389chat.wow_irc = "-WoW-$Name [$Level]: $Msg" 
     1390chat.irc_wow = "-IRC-$Name: $Msg" 
    13691391chat.join_wow = "[$GM] $Name has joined IRC." 
    13701392chat.leave_wow = "[$GM] $Name has left IRC."