Skip to content

Commit 443e489

Browse files
disambiguates more proc names
1 parent 36e9081 commit 443e489

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

code/__HELPERS/math/ray/ray.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
var/turf/previous_turf
2727

2828
/ray/proc/toString()
29-
return "\[Ray\](\n- origin = " + toString(origin) + "\n- origin_floored = "+ toString(origin_floored) + "\n- direction = " + toString(direction) + "\n- z-level = " + num2text(z) + "\n)"
29+
return "\[Ray\](\n- origin = " + vectorToString(origin) + "\n- origin_floored = "+ vectorToString(origin_floored) + "\n- direction = " + vectorToString(direction) + "\n- z-level = " + num2text(z) + "\n)"
3030

3131
//use atom2vector for the origin, atoms2vector for the direction
3232
/ray/New(var/vector/p_origin, var/vector/p_direction, var/z)

code/__HELPERS/math/vector/vector.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Basic geometry things.
2-
/proc/duplicate(vector/v)
2+
/proc/copyVector(vector/v)
33
return vector(v.x, v.y)
44

55
/proc/euclidian_norm(vector/v)
@@ -17,13 +17,13 @@
1717
var/norm = chebyshev_norm(v)
1818
return vector(v.x/norm, v.y/norm)
1919

20-
/proc/is_integer(vector/v)
20+
/proc/isIntegerVector(vector/v)
2121
return IS_INT(v.x) && IS_INT(v.y)
2222

23-
/proc/is_null(vector/v)
23+
/proc/isNullVector(vector/v)
2424
return chebyshev_norm(v) == 0
2525

26-
/proc/toString(vector/v)
26+
/proc/vectorToString(vector/v)
2727
return "\[Vector\]([v.x],[v.y])"
2828

2929
//returns angle from 0 to 360

code/__HELPERS/math/vector/vector_procs.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var/turf/T = get_turf(src)
33
var/turf/destination = locate(T.x + V.x, T.y + V.y, z)
44
var/vector/V_norm = chebyshev_normalized(V)
5-
if (!is_integer(V_norm))
5+
if (!isIntegerVector(V_norm))
66
return
77
var/turf/destination_temp
88
while (destination_temp != destination)

code/modules/reagents/reagent_containers/food/drinks.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@
23332333
// Geometrically checking if we're on a straight line.
23342334
var/vector/V = atoms2vector(src, over_location)
23352335
var/vector/V_norm = V.Normalize()
2336-
if (!is_integer(V_norm))
2336+
if (!isIntegerVector(V_norm))
23372337
return ..() // Only a cardinal vector (north, south, east, west) can pass this test
23382338

23392339
// Checks if there's tables on the path.

code/modules/unit_tests/vector.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
var/vector/D
44
for(var/i in range(100))
55
V = vector(i, i*2)
6-
D = V.duplicate()
6+
D = copyVector(V)
77
if(D == V)
88
fail("Reference copied")
99

@@ -12,16 +12,16 @@
1212

1313
/datum/unit_test/vector_isnull/start()
1414
var/vector/V = vector(0,0.0)
15-
if(!V.is_null())
15+
if(!V.isNullVector())
1616
fail("Vector not null")
1717

1818
/datum/unit_test/vector_isint/start()
1919
var/vector/V = vector(5416,115)
20-
if(!V.is_integer())
20+
if(!V.isIntegerVector())
2121
fail("Vector not int, should be int")
2222

2323
V = vector(5416.044,115)
24-
if(V.is_integer())
24+
if(V.isIntegerVector())
2525
fail("Vector int, should not be int")
2626

2727
/datum/unit_test/vector_toangle/start()

0 commit comments

Comments
 (0)