Skip to content

Align focused cpp/h codestyle #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
billy1arm wants to merge 1 commit into from
Closed

Align focused cpp/h codestyle #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/game/References/GroupRefManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,18 @@ class GroupRefManager : public RefManager<Group, Player>
* @brief Get first group reference
* @return First group reference
*/
GroupReference* getFirst() { return ((GroupReference*) RefManager<Group, Player>::getFirst()); }
GroupReference* getFirst()
{
return ((GroupReference*) RefManager<Group, Player>::getFirst());
}

/**
* @brief Get first group reference (const)
* @return First group reference (const)
*/
GroupReference const* getFirst() const { return ((GroupReference const*) RefManager<Group, Player>::getFirst()); }
GroupReference const* getFirst() const
{
return ((GroupReference const*) RefManager<Group, Player>::getFirst());
}
};
#endif
30 changes: 24 additions & 6 deletions src/game/References/GroupReference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,53 @@ class GroupReference : public Reference<Group, Player>
/**
* @brief Constructor
*/
GroupReference() : Reference<Group, Player>(), iSubGroup(0) {}
GroupReference()
: Reference<Group, Player>(), iSubGroup(0)
{
}

/**
* @brief Destructor
*/
~GroupReference() { unlink(); }
~GroupReference()
{
unlink();
}

/**
* @brief Get next reference
* @return Next group reference
*/
GroupReference* next() { return (GroupReference*)Reference<Group, Player>::next(); }
GroupReference* next()
{
return (GroupReference*)Reference<Group, Player>::next();
}

/**
* @brief Get next reference (const)
* @return Next group reference (const)
*/
GroupReference const* next() const { return (GroupReference const*)Reference<Group, Player>::next(); }
GroupReference const* next() const
{
return (GroupReference const*)Reference<Group, Player>::next();
}

/**
* @brief Get sub-group ID
* @return Sub-group ID
*/
uint8 getSubGroup() const { return iSubGroup; }
uint8 getSubGroup() const
{
return iSubGroup;
}

/**
* @brief Set sub-group ID
* @param pSubGroup Sub-group ID to set
*/
void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; }
void setSubGroup(uint8 pSubGroup)
{
iSubGroup = pSubGroup;
}
};
#endif
15 changes: 12 additions & 3 deletions src/game/References/HostileRefManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ class HostileRefManager : public RefManager<Unit, ThreatManager>
* @brief Get owner unit
* @return Owner unit
*/
Unit* getOwner() { return iOwner; }
Unit* getOwner()
{
return iOwner;
}

/**
* @brief Send threat to all haters for the victim
Expand Down Expand Up @@ -98,7 +101,10 @@ class HostileRefManager : public RefManager<Unit, ThreatManager>
* @brief Get first hostile reference
* @return First hostile reference
*/
HostileReference* getFirst() { return ((HostileReference*) RefManager<Unit, ThreatManager>::getFirst()); }
HostileReference* getFirst()
{
return ((HostileReference*) RefManager<Unit, ThreatManager>::getFirst());
}

/**
* @brief Update threat tables
Expand Down Expand Up @@ -137,7 +143,10 @@ class HostileRefManager : public RefManager<Unit, ThreatManager>
m_redirectionMod = 0.0f;
}

float GetThreatRedirectionMod() const { return m_redirectionMod; }
float GetThreatRedirectionMod() const
{
return m_redirectionMod;
}
Unit* GetThreatRedirectionTarget() const;

private:
Expand Down
45 changes: 36 additions & 9 deletions src/game/References/MapRefManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,55 +44,82 @@ class MapRefManager : public RefManager<Map, Player>
* @brief Get first map reference
* @return First map reference
*/
MapReference* getFirst() { return (MapReference*)RefManager<Map, Player>::getFirst(); }
MapReference* getFirst()
{
return (MapReference*)RefManager<Map, Player>::getFirst();
}

/**
* @brief Get first map reference (const)
* @return First map reference (const)
*/
MapReference const* getFirst() const { return (MapReference const*)RefManager<Map, Player>::getFirst(); }
MapReference const* getFirst() const
{
return (MapReference const*)RefManager<Map, Player>::getFirst();
}

/**
* @brief Get last map reference
* @return Last map reference
*/
MapReference* getLast() { return (MapReference*)RefManager<Map, Player>::getLast(); }
MapReference* getLast()
{
return (MapReference*)RefManager<Map, Player>::getLast();
}

/**
* @brief Get last map reference (const)
* @return Last map reference (const)
*/
MapReference const* getLast() const { return (MapReference const*)RefManager<Map, Player>::getLast(); }
MapReference const* getLast() const
{
return (MapReference const*)RefManager<Map, Player>::getLast();
}

/**
* @brief Get iterator to beginning
* @return Iterator to beginning
*/
iterator begin() { return iterator(getFirst()); }
iterator begin()
{
return iterator(getFirst());
}

/**
* @brief Get iterator to end
* @return Iterator to end
*/
iterator end() { return iterator(NULL); }
iterator end()
{
return iterator(NULL);
}

/**
* @brief Get reverse iterator to beginning
* @return Reverse iterator to beginning
*/
iterator rbegin() { return iterator(getLast()); }
iterator rbegin()
{
return iterator(getLast());
}

/**
* @brief Get reverse iterator to end
* @return Reverse iterator to end
*/
iterator rend() { return iterator(NULL); }
iterator rend()
{
return iterator(NULL);
}

/**
* @brief Get const iterator to beginning
* @return Const iterator to beginning
*/
const_iterator begin() const { return const_iterator(getFirst()); }
const_iterator begin() const
{
return const_iterator(getFirst());
}

/**
* @brief Get const iterator to end
Expand Down
30 changes: 24 additions & 6 deletions src/game/References/MapReference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,35 +74,53 @@ class MapReference : public Reference<Map, Player>
/**
* @brief Constructor
*/
MapReference() : Reference<Map, Player>() {}
MapReference()
: Reference<Map, Player>()
{
}

/**
* @brief Destructor
*/
~MapReference() { unlink(); }
~MapReference()
{
unlink();
}

/**
* @brief Get next reference
* @return Next map reference
*/
MapReference* next() { return (MapReference*)Reference<Map, Player>::next(); }
MapReference* next()
{
return (MapReference*)Reference<Map, Player>::next();
}

/**
* @brief Get next reference (const)
* @return Next map reference (const)
*/
MapReference const* next() const { return (MapReference const*)Reference<Map, Player>::next(); }
MapReference const* next() const
{
return (MapReference const*)Reference<Map, Player>::next();
}

/**
* @brief Get previous reference (no check)
* @return Previous map reference
*/
MapReference* nockeck_prev() { return (MapReference*)Reference<Map, Player>::nocheck_prev(); }
MapReference* nockeck_prev()
{
return (MapReference*)Reference<Map, Player>::nocheck_prev();
}
Comment on lines +112 to +115

/**
* @brief Get previous reference (no check, const)
* @return Previous map reference (const)
*/
MapReference const* nocheck_prev() const { return (MapReference const*)Reference<Map, Player>::nocheck_prev(); }
MapReference const* nocheck_prev() const
{
return (MapReference const*)Reference<Map, Player>::nocheck_prev();
}
};
#endif
Loading
Loading