diff options
Diffstat (limited to 'src/trinitycore')
-rw-r--r-- | src/trinitycore/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/trinitycore/CliRunnable.h | 2 | ||||
-rw-r--r-- | src/trinitycore/Main.cpp | 4 | ||||
-rw-r--r-- | src/trinitycore/Master.cpp | 2 | ||||
-rw-r--r-- | src/trinitycore/Master.h | 2 | ||||
-rw-r--r-- | src/trinitycore/WorldRunnable.cpp | 2 | ||||
-rw-r--r-- | src/trinitycore/WorldRunnable.h | 2 | ||||
-rw-r--r-- | src/trinitycore/resource.h | 2 | ||||
-rw-r--r-- | src/trinitycore/run-mangosd | 2 | ||||
-rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 8 |
10 files changed, 21 insertions, 21 deletions
diff --git a/src/trinitycore/CMakeLists.txt b/src/trinitycore/CMakeLists.txt index 2c7c4544577..7cd012d9f45 100644 --- a/src/trinitycore/CMakeLists.txt +++ b/src/trinitycore/CMakeLists.txt @@ -2,14 +2,14 @@ ########### next target ############### SET(trinity-core_SRCS -CliRunnable.cpp -CliRunnable.h -Main.cpp -Master.cpp -Master.h -RASocket.cpp -RASocket.h -WorldRunnable.cpp +CliRunnable.cpp +CliRunnable.h +Main.cpp +Master.cpp +Master.h +RASocket.cpp +RASocket.h +WorldRunnable.cpp WorldRunnable.h ) diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h index e5f78bb5259..20ff58f27ba 100644 --- a/src/trinitycore/CliRunnable.h +++ b/src/trinitycore/CliRunnable.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index 3ecde1c788a..7b00073026d 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -138,7 +138,7 @@ extern int main(int argc, char **argv) return 1; } sLog.outString("Using configuration file %s.", cfg_file); - + uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0); if (confVersion < _TRINITY_CORE_CONFVER) { diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 7e5cbd381ec..a92ac0584f5 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h index 3b2b38f32f4..967f497051a 100644 --- a/src/trinitycore/Master.h +++ b/src/trinitycore/Master.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index 6583fb8a1ba..e49e4ad74b8 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h index b967d0dac0b..8df3a6a0c89 100644 --- a/src/trinitycore/WorldRunnable.h +++ b/src/trinitycore/WorldRunnable.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/resource.h b/src/trinitycore/resource.h index 7e7d8e4b76f..7dc5cb9ef7b 100644 --- a/src/trinitycore/resource.h +++ b/src/trinitycore/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/src/trinitycore/run-mangosd b/src/trinitycore/run-mangosd index f307bd9e1ad..4a146804e81 100644 --- a/src/trinitycore/run-mangosd +++ b/src/trinitycore/run-mangosd @@ -6,7 +6,7 @@ while : do echo "TrinityCore daemon restarted" echo `date` >> crash.log & - ./mangosd | tail -n 20 >> crash.log + ./mangosd | tail -n 20 >> crash.log echo " " >> crash.log & pid=`ps ax | awk '($5 ~ /trinitycore/) { print $1 }'` wait $pid diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 1411aed3091..018ddf378b5 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -25,7 +25,7 @@ ConfVersion=2009032201 # WorldDatabaseInfo # CharacterDatabaseInfo # Database connection settings for the world server. -# Default: +# Default: # ---MYSQL--- # hostname;port;username;password;database # .;somenumber;username;password;database - use named pipes at Windows @@ -1398,7 +1398,7 @@ Network.TcpNodelay = 1 ################################################################################################################### # AUCTION HOUSE BOT SETTINGS -# +# # AuctionHouseBot.EnableSeller # Enable/Disable the part of AHBot that puts items up for auction # Default 0 (disabled) @@ -1409,7 +1409,7 @@ Network.TcpNodelay = 1 # # Auction House Bot character data # AuctionHouseBot.Account is the account number (in realmd->account table) of the player you want to run as the auction bot. -# AuctionHouseBot.GUID is the GUID (in characters->characters table) of the player you want to run as the auction bot. +# AuctionHouseBot.GUID is the GUID (in characters->characters table) of the player you want to run as the auction bot. # Default: 0 (Auction House Bot disabled) # # AuctionHouseBot.VendorItems @@ -1436,7 +1436,7 @@ Network.TcpNodelay = 1 # Default 1 # Bind_Quest_Item # Default 0 -# +# # AuctionHouseBot.ItemsPerCycle # Number of Items to Add/Remove from the AH during mass operations # Default 200 |