Skip to content

Commit fc0bb9c

Browse files
committed
Исправления для релизов младше 8.3.11 под изменения в AngelScript-движке.
1 parent a7bd121 commit fc0bb9c

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

bld_tools/build.cmd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@ cd /d "%ProjectDir%"
1717
echo Typescript -^> JScript...
1818
packages\Microsoft.TypeScript.Compiler.3.1.5\tools\tsc.exe -p "src\ts" --outDir "%rootdir%\addins"
1919
:: à®¢¥à塞 ¬®¤ã«ì
20-
echo ‘¨­â ªá-¯à®¢¥àª ...
20+
echo ‘¨­â ªá-¯à®¢¥àª  8.3.10...
21+
coreas_runner_c check snegopat /f "%cd%\" /d ver=8.3.10
22+
echo ‘¨­â ªá-¯à®¢¥àª  8.3.18...
2123
coreas_runner_c check snegopat /f "%cd%\" /d ver=8.3.18
24+

engine/colorer.as

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -512,13 +512,13 @@ class ScintillaInfo : EditorInfo {
512512
if (commaPos>1) {
513513
strBPcount = strBPcount.substr(1, commaPos - 1);
514514
//Message(strBPcount);
515-
uint bpCount = parseInt(strBPcount);
515+
uint bpCount = strBPcount.parseInt();
516516
for (uint ii = 0; ii < bpCount; ii++) {
517517
i++; if (i >= arrPflStrings.length)return;
518518
string strBP = arrPflStrings[i].substr(1); // {14,1,"",0,2}, номер строки, активность, условие
519519
array<string>&& arrBP = strBP.split(",");
520520
if (arrBP.length > 2) {
521-
uint lineNum = parseInt(arrBP[0]);
521+
uint lineNum = arrBP[0].parseInt();
522522
bool isEnabled = arrBP[1] == "1";
523523
bool isCondition = arrBP[2] != "\"\"";
524524
//Message("строка " + lineNum + (isEnabled ? " включена " : " отключена ") + (isCondition ? " с условием " : " обычная "));
@@ -561,13 +561,13 @@ class ScintillaInfo : EditorInfo {
561561
if (commaPos>1) {
562562
strBPcount = strBPcount.substr(1, commaPos - 1);
563563
//Message(strBPcount);
564-
uint bpCount = parseInt(strBPcount);
564+
uint bpCount = strBPcount.parseInt();
565565
for (uint ii = 0; ii < bpCount; ii++) {
566566
i++; if (i >= arrPflStrings.length)return;
567567
string strBP = arrPflStrings[i].substr(1); // {14,1,"",0,2}, номер строки
568568
array<string>&& arrBP = strBP.split(",");
569569
if (arrBP.length > 2) {
570-
uint lineNum = parseInt(arrBP[0]);
570+
uint lineNum = arrBP[0].parseInt();
571571
bookmarks.insert(strGuidObj + strGuidProp + lineNum, lineNum);
572572
}
573573
}
@@ -1892,7 +1892,7 @@ class ScintillaEditor : TextEditorWindow, SelectionChangedReceiver {
18921892
tpStart = tpEnd;
18931893
} else {
18941894
ed.setSelection(tpStart, tpEnd, false);
1895-
text.empty();
1895+
text.makeEmpty();
18961896
}
18971897
ed.setSelectionText(text);
18981898
ed.setCaretPosition(tpStart);

0 commit comments

Comments
 (0)