Add SFall arrays and patry_member_list opcodes

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 set(EXECUTABLE_NAME fallout2-ce)
 
-if (APPLE)
+if(APPLE)
     if(IOS)
         set(CMAKE_OSX_DEPLOYMENT_TARGET "11" CACHE STRING "")
         set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
@@ -20,7 +20,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)
 
-if (ANDROID)
+if(ANDROID)
     add_library(${EXECUTABLE_NAME} SHARED)
 else()
     add_executable(${EXECUTABLE_NAME} WIN32 MACOSX_BUNDLE)
@@ -271,6 +271,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/sfall_lists.h"
     "src/sfall_opcodes.cc"
     "src/sfall_opcodes.h"
+    "src/sfall_arrays.cc"
+    "src/sfall_arrays.h"
     "src/touch.cc"
     "src/touch.h"
 )
@@ -297,7 +299,7 @@ if(WIN32)
     )
 endif()
 
-if (WIN32)
+if(WIN32)
     target_sources(${EXECUTABLE_NAME} PUBLIC
         "os/windows/fallout2-ce.ico"
         "os/windows/fallout2-ce.rc"
@@ -377,7 +379,7 @@ if(APPLE)
     else()
         install(TARGETS ${EXECUTABLE_NAME} DESTINATION .)
 
-        if (CPACK_BUNDLE_APPLE_CERT_APP)
+        if(CPACK_BUNDLE_APPLE_CERT_APP)
             install(CODE "
                 execute_process(COMMAND codesign --deep --force --options runtime --sign \"${CPACK_BUNDLE_APPLE_CERT_APP}\" ${CMAKE_BINARY_DIR}/Fallout II Community Edition.app)
                 "

src/game.cc

@@ -50,6 +50,7 @@
 #include "random.h"
 #include "scripts.h"
 #include "settings.h"
+#include "sfall_arrays.h"
 #include "sfall_config.h"
 #include "sfall_global_vars.h"
 #include "sfall_lists.h"
@@ -348,6 +349,11 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
         return -1;
     }
 
+    if (!sfallArraysInit()) {
+        debugPrint("Failed on sfallArraysInit");
+        return -1;
+    }
+
     messageListRepositorySetStandardMessageList(STANDARD_MESSAGE_LIST_MISC, &gMiscMessageList);
 
     return 0;
@@ -395,6 +401,7 @@ void gameReset()
     sfallGlobalVarsReset();
     sfallListsReset();
     messageListRepositoryReset();
+    sfallArraysReset();
 }
 
 // 0x442C34
@@ -403,6 +410,7 @@ void gameExit()
     debugPrint("\nGame Exit\n");
 
     // SFALL
+    sfallArraysExit();
     sfallListsExit();
     sfallGlobalVarsExit();
     premadeCharactersExit();

src/interpreter.cc

@@ -3252,7 +3252,7 @@ void* programReturnStackPopPointer(Program* program)
     return programValue.pointerValue;
 }
 
-bool ProgramValue::isEmpty()
+bool ProgramValue::isEmpty() const
 {
     switch (opcode) {
     case VALUE_TYPE_INT:
@@ -3269,19 +3269,19 @@ bool ProgramValue::isEmpty()
 }
 
 // Matches Sfall implementation.
-bool ProgramValue::isInt()
+bool ProgramValue::isInt() const
 {
     return opcode == VALUE_TYPE_INT;
 }
 
 // Matches Sfall implementation.
-bool ProgramValue::isFloat()
+bool ProgramValue::isFloat() const
 {
     return opcode == VALUE_TYPE_FLOAT;
 }
 
 // Matches Sfall implementation.
-float ProgramValue::asFloat()
+float ProgramValue::asFloat() const
 {
     switch (opcode) {
     case VALUE_TYPE_INT:
@@ -3293,4 +3293,42 @@ float ProgramValue::asFloat()
     }
 }
 
+bool ProgramValue::isString() const
+{
+    return opcode == VALUE_TYPE_STRING || opcode == VALUE_TYPE_DYNAMIC_STRING;
+}
+
+ProgramValue::ProgramValue()
+{
+    opcode = VALUE_TYPE_INT;
+    integerValue = 0;
+}
+ProgramValue::ProgramValue(int value)
+{
+    opcode = VALUE_TYPE_INT;
+    integerValue = value;
+};
+ProgramValue::ProgramValue(Object* value)
+{
+    opcode = VALUE_TYPE_PTR;
+    pointerValue = value;
+};
+
+bool ProgramValue::isPointer() const
+{
+    return opcode == VALUE_TYPE_PTR;
+}
+
+int ProgramValue::asInt() const
+{
+    switch (opcode) {
+    case VALUE_TYPE_INT:
+        return integerValue;
+    case VALUE_TYPE_FLOAT:
+        return static_cast<int>(floatValue);
+    default:
+        return 0;
+    }
+}
+
 } // namespace fallout

src/interpreter.h

@@ -1,6 +1,7 @@
 #ifndef INTERPRETER_H
 #define INTERPRETER_H
 
+#include "object.h"
 #include <setjmp.h>
 
 #include <vector>
@@ -140,19 +141,27 @@ typedef struct Procedure {
     int field_14;
 } Procedure;
 
-typedef struct ProgramValue {
+class ProgramValue {
+public:
+    ProgramValue();
+    ProgramValue(int value);
+    ProgramValue(Object* value);
+
     opcode_t opcode;
     union {
         int integerValue;
         float floatValue;
         void* pointerValue;
     };
 
-    bool isEmpty();
-    bool isInt();
-    bool isFloat();
-    float asFloat();
-} ProgramValue;
+    bool isEmpty() const;
+    bool isInt() const;
+    bool isFloat() const;
+    bool isString() const;
+    float asFloat() const;
+    bool isPointer() const;
+    int asInt() const;
+};
 
 typedef std::vector<ProgramValue> ProgramStack;