Skip to content

Commit 82f9de2

Browse files
committed
added missing path assignment in EET_PLATFORM_CONVERSION function
1 parent df9954f commit 82f9de2

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

EET/other/EET_functions.tph

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
//Example usage:
1212
/*LAF EET_PLATFORM_CONVERSION STR_VAR path = EVAL ~%MOD_FOLDER%~ skip_array = "skip_array" END*/
1313

14+
OUTER_TEXT_SPRINT EET_CONVERTER_DIR ~EET/other/EET_modConverter/EET_modConverter~
1415
DEFINE_ACTION_FUNCTION ~EET_PLATFORM_CONVERSION~
1516
INT_VAR
1617
strrefAdd = 0 //value added to strref references during conversion
1718
STR_VAR
1819
path = "" //path to top directory from which files and directories lookup starts (optional, convert_array parameter can be used instead)
1920
convert_array = "" //associative array containing file paths that should be converted (optional, see path parameter)
2021
skip_array = "" //associative array containing file paths that should be skipped (only matters is path parameter is used)
21-
pcu_tables = "EET/other/EET_modConverter/EET_modConverter/lib/PCU_Dict_bgee-eet.tph" //path to file containing PCU tables (defaults to BG:EE => EET conversion)
22+
pcu_tables = EVAL "%EET_CONVERTER_DIR%/lib/PCU_Dict_bgee-eet.tph" //path to file containing PCU tables (defaults to BG:EE => EET conversion)
2223
remappedPrefix = "remapped" //prefix used in pcu_tables (defaults to 'remapped')
2324
BEGIN
2425
//define variables used by EET_PCU_core macros

EET/other/EET_modConverter/EET_modConverter/EET_modConverter.tp2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VERSION ~beta 0.1~
55
BEGIN ~EET_modConverter~
66
NO_LOG_RECORD
77

8+
OUTER_TEXT_SPRINT EET_CONVERTER_DIR ~EET_modConverter~
9+
810
//create file list for conversion
911
ACTION_IF ~%WEIDU_OS%~ STR_EQ ~win32~ BEGIN
1012
<<<<<<<< .../MakeList.bat

EET/other/EET_modConverter/EET_modConverter/lib/PCU_Dict_bgee-eet.tph

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ END
1616
///// Preparing MUS variables \\\\\
1717
///// \\\\\
1818

19-
COPY - ~EET_modConverter/lib/songlist_ee.2da~ ~EET_modConverter/lib~
19+
COPY - ~%EET_CONVERTER_DIR%/lib/songlist_ee.2da~ ~%EET_CONVERTER_DIR%/lib~
2020
PRETTY_PRINT_2DA
2121
REPLACE_TEXTUALLY ~ BC1\.MUS~ ~ BC3.MUS~
2222
REPLACE_TEXTUALLY ~ BC2\.MUS~ ~ BC4.MUS~
@@ -40,7 +40,7 @@ COPY - ~EET_modConverter/lib/songlist_ee.2da~ ~EET_modConverter/lib~
4040
READ_2DA_ENTRY cnt 1 3 "col2"
4141
READ_2DA_ENTRY cnt 2 3 "col3"
4242
INNER_ACTION BEGIN
43-
COPY - ~EET_modConverter/lib/songlist_eet.2da~ ~EET_modConverter/lib~
43+
COPY - ~%EET_CONVERTER_DIR%/lib/songlist_eet.2da~ ~%EET_CONVERTER_DIR%/lib~
4444
PRETTY_PRINT_2DA
4545
COUNT_2DA_ROWS 3 "cntrow2"
4646
FOR (cnt2 = 1; cnt2 < "%cntrow2%"; cnt2 = cnt2 + 1) BEGIN

EET/other/EET_modConverter/EET_modConverter/lib/PCU_Dict_bgt-eet.tph

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ OUTER_WHILE NOT (IS_AN_INT %songlist%) || (songlist > 5) || (songlist < 1) BEGIN
2828
4. Custom
2929
5. Don't patch ARE music offsets~
3030
ACTION_READLN songlist
31-
ACTION_IF (songlist = 4) AND (NOT FILE_EXISTS ~EET_modConverter/Input/songlist.2da~) BEGIN
32-
PRINT ~Custom songlist.2da not found in EET_modConverter/Input/ directory~
31+
ACTION_IF (songlist = 4) AND (NOT FILE_EXISTS ~%EET_CONVERTER_DIR%/Input/songlist.2da~) BEGIN
32+
PRINT ~Custom songlist.2da not found in %EET_CONVERTER_DIR%/Input/ directory~
3333
OUTER_SPRINT songlist ~~
3434
END
3535
END
3636

3737
ACTION_IF (songlist = 1) BEGIN
38-
OUTER_SPRINT file ~EET_modConverter/lib/songlist_bgt_bg1full.2da~
38+
OUTER_SPRINT file ~%EET_CONVERTER_DIR%/lib/songlist_bgt_bg1full.2da~
3939
END ELSE ACTION_IF (songlist = 2) BEGIN
40-
OUTER_SPRINT file ~EET_modConverter/lib/songlist_bgt_hybrid.2da~
40+
OUTER_SPRINT file ~%EET_CONVERTER_DIR%/lib/songlist_bgt_hybrid.2da~
4141
END ELSE ACTION_IF (songlist = 3) BEGIN
42-
OUTER_SPRINT file ~EET_modConverter/lib/songlist_bgt_full.2da~
42+
OUTER_SPRINT file ~%EET_CONVERTER_DIR%/lib/songlist_bgt_full.2da~
4343
END ELSE ACTION_IF (songlist = 4) BEGIN
44-
OUTER_SPRINT file ~EET_modConverter/Input/songlist.2da~
44+
OUTER_SPRINT file ~%EET_CONVERTER_DIR%/Input/songlist.2da~
4545
END
4646

4747
ACTION_IF (songlist != 5) BEGIN
@@ -55,7 +55,7 @@ ACTION_IF (songlist != 5) BEGIN
5555
READ_2DA_ENTRY cnt 1 3 "col2"
5656
READ_2DA_ENTRY cnt 2 3 "col3"
5757
INNER_ACTION BEGIN
58-
COPY - ~EET_modConverter/lib/songlist_eet.2da~ ~EET_modConverter/lib~
58+
COPY - ~%EET_CONVERTER_DIR%/lib/songlist_eet.2da~ ~%EET_CONVERTER_DIR%/lib~
5959
PRETTY_PRINT_2DA
6060
COUNT_2DA_ROWS 3 "cntrow2"
6161
FOR (cnt2 = 1; cnt2 < "%cntrow2%"; cnt2 = cnt2 + 1) BEGIN

EET/other/EET_modConverter/EET_modConverter/lib/PCU_Dict_eet-bgee.tph

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ END
1616
///// Preparing MUS variables \\\\\
1717
///// \\\\\
1818

19-
COPY - ~EET_modConverter/lib/songlist_eet.2da~ ~EET_modConverter/lib~
19+
COPY - ~%EET_CONVERTER_DIR%/lib/songlist_eet.2da~ ~%EET_CONVERTER_DIR%/lib~
2020
PRETTY_PRINT_2DA
2121
REPLACE_TEXTUALLY ~ BC3\.MUS~ ~ BC1.MUS~
2222
REPLACE_TEXTUALLY ~ BC4\.MUS~ ~ BC2.MUS~
@@ -40,7 +40,7 @@ COPY - ~EET_modConverter/lib/songlist_eet.2da~ ~EET_modConverter/lib~
4040
READ_2DA_ENTRY cnt 1 3 "col2"
4141
READ_2DA_ENTRY cnt 2 3 "col3"
4242
INNER_ACTION BEGIN
43-
COPY - ~EET_modConverter/lib/songlist_ee.2da~ ~EET_modConverter/lib~
43+
COPY - ~%EET_CONVERTER_DIR%/lib/songlist_ee.2da~ ~%EET_CONVERTER_DIR%/lib~
4444
PRETTY_PRINT_2DA
4545
COUNT_2DA_ROWS 3 "cntrow2"
4646
FOR (cnt2 = 1; cnt2 < "%cntrow2%"; cnt2 = cnt2 + 1) BEGIN

0 commit comments

Comments
 (0)