ElnuDev/septadrop
ElnuDev/septadrop
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Remove Windows build things and make adjustments for CMake v3.23.0-rc3

Browse source
This commit is contained in:
Elnu 2022-03-13 12:24:01 -07:00
parent 477a72195c
commit 074faeb05a
19 changed files with 34 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/BlockType.cpp
View file

@ -7,9 +7,9 @@ BlockType::BlockType(TileType* _tile_type, const std::vector<std::vector<bool>>
// Used for alignment in "next block" area
width = 0;
starting_line = 0;
for (unsigned int y = 0; y < grid.size(); y++) {
for (uint y = 0; y < grid.size(); y++) {
bool has_content = false;
for (unsigned int x = 0; x < grid[y].size(); x++) {
for (uint x = 0; x < grid[y].size(); x++) {
if (grid[y][x]) {
width = std::max({width, x + 1});
has_content = true;

30
src/Main.cpp
View file

@ -28,11 +28,11 @@
#include <BlockType.hpp>
#include <Block.hpp>
unsigned int get_level(int lines) {
uint get_level(int lines) {
return std::min(lines / LINES_PER_LEVEL, 15);
}
unsigned int get_update_interval(int level) {
uint get_update_interval(int level) {
// From Tetris Worlds, see https://harddrop.com/wiki/Tetris_Worlds#Gravity
return pow(0.8 - (level - 1) * 0.007, level - 1) * 1000;
}
@ -97,7 +97,7 @@ int main()
bool paused = false;
bool paused_from_lost_focus = false;
sf::Clock update_clock, move_clock, pause_clock;
unsigned int pause_offset = 0;
uint pause_offset = 0;
sf::RectangleShape paused_clear;
paused_clear.setFillColor(sf::Color(81, 62, 69));
@ -133,19 +133,19 @@ int main()
std::fstream highscore_file(highscore_file_path);
std::string highscore_string;
highscore_file >> highscore_string;
unsigned int highscore = std::stoi(highscore_string);
unsigned int point_gcd = gcd(POINTS_1_LINE, gcd(POINTS_2_LINES, gcd(POINTS_3_LINES, POINTS_4_LINES)));
uint highscore = std::stoi(highscore_string);
uint point_gcd = gcd(POINTS_1_LINE, gcd(POINTS_2_LINES, gcd(POINTS_3_LINES, POINTS_4_LINES)));
if (highscore % point_gcd != 0) {
std::cout << "It seems your system is misconfigured. Please see this guide for fixing the issue: https://www.youtube.com/watch?v=dQw4w9WgXcQ" << std::endl;
return 0;
}
unsigned int score = 0;
unsigned int lines = 0;
unsigned int blocks = 0;
unsigned int tiles = 0;
uint score = 0;
uint lines = 0;
uint blocks = 0;
uint tiles = 0;
unsigned int update_interval = get_update_interval(0);
uint update_interval = get_update_interval(0);
// https://sfxr.me/#57uBnWWZeyDTsBRrJsAp2Vwd76cMVrdeRQ7DirNQW5XekKxcrCUNx47Zggh7Uqw4R5FdeUpyk362uhjWmpNHmqxE7JBp3EkxDxfJ1VjzMRpuSHieW6B5iyVFM
sf::SoundBuffer rotate_buffer;
@ -273,7 +273,7 @@ int main()
continue;
}
bool is_update_frame = update_clock.getElapsedTime().asMilliseconds() - pause_offset > (sf::Keyboard::isKeyPressed(sf::Keyboard::Down) ? std::min({update_interval, (unsigned int)MAX_FAST_FORWARD_INTERVAL}) : update_interval);
bool is_update_frame = update_clock.getElapsedTime().asMilliseconds() - pause_offset > (sf::Keyboard::isKeyPressed(sf::Keyboard::Down) ? std::min({update_interval, (uint)MAX_FAST_FORWARD_INTERVAL}) : update_interval);
if (is_update_frame) {
update_clock.restart();
}
@ -370,8 +370,8 @@ int main()
auto next_block_tiles = next_block.get_tiles();
// This is assuming the next block spawns unrotated.
// Refactoring is needed if random rotations are added
unsigned int x_offset = next_block.type->width * TILE_SIZE / 2;
unsigned int y_offset = (next_block.type->height + next_block.type->starting_line * 2) * TILE_SIZE / 2;
uint x_offset = next_block.type->width * TILE_SIZE / 2;
uint y_offset = (next_block.type->height + next_block.type->starting_line * 2) * TILE_SIZE / 2;
for (auto tile : next_block_tiles) {
sprite.setTextureRect(next_block.type->tile_type->texture_rect);
sprite.setPosition(
@ -400,7 +400,7 @@ int main()
for (auto tile : block.get_tiles()) {
grid[tile.y][tile.x] = block.type->tile_type;
}
unsigned int cleared_lines = 0;
uint cleared_lines = 0;
// Check for completed rows
for (int y = 0; y < GRID_HEIGHT; y++) {
bool completed = true;
@ -420,7 +420,7 @@ int main()
}
cleared_lines++;
}
unsigned int scored;
uint scored;
switch (cleared_lines) {
case 0:
scored = 0;

4
src/NumberRenderer.cpp
View file

@ -18,13 +18,13 @@ NumberRenderer::NumberRenderer(
}
}
void NumberRenderer::render(sf::RenderWindow* window, unsigned int number, int x, int y) {
void NumberRenderer::render(sf::RenderWindow* window, uint number, int x, int y) {
auto number_string = std::to_string(number);
std::string numeral_string;
numeral_string.push_back(number_string.back());
auto numeral_rect = numeral_rects[std::stoi(numeral_string)];
int x_offset = -numeral_rect.width;
unsigned int digits = number_string.length();
uint digits = number_string.length();
for (int i = digits - 1; i >= 0; i--) {
char numeral_string[] = {number_string[i]};
auto numeral_rect = numeral_rects[std::stoi(numeral_string)];