Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
bestknighter committed Jun 21, 2017
2 parents 4cd38cb + 440df6a commit 1ed864b
Show file tree
Hide file tree
Showing 287 changed files with 2,239 additions and 1,947 deletions.
6 changes: 4 additions & 2 deletions Engine/include/Color.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ struct Color {
unsigned char r;/**< Canal R */
unsigned char g;/**< Canal G */
unsigned char b;/**< Canal B */
unsigned char a;/**< Canal A */
/**
\brief Cria um tipo para armazenar a cor [R,G,B]
\brief Cria um tipo para armazenar a cor [R,G,B,A]
\param Intensidade do Canal Vermelho (Red) da cor
\param Intensidade do Canal Verde (Green) da cor
\param Intensidade do Canal Azul (Blue) da cor
\param Intensidade do Canal Alfa (Alpha) da cor
Essa struct representa uma cor de 8 bits. Ou seja, cada canal pode receber um número entre 0 (inclusive) e 255 (inclusive).
*/
Color( unsigned char r, unsigned char g, unsigned char b );
Color( unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255 );
};

#endif // COLOR_H
7 changes: 7 additions & 0 deletions Engine/include/Game.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ class Game {
Retorna se o controle de framerate está limitando o framerate a um máximo ou não.
*/
bool IsFramerateLimited(void) const;
/**
\brief Obtém referência do SDL_Window
\return Referncia para SDL_Window
Retorna a referência do SDL_Window do Game
*/
SDL_Window* GetWindow(void) const;
/**
\brief Define as dimensões da janela corrente
\param size Vec2(x, y) que representa os novos tamanhos da janela.
Expand Down
1 change: 0 additions & 1 deletion Engine/include/Sprite.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ class Sprite {
void Scale(float scale);
Color colorMultiplier;/**< A cor a ser usada para multiplicar a sprite.*/
SDL_BlendMode blendMode;/**< O modo de mistura da sprite com as inferiores.*/
unsigned char alpha;/**< A transparência da textura.*/
private:
std::shared_ptr<SDL_Texture> texture;/**< Ponteiro para a textura manejada pelo sprite.*/
int width;/**< Largura da textura em pixels.*/
Expand Down
2 changes: 1 addition & 1 deletion Engine/src/Color.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Color.h"

Color::Color( unsigned char r, unsigned char g, unsigned char b ) : r(r), g(g), b(b) {
Color::Color( unsigned char r, unsigned char g, unsigned char b, unsigned char a ) : r(r), g(g), b(b), a(a) {
}
4 changes: 4 additions & 0 deletions Engine/src/Game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ bool Game::IsFramerateLimited(void) const {
return capFramerate;
}

SDL_Window* Game::GetWindow(void) const {
return window;
}

void Game::SetWindowDimensions(Vec2 size){
SDL_SetWindowSize(window, size.x, size.y);
SetWindowCentered();
Expand Down
4 changes: 2 additions & 2 deletions Engine/src/Sprite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Sprite::Sprite(void): Sprite("", false, 0, 1) {}

Sprite::Sprite(std::string file, bool highlighted, float frameTime, int frameCount)
: colorMultiplier(255, 255, 255), blendMode(ALPHA_BLEND)
, alpha(255), frameCount(frameCount)
, frameCount(frameCount)
, currentFrame(0), timeElapsed(0)
, frameTime(frameTime), scaleX(1.), scaleY(1.) {
if(highlighted){
Expand Down Expand Up @@ -80,7 +80,7 @@ void Sprite::Render(Rect world, float angle, bool isCoordOnWorld) const {
if(isOutOfBounds) return;
}

if( -1 == SDL_SetTextureAlphaMod( texture.get(), alpha ) ) {
if( -1 == SDL_SetTextureAlphaMod( texture.get(), colorMultiplier.a ) ) {
CHECK_SDL_ERROR;
}

Expand Down
6 changes: 6 additions & 0 deletions Game/include/StageState.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "Tileset.h"
#include "Timer.h"
#include "WaveManager.h"

using std::vector;

class StageState: public State {
Expand All @@ -25,16 +26,21 @@ class StageState: public State {
void Render(void) const;
void Pause(void);
void Resume(void);
void ShowLightning(float dt);
private:
Sprite bg;
TileSet tileSet;
TileMap tileMap;
InputManager &inputManager;
Music music;
vector<vector<int>> *spawnGroups;
bool isLightning;
Timer lightningTimer;
Color lightningColor;
WaveManager waveManager;
GameObject nullGameObject;
vector<int> waves;//vetor de waves a ser lido no arquivo
void SpawnEnemy(int tileMapPosition);
};

#include "EndState.h"
Expand Down
70 changes: 63 additions & 7 deletions Game/src/StageState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,24 @@
#define CAM_START_X 300
#define CAM_START_Y 300
#define CAM_START_ZOOM -1.75
#define MAX_TIME_LIGHTINING_RISE 0.1
#define MAX_TIME_LIGHTINING 0.3
#define MAX_TIME_LIGHTINING_FADE 2

StageState::StageState(void)
: State(),
bg("img/ocean.jpg"),
tileSet(120, 120,"img/map/tileset_v2.png"),
tileMap("map/tileMap.txt", &tileSet),
inputManager(InputManager::GetInstance()),
music("audio/stageState.ogg"),
waveManager(tileMap, "assets/wave&enemyData.txt") {
: State()
, bg("img/ocean.jpg")
, tileSet(120, 120,"img/map/tileset_v2.png")
, tileMap("map/tileMap.txt", &tileSet)
, inputManager(InputManager::GetInstance())
, music("audio/stageState.ogg")
, isLightning(false)
, lightningTimer()
, lightningColor(255, 255, 255, 0)
, waveManager(tileMap, "assets/wave&enemyData.txt") {

REPORT_I_WAS_HERE;
tileMap = TileMap(std::string("map/tileMap.txt"), &tileSet);

REPORT_I_WAS_HERE;
spawnGroups = tileMap.GetSpawnPositions();
Expand Down Expand Up @@ -131,6 +140,18 @@ void StageState::Update(float dt) {
if(InputManager::GetInstance().IsKeyDown('.')){
Resources::ChangeSoundVolume(STAGE_STATE_DELTA_VOLUME);
}

if(isLightning){
ShowLightning(dt);
}
else{
isLightning = false;
lightningTimer.Update(dt);
if(lightningTimer.Get() > rand() % 80 + 20){
isLightning = true;
lightningTimer.Restart();
}
}
REPORT_DEBUG("\tFrame rate: " << Game::GetInstance().GetCurrentFramerate() << "/" << Game::GetInstance().GetMaxFramerate());
}

Expand All @@ -150,8 +171,43 @@ void StageState::Render(void) const {
tileMap.Render(Vec2(0,0), false, highlighted ? Camera::ScreenToWorld(InputManager::GetInstance().GetMousePos()) : Vec2(-1, -1));
REPORT_I_WAS_HERE;
State::RenderArray();

if(isLightning){
SDL_SetRenderDrawColor(Game::GetInstance().GetRenderer(), lightningColor.r, lightningColor.g, lightningColor.b, lightningColor.a);
SDL_SetRenderDrawBlendMode(Game::GetInstance().GetRenderer(), SDL_BLENDMODE_BLEND);
SDL_RenderFillRect(Game::GetInstance().GetRenderer(), NULL);
}
}

void StageState::Pause(void) {}

void StageState::Resume(void) {}

void StageState::SpawnEnemy(int tileMapPosition) {
Vec2 tileSize = tileMap.GetTileSize();
Vec2 spawnPosition;
spawnPosition.x = (tileMapPosition % tileMap.GetWidth() ) * tileSize.x;
spawnPosition.y = (tileMapPosition / tileMap.GetWidth() ) * tileSize.y;
objectArray.push_back(unique_ptr<GameObject>( new Enemy(spawnPosition, 1.0) ));
}

void StageState::ShowLightning(float dt){
isLightning = true;
lightningTimer.Update(dt);

if(lightningTimer.Get() < MAX_TIME_LIGHTINING_RISE){
lightningColor.a += 256 * dt / MAX_TIME_LIGHTINING_RISE;
}
else if(lightningTimer.Get() >= MAX_TIME_LIGHTINING_RISE && lightningTimer.Get() < MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING){
lightningColor.a = 255;
}
else if(lightningTimer.Get() >= MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING && lightningTimer.Get() < MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING+MAX_TIME_LIGHTINING_FADE){
float fullTime = (MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING+MAX_TIME_LIGHTINING_FADE) - (MAX_TIME_LIGHTINING_RISE+MAX_TIME_LIGHTINING);
lightningColor.a -= 256* ((dt / fullTime) + 1);
}
else{
lightningColor.a = 0;
isLightning = false;
lightningTimer.Restart();
}
}
3 changes: 1 addition & 2 deletions Game/src/Tower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Tower::Tower(TowerType type, Vec2 pos, Vec2 tileSize)
box.y = pos.y;
sp.ScaleX(tileSize.x/sp.GetWidth());
sp.ScaleY(tileSize.y/sp.GetHeight());
sp.colorMultiplier = Color( 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX );
sp.alpha = 127*(float)rand()/RAND_MAX+127;
sp.colorMultiplier = Color( 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX, 255*(float)rand()/RAND_MAX );
box.w = sp.GetWidth();
box.h = sp.GetHeight();
}
Expand Down
2 changes: 1 addition & 1 deletion docs/AIGoDown_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/AIGoDown_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/ActionManager_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/ActionManager_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Animation_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Animation_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Camera_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ <h2 class="groupheader">Definições e macros</h2>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Camera_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ <h2 class="groupheader">Definições e macros</h2>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Collision_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Color_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Color_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/ComponentType_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ <h2 class="groupheader">Enumerações</h2>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Component_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Component_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ <h2 class="groupheader">Definições e macros</h2>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/Defines_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ <h2 class="groupheader">Definições e macros</h2>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/DragAndDrop_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/DragAndDrop_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:41 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/EndStateData_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h2 class="groupheader">Definições e macros</h2>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/EndStateData_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
2 changes: 1 addition & 1 deletion docs/EndState_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Gerado em Terça, 20 de Junho de 2017 21:46:05 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
Gerado em Terça, 20 de Junho de 2017 22:05:42 para Projeto IDJ - Towers Of Madness por &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
Expand Down
Loading

0 comments on commit 1ed864b

Please sign in to comment.