summaryrefslogtreecommitdiffstats
path: root/src/graphics/engine/lightning.h
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-20 23:04:37 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-20 23:04:37 +0200
commit34a11021daca9d6b51e8cc29c1562a75815df7b3 (patch)
tree7d1427b27337d32224cf66cc114adf4f3665bbee /src/graphics/engine/lightning.h
parent191fdc614ed8022c145d3530f9d412e715ae37db (diff)
parente25823f98437461826b52521bcf9d70eb11a00b3 (diff)
downloadcolobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.tar.gz
colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.tar.bz2
colobot-34a11021daca9d6b51e8cc29c1562a75815df7b3.zip
changed paths for models and levels. Now it's possible to load level. Merged with latest trunk
Diffstat (limited to 'src/graphics/engine/lightning.h')
-rw-r--r--src/graphics/engine/lightning.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/graphics/engine/lightning.h b/src/graphics/engine/lightning.h
index af389f2..d873c64 100644
--- a/src/graphics/engine/lightning.h
+++ b/src/graphics/engine/lightning.h
@@ -17,12 +17,14 @@
/**
* \file graphics/engine/lightning.h
- * \brief Lightning rendering - Gfx::CLightning class (aka blitz)
+ * \brief Lightning rendering - CLightning class (aka blitz)
*/
#pragma once
+
#include "common/event.h"
+
#include "math/vector.h"
@@ -31,6 +33,7 @@ class CObject;
class CSound;
+// Graphics module namespace
namespace Gfx {
class CEngine;
@@ -81,7 +84,7 @@ protected:
float m_sleep;
float m_delay;
float m_magnetic;
- Gfx::BlitzPhase m_phase;
+ BlitzPhase m_phase;
float m_time;
float m_speed;
float m_progress;
@@ -90,4 +93,5 @@ protected:
float m_width[BLITZMAX];
};
-}; // namespace Gfx
+
+} // namespace Gfx