- Fixed one of the ways the Core R&D Computer can lock up and become completely unusable. If it gets stuck from using this method, just close the window and click on the computer again. Fixes issue 316.

- Vaccine bottles from the panD.E.M.I.C. now auto-name. There was a bug where you could very quickly create a ton of bottles which could cause clients to crash. Fixes issue 326.

- Changed various ASSERT()'s to sanity ifs. ASSERT should really only be used during debugging, not in release. Runtime prevention.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3368 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-03-28 16:51:55 +00:00
parent 99d894c168
commit 0f456531b9
9 changed files with 25 additions and 25 deletions

View File

@@ -57,12 +57,12 @@ PriorityQueue
j >>= 1
Dequeue()
ASSERT(L.len)
if(!L.len) return 0
. = L[1]
Remove(1)
Remove(i)
ASSERT(i <= L.len)
if(i > L.len) return 0
L.Swap(i,L.len)
L.Cut(L.len)
if(i < L.len)

View File

@@ -448,7 +448,7 @@ proc
currentLayer = current:layer
if(currentLayer<0) // Special case for FLY_LAYER
ASSERT(currentLayer > -1000)
if(currentLayer <= -1000) return 0
if(pSet == 0) // Underlay
currentLayer = A.layer+currentLayer/1000
else // Overlay