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-06-15 20:04:19 +08:00
parent ac113de096
commit b92abd1ec6
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/constant.h
View File

@ -351,7 +351,7 @@ const int SYNC_FRAME_RATE = 10;
const float FRAME_RATE_MS = 1000.0f / SERVER_FRAME_RATE;
const int NEXT_FRAME_TIMER = 2;
const int MAX_WEAPON_NUM = 9;
const int MAX_WEAPON_NUM = 14;
const int MAX_SKIN_LV = 9;
const int GUN_SLOT1 = 1;
@ -365,8 +365,12 @@ const int SPEC1_IS_END = IS_SMOKE;
const int SPEC2_IS_BEGIN = IS_POSION_GAS_BOMB;
const int SPEC2_IS_END = IS_MINE;
const int SPEC3_IS_BEGIN = IS_C4;
const int SPEC3_IS_END = IS_OIL_BUCKET;
const int SPEC1_SLOT_BEGIN = 3; //手雷 烟雾弹
const int SPEC2_SLOT_BEGIN = 5; //毒气弹 燃烧瓶 陷井 地雷
const int SPEC3_SLOT_BEGIN = 9; //毒气弹 燃烧瓶 陷井 地雷
const int DOOR_THING_ID = 61701;

18
server/gameserver/player.cc
View File

@ -661,8 +661,26 @@ void Player::LootInteraction(Loot* entity)
DecInventory(item_meta->i->_inventory_slot(), add_num);
}
break;
case IS_C4:
case IS_SHIELD_WALL:
case IS_SINGAL_GUN:
case IS_SHEN_BAO:
case IS_OIL_BUCKET:
{
Weapon* weapon = &weapons[SPEC3_SLOT_BEGIN +
(item_meta->i->_inventory_slot() - SPEC3_IS_BEGIN)
];
weapon->weapon_id = entity->item_id;
weapon->weapon_lv = 1;
weapon->ammo += entity->count;
weapon->meta = item_meta;
weapon->Recalc();
DecInventory(item_meta->i->_inventory_slot(), add_num);
}
break;
default:
{
int i = 0;
#if 0
abort();
#endif