Merge branch 'master' into lets_move

This commit is contained in:
KimLS
2016-01-22 19:17:38 -08:00
10 changed files with 165 additions and 116 deletions
+1 -1
View File
@@ -291,7 +291,7 @@ bool Zone::LoadGroundSpawns() {
char* name=0;
uint32 gsnumber=0;
for(gsindex=0;gsindex<50;gsindex++){
if(groundspawn.spawn[gsindex].item>0 && groundspawn.spawn[gsindex].item<500000){
if(groundspawn.spawn[gsindex].item>0 && groundspawn.spawn[gsindex].item<SAYLINK_ITEM_ID){
ItemInst* inst = nullptr;
inst = database.CreateItem(groundspawn.spawn[gsindex].item);
gsnumber=groundspawn.spawn[gsindex].max_allowed;