aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArmano <sponsor15@gmail.com>2015-07-04 11:31:07 +0200
committerArmano <sponsor15@gmail.com>2015-07-04 11:31:07 +0200
commit8a8f4fa0d4e518e81434adde19022378b95eb727 (patch)
tree3a1f9965e60102b9c1051b45a0883c85c54eaf48 /src
parent678a08c8c5e2de508c7517c91e75e0cd49ea3385 (diff)
Cleanup some whitespaces
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Calendar/CalendarMgr.h6
-rw-r--r--src/server/game/Grids/Cells/Cell.h1
-rw-r--r--src/server/game/Grids/Cells/CellImpl.h1
-rw-r--r--src/server/game/Grids/Grid.h1
-rw-r--r--src/server/game/Grids/GridLoader.h1
-rw-r--r--src/server/game/Grids/GridRefManager.h1
-rw-r--r--src/server/game/Grids/GridReference.h1
-rw-r--r--src/server/game/Grids/GridStates.cpp1
-rw-r--r--src/server/game/Grids/NGrid.h1
-rw-r--r--src/server/game/Warden/Warden.cpp20
-rw-r--r--src/server/game/Weather/Weather.cpp7
11 files changed, 16 insertions, 25 deletions
diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h
index 6785b36569f..8122f41c0f5 100644
--- a/src/server/game/Calendar/CalendarMgr.h
+++ b/src/server/game/Calendar/CalendarMgr.h
@@ -167,7 +167,7 @@ struct CalendarInvite
void SetStatusTime(time_t statusTime) { _statusTime = statusTime; }
time_t GetStatusTime() const { return _statusTime; }
- void SetText(const std::string& text) { _text = text; }
+ void SetText(std::string const& text) { _text = text; }
std::string GetText() const { return _text; }
void SetStatus(CalendarInviteStatus status) { _status = status; }
@@ -224,10 +224,10 @@ struct CalendarEvent
void SetGuildId(ObjectGuid::LowType guildId) { _guildId = guildId; }
ObjectGuid::LowType GetGuildId() const { return _guildId; }
- void SetTitle(const std::string& title) { _title = title; }
+ void SetTitle(std::string const& title) { _title = title; }
std::string GetTitle() const { return _title; }
- void SetDescription(const std::string& description) { _description = description; }
+ void SetDescription(std::string const& description) { _description = description; }
std::string GetDescription() const { return _description; }
void SetType(CalendarEventType type) { _type = type; }
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index eb889e328cb..87220e56d0f 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -117,4 +117,3 @@ private:
};
#endif
-
diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
index ea5143375c1..61113d6b36e 100644
--- a/src/server/game/Grids/Cells/CellImpl.h
+++ b/src/server/game/Grids/Cells/CellImpl.h
@@ -178,4 +178,3 @@ inline void Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER>& visitor, Map&
}
}
#endif
-
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index 7d3dc799a7c..d048dc05768 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -141,4 +141,3 @@ class Grid
//ActiveGridObjects m_activeGridObjects;
};
#endif
-
diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
index 153a45c8ccb..650aa8bb381 100644
--- a/src/server/game/Grids/GridLoader.h
+++ b/src/server/game/Grids/GridLoader.h
@@ -75,4 +75,3 @@ class GridLoader
};
*/
#endif
-
diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
index b52f1052fad..7ba6b32642e 100644
--- a/src/server/game/Grids/GridRefManager.h
+++ b/src/server/game/Grids/GridRefManager.h
@@ -39,4 +39,3 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT>
iterator rend() { return iterator(NULL); }
};
#endif
-
diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index 946e2f89278..7b5f2536c24 100644
--- a/src/server/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
@@ -50,4 +50,3 @@ class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
GridReference* next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); }
};
#endif
-
diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp
index 7f12c7b2793..50bd082b83a 100644
--- a/src/server/game/Grids/GridStates.cpp
+++ b/src/server/game/Grids/GridStates.cpp
@@ -61,4 +61,3 @@ void RemovalState::Update(Map& map, NGridType& grid, GridInfo& info, uint32 diff
}
}
}
-
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index b6189d22fe3..f218f5fa5e9 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -191,4 +191,3 @@ class NGrid
bool i_GridObjectDataLoaded;
};
#endif
-
diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
index aed2d73c422..c6192c94fda 100644
--- a/src/server/game/Warden/Warden.cpp
+++ b/src/server/game/Warden/Warden.cpp
@@ -192,14 +192,14 @@ std::string Warden::Penalty(WardenCheck* check /*= NULL*/)
switch (action)
{
- case WARDEN_ACTION_LOG:
- return "None";
- break;
- case WARDEN_ACTION_KICK:
- _session->KickPlayer();
- return "Kick";
- break;
- case WARDEN_ACTION_BAN:
+ case WARDEN_ACTION_LOG:
+ return "None";
+ break;
+ case WARDEN_ACTION_KICK:
+ _session->KickPlayer();
+ return "Kick";
+ break;
+ case WARDEN_ACTION_BAN:
{
std::stringstream duration;
duration << sWorld->getIntConfig(CONFIG_WARDEN_CLIENT_BAN_DURATION) << "s";
@@ -215,8 +215,8 @@ std::string Warden::Penalty(WardenCheck* check /*= NULL*/)
return "Ban";
}
- default:
- break;
+ default:
+ break;
}
return "Undefined";
}
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index ecceb0b102f..348a98aa8b2 100644
--- a/src/server/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
@@ -97,7 +97,7 @@ bool Weather::ReGenerate()
time_t gtime = sWorld->GetGameTime();
struct tm ltime;
localtime_r(&gtime, &ltime);
- uint32 season = ((ltime.tm_yday - 78 + 365)/91)%4;
+ uint32 season = ((ltime.tm_yday - 78 + 365) / 91) % 4;
static char const* seasonName[WEATHER_SEASONS] = { "spring", "summer", "fall", "winter" };
@@ -152,8 +152,8 @@ bool Weather::ReGenerate()
// At this point, only weather that isn't doing anything remains but that have weather data
uint32 chance1 = m_weatherChances->data[season].rainChance;
- uint32 chance2 = chance1+ m_weatherChances->data[season].snowChance;
- uint32 chance3 = chance2+ m_weatherChances->data[season].stormChance;
+ uint32 chance2 = chance1 + m_weatherChances->data[season].snowChance;
+ uint32 chance3 = chance2 + m_weatherChances->data[season].stormChance;
uint32 rnd = urand(0, 99);
if (rnd <= chance1)
@@ -316,4 +316,3 @@ WeatherState Weather::GetWeatherState() const
return WEATHER_STATE_FINE;
}
}
-