games/roguish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turned on all the warnings I could handle and made them into errors then fixed them all. Worldbuilder needs a refactor in random_path.

Browse source
This commit is contained in:
Zed A. Shaw 2025-01-10 15:22:37 -05:00
parent f3f875ee80
commit 128fc4f540
19 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ansi_parser.cpp
View file

@ -219,15 +219,15 @@ _match:
dbc::check(start[0] != '-', "negative numbers not supported");
switch(len) {
case 10: value += (start[len-10] - '0') * 1000000000;
case 9: value += (start[len- 9] - '0') * 100000000;
case 8: value += (start[len- 8] - '0') * 10000000;
case 7: value += (start[len- 7] - '0') * 1000000;
case 6: value += (start[len- 6] - '0') * 100000;
case 5: value += (start[len- 5] - '0') * 10000;
case 4: value += (start[len- 4] - '0') * 1000;
case 3: value += (start[len- 3] - '0') * 100;
case 2: value += (start[len- 2] - '0') * 10;
case 10: value += (start[len-10] - '0') * 1000000000; [[fallthrough]];
case 9: value += (start[len- 9] - '0') * 100000000; [[fallthrough]];
case 8: value += (start[len- 8] - '0') * 10000000; [[fallthrough]];
case 7: value += (start[len- 7] - '0') * 1000000; [[fallthrough]];
case 6: value += (start[len- 6] - '0') * 100000; [[fallthrough]];
case 5: value += (start[len- 5] - '0') * 10000; [[fallthrough]];
case 4: value += (start[len- 4] - '0') * 1000; [[fallthrough]];
case 3: value += (start[len- 3] - '0') * 100; [[fallthrough]];
case 2: value += (start[len- 2] - '0') * 10; [[fallthrough]];
case 1: value += (start[len- 1] - '0');
break;
default:

18
ansi_parser.rl
View file

@ -21,15 +21,15 @@ using namespace fmt;
dbc::check(start[0] != '-', "negative numbers not supported");
switch(len) {
case 10: value += (start[len-10] - '0') * 1000000000;
case 9: value += (start[len- 9] - '0') * 100000000;
case 8: value += (start[len- 8] - '0') * 10000000;
case 7: value += (start[len- 7] - '0') * 1000000;
case 6: value += (start[len- 6] - '0') * 100000;
case 5: value += (start[len- 5] - '0') * 10000;
case 4: value += (start[len- 4] - '0') * 1000;
case 3: value += (start[len- 3] - '0') * 100;
case 2: value += (start[len- 2] - '0') * 10;
case 10: value += (start[len-10] - '0') * 1000000000; [[fallthrough]];
case 9: value += (start[len- 9] - '0') * 100000000; [[fallthrough]];
case 8: value += (start[len- 8] - '0') * 10000000; [[fallthrough]];
case 7: value += (start[len- 7] - '0') * 1000000; [[fallthrough]];
case 6: value += (start[len- 6] - '0') * 100000; [[fallthrough]];
case 5: value += (start[len- 5] - '0') * 10000; [[fallthrough]];
case 4: value += (start[len- 4] - '0') * 1000; [[fallthrough]];
case 3: value += (start[len- 3] - '0') * 100; [[fallthrough]];
case 2: value += (start[len- 2] - '0') * 10; [[fallthrough]];
case 1: value += (start[len- 1] - '0');
break;
default:

2
gui.cpp
View file

@ -392,7 +392,7 @@ void GUI::run_systems() {
auto player = $world.get_the<Player>();
System::motion($world, $game_map);
System::enemy_pathing($world, $game_map, player);
System::lighting($world, $game_map, $lights, player);
System::lighting($world, $game_map, $lights);
System::collision($world, player);
System::death($world);
}

6
inventory.hpp
View file

@ -14,9 +14,9 @@ namespace components {
};
struct Inventory {
int gold;
LightSource light;
std::vector<InventoryItem> items;
int gold=0;
LightSource light{0, 0};
std::vector<InventoryItem> items{};
size_t count() { return items.size(); }

8
map.cpp
View file

@ -173,11 +173,11 @@ bool Map::INVARIANT() {
for(auto room : $rooms) {
check(int(room.x) >= 0 && int(room.y) >= 0,
format("room depth={} has invalid position {},{}",
room.depth, room.x, room.y));
format("room invalid position {},{}",
room.x, room.y));
check(int(room.width) > 0 && int(room.height) > 0,
format("room depth={} has invalid dims {},{}",
room.depth, room.width, room.height));
format("room has invalid dims {},{}",
room.width, room.height));
}
return true;

5
map.hpp
View file

@ -16,13 +16,12 @@
using lighting::LightSource;
struct Room {
int depth;
size_t x = 0;
size_t y = 0;
size_t width = 0;
size_t height = 0;
Point entry;
Point exit;
Point entry{(size_t)-1, (size_t)-1};
Point exit{(size_t)-1, (size_t)-1};
DEFINE_SERIALIZABLE(Room, x, y, width, height);
};

48
meson.build
View file

@ -9,33 +9,38 @@ ftxui_dom = dependency('ftxui-dom')
ftxui_component = dependency('ftxui-component')
sfml = dependency('sfml')
freetype2 = dependency('freetype2')
thread_dep = dependency('threads')
dependencies = [
fmt, ftxui_screen, ftxui_dom,
ftxui_component, json,
sfml, freetype2
sfml, freetype2, thread_dep
]
runtests = executable('runtests', [
'matrix.cpp',
source=[
'dbc.cpp',
'matrix.cpp',
'tilemap.cpp',
'map.cpp',
'gui.cpp',
'rand.cpp',
'sound.cpp',
'combat.cpp',
'spatialmap.cpp',
'combat.cpp',
'systems.cpp',
'ansi_parser.cpp',
'render.cpp',
'config.cpp',
'save.cpp',
'panel.cpp',
'render.cpp',
'pathing.cpp',
'lights.cpp',
'systems.cpp',
'gui.cpp',
'worldbuilder.cpp',
'inventory.cpp',
]
runtests = executable('runtests',
source + [
'tests/tilemap.cpp',
'tests/matrix.cpp',
'tests/fsm.cpp',
@ -55,31 +60,12 @@ runtests = executable('runtests', [
'tests/gui.cpp',
'tests/worldbuilder.cpp',
'tests/inventory.cpp',
],
], cpp_args:['-Wextra','-Werror'],
dependencies: dependencies + catch2)
roguish = executable('roguish', [
'dbc.cpp',
'matrix.cpp',
'tilemap.cpp',
'map.cpp',
'main.cpp',
'gui.cpp',
'rand.cpp',
'sound.cpp',
'spatialmap.cpp',
'combat.cpp',
'systems.cpp',
'ansi_parser.cpp',
'render.cpp',
'config.cpp',
'save.cpp',
'panel.cpp',
'pathing.cpp',
'lights.cpp',
'worldbuilder.cpp',
'inventory.cpp',
],
roguish = executable('roguish',
source + ['main.cpp'],
cpp_args:['-Wextra','-Werror'],
dependencies: dependencies)
designer = executable('designer', [
@ -93,7 +79,7 @@ designer = executable('designer', [
'pathing.cpp',
'lights.cpp',
'tools/designer.cpp'
],
], cpp_args:['-Wextra','-Werror'],
dependencies: dependencies)
fontextract = executable('fontextract', [

2
scripts/quick_clean.ps1 Normal file
View file

@ -0,0 +1,2 @@
rm -recurse -force .\builddir\runtests.exe*
rm -recurse -force .\builddir\roguish.exe*

9
scripts/reset_build.ps1
View file

@ -4,4 +4,13 @@ mkdir subprojects
mv .\packagecache .\subprojects\
mkdir builddir
cp wraps\*.wrap subprojects\
# clang doesn't actually work on Windows, it almost works but Catch2 fails to link against librt, look at https://mesonbuild.com/Builtin-options.html#compiler-options also there's a bug for it https://github.com/brechtsanders/winlibs_mingw/issues/127
# -fsafe-buffer-usage-suggestions
# $env:CC="clang"
# $env:CXX="clang++"
# $env:CC_LD="lld"
# $env:CXX_LD="lld"
meson setup --default-library=static --prefer-static builddir

1
status.txt
View file

@ -1,5 +1,6 @@
TODAY'S GOAL:
* https://github.com/Ericsson/codechecker?tab=readme-ov-file
* Goblins will be in the world and not move or are already dead.
* https://pkl-lang.org/
* Check out https://github.com/stephenberry/glaze

10
systems.cpp
View file

@ -16,16 +16,16 @@ using namespace components;
using ftxui::Color;
using lighting::LightSource;
void System::lighting(DinkyECS::World &world, Map &game_map, LightRender &light, Player &player) {
void System::lighting(DinkyECS::World &world, Map &game_map, LightRender &light) {
light.reset_light();
world.query<Position, LightSource>([&](const auto &ent, auto &position, auto &lightsource) {
world.query<Position>([&](const auto &ent[[maybe_unused]], auto &position) {
light.set_light_target(position.location);
});
light.path_light(game_map.walls());
world.query<Position, LightSource>([&](const auto &ent, auto &position, auto &lightsource) {
world.query<Position, LightSource>([&](const auto &ent[[maybe_unused]], auto &position, auto &lightsource) {
light.render_light(lightsource, position.location);
});
}
@ -62,7 +62,7 @@ void System::init_positions(DinkyECS::World &world) {
}
});
world.query<Position, InventoryItem>([&](const auto &ent, auto &pos, auto &item) {
world.query<Position>([&](const auto &ent, auto &pos) {
collider.insert(pos.location, ent);
});
}
@ -185,7 +185,7 @@ void System::collision(DinkyECS::World &world, Player &player) {
void System::draw_entities(DinkyECS::World &world, Map &game_map, const Matrix &lighting, ftxui::Canvas &canvas, const Point &cam_orig, size_t view_x, size_t view_y) {
auto &tiles = game_map.tiles();
world.query<Position, Tile>([&](const auto &ent, auto &pos, auto &tile) {
world.query<Position, Tile>([&](auto &ent[[maybe_unused]], auto &pos, auto &tile) {
if(pos.location.x >= cam_orig.x && pos.location.x <= cam_orig.x + view_x
&& pos.location.y >= cam_orig.y && pos.location.y <= cam_orig.y + view_y) {
Point loc = game_map.map_to_camera(pos.location, cam_orig);

2
systems.hpp
View file

@ -9,7 +9,7 @@ namespace System {
using namespace components;
using namespace lighting;
void lighting(DinkyECS::World &world, Map &game_map, LightRender &light, Player &player);
void lighting(DinkyECS::World &world, Map &game_map, LightRender &light);
void motion(DinkyECS::World &world, Map &game_map);
void collision(DinkyECS::World &world, Player &player);
void death(DinkyECS::World &world);

3
tests/ansi_parser.cpp
View file

@ -66,8 +66,7 @@ TEST_CASE("test out ragel parser", "[gui]") {
std::wstring colors_utf = $converter.from_bytes(colors);
bool good = ansi.parse(colors_utf,
[&](sf::Color color, sf::Color bgcolor){
// ignore color
[&](sf::Color color[[maybe_unused]], sf::Color bgcolor[[maybe_unused]]){
},
[&](wchar_t ch) {
bool correct_char = ch == '#' || ch == ' ' || ch == '\n' || ch == '\r';

6
tests/dinkyecs.cpp
View file

@ -119,8 +119,14 @@ TEST_CASE("confirm ECS system works", "[ecs]") {
println("--- After remove test, should only result in test2:");
world.query<Position, Velocity>([&](const auto &ent, auto &pos, auto &vel) {
auto &in_position = world.get<Position>(ent);
auto &in_velocity = world.get<Velocity>(ent);
REQUIRE(pos.x >= 0);
REQUIRE(pos.y >= 0);
REQUIRE(in_position.x == pos.x);
REQUIRE(in_position.y == pos.y);
REQUIRE(in_velocity.x == vel.x);
REQUIRE(in_velocity.y == vel.y);
});
}

4
tests/fsm.cpp
View file

@ -25,7 +25,7 @@ public:
}
void START(MyEvent ev) {
println("<<< START");
println("<<< START {}", (int)ev);
state(MyState::RUNNING);
}
@ -40,7 +40,7 @@ public:
}
void END(MyEvent ev) {
println("<<< STOP");
println("<<< STOP {}", (int)ev);
state(MyState::END);
}
};

4
tests/panel.cpp
View file

@ -17,10 +17,10 @@ void test_ansi_parsing(Panel &panel) {
ANSIParser ansi(default_fg, default_bg);
bool good = ansi.parse(panel.to_string(),
[&](sf::Color color, sf::Color bgcolor){
[&](sf::Color color[[maybe_unused]], sf::Color bgcolor[[maybe_unused]]){
// ignore color
},
[&](wchar_t ch) {
[&](wchar_t ch[[maybe_unused]]) {
// ignore char
});

12
tilemap.hpp
View file

@ -11,12 +11,12 @@
struct TileCell {
std::string display;
uint8_t fg_h;
uint8_t fg_s;
uint8_t fg_v;
uint8_t bg_h;
uint8_t bg_s;
uint8_t bg_v;
uint8_t fg_h = 0;
uint8_t fg_s = 0;
uint8_t fg_v = 0;
uint8_t bg_h = 0;
uint8_t bg_s = 0;
uint8_t bg_v = 0;
};
typedef std::vector<TileCell> TileRow;

6
tools/designer.cpp
View file

@ -118,9 +118,9 @@ struct WhatTheColor {
int h;
int s;
int v;
Component h_slider;
Component s_slider;
Component v_slider;
Component h_slider = nullptr;
Component s_slider = nullptr;
Component v_slider = nullptr;
};
class GUI {

6
worldbuilder.cpp
View file

@ -82,13 +82,11 @@ void WorldBuilder::partition_map(Room &cur, int depth) {
// BUG: min room size should be configurable
if(depth > 0 && left.width > 2 && left.height > 2) {
left.depth = depth - 1;
partition_map(left, depth-1);
}
// BUG: min room size should be configurable
if(depth > 0 && right.width > 2 && right.height > 2) {
right.depth = depth - 1;
partition_map(right, depth-1);
}
}
@ -273,7 +271,7 @@ void WorldBuilder::place_rooms() {
}
}
inline bool random_path(Map &map, PointList &holes, Point src, Point target) {
inline bool random_path(Map &map, PointList &holes, Point src) {
bool found = false;
Matrix &paths = map.paths();
Point out{src.x, src.y};
@ -306,7 +304,7 @@ bool WorldBuilder::dig_tunnel(PointList &holes, Point &src, Point &target) {
dbc::check(paths[target.y][target.x] != WALL_PATH_LIMIT,
"target room has path as a wall");
if(!random_path($map, holes, src, target)) {
if(!random_path($map, holes, src)) {
straight_path(holes, src, target);
}