commit fd234987

sago007 · 2015-12-25 09:34
fd23498743afc11fdb61385adf7248196ebff86c patch · browse files
parent d8339fd8e23d72e3578bcfa5e57472f4434ffb43

Make target clean should not fail if there is nothing to remove and play the right chunk

Changed files

M	source/code/Makefile before
M	source/code/main.cpp before

diff --git a/source/code/Makefile b/source/code/Makefile index 0ef5c4b..27d4001 100644 --- a/source/code/Makefile +++ b/source/code/Makefile

@@ -73,7 +73,7 @@ run: $(BINARY)

cd $(GAMEDIR) && ./blockattack

clean:

- rm *.o *.P Libs/*.o Libs/*.P

+ rm *.o *.P Libs/*.o Libs/*.P ; true

SOURCE_FILES = $(OFILES:.o=.cpp)

diff --git a/source/code/main.cpp b/source/code/main.cpp index 4cb61fb..a1d4603 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -231,7 +231,7 @@ static int InitImages(sago::SagoSpriteHolder& holder) {

applause = holder.GetDataHolder().getSoundPtr("applause");

photoClick = holder.GetDataHolder().getSoundPtr("cameraclick");

typingChunk = holder.GetDataHolder().getSoundPtr("typing");

- counterChunk = holder.GetDataHolder().getSoundPtr("counter_final");

+ counterChunk = holder.GetDataHolder().getSoundPtr("counter");

counterFinalChunk = holder.GetDataHolder().getSoundPtr("counter_final");

} //All sound has been loaded or not

return 0;