Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add campfire

Browse Source
This commit is contained in:
Vechro 2019-07-21 22:18:21 +03:00 committed by Pfauenauge90
parent 53f5f2d560
commit 6478c4ec69
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/body/object.rs
View File

@ -35,6 +35,7 @@ impl Body {
}
}
<<<<<<< HEAD
const ALL_OBJECTS: [Body; 24] = [
Body::Bomb,
Body::Scarecrow,
@ -61,3 +62,6 @@ const ALL_OBJECTS: [Body; 24] = [
Body::PotionGreen,
Body::Crate,
];
=======
const ALL_OBJECTS: [Body; 5] = [Body::Bomb, Body::Scarecrow, Body::Chest, Body::Pumpkin, Body::Campfire];
>>>>>>> Add campfire