Implemented DisconnectedScreen, and removed CharacterMap

Project also builds, since I went through and adjusted it. It's hacky
right now, but I just want to make sure it worked. I'll give it another
pass before merging into develop.
This commit is contained in:
Kayne Ruse
2014-10-10 06:54:48 +11:00
parent f3073efa39
commit 974effd95e
10 changed files with 47 additions and 93 deletions
+5 -21
View File
@@ -19,11 +19,8 @@
* 3. This notice may not be removed or altered from any source
* distribution.
*/
#ifndef CLEANUP_HPP_
#define CLEANUP_HPP_
//network
#include "udp_network_utility.hpp"
#ifndef DISCONNECTEDSCREEN_HPP_
#define DISCONNECTEDSCREEN_HPP_
//graphics
#include "image.hpp"
@@ -31,22 +28,16 @@
#include "button.hpp"
//client
#include "character.hpp"
#include "base_scene.hpp"
//std namespace
#include <chrono>
class CleanUp : public BaseScene {
class DisconnectedScreen : public BaseScene {
public:
//Public access members
CleanUp(
int* const argClientIndex,
int* const argAccountIndex,
int* const argCharacterIndex,
CharacterMap* argCharacterMap
);
~CleanUp();
DisconnectedScreen();
~DisconnectedScreen();
protected:
//Frame loop
@@ -61,13 +52,6 @@ protected:
void KeyDown(SDL_KeyboardEvent const&);
void KeyUp(SDL_KeyboardEvent const&);
//shared parameters
UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton();
int& clientIndex;
int& accountIndex;
int& characterIndex;
CharacterMap& characterMap;
//graphics
Image image;
RasterFont font;