review #26
Open
review #26
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
сам server::worker, обрабатывающий соединения (пока что блокирующий) серверные сущности server::game и server::player менеджеры-потомки server::manager
# Conflicts: # CMakeLists.txt
# Conflicts: # CMakeLists.txt # cmake/Modules/FindSFML.cmake
# Conflicts: # CMakeLists.txt # src/GameState.cpp # src/GameState.h
# Conflicts: # CMakeLists.txt # src/Game.cpp # src/GameState.cpp # src/GameState.h # src/Map.cpp
# Conflicts: # CMakeLists.txt # src/Game.cpp # src/GameContext.h # src/GameState.cpp # src/GameState.h # src/Multiplayer/ConnectionFacade/ClientConnectionFacade.h # src/Multiplayer/Entities/Player.h # src/Multiplayer/Manager/PlayerManager.cpp # src/Multiplayer/Master.h # src/Server/Client.cpp # src/Server/Entities.cpp # src/Server/Manager.h # src/Server/Server.cpp
no hardcoded constants in server
# Conflicts: # src/GameState.cpp
buter-brod
reviewed
May 21, 2018
|
|
||
| std::shared_ptr<Bullet> TowerLvlOne::makeBullet() { | ||
| double radAngle = angle_ * M_PI / 180 - M_PI / 2; | ||
| return std::make_shared<BulletLvlOne>(position_ + sf::Vector2f(20 * cos(radAngle), 20 * sin(radAngle)), angle_, target_); |
buter-brod
reviewed
May 21, 2018
| } | ||
|
|
||
| int Barracks::upgrade() { | ||
| if (lvl_ >= 2) { |
buter-brod
reviewed
May 21, 2018
| Game::Game() : window({1000, 1000}, "Tower Defense", sf::Style::Titlebar | | ||
| sf::Style::Default, sf::ContextSettings{0, 0, 8, 1, 1, 0, false}), | ||
| context(window, font, textureHolder, fontHolder, cursor), | ||
| Game::Game() : window({1216, 768}, "Tower Defense", sf::Style::Titlebar | |
buter-brod
reviewed
May 21, 2018
| } | ||
| }); | ||
|
|
||
| std::cout << "12" << std::endl; |
buter-brod
reviewed
May 21, 2018
| } | ||
|
|
||
| bool Textbox::enterText(sf::Uint32 unicode) { | ||
| if(unicode == 8) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.