• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン459 (tree)
日時2007-08-28 01:18:03
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterPanel.cpp (revision 458)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterPanel.cpp (revision 459)
@@ -27,6 +27,7 @@
2727 notebook->AddPage(attackPanel, _T("Attack"));
2828
2929 //設定
30+ monsterTypeListBox->SetMinSize(wxSize(-1, 300));
3031
3132 //配置
3233 wxFlexGridSizer* sizerBase = new wxFlexGridSizer(2);
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterFlagsPanel.cpp (revision 458)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterFlagsPanel.cpp (revision 459)
@@ -6,6 +6,7 @@
66 ID_WEAKNESSES,
77 ID_FRIENDS,
88 ID_ENEMIES,
9+ ID_FLAGS,
910 };
1011
1112 BEGIN_EVENT_TABLE(MonsterFlagsPanel, wxPanel)
@@ -18,6 +19,9 @@
1819 MonsterFlagsPanel::MonsterFlagsPanel(wxWindow* parent, wxWindowID id):
1920 wxPanel(parent, id)
2021 {
22+ wxStaticBox* staticDamage = new wxStaticBox(this, wxID_ANY, _T("Immunities/Weaknesses"));
23+ wxStaticBox* staticEnemy = new wxStaticBox(this, wxID_ANY, _T("Enemies/Friends"));
24+ wxStaticBox* staticFlags = new wxStaticBox(this, wxID_ANY, _T("Flags"));
2125 //create
2226 for(int i = 0; i < NUMBER_OF_DAMAGE_TYPES; i ++){
2327 this->immunities[i] = new wxCheckBox(this, ID_IMMUNITIES, _T(""));
@@ -29,9 +33,10 @@
2933 this->enemies[i] = new wxCheckBox(this, ID_ENEMIES,
3034 wxConvertMB2WX(wxGetApp().monsterInfo[i].jname.c_str()));
3135 }
32- wxStaticBox* staticDamage = new wxStaticBox(this, wxID_ANY, _T("Immunities/Weaknesses"));
33- wxStaticBox* staticEnemy = new wxStaticBox(this, wxID_ANY, _T("Enemies/Friends"));
34- wxStaticBox* staticFlags = new wxStaticBox(this, wxID_ANY, _T("Flags"));
36+ for(int i = 0; i < NUMBER_OF_MONSTER_FLAG_INFORMATIONS; i ++){
37+ this->flags[i] = new wxCheckBox(this, ID_FLAGS,
38+ wxConvertMB2WX(wxGetApp().monsterFlagsBind[i].jname.c_str()));
39+ }
3540
3641 //setting
3742 //layout
@@ -38,31 +43,34 @@
3843 wxBoxSizer* sizerBase = new wxBoxSizer(wxHORIZONTAL);
3944
4045 //damages
41- wxStaticBoxSizer* staticDamageSizer = new wxStaticBoxSizer(staticDamage, wxHORIZONTAL);
42- wxFlexGridSizer* sizerDamage = new wxFlexGridSizer(NUMBER_OF_DAMAGE_TYPES, 2);
46+ wxStaticBoxSizer* staticDamageSizer = new wxStaticBoxSizer(staticDamage, wxVERTICAL);
47+ wxFlexGridSizer* sizerDamage = new wxFlexGridSizer(NUMBER_OF_DAMAGE_TYPES, 2,0,0);
4348 for(int i = 0; i < NUMBER_OF_DAMAGE_TYPES; i ++){
44- sizerDamage->Add(this->immunities[i], 0, 0);
45- sizerDamage->Add(this->weaknesses[i], 0, 0);
49+ sizerDamage->Add(this->immunities[i], 0, 0,0);
50+ sizerDamage->Add(this->weaknesses[i], 0, 0,0);
4651 }
4752 staticDamageSizer->Add(sizerDamage, 0);
4853
4954 //enemy
50- wxStaticBoxSizer* staticEnemySizer = new wxStaticBoxSizer(staticEnemy, wxHORIZONTAL);
51- wxFlexGridSizer* sizerEnemy = new wxFlexGridSizer(NUMBER_OF_CLASS_INFORMATIONS, 2);
52- for(int i = 0; i < NUMBER_OF_DAMAGE_TYPES; i ++){
53- sizerEnemy->Add(this->friends[i], 0, 0);
54- sizerEnemy->Add(this->enemies[i], 0, 0);
55+ wxStaticBoxSizer* staticEnemySizer = new wxStaticBoxSizer(staticEnemy, wxVERTICAL);
56+ wxFlexGridSizer* sizerEnemy = new wxFlexGridSizer(NUMBER_OF_CLASS_INFORMATIONS,2,0,0);
57+ for(int i = 0; i < NUMBER_OF_CLASS_INFORMATIONS; i ++){
58+ sizerEnemy->Add(this->friends[i], 0, 0,0);
59+ sizerEnemy->Add(this->enemies[i], 0, 0,0);
5560 }
5661 staticEnemySizer->Add(sizerEnemy);
5762
5863 //flags
5964 wxStaticBoxSizer* staticFlagsSizer = new wxStaticBoxSizer(staticFlags, wxHORIZONTAL);
60- wxFlexGridSizer* sizerFlags = new wxFlexGridSizer(NUMBER_OF_MONSTER_FLAG_INFORMATIONS,1);
65+ wxFlexGridSizer* sizerFlags = new wxFlexGridSizer(NUMBER_OF_MONSTER_FLAG_INFORMATIONS,1,0,0);
66+ for(int i = 0; i < NUMBER_OF_MONSTER_FLAG_INFORMATIONS; i ++){
67+ sizerFlags->Add(this->flags[i], 0,0,0);
68+ }
6169 staticFlagsSizer->Add(sizerFlags);
6270
63- sizerBase->Add(staticDamageSizer, 0);
64- sizerBase->Add(staticEnemySizer, 1);
65- sizerBase->Add(staticFlagsSizer, 2);
71+ sizerBase->Add(staticDamageSizer, 0, wxEXPAND);
72+ sizerBase->Add(staticEnemySizer, 1, wxEXPAND);
73+ sizerBase->Add(staticFlagsSizer, 2, wxEXPAND);
6674 this->SetSizer(sizerBase);
6775 sizerBase->Fit(this);
6876 this->Layout();
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MainFrame.cpp (revision 458)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MainFrame.cpp (revision 459)
@@ -39,6 +39,8 @@
3939 hpl::error::halt("Unknown error occured when launch app.");
4040 }
4141
42+ this->SetSize(WINDOW_DEFAULT_WIDTH, WINDOW_DEFAULT_HEIGHT);
43+
4244 //status bar
4345 CreateStatusBar();
4446 SetStatusText( _T("get ready..."));
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/PhysicsEditorOneWX.cpp (revision 458)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/PhysicsEditorOneWX.cpp (revision 459)
@@ -136,6 +136,8 @@
136136 };
137137 hpl::aleph::setInformationBind(NUMBER_OF_MONSTER_FLAG_INFORMATIONS,
138138 monsterFlagsBind, monsterFlagsBinds);
139+ hpl::aleph::loadInformation("data/MonsterFlags.txt", NUMBER_OF_MONSTER_FLAG_INFORMATIONS,
140+ monsterFlagsBind);
139141
140142 ////////////////
141143 //projectiles
旧リポジトリブラウザで表示