Commit MetaInfo

Revisionc4d7ddd3a5c691acbf5301db2c63f07e5a84724a (tree)
Time2009-08-16 03:14:06
AuthorFace
CommiterFace

Log Message

Linked UMmuBase with UMMUFB.

Change Summary

Incremental Difference

diff -r 495b47d1edfa -r c4d7ddd3a5c6 Config/Vessels/UMmuBase.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Config/Vessels/UMmuBase.cfg Sat Aug 15 20:14:06 2009 +0200
@@ -0,0 +1,3 @@
1+; === Configuration file for vessel class ShuttlePB ===
2+ClassName = UMmuBase
3+Module = UMmuBase
diff -r 495b47d1edfa -r c4d7ddd3a5c6 Orbitersdk/samples/UMMUFB/UMMUFB.cpp
--- a/Orbitersdk/samples/UMMUFB/UMMUFB.cpp Sat Aug 15 18:52:31 2009 +0200
+++ b/Orbitersdk/samples/UMMUFB/UMMUFB.cpp Sat Aug 15 20:14:06 2009 +0200
@@ -166,7 +166,16 @@
166166
167167 void SetPAX(VESSEL *vessel)
168168 {
169- BaseByVessel()[vessel]=oapiGetVesselByIndex(0);
169+ for (int i=0;i<oapiGetVesselCount();i++)
170+ {
171+ OBJHANDLE base=oapiGetVesselByIndex(i);
172+ char *className=oapiGetVesselInterface(base)->GetClassName();
173+ if (className!=NULL) if (strncmp(className, "UMmuBase", strlen(className))==0)
174+ {
175+ BaseByVessel()[vessel]=base;
176+ break;
177+ }
178+ }
170179 }
171180
172181 bool GetPAX(VESSEL *vessel)
diff -r 495b47d1edfa -r c4d7ddd3a5c6 Orbitersdk/samples/UMMUFB/UMmuBase.cpp
--- a/Orbitersdk/samples/UMMUFB/UMmuBase.cpp Sat Aug 15 18:52:31 2009 +0200
+++ b/Orbitersdk/samples/UMMUFB/UMmuBase.cpp Sat Aug 15 20:14:06 2009 +0200
@@ -7,17 +7,22 @@
77
88 void UMmuBase::clbkSetClassCaps (FILEHANDLE cfg)
99 {
10+ THRUSTER_HANDLE th_main, th_hover, th_rcs[14], th_group[4];
11+
1012 // physical specs
11- SetSize (0);
12- SetEmptyMass (0);
13- SetCameraOffset (_V(0,0.8,0));
13+ SetSize (0.000001);
14+ SetEmptyMass (0.000001);
15+ SetCameraOffset (_V(0,0,0));
16+ SetDockParams (_V(0,1.3,-1), _V(0,1,0), _V(0,0,-1));
1417 SetTouchdownPoints (_V(0,0,1), _V(-1,0,-1), _V(1,0,-1));
18+
1519 int UmmuSdKInitReturnCode=Crew.InitUmmu(GetHandle());
1620 float UMmuVersion=Crew.GetUserUMmuVersion();
1721 Crew.DefineAirLockShape(TRUE,-2,2,0,4,-2,2);
18- Crew.SetMembersPosRotOnEVA(_V(0,0,0),_V(0,0,0));
22+ Crew.SetMembersPosRotOnEVA(_V(0,2,0),_V(0,0,0));
1923 Crew.SetMaxSeatAvailableInShip(100);
2024 SelectedUmmuMember=0;
25+ sprintf(display, "");
2126 }
2227
2328 void UMmuBase::clbkSaveState(FILEHANDLE scn)
@@ -121,7 +126,7 @@
121126
122127 if(key==OAPI_KEY_S)
123128 {
124- sprintf(display,"%i souls aboard ship %s, %i seats available",Crew.GetCrewTotalNumber(),GetName(),4-Crew.GetCrewTotalNumber());
129+ sprintf(display,"%i souls aboard ship %s, %i seats available",Crew.GetCrewTotalNumber(),GetName(),100-Crew.GetCrewTotalNumber());
125130 return 1;
126131 }
127132 return 0;
@@ -129,8 +134,12 @@
129134
130135 void UMmuBase::clbkDrawHUD (int mode, const HUDPAINTSPEC *hps, HDC hDC)
131136 {
132- TextOut(hDC, 0, 0, display, strlen(display));
133- VESSEL2::clbkDrawHUD(mode, hps, hDC);
137+ TextOut(hDC, 0, 0, display, strlen(display));
138+}
139+
140+UMMUCREWMANAGMENT *UMmuBase::GetCrew()
141+{
142+ return &Crew;
134143 }
135144
136145 DLLCLBK VESSEL *ovcInit (OBJHANDLE hvessel, int flightmodel)
diff -r 495b47d1edfa -r c4d7ddd3a5c6 Orbitersdk/samples/UMMUFB/UMmuBase.h
--- a/Orbitersdk/samples/UMMUFB/UMmuBase.h Sat Aug 15 18:52:31 2009 +0200
+++ b/Orbitersdk/samples/UMMUFB/UMmuBase.h Sat Aug 15 20:14:06 2009 +0200
@@ -10,6 +10,7 @@
1010 void clbkPostStep (double simtt, double simdt, double mjd);
1111 int clbkConsumeBufferedKey(DWORD key, bool down, char *kstate);
1212 void clbkDrawHUD (int mode, const HUDPAINTSPEC *hps, HDC hDC);
13+ UMMUCREWMANAGMENT *GetCrew();
1314 private:
1415 // UMMU 1.5 DECLARATION
1516 UMMUCREWMANAGMENT Crew;
Show on old repository browser