mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-13 11:42:31 +00:00
skin.dmf DME Check (#19865)
skin dmf is in the wrong order in the .dme and keeps trying to reorder itself, opening this PR to see why it fails
This commit is contained in:
@@ -3774,12 +3774,12 @@
|
|||||||
#include "code\ZAS\Zone.dm"
|
#include "code\ZAS\Zone.dm"
|
||||||
#include "code\ze_genesis_call\genesis_call.dm"
|
#include "code\ze_genesis_call\genesis_call.dm"
|
||||||
#include "interface\interface.dm"
|
#include "interface\interface.dm"
|
||||||
|
#include "interface\skin.dmf"
|
||||||
#include "interface\fonts\fonts_datum.dm"
|
#include "interface\fonts\fonts_datum.dm"
|
||||||
#include "interface\fonts\grand_9k.dm"
|
#include "interface\fonts\grand_9k.dm"
|
||||||
#include "interface\fonts\pixellari.dm"
|
#include "interface\fonts\pixellari.dm"
|
||||||
#include "interface\fonts\spess_font.dm"
|
#include "interface\fonts\spess_font.dm"
|
||||||
#include "interface\fonts\tiny_unicode.dm"
|
#include "interface\fonts\tiny_unicode.dm"
|
||||||
#include "interface\skin.dmf"
|
|
||||||
#include "maps\_common\areas\ai.dm"
|
#include "maps\_common\areas\ai.dm"
|
||||||
#include "maps\_common\areas\areas.dm"
|
#include "maps\_common\areas\areas.dm"
|
||||||
#include "maps\_common\areas\asteroid_areas.dm"
|
#include "maps\_common\areas\asteroid_areas.dm"
|
||||||
|
|||||||
@@ -74,9 +74,11 @@ def compare_lines(a, b):
|
|||||||
a_segments = a.split('\\')
|
a_segments = a.split('\\')
|
||||||
b_segments = b.split('\\')
|
b_segments = b.split('\\')
|
||||||
|
|
||||||
|
file_end_types = (".dm", ".dmf")
|
||||||
|
|
||||||
for (a_segment, b_segment) in zip(a_segments, b_segments):
|
for (a_segment, b_segment) in zip(a_segments, b_segments):
|
||||||
a_is_file = a_segment.endswith(".dm")
|
a_is_file = a_segment.endswith(file_end_types)
|
||||||
b_is_file = b_segment.endswith(".dm")
|
b_is_file = b_segment.endswith(file_end_types)
|
||||||
|
|
||||||
# code\something.dm will ALWAYS come before code\directory\something.dm
|
# code\something.dm will ALWAYS come before code\directory\something.dm
|
||||||
if a_is_file and not b_is_file:
|
if a_is_file and not b_is_file:
|
||||||
|
|||||||
Reference in New Issue
Block a user