Commit MetaInfo

Révision4cb16a09a71b4184c6a47d71f22557d3411af662 (tree)
l'heure2013-05-20 01:23:37
AuteurFace
CommiterFace

Message de Log

Fixed merged resources

Change Summary

Modification

diff -r 605173e50711 -r 4cb16a09a71b Modules/genericvessel.dll
Binary file Modules/genericvessel.dll has changed
diff -r 605173e50711 -r 4cb16a09a71b Orbitersdk/samples/genericvessel/GenericVessel.cpp
--- a/Orbitersdk/samples/genericvessel/GenericVessel.cpp Sun May 19 15:19:32 2013 +0200
+++ b/Orbitersdk/samples/genericvessel/GenericVessel.cpp Sun May 19 18:23:37 2013 +0200
@@ -76,32 +76,28 @@
7676 msh_idh=NULL;
7777 ani=NULL;
7878 att_h=NULL;
79- iniFile=NULL;
8079 }
8180 //############################################################################//
8281 void GenericVessel::do_clean()
8382 {
8483
85- for(i=0;i<gv_config.attcnt;i++)DelAttachment(att_h[i]);
86- for(i=0;i<gv_config.propcnt;i++)DelPropellantResource(ph_h[i]);
87- for(i=0;i<gv_config.thcnt;i++)DelThruster(th_h[i]);
88- for(i=0;i<gv_config.thgcnt;i++)DelThrusterGroup(thg_h[i]);
89- for(i=0;i<gv_config.exhcnt;i++)DelExhaust(exh_h[i]);
84+ for(int i=0;i<sc3.Config.attcnt;i++)DelAttachment(att_h[i]);
85+ for(int i=0;i<sc3.Config.propcnt;i++)DelPropellantResource(ph_h[i]);
86+ for(int i=0;i<sc3.Config.thcnt;i++)DelThruster(th_h[i]);
87+ for(int i=0;i<sc3.Config.thgcnt;i++)DelThrusterGroup(thg_h[i]);
88+ for(int i=0;i<sc3.Config.exhcnt;i++)DelExhaust(exh_h[i]);
9089
91- for(i=0;i<gv_config.mshcnt;i++)if(gv_data.msh[i].typ==0){
90+ for(int i=0;i<sc3.Config.mshcnt;i++)if(sc3.Data.msh[i].typ==0){
9291 DelMesh(msh_idh[i]);
9392 //msh_h[i]=oapiLoadMeshGlobal(gv_data.msh[i].nam);
9493 }
9594
96- for(i=0;i<gv_config.anicnt;i++)DelAnimation(ani[i].id);
95+ for(int i=0;i<sc3.Config.anicnt;i++)DelAnimation(ani[i].id);
9796
9897
9998 //for(i=0;i<gv_config.beaccnt;i++)DelBeacon(&gv_data.beac[i].bl);
10099 //for(i=0;i<gv_config.dockcnt;i++)DelDock(gv_data.dock[i].pos,gv_data.dock[i].dir,gv_data.dock[i].rot);
101100
102- if(gv_config.crewcnt!=0)if(gv_data.crew[0].maxcrew!=0)Crew.InitUmmu(GetHandle());
103-
104-
105101 delete [] ph_h;
106102 delete [] th_h;
107103 delete [] thg_h;
@@ -116,7 +112,6 @@
116112 }
117113 delete [] ani;
118114 delete [] att_h;
119- delete [] iniFile;
120115 }
121116 //############################################################################//
122117 GenericVessel::GenericVessel(OBJHANDLE hObj,int fmodel):VESSEL3(hObj,fmodel){do_init();}
@@ -135,7 +130,6 @@
135130 char *className=GetClassName(), *cn=NULL;
136131 char *name=GetName();
137132 strcpy(cn=new char[(k=strlen(className))+1], className);
138- in_cfg=cfg;
139133
140134 strlwr(cn);
141135 for(i=0;i<k;i++)if(cn[i]=='/')cn[i]='\\';
@@ -256,7 +250,7 @@
256250 delete [] grpc;
257251
258252 //Exhausts
259- exh_h=new UINT[gv_config.exhcnt];
253+ exh_h=new UINT[sc3.Config.exhcnt];
260254 for(i=0;i<sc3.Config.exhcnt;i++){
261255 if(sc3.Data.exh[i].tp==0)exh_h[i]=AddExhaust(th_h[sc3.Data.exh[i].th],sc3.Data.exh[i].lscl,sc3.Data.exh[i].wscl);
262256 if(sc3.Data.exh[i].tp==1)exh_h[i]=AddExhaust(th_h[sc3.Data.exh[i].th],sc3.Data.exh[i].lscl,sc3.Data.exh[i].wscl,sc3.Data.exh[i].pos,sc3.Data.exh[i].rot);
@@ -268,8 +262,6 @@
268262 for(i=0;i<sc3.Config.mshcnt;i++){
269263 if(sc3.Data.msh[i].typ==0)SetMeshVisibilityMode(msh_idh[i]=AddMesh(msh_h[i]=oapiLoadMeshGlobal(sc3.Data.msh[i].nam),&sc3.Data.msh[i].off),sc3.Data.msh[i].vis);
270264 }
271- for(i=0;i<sc3.Config.paycnt;i++)
272- for(j=0;j<sc3.Data.pay[i].mesh_cnt;j++)DelMesh(sc3.Data.pay[i].mesh+j); //Delete payload meshes again, native parser does it, anyway
273265
274266 //Animations
275267 ani=new genericvessel_animinfo[sc3.Config.anicnt];
@@ -667,7 +659,6 @@
667659 {
668660 do_clean();
669661 do_init();
670- clbkSetClassCaps(in_cfg);
671662
672663 return TRUE;
673664 }
diff -r 605173e50711 -r 4cb16a09a71b Orbitersdk/samples/genericvessel/GenericVessel.h
--- a/Orbitersdk/samples/genericvessel/GenericVessel.h Sun May 19 15:19:32 2013 +0200
+++ b/Orbitersdk/samples/genericvessel/GenericVessel.h Sun May 19 18:23:37 2013 +0200
@@ -65,10 +65,6 @@
6565 //Methods
6666 void toggle_attach(int point);
6767
68- //INI file name
69- char *iniFile;
70- FILEHANDLE in_cfg;
71-
7268 //Thrusters
7369 PROPELLANT_HANDLE *ph_h;
7470 THRUSTER_HANDLE *th_h;
diff -r 605173e50711 -r 4cb16a09a71b Orbitersdk/samples/genericvessel/editdialog.rc
--- a/Orbitersdk/samples/genericvessel/editdialog.rc Sun May 19 15:19:32 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
1-// Microsoft Visual C++ generated resource script.
2-//
3-#include "resource.h"
4-
5-#define APSTUDIO_READONLY_SYMBOLS
6-/////////////////////////////////////////////////////////////////////////////
7-//
8-// Generated from the TEXTINCLUDE 2 resource.
9-//
10-#include "afxres.h"
11-
12-/////////////////////////////////////////////////////////////////////////////
13-#undef APSTUDIO_READONLY_SYMBOLS
14-
15-/////////////////////////////////////////////////////////////////////////////
16-// English (U.K.) resources
17-
18-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
19-#ifdef _WIN32
20-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
21-#pragma code_page(1252)
22-#endif //_WIN32
23-
24-/////////////////////////////////////////////////////////////////////////////
25-//
26-// Dialog
27-//
28-
29-IDD_MYDIALOG DIALOGEX 0, 0, 314, 198
30-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
31-EXSTYLE WS_EX_TOOLWINDOW
32-CAPTION "Generic vessel editor"
33-FONT 8, "MS Sans Serif", 0, 0, 0x1
34-BEGIN
35- PUSHBUTTON "Close",IDCANCEL,257,177,50,14
36- EDITTEXT IDC_EDIT,7,7,300,164,ES_MULTILINE | ES_AUTOHSCROLL | ES_NUMBER | WS_VSCROLL | WS_HSCROLL
37- PUSHBUTTON "Reload",ID_RELOAD,7,178,55,13
38-END
39-
40-
41-/////////////////////////////////////////////////////////////////////////////
42-//
43-// DESIGNINFO
44-//
45-
46-#ifdef APSTUDIO_INVOKED
47-GUIDELINES DESIGNINFO
48-BEGIN
49- IDD_MYDIALOG, DIALOG
50- BEGIN
51- LEFTMARGIN, 7
52- RIGHTMARGIN, 307
53- TOPMARGIN, 7
54- BOTTOMMARGIN, 191
55- END
56-END
57-#endif // APSTUDIO_INVOKED
58-
59-
60-#ifdef APSTUDIO_INVOKED
61-/////////////////////////////////////////////////////////////////////////////
62-//
63-// TEXTINCLUDE
64-//
65-
66-1 TEXTINCLUDE
67-BEGIN
68- "resource.h\0"
69-END
70-
71-2 TEXTINCLUDE
72-BEGIN
73- "#include ""afxres.h""\r\n"
74- "\0"
75-END
76-
77-3 TEXTINCLUDE
78-BEGIN
79- "\r\n"
80- "\0"
81-END
82-
83-#endif // APSTUDIO_INVOKED
84-
85-
86-/////////////////////////////////////////////////////////////////////////////
87-//
88-// String Table
89-//
90-
91-STRINGTABLE
92-BEGIN
93- IDS_INFO "DIALOG TEMPLATE:\r\n\r\nA simple SDK example which provides a dialog box that can be opened during a simulation session via the ""My dialog"" entry in the Custom Functions list (Ctrl-F4).\r\n\r\nThis addon is not very useful - it is intended as a starting point for developers."
94- IDS_TYPE "Developer resources and samples"
95-END
96-
97-#endif // English (U.K.) resources
98-/////////////////////////////////////////////////////////////////////////////
99-
100-
101-
102-#ifndef APSTUDIO_INVOKED
103-/////////////////////////////////////////////////////////////////////////////
104-//
105-// Generated from the TEXTINCLUDE 3 resource.
106-//
107-
108-
109-/////////////////////////////////////////////////////////////////////////////
110-#endif // not APSTUDIO_INVOKED
111-
diff -r 605173e50711 -r 4cb16a09a71b Orbitersdk/samples/genericvessel/genericvessel.rc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Orbitersdk/samples/genericvessel/genericvessel.rc Sun May 19 18:23:37 2013 +0200
@@ -0,0 +1,109 @@
1+// Microsoft Visual C++ generated resource script.
2+//
3+#include "resource.h"
4+
5+#define APSTUDIO_READONLY_SYMBOLS
6+/////////////////////////////////////////////////////////////////////////////
7+//
8+// Generated from the TEXTINCLUDE 2 resource.
9+//
10+#include "afxres.h"
11+
12+/////////////////////////////////////////////////////////////////////////////
13+#undef APSTUDIO_READONLY_SYMBOLS
14+
15+/////////////////////////////////////////////////////////////////////////////
16+// English (U.S.) resources
17+
18+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
19+LANGUAGE 7, 3
20+#pragma code_page(1252)
21+#endif //_WIN32
22+
23+/////////////////////////////////////////////////////////////////////////////
24+//
25+// Dialog
26+//
27+
28+IDD_MYDIALOG DIALOGEX 0, 0, 314, 198
29+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
30+EXSTYLE WS_EX_TOOLWINDOW
31+CAPTION "Generic vessel editor"
32+FONT 8, "MS Sans Serif", 0, 0, 0x1
33+BEGIN
34+ PUSHBUTTON "Close",IDCANCEL,257,177,50,14
35+ EDITTEXT IDC_EDIT,7,7,300,164,ES_MULTILINE | ES_AUTOHSCROLL | ES_NUMBER | WS_VSCROLL | WS_HSCROLL
36+ PUSHBUTTON "Reload",ID_RELOAD,7,178,55,13
37+END
38+
39+
40+/////////////////////////////////////////////////////////////////////////////
41+//
42+// DESIGNINFO
43+//
44+
45+#ifdef APSTUDIO_INVOKED
46+GUIDELINES DESIGNINFO
47+BEGIN
48+ IDD_MYDIALOG, DIALOG
49+ BEGIN
50+ LEFTMARGIN, 7
51+ RIGHTMARGIN, 307
52+ TOPMARGIN, 7
53+ BOTTOMMARGIN, 191
54+ END
55+END
56+#endif // APSTUDIO_INVOKED
57+
58+
59+#ifdef APSTUDIO_INVOKED
60+/////////////////////////////////////////////////////////////////////////////
61+//
62+// TEXTINCLUDE
63+//
64+
65+1 TEXTINCLUDE
66+BEGIN
67+ "resource.h\0"
68+END
69+
70+2 TEXTINCLUDE
71+BEGIN
72+ "#include ""afxres.h""\r\n"
73+ "\0"
74+END
75+
76+3 TEXTINCLUDE
77+BEGIN
78+ "\r\n"
79+ "\0"
80+END
81+
82+#endif // APSTUDIO_INVOKED
83+
84+
85+/////////////////////////////////////////////////////////////////////////////
86+//
87+// String Table
88+//
89+
90+STRINGTABLE
91+BEGIN
92+ IDS_INFO "DIALOG TEMPLATE:\r\n\r\nA simple SDK example which provides a dialog box that can be opened during a simulation session via the ""My dialog"" entry in the Custom Functions list (Ctrl-F4).\r\n\r\nThis addon is not very useful - it is intended as a starting point for developers."
93+ IDS_TYPE "Developer resources and samples"
94+END
95+
96+/////////////////////////////////////////////////////////////////////////////
97+
98+
99+
100+#ifndef APSTUDIO_INVOKED
101+/////////////////////////////////////////////////////////////////////////////
102+//
103+// Generated from the TEXTINCLUDE 3 resource.
104+//
105+
106+
107+/////////////////////////////////////////////////////////////////////////////
108+#endif // not APSTUDIO_INVOKED
109+
diff -r 605173e50711 -r 4cb16a09a71b Orbitersdk/samples/genericvessel/genericvessel.vcproj
--- a/Orbitersdk/samples/genericvessel/genericvessel.vcproj Sun May 19 15:19:32 2013 +0200
+++ b/Orbitersdk/samples/genericvessel/genericvessel.vcproj Sun May 19 18:23:37 2013 +0200
@@ -238,6 +238,10 @@
238238 >
239239 </File>
240240 <File
241+ RelativePath=".\genericvessel.rc"
242+ >
243+ </File>
244+ <File
241245 RelativePath="..\..\..\orbitersdk\lib\Orbiter.lib"
242246 >
243247 </File>
Afficher sur ancien navigateur de dépôt.