From c79fcdca2f1af501291e3cdef04aa49b57274105 Mon Sep 17 00:00:00 2001 From: TheDarklingWolf Date: Tue, 26 Feb 2013 22:12:32 +0000 Subject: [PATCH] Fix for windows, probably --- itype.h | 3 ++- itypedef.cpp | 1 - mapdata.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/itype.h b/itype.h index 7c7057747c1da..a8bee390962db 100644 --- a/itype.h +++ b/itype.h @@ -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 diff --git a/itypedef.cpp b/itypedef.cpp index 2558a34d485b2..3e0f20111c382 100644 --- a/itypedef.cpp +++ b/itypedef.cpp @@ -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 diff --git a/mapdata.h b/mapdata.h index a4ab52165c67f..94e46a34b98dd 100644 --- a/mapdata.h +++ b/mapdata.h @@ -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)},