• R/O
  • SSH
  • HTTPS

gd10: Commit


Commit MetaInfo

Revisão119 (tree)
Hora2019-08-10 01:49:42
Autorhgtterry

Mensagem de Log

Entities change Environment Change Level Change Area 080819

Mudança Sumário

Diff

--- Equity10/GD10_Objects_New.cpp (revision 118)
+++ Equity10/GD10_Objects_New.cpp (revision 119)
@@ -991,14 +991,7 @@
991991
992992 GD10_Objects* Object = App->GDCL_Scene_Data->CL_Object[Index];
993993
994- // Create Teleport and use Player Start Position as Default
995- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0] = new Teleport_type2;
996-
997- strcpy(App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Name, App->GDCL_Scene_Data->S_Player_Locations[0]->Name);
998- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Player_Position = App->GDCL_Scene_Data->S_Player_Locations[0]->Current_Position;
999- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Physics_Position = App->GDCL_Scene_Data->S_Player_Locations[0]->Physics_Position;
1000- App->GDCL_Scene_Data->CL_Object[Index]->S_Teleport[0]->Physics_Rotation = App->GDCL_Scene_Data->S_Player_Locations[0]->Physics_Rotation;
1001-
994+
1002995 // Create Sound
1003996 App->GDCL_Scene_Data->CL_Object[Index]->HasSound = 1;
1004997 App->GDCL_Scene_Data->CL_Object[Index]->S_Sounds[0] = new Sound_Type2;
@@ -1009,13 +1002,13 @@
10091002 App->GDCL_Scene_Data->CL_Object[Index]->Type = Enums::Bullet_Type_Static;
10101003 App->GDCL_Scene_Data->CL_Object[Index]->Shape = Enums::Shape_Box;
10111004
1012- strcpy(App->GDCL_Scene_Data->CL_Object[Index]->MeshName, "TeleportSend.mesh");
1005+ strcpy(App->GDCL_Scene_Data->CL_Object[Index]->MeshName, "TeleportRecieve.mesh");
10131006
10141007 char ConNum[256];
10151008 char ATest[256];
10161009 char Name[256];
10171010
1018- strcpy_s(Name, "Env_");
1011+ strcpy_s(Name, "Change_Level_");
10191012 itoa(Index, ConNum, 10);
10201013 strcat(Name, ConNum);
10211014
@@ -1024,10 +1017,10 @@
10241017 strcat(ATest, ConNum);
10251018
10261019 strcpy(Object->Name, Name);
1027- strcpy(Object->MeshName, "TeleportSend.mesh"); // Needs Chaning to Environment
1028- strcpy(Object->MeshName_FullPath, "TeleportSend.mesh");
1020+ strcpy(Object->MeshName, "TeleportRecieve.mesh"); // Needs Chaning to Environment
1021+ strcpy(Object->MeshName_FullPath, "TeleportRecieve.mesh");
10291022
1030- Object->OgreEntity = App->Cl_Ogre->mSceneMgr->createEntity(ATest, "TeleportSend.mesh", App->Cl_Ogre->PermResourceGroup);
1023+ Object->OgreEntity = App->Cl_Ogre->mSceneMgr->createEntity(ATest, "TeleportRecieve.mesh", App->Cl_Ogre->PermResourceGroup);
10311024 Object->OgreNode = App->Cl_Ogre->mSceneMgr->getRootSceneNode()->createChildSceneNode();
10321025 Object->OgreNode->attachObject(Object->OgreEntity);
10331026 Object->OgreNode->scale(1, 1, 1);
@@ -1069,13 +1062,13 @@
10691062
10701063 Object->bt_body->setCollisionFlags(btCollisionObject::CF_KINEMATIC_OBJECT | btCollisionObject::CF_NO_CONTACT_RESPONSE);
10711064
1072- Object->Usage = Enums::Usage_Teleport;
1073- Object->bt_body->setUserIndex(Enums::Usage_Teleport);
1065+ Object->Usage = Enums::Usage_ChangeLevel;
1066+ Object->bt_body->setUserIndex(Enums::Usage_ChangeLevel);
10741067 Object->bt_body->setUserIndex2(Index);
10751068
10761069 App->GDCL_Bullet->dynamicsWorld->addRigidBody(Object->bt_body);
10771070
1078- Object->Folder = Enums::Folder_Teleports;
1071+ Object->Folder = Enums::Folder_Change_Level;
10791072 Object->Physics_Valid = 1;
10801073
10811074 HTREEITEM Temp = App->GDCL_FileView->Add_Change_Level(Object->Name, Index);
--- Equity10/VersionNo2.h (revision 118)
+++ Equity10/VersionNo2.h (revision 119)
@@ -39,21 +39,21 @@
3939 #ifndef _VERSIONNO__H_
4040 #define _VERSIONNO__H_
4141
42-#define VERSION_FULL 1.20.220.70
42+#define VERSION_FULL 1.20.220.74
4343
4444 #define VERSION_BASEYEAR 2019
4545 #define VERSION_DATE "2019-08-09"
46-#define VERSION_TIME "16:59:11"
46+#define VERSION_TIME "17:47:39"
4747
4848 #define VERSION_MAJOR 1
4949 #define VERSION_MINOR 20
5050 #define VERSION_BUILDNO 220
51-#define VERSION_EXTEND 70
51+#define VERSION_EXTEND 74
5252
53-#define VERSION_FILE 1,20,220,70
54-#define VERSION_PRODUCT 1,20,220,77
55-#define VERSION_FILESTR "1,20,220,70\0"
56-#define VERSION_PRODUCTSTR "1,20,220,77\0"
53+#define VERSION_FILE 1,20,220,74
54+#define VERSION_PRODUCT 1,20,220,81
55+#define VERSION_FILESTR "1,20,220,74\0"
56+#define VERSION_PRODUCTSTR "1,20,220,81\0"
5757 #define VERSION_EVERSION "0.3.4.0\0"
5858
5959 #endif
\ No newline at end of file
--- Equity10/stdafx.h (revision 118)
+++ Equity10/stdafx.h (revision 119)
@@ -239,7 +239,8 @@
239239 Folder_Collectables = 5,
240240 Folder_Teleports = 6,
241241 Folder_Environment = 7,
242- Folder_RoomChange = 8
242+ Folder_RoomChange = 8,
243+ Folder_Change_Level = 9
243244 };
244245 enum Selected_Type
245246 {
Show on old repository browser