Skip to content

Commit

Permalink
Fix for windows, probably
Browse files Browse the repository at this point in the history
  • Loading branch information
TheDarklingWolf committed Feb 26, 2013
1 parent c618b1a commit c79fcdc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion itype.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ IF_USE_UPS, // Draws power from a UPS
IF_RELOAD_AND_SHOOT, // Reloading and shooting is one action
IF_FIRE_100, // Fires 100 rounds at once! (e.g. flamethrower)
IF_GRENADE, // NPCs treat this as a grenade
IF_CHARGE, // For guns; charges up slowly
IF_CHARGE, // For guns; charges up slowly
IF_SHOCK, // Stuns and damages enemies, powers up shockers.

IF_UNARMED_WEAPON, // Counts as an unarmed weapon
IF_NO_UNWIELD, // Impossible to unwield, e.g. bionic claws
Expand Down
1 change: 0 additions & 1 deletion itypedef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4065,7 +4065,6 @@ TOOL("pocket knife", 14, 100,';', c_blue, STEEL, PLASTIC,
mfb(IF_STAB), "\
A small pocket knife.");


// BIONICS
// These are the modules used to install new bionics in the player. They're
// very simple and straightforward; a difficulty, followed by a NULL-terminated
Expand Down
8 changes: 4 additions & 4 deletions mapdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -328,13 +328,13 @@ const ter_t terlist[num_terrain_types] = { // MUST match enum ter_id above!
mfb(bashable)|mfb(flammable)|mfb(noitem)| mfb(supports_roof)}, // Regular window
{"window", '"', c_ltcyan, 0, tr_null,
mfb(transparent)|mfb(bashable)|mfb(flammable)|mfb(noitem)|
mfb(supports_roof)|mfb(deconstruct)}, //has curtains
mfb(supports_roof)|mfb(deconstruct)}, //has curtains
{"taped window", '"', c_dkgray, 0, tr_null,
mfb(bashable)|mfb(flammable)|mfb(noitem)| mfb(supports_roof)}, // Curtain window
{"open window", '\'', c_ltcyan, 4, tr_null,
mfb(transparent)|mfb(flammable)|mfb(noitem)| mfb(supports_roof)},
{"closed curtains", '"', c_dkgray, 0, tr_null,
mfb(bashable)|mfb(flammable)|mfb(noitem)| mfb(supports_roof)},
{"taped window", '"', c_dkgray, 0, tr_null,
mfb(bashable)|mfb(flammable)|mfb(noitem)| mfb(supports_roof)}, // Curtain window
mfb(bashable)|mfb(flammable)|mfb(noitem)| mfb(supports_roof)},
{"window", '"', c_ltcyan, 0, tr_null, // Actually alarmed
mfb(transparent)|mfb(bashable)|mfb(flammable)|mfb(alarmed)|mfb(noitem)|
mfb(supports_roof)},
Expand Down

0 comments on commit c79fcdc

Please sign in to comment.