Merge lp:~evigo-deactivatedaccount/deadends/evigo into lp:deadends

[Eugenio M. Vigo]

Merge from lp:~evigo/deadends/evigo

[Eugenio M. Vigo (evigo-deactivatedaccount)]

Several changes. Mainly:

* Fixed the compiler warnings.
* Created a new member for Player so it can in a future hold more than one Weapon.
* Created a new set of images for ShooterZombie, so it can be distinguished on play.
* Fixed the COPYRIGHT file to something much clearer, not touching the distribution terms. But, it lacks the permission and terms by Lazy Foo Productions, which you should include there (and destroy that CREDITS file, btw).

=== modified file 'COPYRIGHT'
--- COPYRIGHT	2009-08-03 18:51:04 +0000
+++ COPYRIGHT	2009-08-08 08:54:15 +0000
@@ -1,39 +1,79 @@
- Copyright (c) 2009 jimi_hendrix.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the author(s) nor the names of the contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
+Dead Ends:
+
+    Copyright (C) 2009 jimi_hendrix
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+    3. Neither the name of the author(s) nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+This program uses software by Lazy Foo productions (http://lazyfoo.net), which are distributed under these terms:
+
+    <JIMI_HENDRIX, PLEASE COPY HERE THE PERMISSION YOU GOT FOR LAZY FOO.NET>
+
+Images Media/szombieu.png, Media/szombied.png, Media/szombiel.png,
+Media/szombier.png are distributed under these terms:
+
+    Copyright (C) 2009 jimi_hendrix
+    Copyright (C) 2009 Eugenio M. Vigo
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+    3. Neither the name of the author(s) nor the names of the contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.    
+
+
+This program uses the Boost Library, which is distributed under the following
+terms:
+
+    Boost Software License - Version 1.0 - August 17th, 2003
+
+    Permission is hereby granted, free of charge, to any person or organization
+    obtaining a copy of the software and accompanying documentation covered by
+    this license (the "Software") to use, reproduce, display, distribute,
+    execute, and transmit the Software, and to prepare derivative works of the
+    Software, and to permit third-parties to whom the Software is furnished to
+    do so, all subject to the following:
     
     The copyright notices in the Software and this entire statement, including
     the above license grant, this restriction and the following disclaimer,

=== modified file 'ChangeLog'
--- ChangeLog	2009-08-04 00:57:27 +0000
+++ ChangeLog	2009-08-08 08:54:15 +0000
@@ -1,8 +1,59 @@
-2009-8-3 jimi_hendrix <[e-mail]>
[phone] jimi_hendrix <[e-mail]>
 	Initial Commit
 
-2009-8-3 jimi_hendrix <[e-mail]>
-	* src/classes/Weapon.h - Added the BSD license header
-	* README - Added a few more lines including contact information
-	* arcade.cpp - Allowed for proper freeing so closing the window will not
[phone] jimi_hendrix <[e-mail]>
+	* src/classes/Weapon.h: Added the BSD license header.
+	
+	* README: Added a few more lines including contact information.
+	
+	* arcade.cpp: Allowed for proper freeing so closing the window will not
 	result in a segfault.
+
[phone] Eugenio M. Vigo <[e-mail]>
+	* src/classes/Weapon.cpp (Weapon::Weapon): Changed interface for
+	second constructor accordingly to the change above.
+
+	(Weapon::getClipsize): Also changed interface because of the
+	above. Returning unsigned int.
+
+	* src/include/Weapon.h: Adjusted header to the changes above. 
+
+	(Weapon.clipsize, Weapon.ammo): Changed to unsigned int.
+	
+	* srr/arcade.cpp: Fixed comparisons between unsigned int and int.
+
+	* src/classes/ShooterZombie.cpp (ShooterZoombie::shoot): Fixed the
+	placement of return statement...
+
+	* src/classes/Bullet.cpp (Bullet::~Bullet): Uncommented code that
+	should be working flawlessly.
+
[phone] Eugenio M. Vigo <[e-mail]>
+	* src/include/Player.h (Player.arms): Created a new public member
+	that will allow the Player to hold more than one type of Weapon
+	simultaneously in some future.
+
+	* src/classes/Bullet.cpp (Bullet::~Bullet): Ok, the last
+	uncommenting created a memory corruption scenario because of
+	freeing memory allocated at stack. Now corrected.
+
+	* Makefile: Introduced -ggdb flag for all compilation units. This
+	should be kept until release or real security that our code is
+	stable.
+	
+	* ChangeLog: Corrected earlier entries to GNU style.
+
+	* Media/szombie*.png: Created a different image for shooting zombies.
+	
+	* scr/arcade.cpp (arcade_s): Made ShooterZombies use the
+	szombie*.png images.
+
[phone] Eugenio M. Vigo <[e-mail]>
+	* COPYRIGHT: Added my licensing terms and copyright for the Media/
+	stuff I created. As these were derived from jimi_hendrix's
+	original images, I have to add his copyright and his license
+	again. For convenience, although I would have prefered a different
+	license (probably LGPLv3 for this case), I choose to use the same
+	BSD license so the whole project has the same distribution terms.
+
+	Also, formatted the COPYRIGHT file to something a bit clearer.

=== modified file 'Makefile'
--- Makefile	2009-08-03 18:51:04 +0000
+++ Makefile	2009-08-06 10:22:50 +0000
@@ -1,5 +1,5 @@
 CC=g++
-FLAGS=-Wall
+FLAGS=-Wall -ggdb
 IFLAGS=-I./include
 LIBS=-lSDL -lSDL_mixer -lSDL_image -lSDL_ttf
 SRC=$(wildcard ./src/*.cpp wildcard ./src/classes/*.cpp)

=== added file 'Media/szombied.png'
Binary files Media/szombied.png	1970-01-01 00:00:00 +0000 and Media/szombied.png	2009-08-06 10:54:11 +0000 differ
=== added file 'Media/szombiel.png'
Binary files Media/szombiel.png	1970-01-01 00:00:00 +0000 and Media/szombiel.png	2009-08-06 10:54:11 +0000 differ
=== added file 'Media/szombier.png'
Binary files Media/szombier.png	1970-01-01 00:00:00 +0000 and Media/szombier.png	2009-08-06 10:54:11 +0000 differ
=== added file 'Media/szombieu.png'
Binary files Media/szombieu.png	1970-01-01 00:00:00 +0000 and Media/szombieu.png	2009-08-06 10:54:11 +0000 differ
=== modified file 'include/Player.h'
--- include/Player.h	2009-08-03 18:51:04 +0000
+++ include/Player.h	2009-08-06 10:22:50 +0000
@@ -33,6 +33,7 @@
 #include "helpers.h"
 #include "Weapon.h"
 #include <string>
+#include <vector>
 
 class Player: public Object {
 public:
@@ -40,8 +41,9 @@
 	double movespeed;
 	bool canMove;
 	SDL_Surface *surface[4];
-	SDL_Surface* current;
-	Weapon gun;
+	SDL_Surface *current;
+    std::vector<Weapon *> arms;
+    Weapon gun;
 	DIRECTION direction;
 
 	Player(std::string basefilename, double x, double y, double movespeed);

=== modified file 'include/Weapon.h'
--- include/Weapon.h	2009-08-04 00:57:27 +0000
+++ include/Weapon.h	2009-08-05 17:43:51 +0000
@@ -35,14 +35,15 @@
 
 class Weapon: public Object {
 public:
-	int clipsize;
-	int ammo, clips, damage;
+	unsigned int clipsize;
+	unsigned int ammo;
+    int clips, damage;
 	std::vector<Bullet*> bullets;
 
 	Weapon();
-	Weapon(int clipsize, int clips, int damage, int cooldown);
+	Weapon(unsigned int clipsize, int clips, int damage, int cooldown);
 	virtual ~Weapon();
-	int getClipsize();
+	unsigned int getClipsize();
 	bool reload();
 	void update();
 };

=== modified file 'src/arcade.cpp'
--- src/arcade.cpp	2009-08-03 18:51:04 +0000
+++ src/arcade.cpp	2009-08-06 10:54:11 +0000
@@ -246,7 +246,7 @@
 		SDL_FillRect(scr, &scr->clip_rect, SDL_MapRGB(scr->format, 0x0, 0x0, 0x0));
 		player->draw(scr);
 		//grid->draw(scr);
-		for (int i = 0; i < player->gun.bullets.size(); i++) {
+		for (unsigned int i = 0; i < player->gun.bullets.size(); i++) {
 			player->gun.bullets[i]->move(scr);
 //			player->gun.bullets[i]->draw(scr);
 
@@ -255,7 +255,7 @@
 				player->gun.bullets.erase(player->gun.bullets.begin() + i);
 			}
 
-			for (int j = 0; j < zombies.size(); j++) {
+			for (unsigned int j = 0; j < zombies.size(); j++) {
 				if (zombies[j]->show) {
 					// std::cout<<player->gun.bullets[i]->rectangle.x<<",
 					if (SDL::check_collision(player->gun.bullets[i]->rectangle, zombies[j]->rectangle) && player->gun.bullets[i]->live) {
@@ -268,7 +268,7 @@
 				}
 			}
 
-				for (int j = 0; j < szombies.size(); j++) {
+				for (unsigned int j = 0; j < szombies.size(); j++) {
 					if (szombies[j]->show) {
 						if (SDL::check_collision(player->gun.bullets[i]->rectangle,	szombies[j]->rectangle) && player->gun.bullets[i]->live) {
 							Mix_PlayChannel(-1, squish, 0);
@@ -280,7 +280,7 @@
 					}
 				}
 
-				for (int j = 0; j < bzombies.size(); j++) {
+				for (unsigned int j = 0; j < bzombies.size(); j++) {
 					if (bzombies[j]->show) {
 					// std::cout<<player->gun.bullets[i]->rectangle.x<<",
 						if (SDL::check_collision(player->gun.bullets[i]->rectangle, bzombies[j]->rectangle) && player->gun.bullets[i]->live) {
@@ -298,7 +298,7 @@
 		}
 
 
-		for (int i = 0; i < zombieBullets.size(); i++) {
+		for (unsigned int i = 0; i < zombieBullets.size(); i++) {
 
 			zombieBullets[i]->move(scr);
 			zombieBullets[i]->draw(scr);
@@ -312,7 +312,7 @@
 			}
 		}
 
-		for (int i = 0; i < zombies.size(); i++) {
+		for (unsigned int i = 0; i < zombies.size(); i++) {
 			//SDL_FillRect(scr, &objs[i]->surface->clip_rect, SDL_MapRGB(scr->format, 23, 56, 0));
 			zombies[i]->AI(player);
 			zombies[i]->draw(scr);
@@ -320,7 +320,7 @@
 			//printf("Player rect: (%d, %d)\n", player->rectangle.x, player->rectangle.y);
 		}
 
-		for (int i = 0; i < szombies.size(); i++) {
+		for (unsigned int i = 0; i < szombies.size(); i++) {
 			if (szombies[i]->show) {
 				szombies[i]->AI(player);
 				szombies[i]->draw(scr);
@@ -338,7 +338,7 @@
 			}
 		}
 
-		for (int i = 0; i < bzombies.size(); i++) {
+		for (unsigned int i = 0; i < bzombies.size(); i++) {
 			if (bzombies[i]->show) {
 				bzombies[i]->AI(player);
 				bzombies[i]->draw(scr);
@@ -359,7 +359,7 @@
 				zombies.push_back(new Zombie("./Media/zombie", rand() % SCR_WIDTH, rand() % SCR_HEIGHT, 0.2, 1));
 
 			for (int i = 0; i < level / 5; i++) {
-				szombies.push_back(new ShooterZombie("./Media/zombie", rand() % SCR_WIDTH, rand() % SCR_HEIGHT, 0.2, 1));
+				szombies.push_back(new ShooterZombie("./Media/szombie", rand() % SCR_WIDTH, rand() % SCR_HEIGHT, 0.2, 1));
 				liveZombies++;
 			}
 
@@ -386,19 +386,19 @@
 
 			printf("live zombies: %d", liveZombies);
 
-			for (int i = 0; i < zombieBullets.size(); i++) {
+			for (unsigned int i = 0; i < zombieBullets.size(); i++) {
 				delete zombieBullets[i];
 			}
 
 			zombieBullets.clear();
 
-			for (int i = 0; i < zombies.size(); i++) {
+			for (unsigned int i = 0; i < zombies.size(); i++) {
 				zombies[i]->show = true;
 				//zombies[i]->x = rand() % SCR_WIDTH;
 				//zombies[i]->y = rand() % SCR_HEIGHT;
 			}
 
-			for (int i = 0; i < szombies.size(); i++)
+			for (unsigned int i = 0; i < szombies.size(); i++)
 				szombies[i]->show = true;
 		}
 

=== modified file 'src/classes/Bullet.cpp'
--- src/classes/Bullet.cpp	2009-08-03 18:51:04 +0000
+++ src/classes/Bullet.cpp	2009-08-06 10:22:50 +0000
@@ -56,7 +56,7 @@
 	this->live = true;
 }
 
-/*Bullet::Bullet(/*Object *parentstd::string filename, double& x, double& y, double velocity, DIRECTION& dir) {
+/*Bullet::Bullet(Object *parent, std::string filename, double& x, double& y, double velocity, DIRECTION& dir) {
 	this->parent = parent;
 	this->surface = SDL::load_image(filename);
 	this->x = this->y = 0;
@@ -67,10 +67,8 @@
 }*/
 
 Bullet::~Bullet() {
-	//TODO: FREE THE SDL SURFACE!!!
 	//SDL_FreeSurface(this->surface);
-	//delete this->velocity;
-	//delete this->move;
+
 	puts("bullet destroyed");
 }
 

=== modified file 'src/classes/ShooterZombie.cpp'
--- src/classes/ShooterZombie.cpp	2009-08-03 18:51:04 +0000
+++ src/classes/ShooterZombie.cpp	2009-08-05 17:43:51 +0000
@@ -70,8 +70,9 @@
 		this->bullet = new Bullet((std::string) "./Media/bullet.png", tx, ty,
 				1.0, this->direction);
 
-		return this->bullet;
-	}
+    }
+    
+    return this->bullet;
 }
 
 bool ShooterZombie::facingPlayer(Player *player) {

=== modified file 'src/classes/Weapon.cpp'
--- src/classes/Weapon.cpp	2009-08-03 18:51:04 +0000
+++ src/classes/Weapon.cpp	2009-08-05 17:43:51 +0000
@@ -34,7 +34,7 @@
 	this->ammo = this->clipsize = this->clips = this->damage = 0;
 }
 
-Weapon::Weapon(int clipsize, int clips, int damage, int cooldown) {
+Weapon::Weapon(unsigned int clipsize, int clips, int damage, int cooldown) {
 	this->ammo = clipsize;
 	this->clipsize = clipsize;
 	this->clips = clips;
@@ -44,7 +44,7 @@
 Weapon::~Weapon() {
 }
 
-int Weapon::getClipsize() {
+unsigned int Weapon::getClipsize() {
 	return this->clipsize;
 }