[Gnash-commit] gnash ChangeLog server/parser/button_character_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/20 12:55:58

Modified files:
        .              : ChangeLog 
        server/parser  : button_character_def.cpp 

Log message:
        more symbolic names

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.878&r2=1.879
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.878
retrieving revision 1.879
diff -u -b -r1.878 -r1.879
--- ChangeLog   20 Sep 2006 12:09:09 -0000      1.878
+++ ChangeLog   20 Sep 2006 12:55:58 -0000      1.879
@@ -1,3 +1,8 @@
+2006-09-20 Sandro Santilli  <address@hidden>
+
+       * server/parser/button_character_def.cpp: more symbolic
+         names.
+
 2006-09-20 Vitaly Alexeev <address@hidden>
 
        * server/sprite_instance.cpp,

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/parser/button_character_def.cpp      26 Aug 2006 22:58:12 -0000      
1.1
+++ server/parser/button_character_def.cpp      20 Sep 2006 12:55:58 -0000      
1.2
@@ -35,13 +35,13 @@
 void   button_action::read(stream* in, int tag_type)
 {
        // Read condition flags.
-       if (tag_type == 7)
+       if (tag_type == SWF::DEFINEBUTTON) // 7
        {
                m_conditions = OVER_DOWN_TO_OVER_UP;
        }
        else
        {
-               assert(tag_type == 34);
+               assert(tag_type == SWF::DEFINEBUTTON2); // 34
                m_conditions = in->read_u16();
        }
 
@@ -148,12 +148,19 @@
 
 
 
-void   button_character_definition::read(stream* in, int tag_type, 
movie_definition* m)
+void
+button_character_definition::read(stream* in, int tag_type, movie_definition* 
m)
 // Initialize from the given stream.
 {
-       assert(tag_type == 7 || tag_type == 17 || tag_type == 34);
+       // Character ID has been read already 
 
-       if (tag_type == 7)
+       assert(
+               tag_type == SWF::DEFINEBUTTON           // 7
+               || tag_type == SWF::DEFINEBUTTONSOUND   // 17
+               || tag_type == SWF::DEFINEBUTTON2       // 34
+        );
+
+       if (tag_type == SWF::DEFINEBUTTON)
        {
                // Old button tag.
                        
@@ -173,7 +180,7 @@
                m_button_actions.resize(m_button_actions.size() + 1);
                m_button_actions.back().read(in, tag_type);
        }
-       else if (tag_type == 17)
+       else if (tag_type == SWF::DEFINEBUTTONSOUND)
        {
                assert(m_sound == NULL);        // redefinition button sound is 
error
                m_sound = new button_sound_def();
@@ -198,9 +205,10 @@
                        }
                }
        }
-       else if (tag_type == 34)
+       else if (tag_type == SWF::DEFINEBUTTON2)
        {
-               // Read the menu flag.
+               // Read the menu flag
+               // (this is a single bit, the other 7 bits are reserved)
                m_menu = in->read_u8() != 0;
 
                int     button_2_action_offset = in->read_u16();