Merged the new frame rate system into dev-char

This commit is contained in:
Kayne Ruse
2013-06-23 15:11:24 +10:00
4 changed files with 34 additions and 27 deletions
+3 -1
View File
@@ -35,6 +35,7 @@
#include "udp_network_utility.hpp"
#include "button.hpp"
#include "raster_font.hpp"
#include "frame_rate.hpp"
//debugging
#include "player_character.hpp"
@@ -73,7 +74,8 @@ protected:
InformationManager* infoMgr = ServiceLocator<InformationManager>::Get();
//members
RasterFont font;
PlayerCharacter pc;
};
#endif
#endif