From 9f77572fb0d045229556314ba9d7aa0f52ad5635 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Mon, 26 Dec 2011 20:57:12 +0000 Subject: - improved Simulator system -> Manager handles all ticks -> advantage: Much easier to add new simulators, because you only have to register them in the manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - moved sand and gravel simulation to a Simulator-class (cSandSimulator) - Made Squid a little bit more funny and realistic, because it dies now when it´s not in water -Escaping mobs run now faster than normal (They just walked away before :D) git-svn-id: http://mc-server.googlecode.com/svn/trunk@125 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- makefile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'makefile') diff --git a/makefile b/makefile index ddd3d42c6..50c638883 100644 --- a/makefile +++ b/makefile @@ -232,6 +232,9 @@ MCServer : \ build/zutil.o\ build/iniFile.o\ build/cSocket.o\ + build/cSimulator.o\ + build/cSimulatorManager.o\ + build/cSandSimulator.o\ build/cFluidSimulator.o\ build/cWaterSimulator.o\ build/cLavaSimulator.o\ @@ -431,6 +434,9 @@ MCServer : \ build/zutil.o\ build/iniFile.o\ build/cSocket.o\ + build/cSimulator.o\ + build/cSimulatorManager.o\ + build/cSandSimulator.o\ build/cFluidSimulator.o\ build/cWaterSimulator.o\ build/cLavaSimulator.o\ @@ -633,6 +639,9 @@ clean : build/zutil.o\ build/iniFile.o\ build/cSocket.o\ + build/cSimulator.o\ + build/cSimulatorManager.o\ + build/cSandSimulator.o\ build/cFluidSimulator.o\ build/cWaterSimulator.o\ build/cLavaSimulator.o\ @@ -1447,6 +1456,15 @@ build/cMakeDir.o : source/cMakeDir.cpp build/cSocket.o : source/cSocket.cpp $(CC) $(CC_OPTIONS) source/cSocket.cpp -c $(INCLUDE) -o build/cSocket.o + +build/cSimulator.o : source/cSimulator.cpp + $(CC) $(CC_OPTIONS) source/cSimulator.cpp -c $(INCLUDE) -o build/cSimulator.o + +build/cSimulatorManager.o : source/cSimulatorManager.cpp + $(CC) $(CC_OPTIONS) source/cSimulatorManager.cpp -c $(INCLUDE) -o build/cSimulatorManager.o + +build/cSandSimulator.o : source/cSandSimulator.cpp + $(CC) $(CC_OPTIONS) source/cSandSimulator.cpp -c $(INCLUDE) -o build/cSandSimulator.o build/cFluidSimulator.o : source/cFluidSimulator.cpp $(CC) $(CC_OPTIONS) source/cFluidSimulator.cpp -c $(INCLUDE) -o build/cFluidSimulator.o @@ -1463,5 +1481,4 @@ build/cFileFormatUpdater.o : source/cFileFormatUpdater.cpp build/cItem.o : source/cItem.cpp $(CC) $(CC_OPTIONS) source/cItem.cpp -c $(INCLUDE) -o build/cItem.o - ##### END RUN #### -- cgit v1.2.3