[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs entrance_obj.cxx,1.3,1.4 e
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs entrance_obj.cxx,1.3,1.4 entrance_obj.hxx,1.2,1.3 |
Date: |
1 Dec 2002 21:45:16 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv29584/editorobjs
Modified Files:
entrance_obj.cxx entrance_obj.hxx
Log Message:
- fixed entrance propertie dialog
Index: entrance_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/entrance_obj.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entrance_obj.cxx 28 Nov 2002 20:09:54 -0000 1.3
+++ entrance_obj.cxx 1 Dec 2002 21:45:14 -0000 1.4
@@ -23,14 +23,16 @@
#include "../editor/entrance_window.hxx"
#include "../editor/editor.hxx"
#include "../editor/property_window.hxx"
+#include "../editor/generic_property_frame.hxx"
+#include "../editor/editor.hxx"
#include "entrance_obj.hxx"
+using namespace WorldObjsData;
+
namespace EditorObjs {
EntranceObj::EntranceObj (const WorldObjsData::EntranceData& data_)
- : data(new WorldObjsData::EntranceData(data_)),
- direction(data->direction),
- release_rate(data->release_rate)
+ : data(new WorldObjsData::EntranceData(data_))
{
pos_ref = &data->pos;
@@ -85,7 +87,7 @@
std::string dir_str;
char str[256];
- switch(direction)
+ switch(data->direction)
{
case WorldObjsData::EntranceData::LEFT:
dir_str = "left";
@@ -107,9 +109,22 @@
}
EditorNS::PropertyFrame*
-EntranceObj::get_gui_dialog (EditorNS::Editor* parent)
+EntranceObj::get_gui_dialog (EditorNS::Editor* editor)
{
- return new
EditorNS::EntranceWindow(parent->get_property_window()->get_client_area(),
this);
+ EditorNS::GenericPropertyFrame* propframe
+ = new EditorNS::GenericPropertyFrame("GroundPiece Properties",
+
editor->get_property_window()->get_client_area());
+
+ propframe->begin_add_enum_box("Direction", (int*)&data->direction);
+ propframe->add_enum_value("left", EntranceData::LEFT);
+ propframe->add_enum_value("right", EntranceData::RIGHT);
+ propframe->add_enum_value("misc", EntranceData::MISC);
+ propframe->end_add_enum_box();
+
+ propframe->add_integer_box("Release Rate", &data->release_rate);
+ propframe->add_integer_box("Owner ID (Player)", &data->owner_id);
+
+ return propframe;
}
} // namespace EditorObjs
Index: entrance_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/entrance_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entrance_obj.hxx 28 Nov 2002 20:09:54 -0000 1.2
+++ entrance_obj.hxx 1 Dec 2002 21:45:14 -0000 1.3
@@ -31,11 +31,8 @@
WorldObjsData::EntranceData* const data;
public:
- WorldObjsData::EntranceData::EntranceDirection direction;
- int release_rate;
-
EntranceObj (const WorldObjsData::EntranceData& data_);
- ~EntranceObj ();
+ ~EntranceObj ();
EditorObj* duplicate ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editorobjs entrance_obj.cxx,1.3,1.4 entrance_obj.hxx,1.2,1.3,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.123,1.124 action_button.cxx,1.21,1.22 action_button.hxx,1.15,1.16 button_panel.hxx,1.15,1.16 anim_counter.cxx,1.1,NONE anim_counter.hxx,1.4,NONE
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor Makefile.am,1.29,1.30
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.123,1.124 action_button.cxx,1.21,1.22 action_button.hxx,1.15,1.16 button_panel.hxx,1.15,1.16 anim_counter.cxx,1.1,NONE anim_counter.hxx,1.4,NONE
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor Makefile.am,1.29,1.30
- Index(es):