kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug-Fix: Furniture fixes for removed furniture, and sitter counts (Thanks MTFox)

Browse Source
This commit is contained in:
JamDog
2009-06-02 00:23:02 +00:00
parent 5e3ffd750b
commit 6ddc788b1b
2 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/utils.c
View File

@@ -893,7 +893,6 @@ void char_from_furniture(struct char_data *ch)
{
struct obj_data *furniture;
struct char_data *tempch;
int i, found = 0;
if (!SITTING(ch))
return;
@@ -909,34 +908,33 @@ void char_from_furniture(struct char_data *ch)
log("SYSERR: Char from furniture, but no furniture!");
SITTING(ch) = NULL;
NEXT_SITTING(ch) = NULL;
GET_OBJ_VAL(furniture, 1) = 0;
return;
}
if (tempch == ch){
if (!NEXT_SITTING(ch))
if (!NEXT_SITTING(ch)) {
OBJ_SAT_IN_BY(furniture) = NULL;
else
} else {
OBJ_SAT_IN_BY(furniture) = NEXT_SITTING(ch);
GET_OBJ_VAL(furniture, 1) -= 1;
SITTING(ch) = NULL;
NEXT_SITTING(ch) = NULL;
return;
}
for (i = 0; i < GET_OBJ_VAL(furniture, 1) && found == 0; i++){
if (NEXT_SITTING(tempch) != ch){
NEXT_SITTING(tempch) = NEXT_SITTING(ch);
found++;
}
} else {
for (tempch = OBJ_SAT_IN_BY(furniture); tempch; tempch = NEXT_SITTING(tempch)) {
if (NEXT_SITTING(tempch) == ch) {
NEXT_SITTING(tempch) = NEXT_SITTING(ch);
}
}
}
if (found)
log("SYSERR: Char flagged as sitting, but not in furniture.");
else
GET_OBJ_VAL(furniture, 1) -= 1;
GET_OBJ_VAL(furniture, 1) -= 1;
SITTING(ch) = NULL;
NEXT_SITTING(ch) = NULL;
if (GET_OBJ_VAL(furniture, 1) < 1){
OBJ_SAT_IN_BY(furniture) = NULL;
GET_OBJ_VAL(furniture, 1) = 0;
}
return;
}