[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/character.cpp server/cha...
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog server/character.cpp server/cha... |
Date: |
Sun, 24 Feb 2008 11:03:09 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/02/24 11:03:08
Modified files:
. : ChangeLog
server : character.cpp character.h
Log message:
* server/character.{h,cpp}: define all static const data
members outside
the class declaration; move initialization back where it
belongs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5735&r2=1.5736
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.129&r2=1.130
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5735
retrieving revision 1.5736
diff -u -b -r1.5735 -r1.5736
--- ChangeLog 23 Feb 2008 20:40:43 -0000 1.5735
+++ ChangeLog 24 Feb 2008 11:03:07 -0000 1.5736
@@ -1,3 +1,8 @@
+2008-02-24 Benjamin Wolsey <address@hidden>
+
+ * server/character.{h,cpp}: define all static const data members outside
+ the class declaration; move initialization back where it belongs.
+
2008-02-23 Sean McNamara <address@hidden>
* server/asobj/NetStreamGst.cpp: Use the new GstUtil for obtaining an
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/character.cpp 22 Feb 2008 20:08:51 -0000 1.80
+++ server/character.cpp 24 Feb 2008 11:03:08 -0000 1.81
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: character.cpp,v 1.80 2008/02/22 20:08:51 bwy Exp $ */
+/* $Id: character.cpp,v 1.81 2008/02/24 11:03:08 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -40,12 +40,16 @@
namespace gnash
{
+// Define static const members or there will be linkage problems.
+const int character::staticDepthOffset;
+const int character::removedDepthOffset;
+const int character::noClipDepthValue;
+const int character::dynClipDepthValue;
+const int character::noRatioValue;
+
// Initialize unnamed instance count
unsigned int character::_lastUnnamedInstanceNum=0;
-const int character::staticDepthOffset = -16384;
-const int character::removedDepthOffset = -32769;
-
/*protected static*/
std::string
character::getNextUnnamedInstanceName()
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/character.h 22 Feb 2008 20:08:51 -0000 1.129
+++ server/character.h 24 Feb 2008 11:03:08 -0000 1.130
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: character.h,v 1.129 2008/02/22 20:08:51 bwy Exp $ */
+/* $Id: character.h,v 1.130 2008/02/24 11:03:08 bwy Exp $ */
#ifndef GNASH_CHARACTER_H
#define GNASH_CHARACTER_H
@@ -308,7 +308,7 @@
///
/// See: http://www.senocular.com/flash/tutorials/depths/?page=2
///
- static const int staticDepthOffset;
+ static const int staticDepthOffset = -16384;
/// This is the offset at which character's depth is
/// shifted when a character is removed from stage but
@@ -326,7 +326,7 @@
/// (all of the above correct?)
///
///
- static const int removedDepthOffset;
+ static const int removedDepthOffset = -32769;
/// Return true if the given depth is in the removed zone
static bool depthInRemovedZone(int depth)