aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-09-07 22:22:16 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-09-07 22:22:16 +0200
commitf2655b2d2d969e47630b7ed07c4517a1b3004c97 (patch)
tree786db0e28c9e7817fc91d4a114c2b188cc69ff50
parentd1183e55b5610a3ded9e9135ab281f1cbdea9a58 (diff)
Core: Remove whitespace (again, again, ...)
-rw-r--r--CONTRIBUTING.md22
-rw-r--r--README.md2
-rw-r--r--src/server/scripts/Commands/cs_server.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp2
5 files changed, 15 insertions, 15 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 99fb588c1cf..b83aaebfee0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,9 +14,9 @@ When creating patches read:
- [WDB Fields](http://www.trinitycore.org/f/topic/58-wdb-fields/)
- [Git Squash](https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/)
-We suggest you to create one branch for each `C++` based fix: on that way you can continue creating more fixes without having to wait to get one pull request merged.
-For the `SQL` files of `C++` based fixes the naming schema is: `YYYY_MM_DD_i_database_description.sql`, where `YYYY_MM_DD` is the date of the fix, `i_database` is the *ith* sql created that day for `database`.
-When doing changes to `auth` or `characters` database remember to update the base files (`/sql/base/*`).
+We suggest you to create one branch for each `C++` based fix: on that way you can continue creating more fixes without having to wait to get one pull request merged.
+For the `SQL` files of `C++` based fixes the naming schema is: `YYYY_MM_DD_i_database_description.sql`, where `YYYY_MM_DD` is the date of the fix, `i_database` is the *ith* sql created that day for `database`.
+When doing changes to `auth` or `characters` database remember to update the base files (`/sql/base/*`).
For SQL only fixes [create a ticket](https://github.com/TrinityCore/TrinityCore/issues/new).
Wiki
@@ -30,21 +30,21 @@ You are welcome to create an account and help us improve and extend the wiki.
Issues
======
-Read [this](http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
+Read [this](http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
If you have problems with TrinityCore instalation, read http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/
Requirements
============
-Platform: Linux, Windows or Mac
-Processor with SSE2 support
-Boost ≥ 1.4.9
+Platform: Linux, Windows or Mac
+Processor with SSE2 support
+Boost ≥ 1.4.9
MySQL ≥ 5.1.0
-CMake ≥ 2.8.11.2 / 2.8.9 (Windows / Linux)
-OpenSSL ≥ 1.0.0
-GCC ≥ 4.7.2 (Linux only)
+CMake ≥ 2.8.11.2 / 2.8.9 (Windows / Linux)
+OpenSSL ≥ 1.0.0
+GCC ≥ 4.7.2 (Linux only)
MS Visual Studio ≥ 12 (2013) (Windows only)
-In case you choose Linux, we recommend to use Debian 7, it's the Linux we use to test compilations.
+In case you choose Linux, we recommend to use Debian 7, it's the Linux we use to test compilations.
Remember 4.3.4 branch is alpha, only intended for development, we don't recomend this branch to run a server.
diff --git a/README.md b/README.md
index 33fea30e36e..e91810b523f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# ![logo](http://www.trinitycore.org/f/public/style_images/1_trinitycore.png) TrinityCore
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/435/badge.svg)](https://scan.coverity.com/projects/435)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/435/badge.svg)](https://scan.coverity.com/projects/435)
`3.3.5`: [![3.3.5 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=master)](https://travis-ci.org/TrinityCore/TrinityCore)
`4.3.4`: [![4.3.4 Build Status](https://travis-ci.org/TrinityCore/TrinityCore.svg?branch=4.3.4)](https://travis-ci.org/TrinityCore/TrinityCore)
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index f828b66a93a..74a947e42e4 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -288,7 +288,7 @@ public:
return false;
sWorld->SetRecordDiffInterval(newTime);
- printf("Record diff every %u ms\n", newTime);
+ printf("Record diff every %i ms\n", newTime);
return true;
}
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 87272037755..ca46ff36079 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -173,7 +173,7 @@ public:
DoMeleeAttackIfReady();
}
-
+
private:
EventMap events;
SummonList summons;
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 889fbe8fdc9..9c733677b42 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -149,7 +149,7 @@ public:
void JustSummoned(Creature* summoned) override
{
summoned->CastSpell(summoned, SPELL_SOUL_FREED, false);
-
+
if (Player* player = ObjectAccessor::GetPlayer(*me, Tagger))
summoned->GetMotionMaster()->MoveFollow(player, 0.0f, 0.0f);
}