← Back to branch summary

~sylpheed74/cataclysm-dda/ru

« back to all changes in this revision

Viewing changes to src/map.cpp

  • Committer: Coolthulhu
  • Date: 2015-08-05 18:34:05 UTC
  • mfrom: (5399.1.4)
  • Revision ID: git-v1:580b309bac97d3a94aaccc7efd189dd5bc0d3fa4
Merge pull request #13175 from chaosvolt/pipe-combination-gun-fix

Workaround to issue #13171, makes underbarrel pipe shotgun craftable, other weapon fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/map.cpp
1
 
#include "map.h"
 
1
#include "map.h"
2
2
#include "lightmap.h"
3
3
#include "output.h"
4
4
#include "rng.h"
4351
4351
            }
4352
4352
        }
4353
4353
        if( i_at( p_it ).size() < MAX_ITEM_IN_SQUARE ) {
4354
 
            if( !( new_item.has_flag("IRREMOVABLE") && !new_item.is_gun() ) ){
 
4354
            if( !new_item.is_gunmod() ||  !new_item.has_flag("IRREMOVABLE") ) {
4355
4355
                add_item( p_it, new_item );
4356
4356
                support_dirty( p_it );
4357
4357
            }