mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
Merged most of the changes from trunk.
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
This commit is contained in:
@@ -35,7 +35,7 @@ public:
|
||||
x+=i.x;
|
||||
y+=i.y;
|
||||
z+=i.z;
|
||||
}
|
||||
}
|
||||
inline void operator+=(const si32 & i)
|
||||
{
|
||||
x+=i;
|
||||
@@ -47,15 +47,15 @@ public:
|
||||
x-=i.x;
|
||||
y-=i.y;
|
||||
z-=i.z;
|
||||
}
|
||||
}
|
||||
inline void operator-=(const si32 & i)
|
||||
{
|
||||
x+=i;
|
||||
y+=i;
|
||||
z+=i;
|
||||
}
|
||||
}
|
||||
inline bool operator==(const int3 & i) const
|
||||
{return (x==i.x) && (y==i.y) && (z==i.z);}
|
||||
{return (x==i.x) && (y==i.y) && (z==i.z);}
|
||||
inline bool operator!=(const int3 & i) const
|
||||
{return !(*this==i);}
|
||||
inline bool operator<(const int3 & i) const
|
||||
@@ -88,4 +88,4 @@ inline std::ostream & operator<<(std::ostream & str, const int3 & sth)
|
||||
{
|
||||
return str<<sth.x<<' '<<sth.y<<' '<<sth.z;
|
||||
}
|
||||
#endif //INT3_H
|
||||
#endif //INT3_H
|
||||
|
||||
Reference in New Issue
Block a user