← Back to branch summary

~flosoft/s25rttr/trunk

« back to all changes in this revision

Viewing changes to src/CollisionDetection.h

  • Committer: FloSoft
  • Date: 2014-04-25 15:35:50 UTC
  • Revision ID: flosoft@siedler25.org-20140425153550-9muu4vodhlqu58m0
committing subversion revision 9357 by FloSoft
astyle

modified:
s25client/trunk/
s25client/trunk/contrib/lua/lin32/include/
s25client/trunk/contrib/lua/lin64/include/
s25client/trunk/contrib/lua/mac/include/
s25client/trunk/contrib/lua/win32/include/
s25client/trunk/contrib/lua/win64/include/
s25client/trunk/driver/audio/SDL/src/
s25client/trunk/driver/src/
s25client/trunk/driver/video/GLFW/src/
s25client/trunk/driver/video/SDL/src/
s25client/trunk/driver/video/WinAPI/src/
s25client/trunk/src/
s25client/trunk/win32/
s25client/trunk/win32/prebuild-mutex/src/

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/CollisionDetection.h
1
 
// $Id: CollisionDetection.h 7521 2011-09-08 20:45:55Z FloSoft $
 
1
// $Id: CollisionDetection.h 9357 2014-04-25 15:35:25Z FloSoft $
2
2
//
3
3
// Copyright (c) 2005 - 2011 Settlers Freaks (sf-team at siedler25.org)
4
4
//
24
24
struct Rect;
25
25
 
26
26
// Punkt in einem Rechteck
27
 
bool Coll(const int x, const int y, const Rect &rect);
 
27
bool Coll(const int x, const int y, const Rect& rect);
28
28
// Punkt in einem Rechteck
29
 
bool Coll(const int x, const int y, const int rx,const int ry, const int rwidth,const int rheight);
 
29
bool Coll(const int x, const int y, const int rx, const int ry, const int rwidth, const int rheight);
30
30
// 1D (2 Linien)
31
31
bool Coll(const int left1, const int right1, const int left2, const int right2);
32
32
// 2D (2 Rechtecke)
33
 
bool CollEdges(const Rect &rect1, const Rect &rect2);
 
33
bool CollEdges(const Rect& rect1, const Rect& rect2);
34
34
// 2D (2 Rechtecke)
35
 
bool Coll(const Rect &rect1, const Rect &rec2);
 
35
bool Coll(const Rect& rect1, const Rect& rec2);
36
36
 
37
37
#endif // COLLISIONDETECTION_H_INCLUDED