Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/GameLogic/SCA_IInputDevice.h')
-rw-r--r--source/gameengine/GameLogic/SCA_IInputDevice.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h
index 443faef6338..0382a2efd21 100644
--- a/source/gameengine/GameLogic/SCA_IInputDevice.h
+++ b/source/gameengine/GameLogic/SCA_IInputDevice.h
@@ -274,14 +274,14 @@ public:
protected:
/**
- m_eventStatusTables are two tables that contain current and previous
- status of all events
- */
+ * m_eventStatusTables are two tables that contain current and previous
+ * status of all events
+ */
SCA_InputEvent m_eventStatusTables[2][SCA_IInputDevice::KX_MAX_KEYS];
/**
- m_currentTable is index for m_keyStatusTable that toggle between 0 or 1
- */
+ * m_currentTable is index for m_keyStatusTable that toggle between 0 or 1
+ */
int m_currentTable;
void ClearStatusTable(int tableid);
@@ -316,9 +316,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
- void operator delete(void *mem) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_InputEvent")
#endif
};