• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン467 (tree)
日時2007-09-05 00:25:50
作者hogepiyo

ログメッセージ

途中

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 466)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 467)
@@ -414,7 +414,7 @@
414414 void MonsterAppearancePanel::OnVitality(wxCommandEvent& ev)
415415 {
416416 int type = wxGetApp().getEditingMonsterIndex();
417- monster_definitions[type].vitality = getNumberFromText(&ev);
417+ monster_definitions[type].vitality = getNumberFromTextCtrl(&ev);
418418 }
419419 void MonsterAppearancePanel::OnClass(wxCommandEvent& ev)
420420 {
@@ -425,63 +425,65 @@
425425 void MonsterAppearancePanel::OnRadius(wxCommandEvent& ev)
426426 {
427427 int type = wxGetApp().getEditingMonsterIndex();
428- monster_definitions[type].radius = getNumberFromText(&ev);
428+ monster_definitions[type].radius = getNumberFromTextCtrl(&ev);
429429 }
430430 void MonsterAppearancePanel::OnHeight(wxCommandEvent& ev)
431431 {
432432 int type = wxGetApp().getEditingMonsterIndex();
433- monster_definitions[type].height= getNumberFromText(&ev);
433+ monster_definitions[type].height= getNumberFromTextCtrl(&ev);
434434 }
435435 void MonsterAppearancePanel::OnHover(wxCommandEvent& ev)
436436 {
437437 int type = wxGetApp().getEditingMonsterIndex();
438- monster_definitions[type].preferred_hover_height = getNumberFromText(&ev);
438+ monster_definitions[type].preferred_hover_height = getNumberFromTextCtrl(&ev);
439439 }
440440 void MonsterAppearancePanel::OnMinLedge(wxCommandEvent& ev)
441441 {
442442 int type = wxGetApp().getEditingMonsterIndex();
443- monster_definitions[type].minimum_ledge_delta = getNumberFromText(&ev);
443+ monster_definitions[type].minimum_ledge_delta = getNumberFromTextCtrl(&ev);
444444 }
445445 void MonsterAppearancePanel::OnMaxLedge(wxCommandEvent& ev)
446446 {
447447 int type = wxGetApp().getEditingMonsterIndex();
448- monster_definitions[type].maximum_ledge_delta = getNumberFromText(&ev);
448+ monster_definitions[type].maximum_ledge_delta = getNumberFromTextCtrl(&ev);
449449 }
450450 void MonsterAppearancePanel::OnExtVelScale(wxCommandEvent& ev)
451451 {
452452 int type = wxGetApp().getEditingMonsterIndex();
453- monster_definitions[type].external_velocity_scale = getNumberFromText(&ev);
453+ monster_definitions[type].external_velocity_scale = getNumberFromTextCtrl(&ev);
454454 }
455455 void MonsterAppearancePanel::OnCarryItem(wxCommandEvent& ev)
456456 {
457457 int type = wxGetApp().getEditingMonsterIndex();
458- monster_definitions[type].carry_item =
458+ monster_definitions[type].carrying_item_type =
459459 getChoice(carryItemChoice, NUMBER_OF_DEFINED_ITEMS);
460460 }
461461 void MonsterAppearancePanel::OnHalfVisualArc(wxCommandEvent& ev)
462462 {
463463 int type = wxGetApp().getEditingMonsterIndex();
464- monster_definitions[type].half_visual_arc = getNumberFromText(&ev);
464+ monster_definitions[type].half_visual_arc = getNumberFromTextCtrl(&ev);
465465 }
466466 void MonsterAppearancePanel::OnVertVisualArc(wxCommandEvent& ev)
467467 {
468468 int type = wxGetApp().getEditingMonsterIndex();
469- monster_definitions[type].half_vertical_visual_arc = getNumberFromText(&ev);
469+ monster_definitions[type].half_vertical_visual_arc = getNumberFromTextCtrl(&ev);
470470 }
471471 void MonsterAppearancePanel::OnIntelligence(wxCommandEvent& ev)
472472 {
473473 int type = wxGetApp().getEditingMonsterIndex();
474- monster_definitions[type].intelligence = wxGetApp().monsterIntelligenceBind[getChoice(&ev)].bind;
474+ monster_definitions[type].intelligence = wxGetApp().monsterIntelligenceBind[
475+ getChoice(&ev, NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS)].bind;
475476 }
476477
477478 void MonsterAppearancePanel::OnSpeedText(wxCommandEvent& ev)
478479 {
479480 int type = wxGetApp().getEditingMonsterIndex();
480- monster_definitions[type].speed = getNumberFromText(&ev);
481+ monster_definitions[type].speed = getNumberFromTextCtrl(&ev);
481482
482483 int oldIndex = this->speedChoice->GetSelection();
483484 int index = hpl::aleph::getIndexFromInformationBinded(
484- value, wxGetApp().monsterIntelligenceBind, NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS);
485+ monster_definitions[type].speed, wxGetApp().speedBind,
486+ NUMBER_OF_SPEED_INFORMATIONS);
485487 if(index < 0){
486488 index = NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS;
487489 }else{
@@ -497,7 +499,7 @@
497499 int sel = ev.GetSelection();
498500 if(sel >= NUMBER_OF_SPEED_INFORMATIONS){
499501 }else{
500- //monster_definitions[type].speed = getNumberFromText(&ev);
502+ //monster_definitions[type].speed = getNumberFromTextCtrl(&ev);
501503 int prefferedNum = wxGetApp().speedBind[sel].bind;
502504 if(getNumberFromTextCtrl(this->speedText) != prefferedNum){
503505 this->speedText->SetValue(wx::string::getString("%d", prefferedNum));
@@ -508,84 +510,84 @@
508510 void MonsterAppearancePanel::OnGravity(wxCommandEvent& ev)
509511 {
510512 int type = wxGetApp().getEditingMonsterIndex();
511- monster_definitions[type]. = getNumberFromText(&ev);
513+ monster_definitions[type].gravity = getNumberFromTextCtrl(&ev);
512514 }
513515
514516 void MonsterAppearancePanel::OnStationaly(wxCommandEvent& ev)
515517 {
516518 int type = wxGetApp().getEditingMonsterIndex();
517- monster_definitions[type].stationary_shape = getNumberFromText(&ev);
519+ monster_definitions[type].stationary_shape = getNumberFromTextCtrl(&ev);
518520 }
519521 void MonsterAppearancePanel::OnMoving(wxCommandEvent& ev)
520522 {
521523 int type = wxGetApp().getEditingMonsterIndex();
522- monster_definitions[type].moving_shape = getNumberFromText(&ev);
524+ monster_definitions[type].moving_shape = getNumberFromTextCtrl(&ev);
523525 }
524526 void MonsterAppearancePanel::OnHitting(wxCommandEvent& ev)
525527 {
526528 int type = wxGetApp().getEditingMonsterIndex();
527- monster_definitions[type].hit_shapes = getNumberFromText(&ev);
529+ monster_definitions[type].hit_shapes = getNumberFromTextCtrl(&ev);
528530 }
529531 void MonsterAppearancePanel::OnSoftDying(wxCommandEvent& ev)
530532 {
531533 int type = wxGetApp().getEditingMonsterIndex();
532- monster_definitions[type].soft_dying_shape = getNumberFromText(&ev);
534+ monster_definitions[type].soft_dying_shape = getNumberFromTextCtrl(&ev);
533535 }
534536 void MonsterAppearancePanel::OnSoftDead(wxCommandEvent& ev)
535537 {
536538 int type = wxGetApp().getEditingMonsterIndex();
537- monster_definitions[type].soft_dead_shapes = getNumberFromText(&ev);
539+ monster_definitions[type].soft_dead_shapes = getNumberFromTextCtrl(&ev);
538540 }
539541 void MonsterAppearancePanel::OnHardDying(wxCommandEvent& ev)
540542 {
541543 int type = wxGetApp().getEditingMonsterIndex();
542- monster_definitions[type].hard_dying_shape = getNumberFromText(&ev);
544+ monster_definitions[type].hard_dying_shape = getNumberFromTextCtrl(&ev);
543545 }
544546 void MonsterAppearancePanel::OnHardDead(wxCommandEvent& ev)
545547 {
546548 int type = wxGetApp().getEditingMonsterIndex();
547- monster_definitions[type].hard_dead_shapes = getNumberFromText(&ev);
549+ monster_definitions[type].hard_dead_shapes = getNumberFromTextCtrl(&ev);
548550 }
549551 void MonsterAppearancePanel::OnTeleportIn(wxCommandEvent& ev)
550552 {
551553 int type = wxGetApp().getEditingMonsterIndex();
552- monster_definitions[type].teleport_in_shape = getNumberFromText(&ev);
554+ monster_definitions[type].teleport_in_shape = getNumberFromTextCtrl(&ev);
553555 }
554556 void MonsterAppearancePanel::OnTeleportOut(wxCommandEvent& ev)
555557 {
556558 int type = wxGetApp().getEditingMonsterIndex();
557- monster_definitions[type].teleport_out_shape = getNumberFromText(&ev);
559+ monster_definitions[type].teleport_out_shape = getNumberFromTextCtrl(&ev);
558560 }
559561
560562 void MonsterAppearancePanel::OnShrapnelRadius(wxCommandEvent& ev)
561563 {
562564 int type = wxGetApp().getEditingMonsterIndex();
563- monster_definitions[type]. = getNumberFromText(&ev);
565+ monster_definitions[type].shrapnel_radius = getNumberFromTextCtrl(&ev);
564566 }
565567 void MonsterAppearancePanel::OnShrapnelBase(wxCommandEvent& ev)
566568 {
567569 int type = wxGetApp().getEditingMonsterIndex();
568- monster_definitions[type]. = getNumberFromText(&ev);
570+ monster_definitions[type].shrapnel_damage.base = getNumberFromTextCtrl(&ev);
569571 }
570572 void MonsterAppearancePanel::OnShrapnelRnd(wxCommandEvent& ev)
571573 {
572574 int type = wxGetApp().getEditingMonsterIndex();
573- monster_definitions[type]. = getNumberFromText(&ev);
575+ monster_definitions[type].shrapnel_damage.random = getNumberFromTextCtrl(&ev);
574576 }
575577 void MonsterAppearancePanel::OnShrapnelScale(wxCommandEvent& ev)
576578 {
577579 int type = wxGetApp().getEditingMonsterIndex();
578- monster_definitions[type]. = getNumberFromText(&ev);
580+ monster_definitions[type].shrapnel_damage.scale = getNumberFromTextCtrl(&ev);
579581 }
580582 void MonsterAppearancePanel::OnShrapnelType(wxCommandEvent& ev)
581583 {
582584 int type = wxGetApp().getEditingMonsterIndex();
583- monster_definitions[type]. = getChoice(&ev, NUMBER_OF_DAMAGE_TYPES);
585+ monster_definitions[type].shrapnel_damage.type = getChoice(&ev, NUMBER_OF_DAMAGE_TYPES);
584586 }
585587 void MonsterAppearancePanel::OnShrapnelIsAlien(wxCommandEvent& ev)
586588 {
587589 int type = wxGetApp().getEditingMonsterIndex();
588- monster_definitions[type]. = ev.IsChecked() ? 1: 0;
590+ monster_definitions[type].shrapnel_damage.flags = ev.IsChecked() ? 1: 0;
589591 }
590592
591593 void MonsterAppearancePanel::OnCopyFrom(wxCommandEvent& ev)
@@ -597,7 +599,7 @@
597599 void MonsterAppearancePanel::OnSoundPitch(wxCommandEvent& ev)
598600 {
599601 int type = wxGetApp().getEditingMonsterIndex();
600- monster_definitions[type].sound_pitch = getNumberFromText(&ev);
602+ monster_definitions[type].sound_pitch = getNumberFromTextCtrl(&ev);
601603 }
602604 void MonsterAppearancePanel::OnSoundActivation(wxCommandEvent& ev)
603605 {
@@ -608,67 +610,67 @@
608610 void MonsterAppearancePanel::OnSoundFriendAct(wxCommandEvent& ev)
609611 {
610612 int type = wxGetApp().getEditingMonsterIndex();
611- monster_definitions[type]. = getChoice(&ev,
613+ monster_definitions[type].friendly_activation_sound = getChoice(&ev,
612614 NUMBER_OF_SOUND_DEFINITIONS);
613615 }
614616 void MonsterAppearancePanel::OnSoundClear(wxCommandEvent& ev)
615617 {
616618 int type = wxGetApp().getEditingMonsterIndex();
617- monster_definitions[type]. = getChoice(&ev,
619+ monster_definitions[type].clear_sound = getChoice(&ev,
618620 NUMBER_OF_SOUND_DEFINITIONS);
619621 }
620622 void MonsterAppearancePanel::OnSoundKill(wxCommandEvent& ev)
621623 {
622624 int type = wxGetApp().getEditingMonsterIndex();
623- monster_definitions[type]. = getChoice(&ev,
625+ monster_definitions[type].kill_sound = getChoice(&ev,
624626 NUMBER_OF_SOUND_DEFINITIONS);
625627 }
626628 void MonsterAppearancePanel::OnSoundApology(wxCommandEvent& ev)
627629 {
628630 int type = wxGetApp().getEditingMonsterIndex();
629- monster_definitions[type]. = getChoice(&ev,
631+ monster_definitions[type].apology_sound = getChoice(&ev,
630632 NUMBER_OF_SOUND_DEFINITIONS);
631633 }
632634 void MonsterAppearancePanel::OnSoundFriendFire(wxCommandEvent& ev)
633635 {
634636 int type = wxGetApp().getEditingMonsterIndex();
635- monster_definitions[type]. = getChoice(&ev,
637+ monster_definitions[type].friendly_fire_sound = getChoice(&ev,
636638 NUMBER_OF_SOUND_DEFINITIONS);
637639 }
638640 void MonsterAppearancePanel::OnSoundFlaming(wxCommandEvent& ev)
639641 {
640642 int type = wxGetApp().getEditingMonsterIndex();
641- monster_definitions[type]. = getChoice(&ev,
643+ monster_definitions[type].flaming_sound = getChoice(&ev,
642644 NUMBER_OF_SOUND_DEFINITIONS);
643645 }
644646 void MonsterAppearancePanel::OnSoundRandom(wxCommandEvent& ev)
645647 {
646648 int type = wxGetApp().getEditingMonsterIndex();
647- monster_definitions[type]. = getChoice(&ev,
649+ monster_definitions[type].random_sound = getChoice(&ev,
648650 NUMBER_OF_SOUND_DEFINITIONS);
649651 }
650652 void MonsterAppearancePanel::OnSoundRandomMask(wxCommandEvent& ev)
651653 {
652654 int type = wxGetApp().getEditingMonsterIndex();
653- monster_definitions[type]. = getNumberFromText(&ev);
655+ monster_definitions[type].random_sound_mask = getNumberFromTextCtrl(&ev);
654656 }
655657
656658 void MonsterAppearancePanel::OnEffect(wxCommandEvent& ev)
657659 {
658660 int type = wxGetApp().getEditingMonsterIndex();
659- monster_definitions[type]. = getChoice(&ev,
661+ monster_definitions[type].impact_effect = getChoice(&ev,
660662 NUMBER_OF_EFFECT_TYPES);
661663 }
662664 void MonsterAppearancePanel::OnEffectMelee(wxCommandEvent& ev)
663665 {
664666 int type = wxGetApp().getEditingMonsterIndex();
665- monster_definitions[type]. = getChoice(&ev,
667+ monster_definitions[type].melee_impact_effect = getChoice(&ev,
666668 NUMBER_OF_EFFECT_TYPES);
667669 }
668670 void MonsterAppearancePanel::OnEffectContrail(wxCommandEvent& ev)
669671 {
670672 int type = wxGetApp().getEditingMonsterIndex();
671- monster_definitions[type]. = getChoice(&ev,
673+ monster_definitions[type].contrail_effect = getChoice(&ev,
672674 NUMBER_OF_EFFECT_TYPES);
673675 }
674676
@@ -675,7 +677,7 @@
675677 void MonsterAppearancePanel::OnDoorRetryMask(wxCommandEvent& ev)
676678 {
677679 int type = wxGetApp().getEditingMonsterIndex();
678- monster_definitions[type]. = getNumberFromText(&ev);
680+ monster_definitions[type].door_retry_mask = getNumberFromTextCtrl(&ev);
679681 }
680682
681683 void MonsterAppearancePanel::OnResetButton(wxCommandEvent& ev)
@@ -687,6 +689,7 @@
687689 memcpy(&monster_definitions[type],
688690 wxGetApp().getDefaultValues()->getMonsterDefinition(type),
689691 sizeof(monster_definition));
692+ setup();
690693 }
691694 }
692695
旧リポジトリブラウザで表示