From c6b4ee8c9fb597b6f87f4cb756f43d5548ab2d66 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Wed, 28 Dec 2011 21:00:35 +0000 Subject: - implemented the fire simulation in native c++ (cFireSimulator) - Changed the Durationsystem for Items. cPlayer::UseEquippedItem calls cItem::DamageItem this function damages the item if it has a duration. (needed the duration also in another place so this saves code ;)) - added some other burning blocks - the mobtypes for the settings.ini which i must have forgotten in the last commit git-svn-id: http://mc-server.googlecode.com/svn/trunk@150 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'makefile') diff --git a/makefile b/makefile index 10ab38351..223c6e13b 100644 --- a/makefile +++ b/makefile @@ -239,6 +239,7 @@ MCServer : \ build/cFluidSimulator.o\ build/cWaterSimulator.o\ build/cLavaSimulator.o\ + build/cFireSimulator.o\ build/cFileFormatUpdater.o\ build/cItem.o $(CC) $(LNK_OPTIONS) \ @@ -442,6 +443,7 @@ MCServer : \ build/cFluidSimulator.o\ build/cWaterSimulator.o\ build/cLavaSimulator.o\ + build/cFireSimulator.o\ build/cFileFormatUpdater.o\ build/cItem.o\ -o MCServer @@ -648,6 +650,7 @@ clean : build/cFluidSimulator.o\ build/cWaterSimulator.o\ build/cLavaSimulator.o\ + build/cFireSimulator.o\ build/cFileFormatUpdater.o\ build/cItem.o\ MCServer @@ -1480,6 +1483,9 @@ build/cWaterSimulator.o : source/cWaterSimulator.cpp build/cLavaSimulator.o : source/cLavaSimulator.cpp $(CC) $(CC_OPTIONS) source/cLavaSimulator.cpp -c $(INCLUDE) -o build/cLavaSimulator.o + +build/cFireSimulator.o : source/cFireSimulator.cpp + $(CC) $(CC_OPTIONS) source/cFireSimulator.cpp -c $(INCLUDE) -o build/cFireSimulator.o build/cFileFormatUpdater.o : source/cFileFormatUpdater.cpp $(CC) $(CC_OPTIONS) source/cFileFormatUpdater.cpp -c $(INCLUDE) -o build/cFileFormatUpdater.o -- cgit v1.2.3