summaryrefslogtreecommitdiff
path: root/scene.h
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-06-12 17:52:31 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2011-06-12 17:52:31 +0200
commitd289e0eacbd00538ee2bcaedeba4366cc1e98231 (patch)
tree16d49421b24520c1728149f96a63635340e2e4a2 /scene.h
parentd94e9e78af4e59e27524556b828291c1dfb72407 (diff)
Handle and render players with a placeholder texture.
Diffstat (limited to 'scene.h')
-rw-r--r--scene.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/scene.h b/scene.h
index f244ab1..247b52c 100644
--- a/scene.h
+++ b/scene.h
@@ -8,6 +8,7 @@
#include "gui.h"
#include "tool.h"
#include "scripting.h"
+#include "player.h"
#include <FTGL/ftgl.h>
@@ -23,6 +24,7 @@ class Scene {
ConsoleWindow *console;
ChatWindow *chat;
Lua *lua;
+ PlayerList players;
bool running;
bool grid;
@@ -36,6 +38,7 @@ class Scene {
Terrain::Node *last_node;
unsigned int last_time;
+ unsigned int last_sort;
Vector3 selected;
bool do_select, show_selection;
@@ -44,7 +47,7 @@ class Scene {
GLShaderProgram terrain_program;
GLShaderProgram water_program;
- GLuint grass_texture, rock_texture, soil_texture, water_texture, marker_texture;
+ GLuint grass_texture, rock_texture, soil_texture, water_texture, marker_texture, placeholder_texture;
Scene();
~Scene();
@@ -56,6 +59,8 @@ class Scene {
void events();
void render();
GLuint load_texture(const char *filename);
+
+ void sort_players();
};
#endif