Fix remaining issues on port

szapp · Aug 8, 2023 · 269f60f · 269f60f
1 parent 6122ac8
commit 269f60f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/exec/init.asm b/src/exec/init.asm
@@ -5,6 +5,9 @@ init_menu:
     resetStackoffset g1g2(0x34,0x3C,0x34,0x34)
         call    zCArraySort_zCMenu___InsertSort                            ; Overwritten
         pusha
+%if GOTHIC_BASE_VERSION == 112
+        mov     ebp, ebx
+%endif
         push    ninja_initMenu
         push    char_src
         push    NINJA_PATH_CONTENT

diff --git a/src/func/dispatch.asm b/src/func/dispatch.asm
@@ -120,7 +120,7 @@ ninja_dispatch:
         push    esi
         call    DWORD [ds_lstrlenA]
     addStack 4
-        sub     eax, 0x7                                                   ; Cut off '_G*.EXT'
+        sub     eax, g1g2(0x7,0x9,0x9,0x7)                                 ; Cut off '_G*.EXT'
         mov     BYTE [esi+eax], 0x0
         push    DWORD [esp+stackoffset+arg_2]
         push    esi

diff --git a/src/func/injectMds.asm b/src/func/injectMds.asm
@@ -55,7 +55,7 @@ ninja_injectMds:
         push    DWORD [zFILE_cur_mds_file]
         mov     DWORD [zFILE_cur_mds_file], esi
 
-%if GOTHIC_BASE_VERSION == 2
+%if GOTHIC_BASE_VERSION == 130 || GOTHIC_BASE_VERSION == 2
         sub     esp, 0xC                                                   ; Create fake zCFileBIN
         mov     DWORD [esp], 0xFFFFFFFF                                    ; -1
 %endif
@@ -90,19 +90,19 @@ ninja_injectMds:
     addStack 3*4
         cmp     eax, 0xFFFFFFFF
         jz      .mds_loop_start
-%if GOTHIC_BASE_VERSION == 2
+%if GOTHIC_BASE_VERSION == 130 || GOTHIC_BASE_VERSION == 2
         mov     ecx, esp                                                   ; zCFileBIN * (ignored in Gothic 1)
         push    ecx
 %endif
         mov     ecx, ebp
         call    zCModelPrototype__ReadModel
-%if GOTHIC_BASE_VERSION == 2
+%if GOTHIC_BASE_VERSION == 130 || GOTHIC_BASE_VERSION == 2
     addStack 4
 %endif
         jnz     .mds_loop_start
 
 .eof:
-%if GOTHIC_BASE_VERSION == 2
+%if GOTHIC_BASE_VERSION == 130 || GOTHIC_BASE_VERSION == 2
         add     esp, 0xC
 %endif