513 Compatability

This commit is contained in:
Atermonera
2019-12-15 11:47:42 -08:00
committed by VirgoBot
parent f8d71fadcc
commit c8a59aa5f7
2 changed files with 11 additions and 7 deletions

View File

@@ -3,4 +3,8 @@
#define TYPEID_NORMAL_LIST "f" #define TYPEID_NORMAL_LIST "f"
//helper macros //helper macros
#define GET_TYPEID(ref) ( ( (length(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, length(ref)-6) ) ) #define GET_TYPEID(ref) ( ( (length(ref) <= 10) ? "TYPEID_NULL" : copytext(ref, 4, length(ref)-6) ) )
#define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST) <<<<<<< HEAD
#define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST)
=======
#define IS_NORMAL_LIST(L) (GET_TYPEID("\ref[L]") == TYPEID_NORMAL_LIST)
>>>>>>> af301e7b... Merge pull request #6563 from Novacat/nova-accessory

View File

@@ -40,12 +40,12 @@ proc
///////////////////// /////////////////////
dd_hasprefix(text, prefix) dd_hasprefix(text, prefix)
var/start = 1 var/start = 1
var/end = lentext(prefix) + 1 var/end = length(prefix) + 1
return findtext(text, prefix, start, end) return findtext(text, prefix, start, end)
dd_hasPrefix(text, prefix) dd_hasPrefix(text, prefix)
var/start = 1 var/start = 1
var/end = lentext(prefix) + 1 var/end = length(prefix) + 1
return findtextEx(text, prefix, start, end) return findtextEx(text, prefix, start, end)
@@ -64,8 +64,8 @@ proc
// Turning text into lists // // Turning text into lists //
///////////////////////////// /////////////////////////////
dd_text2list(text, separator) dd_text2list(text, separator)
var/textlength = lentext(text) var/textlength = length(text)
var/separatorlength = lentext(separator) var/separatorlength = length(separator)
var/list/textList = new /list() var/list/textList = new /list()
var/searchPosition = 1 var/searchPosition = 1
var/findPosition = 1 var/findPosition = 1
@@ -84,8 +84,8 @@ proc
return textList return textList
dd_text2List(text, separator) dd_text2List(text, separator)
var/textlength = lentext(text) var/textlength = length(text)
var/separatorlength = lentext(separator) var/separatorlength = length(separator)
var/list/textList = new /list() var/list/textList = new /list()
var/searchPosition = 1 var/searchPosition = 1
var/findPosition = 1 var/findPosition = 1