[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/server action.cpp swf.h
|
From: |
strk |
|
Subject: |
[Gnash-commit] gnash/server action.cpp swf.h |
|
Date: |
Thu, 09 Feb 2006 00:33:06 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: strk <address@hidden> 06/02/09 00:33:06
Modified files:
server : action.cpp swf.h
Log message:
Changed Action type names to reflect changes in Ming.
Removed compiler warnings about unused variables in action.cpp.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/swf.h.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.30 gnash/server/action.cpp:1.31
--- gnash/server/action.cpp:1.30 Wed Feb 8 21:56:20 2006
+++ gnash/server/action.cpp Thu Feb 9 00:33:06 2006
@@ -1112,8 +1112,10 @@
as_member member = it.get_value();
as_prop_flags f = member.get_member_flags();
- const int oldflags = f.get_flags();
- const int newflags = f.set_flags(set_true,
set_false);
+ //const int oldflags =
+ f.get_flags();
+ //const int newflags =
+ f.set_flags(set_true, set_false);
member.set_member_flags(f);
object->m_members.set(it.get_key(), member);
@@ -1131,8 +1133,10 @@
as_member member = it.get_value();
as_prop_flags f =
member.get_member_flags();
- const int oldflags = f.get_flags();
- const int newflags =
f.set_flags(set_true, set_false);
+ //const int oldflags =
+ f.get_flags();
+ //const int newflags =
+ f.set_flags(set_true, set_false);
member.set_member_flags(f);
object->m_members.set(it.get_key(),
member);
@@ -1155,8 +1159,10 @@
as_member member = it2.get_value();
as_prop_flags f =
member.get_member_flags();
- const int oldflags = f.get_flags();
- const int newflags =
f.set_flags(set_true, set_false);
+ //const int oldflags =
+ f.get_flags();
+ //const int newflags =
+ f.set_flags(set_true, set_false);
member.set_member_flags(f);
object->m_members.set((it.get_value()).get_member_value().to_string(), member);
@@ -1168,6 +1174,7 @@
}
+
void action_init()
// Create/hook built-ins.
{
@@ -1861,7 +1868,7 @@
break;
}
- case SWF::ACTION_CASTOBJECT: // 0x2B
+ case SWF::ACTION_CASTOP: // 0x2B
{
// TODO
//
@@ -1875,7 +1882,7 @@
break;
}
- case SWF::ACTION_IMPLEMENTS: // 0x2C
+ case SWF::ACTION_IMPLEMENTSOP: // 0x2C
{
// Declare that a class s1 implements
one or more
// interfaces (i2 == number of
interfaces, s3..sn are the names
@@ -2500,7 +2507,7 @@
env->drop(1);
}
break;
- case SWF::ACTION_GREATERTHEN: // 0x67:
+ case SWF::ACTION_GREATER: // 0x67:
if (env->top(1).get_type() ==
as_value::STRING)
{
env->top(1).set_bool(env->top(1).to_tu_string() > env->top(0).to_tu_string());
@@ -2511,7 +2518,7 @@
}
env->drop(1);
break;
- case SWF::ACTION_STRING_GREATERTHEN: // 0x68
+ case SWF::ACTION_STRINGGREATER: // 0x68
env->top(1).set_bool(env->top(1).to_tu_string() > env->top(0).to_tu_string());
env->drop(1);
break;
@@ -4171,8 +4178,8 @@
{ SWF::ACTION_STOPDRAGMOVIE, "stop_drag", ARG_NONE },
{ SWF::ACTION_STRINGCOMPARE, "str_lt", ARG_NONE },
{ SWF::ACTION_THROW, "throw_fixme", ARG_NONE },
- { SWF::ACTION_CASTOBJECT, "cast_fixme", ARG_NONE },
- { SWF::ACTION_IMPLEMENTS, "implements_fixme", ARG_NONE
},
+ { SWF::ACTION_CASTOP, "cast_fixme", ARG_NONE },
+ { SWF::ACTION_IMPLEMENTSOP, "implements_fixme",
ARG_NONE },
{ SWF::ACTION_RANDOM, "random", ARG_NONE },
{ SWF::ACTION_MBLENGTH, "mb_length_fixme", ARG_NONE },
{ SWF::ACTION_ORD, "ord", ARG_NONE },
@@ -4216,7 +4223,7 @@
{ SWF::ACTION_SHIFTRIGHT, "asr", ARG_NONE },
{ SWF::ACTION_SHIFTRIGHT2, "lsr", ARG_NONE },
{ SWF::ACTION_STRICTEQ, "eq_strict", ARG_NONE },
- { SWF::ACTION_GREATERTHEN, "gt_t", ARG_NONE },
+ { SWF::ACTION_GREATER, "gt_t", ARG_NONE },
{ SWF::ACTION_EXTENDS, "extends_fixme", ARG_NONE },
{ SWF::ACTION_GOTOFRAME, "goto_frame", ARG_U16 },
{ SWF::ACTION_GETURL, "get_url", ARG_STR },
Index: gnash/server/swf.h
diff -u gnash/server/swf.h:1.8 gnash/server/swf.h:1.9
--- gnash/server/swf.h:1.8 Tue Feb 7 03:09:46 2006
+++ gnash/server/swf.h Thu Feb 9 00:33:06 2006
@@ -151,7 +151,7 @@
/// See:
///
http://sswf.sourceforge.net/SWFalexref.html#action_cast_object
///
- ACTION_CASTOBJECT = 0x2B,
+ ACTION_CASTOP = 0x2B,
/// SWF7
///
@@ -164,7 +164,7 @@
/// See:
///
http://sswf.sourceforge.net/SWFalexref.html#action_implements
///
- ACTION_IMPLEMENTS = 0x2C,
+ ACTION_IMPLEMENTSOP = 0x2C,
ACTION_RANDOM = 0x30,
ACTION_MBLENGTH = 0x31,
@@ -303,7 +303,7 @@
/// See:
///
http://sswf.sourceforge.net/SWFalexref.html#action_greater_than_typed
///
- ACTION_GREATERTHEN = 0x67,
+ ACTION_GREATER = 0x67,
/// SWF6
///
@@ -314,7 +314,7 @@
/// See:
///
http://sswf.sourceforge.net/SWFalexref.html#action_string_greater_than
///
- ACTION_STRING_GREATERTHEN = 0x68,
+ ACTION_STRINGGREATER = 0x68,
///
/// SWF7