[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog server/generic_character.h
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ./ChangeLog server/generic_character.h |
Date: |
Thu, 18 May 2006 10:40:00 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Sandro Santilli <address@hidden> 06/05/18 10:40:00
Modified files:
. : ChangeLog
server : generic_character.h
Log message:
* server/generic_character.h: struct => class, headers inclusion
streamlined.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.353&tr2=1.354&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/generic_character.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.353 gnash/ChangeLog:1.354
--- gnash/ChangeLog:1.353 Thu May 18 10:21:25 2006
+++ gnash/ChangeLog Thu May 18 10:40:00 2006
@@ -1,5 +1,7 @@
2006-05-18 Sandro Santilli <address@hidden>
+ * server/generic_character.h: struct => class, headers
+ inclusion streamlined.
* server/Makefile.am, server/edit_text_character_def.cpp,
server/edit_text_character_def.h, server/text.cpp,
server/text.h: moved edit_text_character_def class and
Index: gnash/server/generic_character.h
diff -u gnash/server/generic_character.h:1.1
gnash/server/generic_character.h:1.2
--- gnash/server/generic_character.h:1.1 Sun May 7 19:40:43 2006
+++ gnash/server/generic_character.h Thu May 18 10:40:00 2006
@@ -43,24 +43,25 @@
#include "config.h"
#endif
-#include "gnash.h"
-#include "character_def.h" // for character_def inheritance
-#include "types.h"
-#include "log.h"
-#include <assert.h>
-#include "container.h"
-#include "utility.h"
-#include "smart_ptr.h"
-#include "movie_interface.h"
-#include <stdarg.h>
+#include "character.h" // for inheritance
+
+#include <cassert>
namespace gnash {
+// Forward declarations
+class character_def;
+
/// For characters that don't store unusual state in their instances.
-struct generic_character : public character
+class generic_character : public character
{
+
+private:
+
character_def* m_def;
+public:
+
generic_character(character_def* def, movie* parent, int id)
:
character(parent, id),
@@ -111,6 +112,11 @@
}
return NULL;
}
+
+ /// Return the character definition from which this
+ /// instance derive.
+ character_def* get_character_def() { return m_def; }
+
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog server/generic_character.h,
Sandro Santilli <=