diff options
author | Colin Noga <Tempus@chronometry.ca> | 2012-12-08 14:13:53 -0600 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2012-12-08 14:13:53 -0600 |
commit | da3aa8b641e21a766b4212385e434ff2f9927e98 (patch) | |
tree | 16ed9a79f04bbc4bfdc0bb6b1b4d551df044c812 /include | |
parent | 16d563a330e1a3190b6212a0bca2a4c80e2b5cff (diff) | |
parent | 3e1eddbcca15042a7a63f29f5db3ce66237355b9 (diff) | |
download | kamek-da3aa8b641e21a766b4212385e434ff2f9927e98.tar.gz kamek-da3aa8b641e21a766b4212385e434ff2f9927e98.zip |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'include')
-rwxr-xr-x | include/game.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/game.h b/include/game.h index 403d1b3..780b76c 100755 --- a/include/game.h +++ b/include/game.h @@ -2057,6 +2057,7 @@ public: static fBase_c *search(Actors name, fBase_c *previous = 0);
static fBase_c *search(u32 id);
+ static fBase_c *searchByBaseType(int type, fBase_c *previous);
};
class dBase_c : public fBase_c {
@@ -3582,5 +3583,8 @@ namespace nw4r { }
}
+
+extern float EnemyBounceValue;
+
#endif
|