server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-20 06:42:03 +00:00
parent b613141b89
commit bd65f58886
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/gameserver/human.cc
View File

@ -3577,6 +3577,22 @@ void Human::GMAddItem(int item_id, int item_num)
DecInventory(item_meta->i->_inventory_slot(), add_num); DecInventory(item_meta->i->_inventory_slot(), add_num);
} }
break; break;
case IS_C4:
case IS_SHIELD_WALL:
case IS_SINGAL_GUN:
case IS_OIL_BUCKET:
{
Weapon* weapon = &weapons[SPEC3_SLOT_BEGIN +
(item_meta->i->_inventory_slot() - SPEC3_IS_BEGIN)
];
weapon->weapon_id = item_id;
weapon->weapon_lv = 1;
weapon->ammo += item_num;
weapon->meta = item_meta;
weapon->Recalc();
DecInventory(item_meta->i->_inventory_slot(), add_num);
}
break;
default: default:
{ {
#if 0 #if 0

3
server/gameserver/roomobstacle.cc
View File

@ -444,7 +444,8 @@ void RoomObstacle::ActiveAirDrop()
); );
room->xtimer.AddDeadLineTimerAndAttach room->xtimer.AddDeadLineTimerAndAttach
( (
meta->int_param2 / FRAME_RATE_MS * 1, 0,
//meta->int_param2 / FRAME_RATE_MS * 1,
a8::XParams() a8::XParams()
.SetSender(this), .SetSender(this),
[] (const a8::XParams& param) [] (const a8::XParams& param)