Merge branch 'master' into dev_container_refactory

lucas-zimerman · Aug 17, 2021 · f8aca17 · f8aca17
2 parents 1000095 + 9db5667
commit f8aca17
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/MT2D/Container/MT2D_Container.cpp b/MT2D/Container/MT2D_Container.cpp
@@ -590,6 +590,12 @@ void MT2D_Container_Clear() {
 	while(ListFilePaths.start != NULL){
 		try_remove_container(ListFilePaths.start);
 	}
+	MT2D_GlobalContainer.Names[MT2D_GlobalContainer.Files] = Name;
+	MT2D_GlobalContainer.Length[MT2D_GlobalContainer.Files] = Length;
+	MT2D_GlobalContainer.Xpadding[MT2D_GlobalContainer.Files] = Padding;
+	MT2D_GlobalContainer.Data[MT2D_GlobalContainer.Files] = (BYTE*)malloc((Length+Padding) * sizeof(BYTE));
+	MT2D_FILE_READ(file, MT2D_GlobalContainer.Data[MT2D_GlobalContainer.Files], Length + Padding, 1);
+	MT2D_GlobalContainer.Files++;
 }
 
 
@@ -923,3 +929,4 @@ BYTE * MT2D_Container_Get_Data(int id, bool decrypt) {
 	}
 	return data;
 }
+
diff --git a/MT2D/Container/MT2D_Container.h b/MT2D/Container/MT2D_Container.h
@@ -37,7 +37,7 @@ Line X+3,...,Y: Data
 
 #pragma region  Container Struct
 
-enum MT2D_Container_DataStore_Type
+enum _DataStore_Type
 {
 	MT2D_CONT_DATATYPE_MEM = -1,
 	MT2D_CONT_DATATYPE_CONT = 0,
@@ -100,6 +100,7 @@ bool MT2D_Container_Update(int id, BYTE * data, int length, bool encrypt);
  * Delete the referenced id from the disc or memory
 */
 void MT2D_Container_Delete_Data(int id);
+
 void MT2D_Container_Init();
 /**
 Free the loaded files

diff --git a/MT2D/MT2D_Terminal_Define.h b/MT2D/MT2D_Terminal_Define.h
@@ -71,4 +71,14 @@ MT2D_Terminal_Define.h Created by: Lucas Zimerman Fraulob
 #endif
 #pragma endregion
 
+#pragma region Portable_Inline
+#ifdef _MSC_VER
+#define forceinline __forceinline
+#elif defined(__GNUC__)
+#define forceinline __attribute__((always_inline)) inline
+#else
+#define forceinline inline
+#endif
+#pragma endregion
+
 #endif 
diff --git a/MT2D/ObjectCore/Vars.h b/MT2D/ObjectCore/Vars.h
@@ -5,7 +5,6 @@
 
 enum MT2D_VAR_TYPE
 {
-	VAR_BOOL,
 	VAR_CHAR = 1,
 	VAR_INT,
 	VAR_FLOAT,

diff --git a/README.md b/README.md
@@ -16,9 +16,16 @@ The Working operational systems are:
 
 Here are some youtube videos from softwares that were Developed using MT2D:
 
+Super Shibe 3000:https://www.youtube.com/watch?v=3MYdq7QXjFs
+
 Project Asteroid:https://www.youtube.com/watch?v=atRMo71Xgzk
+
 Cscript Test Demo: https://www.youtube.com/watch?v=mg7kxA6tLhQ
+
 PathFind Demo: https://www.youtube.com/watch?v=wm-WmNFX8Mg
+
 HexStartup++: https://www.youtube.com/watch?v=8WkwBKS80oQ
+
 3D Maze: https://www.youtube.com/watch?v=JqT4374zego
+
 Pong (ms-dos): https://www.youtube.com/watch?v=ALux2S34D-s