From 1c36f0002e3778f05aca3e6836556cfff94a268e Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Wed, 29 Aug 2012 23:38:36 +0200 Subject: [PATCH] initialized monster animations and enabled -Wall compiler flag --- Debug/src/app/subdir.mk | 2 +- Debug/src/battle/states/subdir.mk | 2 +- Debug/src/battle/subdir.mk | 2 +- Debug/src/common/subdir.mk | 2 +- Debug/src/graphics/subdir.mk | 2 +- Debug/src/sdl/subdir.mk | 2 +- Debug/src/subdir.mk | 2 +- Release/src/app/subdir.mk | 2 +- Release/src/battle/states/subdir.mk | 2 +- Release/src/battle/subdir.mk | 2 +- Release/src/common/subdir.mk | 2 +- Release/src/graphics/subdir.mk | 2 +- Release/src/sdl/subdir.mk | 2 +- Release/src/subdir.mk | 2 +- src/battle/Monster.cpp | 4 ++++ 15 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Debug/src/app/subdir.mk b/Debug/src/app/subdir.mk index ae7ec03..645d8ed 100644 --- a/Debug/src/app/subdir.mk +++ b/Debug/src/app/subdir.mk @@ -20,7 +20,7 @@ CPP_DEPS += \ src/app/%.o: ../src/app/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/battle/states/subdir.mk b/Debug/src/battle/states/subdir.mk index 9b3a196..d817c33 100644 --- a/Debug/src/battle/states/subdir.mk +++ b/Debug/src/battle/states/subdir.mk @@ -41,7 +41,7 @@ CPP_DEPS += \ src/battle/states/%.o: ../src/battle/states/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/battle/subdir.mk b/Debug/src/battle/subdir.mk index c31d03d..703adbf 100644 --- a/Debug/src/battle/subdir.mk +++ b/Debug/src/battle/subdir.mk @@ -50,7 +50,7 @@ CPP_DEPS += \ src/battle/%.o: ../src/battle/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/common/subdir.mk b/Debug/src/common/subdir.mk index 23c1e4d..f253180 100644 --- a/Debug/src/common/subdir.mk +++ b/Debug/src/common/subdir.mk @@ -26,7 +26,7 @@ CPP_DEPS += \ src/common/%.o: ../src/common/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/graphics/subdir.mk b/Debug/src/graphics/subdir.mk index fbd8230..53d19d5 100644 --- a/Debug/src/graphics/subdir.mk +++ b/Debug/src/graphics/subdir.mk @@ -26,7 +26,7 @@ CPP_DEPS += \ src/graphics/%.o: ../src/graphics/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/sdl/subdir.mk b/Debug/src/sdl/subdir.mk index b800be3..4a12c4d 100644 --- a/Debug/src/sdl/subdir.mk +++ b/Debug/src/sdl/subdir.mk @@ -23,7 +23,7 @@ CPP_DEPS += \ src/sdl/%.o: ../src/sdl/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Debug/src/subdir.mk b/Debug/src/subdir.mk index b8432d7..773b36c 100644 --- a/Debug/src/subdir.mk +++ b/Debug/src/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ src/%.o: ../src/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O0 -g3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/app/subdir.mk b/Release/src/app/subdir.mk index e0bc8c4..764eb6f 100644 --- a/Release/src/app/subdir.mk +++ b/Release/src/app/subdir.mk @@ -20,7 +20,7 @@ CPP_DEPS += \ src/app/%.o: ../src/app/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/battle/states/subdir.mk b/Release/src/battle/states/subdir.mk index 0a764ce..dab568f 100644 --- a/Release/src/battle/states/subdir.mk +++ b/Release/src/battle/states/subdir.mk @@ -41,7 +41,7 @@ CPP_DEPS += \ src/battle/states/%.o: ../src/battle/states/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/battle/subdir.mk b/Release/src/battle/subdir.mk index dc5e485..70d865d 100644 --- a/Release/src/battle/subdir.mk +++ b/Release/src/battle/subdir.mk @@ -50,7 +50,7 @@ CPP_DEPS += \ src/battle/%.o: ../src/battle/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/common/subdir.mk b/Release/src/common/subdir.mk index 0f0f34d..c471112 100644 --- a/Release/src/common/subdir.mk +++ b/Release/src/common/subdir.mk @@ -26,7 +26,7 @@ CPP_DEPS += \ src/common/%.o: ../src/common/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/graphics/subdir.mk b/Release/src/graphics/subdir.mk index 2611758..fa52cf2 100644 --- a/Release/src/graphics/subdir.mk +++ b/Release/src/graphics/subdir.mk @@ -26,7 +26,7 @@ CPP_DEPS += \ src/graphics/%.o: ../src/graphics/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/sdl/subdir.mk b/Release/src/sdl/subdir.mk index 3bef090..ec2df9c 100644 --- a/Release/src/sdl/subdir.mk +++ b/Release/src/sdl/subdir.mk @@ -23,7 +23,7 @@ CPP_DEPS += \ src/sdl/%.o: ../src/sdl/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/subdir.mk b/Release/src/subdir.mk index e2d08a0..30ec7e9 100644 --- a/Release/src/subdir.mk +++ b/Release/src/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ src/%.o: ../src/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/SDL -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -I/usr/include/SDL -O3 -Wall -Werror -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/src/battle/Monster.cpp b/src/battle/Monster.cpp index ec179e4..f0b9f37 100644 --- a/src/battle/Monster.cpp +++ b/src/battle/Monster.cpp @@ -16,6 +16,10 @@ Monster::Monster() , attackScript(0) , defenseScript(0) +, meleeAnimation(0) +, attackAnimation(0) +, spellAnimation(0) + , maxHealth(0) , health(0) , maxMana(0) -- 2.39.2