All Games: Moved the macro INRANGEOF into doomdef.h/h2def.h

skyjake · Jun 25, 2008 · 28058b9 · 28058b9
1 parent 46b3e36
commit 28058b9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/doomsday/plugins/jdoom/include/doomdef.h b/doomsday/plugins/jdoom/include/doomdef.h
@@ -72,6 +72,7 @@ extern game_export_t gx;
 
 // Misc macros.
 #define CLAMP(v, min, max)  (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 /**
  * Game mode handling - identify IWAD version to handle IWAD dependant

diff --git a/doomsday/plugins/jdoom64/include/doomdef.h b/doomsday/plugins/jdoom64/include/doomdef.h
@@ -68,6 +68,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max)  (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 /**
  * Game mode handling - identify IWAD version to handle IWAD dependant

diff --git a/doomsday/plugins/jheretic/include/doomdef.h b/doomsday/plugins/jheretic/include/doomdef.h
@@ -74,6 +74,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max) (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 extern game_import_t gi;
 extern game_export_t gx;

diff --git a/doomsday/plugins/jhexen/include/h2def.h b/doomsday/plugins/jhexen/include/h2def.h
@@ -79,6 +79,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max)  (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 extern game_import_t gi;
 extern game_export_t gx;

diff --git a/doomsday/plugins/wolftc/include/doomdef.h b/doomsday/plugins/wolftc/include/doomdef.h
@@ -57,6 +57,7 @@
 
 // Misc macros.
 #define CLAMP(v, min, max) (v < min? v=min : v > max? v=max : v)
+#define INRANGEOF(x, y, r)  ((x) >= (y) - (r) && (x) <= (y) + (r))
 
 extern game_import_t gi;
 extern game_export_t gx;