summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@yahoo.com>2014-01-26 21:31:59 +0100
committerRealBadAngel <maciej.kasatkin@yahoo.com>2014-01-26 21:31:59 +0100
commit21f1bec72433748e220d19e97a846df83340518e (patch)
treea4b45526ca5f21a63a5075de17b1911c662eb656 /src/game.cpp
parent3f0ee5d6800302f0ad7e56f0aa4ddddddae86823 (diff)
downloadminetest-21f1bec72433748e220d19e97a846df83340518e.tar.gz
minetest-21f1bec72433748e220d19e97a846df83340518e.tar.bz2
minetest-21f1bec72433748e220d19e97a846df83340518e.zip
New HUD element - waypoint.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 16fd42f16..407672ac2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1486,7 +1486,7 @@ void the_game(
/*
HUD object
*/
- Hud hud(driver, guienv, font, text_height,
+ Hud hud(driver, smgr, guienv, font, text_height,
gamedef, player, &local_inventory);
bool use_weather = g_settings->getBool("weather");
@@ -2376,6 +2376,7 @@ void the_game(
delete event.hudadd.text;
delete event.hudadd.align;
delete event.hudadd.offset;
+ delete event.hudadd.world_pos;
continue;
}
@@ -2390,6 +2391,7 @@ void the_game(
e->dir = event.hudadd.dir;
e->align = *event.hudadd.align;
e->offset = *event.hudadd.offset;
+ e->world_pos = *event.hudadd.world_pos;
if (id == nhudelem)
player->hud.push_back(e);
@@ -2402,6 +2404,7 @@ void the_game(
delete event.hudadd.text;
delete event.hudadd.align;
delete event.hudadd.offset;
+ delete event.hudadd.world_pos;
}
else if (event.type == CE_HUDRM)
{
@@ -2415,6 +2418,7 @@ void the_game(
{
u32 id = event.hudchange.id;
if (id >= player->hud.size() || !player->hud[id]) {
+ delete event.hudchange.v3fdata;
delete event.hudchange.v2fdata;
delete event.hudchange.sdata;
continue;
@@ -2449,8 +2453,12 @@ void the_game(
case HUD_STAT_OFFSET:
e->offset = *event.hudchange.v2fdata;
break;
+ case HUD_STAT_WORLD_POS:
+ e->world_pos = *event.hudchange.v3fdata;
+ break;
}
+ delete event.hudchange.v3fdata;
delete event.hudchange.v2fdata;
delete event.hudchange.sdata;
}