Use compatible var statements

This commit is contained in:
Tad Hardesty
2020-01-18 22:59:32 -08:00
parent 7bd3208cc6
commit d8a64c83dc
8 changed files with 30 additions and 40 deletions

View File

@@ -144,9 +144,8 @@ Class Procs:
merge(A.zone,B.zone) merge(A.zone,B.zone)
return return
var var/a_to_b = get_dir(A,B)
a_to_b = get_dir(A,B) var/b_to_a = get_dir(B,A)
b_to_a = get_dir(B,A)
if(!A.connections) A.connections = new if(!A.connections) A.connections = new
if(!B.connections) B.connections = new if(!B.connections) B.connections = new

View File

@@ -29,7 +29,7 @@
icon_state = "unathiknife" icon_state = "unathiknife"
attack_verb = list("ripped", "torn", "cut") attack_verb = list("ripped", "torn", "cut")
can_cleave = FALSE can_cleave = FALSE
var hits = 0 var/hits = 0
/obj/item/weapon/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob) /obj/item/weapon/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob)
if(hits > 0) if(hits > 0)

View File

@@ -1529,9 +1529,8 @@ datum/admins/var/obj/item/weapon/paper/admin/faxreply // var to hold fax replies
P.stamps += "<hr><i>This paper has been stamped by the [P.origin] Quantum Relay.</i>" P.stamps += "<hr><i>This paper has been stamped by the [P.origin] Quantum Relay.</i>"
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
var/{x; y;} var/x = rand(-2, 0)
x = rand(-2, 0) var/y = rand(-1, 2)
y = rand(-1, 2)
P.offset_x += x P.offset_x += x
P.offset_y += y P.offset_y += y
stampoverlay.pixel_x = x stampoverlay.pixel_x = x

View File

@@ -66,9 +66,8 @@ proc/Ellipsis(original_msg, chance = 50)
if(chance <= 0) return "..." if(chance <= 0) return "..."
if(chance >= 100) return original_msg if(chance >= 100) return original_msg
var/list var/list/words = splittext(original_msg," ")
words = splittext(original_msg," ") var/list/new_words = list()
new_words = list()
var/new_msg = "" var/new_msg = ""

View File

@@ -2,8 +2,8 @@
name = "paper" name = "paper"
icon_state = "paper_stack" icon_state = "paper_stack"
item_state = "paper" item_state = "paper"
var copied = 0 var/copied = 0
var iscopy = 0 var/iscopy = 0
/obj/item/weapon/paper/carbon/update_icon() /obj/item/weapon/paper/carbon/update_icon()

View File

@@ -546,7 +546,7 @@
stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the [P.name].</i>" stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the [P.name].</i>"
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
var/{x; y;} var/x, y
if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm))
x = rand(-2, 0) x = rand(-2, 0)
y = rand(-1, 2) y = rand(-1, 2)

View File

@@ -53,10 +53,9 @@
if(/token/word) if(/token/word)
return new/node/expression/value/variable(T.value) return new/node/expression/value/variable(T.value)
if(/token/accessor) if(/token/accessor)
var var/token/accessor/A=T
token/accessor/A=T var/node/expression/value/variable/E//=new(A.member)
node/expression/value/variable/E//=new(A.member) var/stack/S=new()
stack/S=new()
while(istype(A.object, /token/accessor)) while(istype(A.object, /token/accessor))
S.Push(A) S.Push(A)
A=A.object A=A.object
@@ -181,9 +180,8 @@
- <ParseParamExpression()> - <ParseParamExpression()>
*/ */
ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}")) ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}"))
var/stack var/stack/opr=new
opr=new var/stack/val=new
val=new
src.expecting=VALUE src.expecting=VALUE
while(TRUE) while(TRUE)
if(EndOfExpression(end)) if(EndOfExpression(end))

View File

@@ -153,8 +153,7 @@
start - The character used to start the string. start - The character used to start the string.
*/ */
ReadString(start) ReadString(start)
var var/buf
buf
for(, codepos <= length(code), codepos++)//codepos to length(code)) for(, codepos <= length(code), codepos++)//codepos to length(code))
var/char=copytext(code, codepos, codepos+1) var/char=copytext(code, codepos, codepos+1)
switch(char) switch(char)
@@ -189,9 +188,8 @@
Reads characters separated by an item in <delim> into a token. Reads characters separated by an item in <delim> into a token.
*/ */
ReadWord() ReadWord()
var var/char=copytext(code, codepos, codepos+1)
char=copytext(code, codepos, codepos+1) var/buf
buf
while(!delim.Find(char) && codepos<=length(code)) while(!delim.Find(char) && codepos<=length(code))
buf+=char buf+=char
char=copytext(code, ++codepos, codepos+1) char=copytext(code, ++codepos, codepos+1)
@@ -206,9 +204,8 @@
Reads a symbol into a token. Reads a symbol into a token.
*/ */
ReadSymbol() ReadSymbol()
var var/char=copytext(code, codepos, codepos+1)
char=copytext(code, codepos, codepos+1) var/buf
buf
while(options.symbols.Find(buf+char)) while(options.symbols.Find(buf+char))
buf+=char buf+=char
@@ -223,10 +220,9 @@
Reads a number into a token. Reads a number into a token.
*/ */
ReadNumber() ReadNumber()
var var/char=copytext(code, codepos, codepos+1)
char=copytext(code, codepos, codepos+1) var/buf
buf var/dec=0
dec=0
while(options.IsDigit(char) || (char=="." && !dec)) while(options.IsDigit(char) || (char=="." && !dec))
if(char==".") dec=1 if(char==".") dec=1
@@ -246,14 +242,13 @@
*/ */
ReadComment() ReadComment()
var var/char=copytext(code, codepos, codepos+1)
char=copytext(code, codepos, codepos+1) var/nextchar=copytext(code, codepos+1, codepos+2)
nextchar=copytext(code, codepos+1, codepos+2) var/charstring = char+nextchar
charstring = char+nextchar var/comm = 1
comm = 1 // 1: single-line comment
// 1: single-line comment // 2: multi-line comment
// 2: multi-line comment var/expectedend = 0
expectedend = 0
if(charstring == "//" || charstring == "/*") if(charstring == "//" || charstring == "/*")
if(charstring == "/*") if(charstring == "/*")