Fixed the default values for the MovieXX options

Added some comments to elevators.ini & other codes.
Updated version number.

artifacts/config_files/elevators.ini

@@ -40,7 +40,7 @@ Image=24
 ButtonCount=3
 
 ;Set the appearance of the elevator
-MainFrm=148
-ButtonsFrm=151
+MainFrm=148    ; EL_VAULT.FRM
+ButtonsFrm=151 ; EL_MIL3.FRM
 
 ;Set up the exit points for all three buttons (see examples above)

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v4.2.6
+;v4.2.7
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.

sfall/FalloutEngine/EngineUtils.cpp

@@ -68,7 +68,7 @@ bool CritterCopyProto(long pid, long* &proto_dst) {
 		proto_dst = nullptr;
 		return false;
 	}
-	proto_dst = reinterpret_cast<long*>(new int32_t[104]);
+	proto_dst = reinterpret_cast<long*>(new long[104]);
 	memcpy(proto_dst, protoPtr, 416);
 	return true;
 }
@@ -505,7 +505,7 @@ void RedrawObject(GameObject* obj) {
 	func::tile_refresh_rect(&rect, obj->elevation);
 }
 
-/////////////////////////////////////////////////////////////////UNLISTED FRM FUNCTIONS////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////UNLISTED FRM FUNCTIONS//////////////////////////////////////////////////////////////
 
 static bool LoadFrmHeader(UnlistedFrm *frmHeader, fo::DbFile* frmStream) {
 	if (fo::func::db_freadInt(frmStream, &frmHeader->version) == -1)

sfall/FalloutEngine/Structs.h

@@ -811,7 +811,7 @@ struct QueueDrug {
 };
 
 struct QueueAddict {
-	long init;      // 1 - perk is not active yet
+	long init;       // 1 - perk is not active yet
 	DWORD drugPid;
 	fo::Perk perkId; // effect of addiction
 };

sfall/FalloutEngine/VariableOffsets.h

@@ -155,6 +155,7 @@
 #define FO_VAR_mouse_y                    0x664450
 #define FO_VAR_mouse_y_                   0x6AC7A4
 #define FO_VAR_movePointRect              0x518FD4
+#define FO_VAR_movie_list                 0x518DA0
 #define FO_VAR_Mutate_                    0x5708B4
 #define FO_VAR_name_color                 0x56D744
 #define FO_VAR_name_font                  0x56D74C

sfall/FalloutEngine/Variables_def.h

@@ -122,6 +122,7 @@ VAR_(mouse_x_,                   DWORD)
 VAR_(mouse_y,                    DWORD)
 VAR_(mouse_y_,                   DWORD)
 VAR_(movePointRect,              BoundRect)
+VARA(movie_list,                 const char*, 17)
 VAR_(Mutate_,                    DWORD)
 VAR_(name_color,                 DWORD)
 VAR_(name_font,                  DWORD)

sfall/Modules/CritterStats.cpp

@@ -43,7 +43,7 @@ struct ProtoMem {
 	}
 
 	void CreateProtoMem(long* srcProto) {
-		this->proto = reinterpret_cast<long*>(new int32_t[104]); // 416 bytes
+		this->proto = reinterpret_cast<long*>(new long[104]); // 416 bytes
 		std::memcpy(this->proto, srcProto, 416);
 	}
 

sfall/Modules/Elevators.cpp

@@ -26,7 +26,7 @@ namespace sfall
 
 static const int exitsPerElevator = 4;
 static const int vanillaElevatorCount = 24;
-static const int elevatorCount = 50;
+static const int elevatorCount = 50; // The maximum allowed for Elevator stub in the BIS mapper
 
 static DWORD elevatorType[elevatorCount] = {0};
 static fo::ElevatorExit elevatorExits[elevatorCount][exitsPerElevator] = {0}; // _retvals

sfall/Modules/Movies.cpp

@@ -479,16 +479,13 @@ void Movies::init() {
 		strcpy_s(ininame, "Movie");
 		_itoa_s(i + 1, &ininame[5], 3, 10);
 		if (i < 17) {
-			GetConfigString("Misc", ininame, (char*)(0x518DA0 + i * 4), &MoviePaths[i * 65], 65);
+			GetConfigString("Misc", ininame, fo::var::movie_list[i], &MoviePaths[i * 65], 65);
 		} else {
 			GetConfigString("Misc", ininame, "", &MoviePaths[i * 65], 65);
 		}
 	}
 	dlog(".", DL_INIT);
-	SafeWrite32(0x44E6AE, (DWORD)MoviePtrs);
-	SafeWrite32(0x44E721, (DWORD)MoviePtrs);
-	SafeWrite32(0x44E75E, (DWORD)MoviePtrs);
-	SafeWrite32(0x44E78A, (DWORD)MoviePtrs);
+	SafeWriteBatch<DWORD>((DWORD)MoviePtrs, {0x44E6AE, 0x44E721, 0x44E75E, 0x44E78A});
 	dlog(".", DL_INIT);
 
 	/*

sfall/version.h

@@ -24,7 +24,7 @@
 
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 2
-#define VERSION_BUILD 6
+#define VERSION_BUILD 7
 #define VERSION_REV 0
 
-#define VERSION_STRING "4.2.6"
+#define VERSION_STRING "4.2.7"