diff options
| author | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-04 15:35:41 +0200 |
|---|---|---|
| committer | cedeel@gmail.com <cedeel@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-06-04 15:35:41 +0200 |
| commit | 6fb868d1965269014189411d7516c584e6c010a5 (patch) | |
| tree | e5338d52a64d886dc27765da3b3e9a304893a7aa | |
| parent | Added the new recipe parser, parsing the crafting.txt file. Included are a few recipes. The old parser still works, but will be replaced soon. (diff) | |
| download | cuberite-6fb868d1965269014189411d7516c584e6c010a5.tar cuberite-6fb868d1965269014189411d7516c584e6c010a5.tar.gz cuberite-6fb868d1965269014189411d7516c584e6c010a5.tar.bz2 cuberite-6fb868d1965269014189411d7516c584e6c010a5.tar.lz cuberite-6fb868d1965269014189411d7516c584e6c010a5.tar.xz cuberite-6fb868d1965269014189411d7516c584e6c010a5.tar.zst cuberite-6fb868d1965269014189411d7516c584e6c010a5.zip | |
| -rw-r--r-- | makefile_base | 8 | ||||
| -rw-r--r-- | source/BlockID.cpp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/makefile_base b/makefile_base index ff8201191..540d18fe7 100644 --- a/makefile_base +++ b/makefile_base @@ -253,7 +253,8 @@ MCServer : \ build/WSSCompact.o\ build/WSSAnvil.o\ build/FastNBT.o\ - build/StringCompression.o + build/StringCompression.o\ + build/CraftingRecipes.o $(CC) $(LNK_OPTIONS) \ build/json_reader.o\ build/json_value.o\ @@ -476,6 +477,7 @@ MCServer : \ build/WSSAnvil.o\ build/FastNBT.o\ build/StringCompression.o\ + build/CraftingRecipes.o\ -o MCServer clean : @@ -696,6 +698,7 @@ clean : build/StringUtils.o\ build/cIsThread.o\ build/cSocketThreads.o\ + build/CraftingRecipes.o\ MCServer install : MCServer @@ -1604,6 +1607,9 @@ build/StringCompression.o : source/StringCompression.cpp build/cRedstoneSimulator.o : source/cRedstoneSimulator.cpp $(CC) $(CC_OPTIONS) source/cRedstoneSimulator.cpp -c $(INCLUDE) -o build/cRedstoneSimulator.o +build/CraftingRecipes.o : source/CraftingRecipes.cpp + $(CC) $(CC_OPTIONS) source/CraftingRecipes.cpp -c $(INCLUDE) -o build/CraftingRecipes.o + # Template: copy and delete the "# "; insert filenames # build/.o : source/.cpp # $(CC) $(CC_OPTIONS) source/.cpp -c $(INCLUDE) -o build/.o diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 12771513f..c4d6787f0 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -36,7 +36,7 @@ public: return m_Ini.GetValueI("Items", a_ItemName, -1);
}
- AString ResolveString(AString & a_ItemName)
+ AString ResolveString(const AString & a_ItemName)
{
return m_Ini.GetValue("Items", a_ItemName, "");
}
|