Merge pull request #5 from CleverRaven/master

Update

Makefile

@@ -103,10 +103,10 @@ RC  = $(CROSS)windres
 # enable optimizations. slow to build
 ifdef RELEASE
   ifeq ($(NATIVE), osx)
-    OTHERS += -O3
+    CXXFLAGS += -O3
   else
-    OTHERS += -Os
-    OTHERS += -s
+    CXXFLAGS += -Os
+    LDFLAGS += -s
   endif
   # OTHERS += -mmmx -m3dnow -msse -msse2 -msse3 -mfpmath=sse -mtune=native
   # Strip symbols, generates smaller executable.
@@ -362,7 +362,7 @@ all: version $(TARGET) $(L10N)
 	@
 
 $(TARGET): $(ODIR) $(DDIR) $(OBJS)
-	$(LD) $(W32FLAGS) -o $(TARGET) $(DEFINES) $(CXXFLAGS) \
+	$(LD) $(W32FLAGS) -o $(TARGET) $(DEFINES) \
           $(OBJS) $(LDFLAGS)
 
 .PHONY: version json-verify

data/json/items/ammo.json

@@ -1019,7 +1019,7 @@
         "name_plural" : "5.7x28mm",
         "symbol" : "=",
         "color" : "dark_gray",
-        "description" : "The 5.7x28mm round is a proprietary round developed by FN Hestal for use in their P90 SMG. While it is a very small round, comparable in power to .22, it features incredible armor-piercing capabilities and very low recoil.",
+        "description" : "The 5.7x28mm round is a proprietary round developed by FN Herstal for use in their P90 SMG. While it is a very small round, comparable in power to .22, it features incredible armor-piercing capabilities and very low recoil.",
         "material" : "steel",
         "volume" : 1,
         "weight" : 2,

data/json/items/handloaded_bullets.json

@@ -540,7 +540,7 @@
         "name_plural" : "reloaded 5.7x28mm",
         "symbol" : "=",
         "color" : "dark_gray",
-        "description" : "The 5.7x28mm round is a proprietary round developed by FN Hestal for use in their P90 SMG. While it is a very small round, comparable in power to .22, it features incredible armor-piercing capabilities and very low recoil. This one has been hand-reloaded.",
+        "description" : "The 5.7x28mm round is a proprietary round developed by FN Herstal for use in their P90 SMG. While it is a very small round, comparable in power to .22, it features incredible armor-piercing capabilities and very low recoil. This one has been hand-reloaded.",
         "material" : "steel",
         "volume" : 1,
         "weight" : 2,

data/json/items/ranged.json

@@ -1651,7 +1651,7 @@
     "color": "dark_gray",
     "name": "FN FAL",
     "name_plural": "FN FAL",
-    "description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed . Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.",
+    "description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed. Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.",
     "price": 450000,
     "material": ["steel", "wood"],
     "flags": "MODE_BURST",

data/json/items/tools.json

@@ -6681,7 +6681,7 @@
     "symbol": "*",
     "color": "light_red",
     "name": "match head bomb",
-    "description": "This is a bottle filled with match heads and equipped with a fuse. Use this item to light the fuse; you will, of course, need a lighter in your inventory to do this. After lighting it, throw it to cause fires.",
+    "description": "This is a homemade bomb consisting of a bottle filled with match heads and equipped with a fuse. Use this item to light the fuse; you will, of course, need a lighter in your inventory to do this.",
     "price": 20000,
     "material": ["glass", "cotton"],
     "weight": 412,